CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename feature to G38_PROBE_TARGET

Browse Source
This commit is contained in:
Scott Lahteine 2016-09-29 15:06:01 -05:00
parent a2864ab7fe
commit 919fe3e4b8
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration_adv.h
View File

@ -532,9 +532,9 @@
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
//#define BEZIER_CURVE_SUPPORT //#define BEZIER_CURVE_SUPPORT
// G38 Probe Target // G38.2 and G38.3 Probe Target
//#define G38_2_3 //#define G38_PROBE_TARGET
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
#define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move) #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move)
#endif #endif

2
Marlin/Marlin.h
View File

@ -209,7 +209,7 @@ void manage_inactivity(bool ignore_stepper_queue = false);
#endif // !MIXING_EXTRUDER #endif // !MIXING_EXTRUDER
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
extern bool G38_move, // flag to tell the interrupt handler that a G38 command is being run extern bool G38_move, // flag to tell the interrupt handler that a G38 command is being run
G38_endstop_hit; // flag from the interrupt handler to indicate if the endstop went active G38_endstop_hit; // flag from the interrupt handler to indicate if the endstop went active
#endif #endif

13
Marlin/Marlin_main.cpp
View File

@ -277,7 +277,7 @@
TWIBus i2c; TWIBus i2c;
#endif #endif
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
bool G38_move = false, bool G38_move = false,
G38_endstop_hit = false; G38_endstop_hit = false;
#endif #endif
@ -2331,6 +2331,7 @@ static void clean_up_after_endstop_or_probe_move() {
#endif // AUTO_BED_LEVELING_BILINEAR #endif // AUTO_BED_LEVELING_BILINEAR
/** /**
* Home an individual linear axis * Home an individual linear axis
*/ */
@ -4166,7 +4167,7 @@ inline void gcode_G28() {
#endif // HAS_BED_PROBE #endif // HAS_BED_PROBE
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
static bool G38_run_probe() { static bool G38_run_probe() {
@ -4252,7 +4253,7 @@ inline void gcode_G28() {
clean_up_after_endstop_or_probe_move(); clean_up_after_endstop_or_probe_move();
} }
#endif // G38_2_3 #endif // G38_PROBE_TARGET
/** /**
* G92: Set current position to given X Y Z E * G92: Set current position to given X Y Z E
@ -7376,7 +7377,7 @@ void process_next_command() {
while (*cmd_ptr == ' ') cmd_ptr++; while (*cmd_ptr == ' ') cmd_ptr++;
// Allow for decimal point in command // Allow for decimal point in command
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
uint8_t subcode = 0; uint8_t subcode = 0;
#endif #endif
@ -7393,7 +7394,7 @@ void process_next_command() {
} while (NUMERIC(*cmd_ptr)); } while (NUMERIC(*cmd_ptr));
// Allow for decimal point in command // Allow for decimal point in command
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
if (*cmd_ptr == '.') { if (*cmd_ptr == '.') {
cmd_ptr++; cmd_ptr++;
while (NUMERIC(*cmd_ptr)) while (NUMERIC(*cmd_ptr))
@ -7501,7 +7502,7 @@ void process_next_command() {
#endif // Z_PROBE_SLED #endif // Z_PROBE_SLED
#endif // HAS_BED_PROBE #endif // HAS_BED_PROBE
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
case 38: // G38.2 & G38.3 case 38: // G38.2 & G38.3
if (subcode == 2 || subcode == 3) if (subcode == 2 || subcode == 3)
gcode_G38(subcode == 2); gcode_G38(subcode == 2);

6
Marlin/SanityCheck.h
View File

@ -854,11 +854,11 @@
/** /**
* G38 Probe Target * G38 Probe Target
*/ */
#if ENABLED(G38_2_3) #if ENABLED(G38_PROBE_TARGET)
#if !HAS_BED_PROBE #if !HAS_BED_PROBE
#error "G38_2_3 requires a bed probe." #error "G38_PROBE_TARGET requires a bed probe."
#elif !IS_CARTESIAN #elif !IS_CARTESIAN
#error "G38_2_3 requires a Cartesian machine." #error "G38_PROBE_TARGET requires a Cartesian machine."
#endif #endif
#endif #endif

2
Marlin/endstops.cpp
View File

@ -252,7 +252,7 @@ void Endstops::update() {
} \ } \
} while(0) } while(0)
#if ENABLED(G38_2_3) && PIN_EXISTS(Z_MIN) // If G38 command then check Z_MIN for every axis and every direction #if ENABLED(G38_PROBE_TARGET) && PIN_EXISTS(Z_MIN) // If G38 command then check Z_MIN for every axis and every direction
#define UPDATE_ENDSTOP(AXIS,MINMAX) do { \ #define UPDATE_ENDSTOP(AXIS,MINMAX) do { \
_UPDATE_ENDSTOP(AXIS,MINMAX,NOOP); \ _UPDATE_ENDSTOP(AXIS,MINMAX,NOOP); \