|
|
@ -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);
|
|
|
|