Pārlūkot izejas kodu

Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543)

These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.
Roxy-3D 7 gadus atpakaļ
vecāks
revīzija
ec04cf27d3
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 1
- 1
Marlin/src/feature/bedlevel/bedlevel.cpp Parādīt failu

@@ -41,7 +41,7 @@
41 41
   #endif
42 42
 #endif
43 43
 
44
-#if G26_MESH_VALIDATION
44
+#if ENABLED(G26_MESH_VALIDATION)
45 45
   bool g26_debug_flag; // = false
46 46
 #endif
47 47
 

+ 9
- 3
Marlin/src/gcode/bedlevel/G26.cpp Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt