|
@@ -277,7 +277,7 @@
|
277
|
277
|
TWIBus i2c;
|
278
|
278
|
#endif
|
279
|
279
|
|
280
|
|
-#if ENABLED(G38_2_3)
|
|
280
|
+#if ENABLED(G38_PROBE_TARGET)
|
281
|
281
|
bool G38_move = false,
|
282
|
282
|
G38_endstop_hit = false;
|
283
|
283
|
#endif
|
|
@@ -2331,6 +2331,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
2331
|
2331
|
|
2332
|
2332
|
#endif // AUTO_BED_LEVELING_BILINEAR
|
2333
|
2333
|
|
|
2334
|
+
|
2334
|
2335
|
/**
|
2335
|
2336
|
* Home an individual linear axis
|
2336
|
2337
|
*/
|
|
@@ -4166,7 +4167,7 @@ inline void gcode_G28() {
|
4166
|
4167
|
|
4167
|
4168
|
#endif // HAS_BED_PROBE
|
4168
|
4169
|
|
4169
|
|
-#if ENABLED(G38_2_3)
|
|
4170
|
+#if ENABLED(G38_PROBE_TARGET)
|
4170
|
4171
|
|
4171
|
4172
|
static bool G38_run_probe() {
|
4172
|
4173
|
|
|
@@ -4252,7 +4253,7 @@ inline void gcode_G28() {
|
4252
|
4253
|
clean_up_after_endstop_or_probe_move();
|
4253
|
4254
|
}
|
4254
|
4255
|
|
4255
|
|
-#endif // G38_2_3
|
|
4256
|
+#endif // G38_PROBE_TARGET
|
4256
|
4257
|
|
4257
|
4258
|
/**
|
4258
|
4259
|
* G92: Set current position to given X Y Z E
|
|
@@ -7376,7 +7377,7 @@ void process_next_command() {
|
7376
|
7377
|
while (*cmd_ptr == ' ') cmd_ptr++;
|
7377
|
7378
|
|
7378
|
7379
|
// Allow for decimal point in command
|
7379
|
|
- #if ENABLED(G38_2_3)
|
|
7380
|
+ #if ENABLED(G38_PROBE_TARGET)
|
7380
|
7381
|
uint8_t subcode = 0;
|
7381
|
7382
|
#endif
|
7382
|
7383
|
|
|
@@ -7393,7 +7394,7 @@ void process_next_command() {
|
7393
|
7394
|
} while (NUMERIC(*cmd_ptr));
|
7394
|
7395
|
|
7395
|
7396
|
// Allow for decimal point in command
|
7396
|
|
- #if ENABLED(G38_2_3)
|
|
7397
|
+ #if ENABLED(G38_PROBE_TARGET)
|
7397
|
7398
|
if (*cmd_ptr == '.') {
|
7398
|
7399
|
cmd_ptr++;
|
7399
|
7400
|
while (NUMERIC(*cmd_ptr))
|
|
@@ -7501,7 +7502,7 @@ void process_next_command() {
|
7501
|
7502
|
#endif // Z_PROBE_SLED
|
7502
|
7503
|
#endif // HAS_BED_PROBE
|
7503
|
7504
|
|
7504
|
|
- #if ENABLED(G38_2_3)
|
|
7505
|
+ #if ENABLED(G38_PROBE_TARGET)
|
7505
|
7506
|
case 38: // G38.2 & G38.3
|
7506
|
7507
|
if (subcode == 2 || subcode == 3)
|
7507
|
7508
|
gcode_G38(subcode == 2);
|