|
@@ -146,6 +146,8 @@ float g26_extrusion_multiplier,
|
146
|
146
|
g26_layer_height,
|
147
|
147
|
g26_prime_length;
|
148
|
148
|
|
|
149
|
+float g26_x_pos=0, g26_y_pos=0;
|
|
150
|
+
|
149
|
151
|
int16_t g26_bed_temp,
|
150
|
152
|
g26_hotend_temp;
|
151
|
153
|
|
|
@@ -403,7 +405,10 @@ inline bool look_for_lines_to_connect() {
|
403
|
405
|
SERIAL_ECHOPAIR(", ey=", ey);
|
404
|
406
|
SERIAL_CHAR(')');
|
405
|
407
|
SERIAL_EOL();
|
406
|
|
- debug_current_and_destination(PSTR("Connecting vertical line."));
|
|
408
|
+ #if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
409
|
+ void debug_current_and_destination(const char *title);
|
|
410
|
+ debug_current_and_destination(PSTR("Connecting vertical line."));
|
|
411
|
+ #endif
|
407
|
412
|
}
|
408
|
413
|
print_line_from_here_to_there(sx, sy, g26_layer_height, ex, ey, g26_layer_height);
|
409
|
414
|
}
|
|
@@ -675,8 +680,9 @@ void GcodeSuite::G26() {
|
675
|
680
|
return G26_ERR;
|
676
|
681
|
}
|
677
|
682
|
|
678
|
|
- float g26_x_pos = parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position[X_AXIS],
|
679
|
|
- g26_y_pos = parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position[Y_AXIS];
|
|
683
|
+ g26_x_pos = parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position[X_AXIS],
|
|
684
|
+ g26_y_pos = parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position[Y_AXIS];
|
|
685
|
+
|
680
|
686
|
if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
|
681
|
687
|
SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
|
682
|
688
|
return G26_ERR;
|