Browse Source

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 years ago
parent
commit
ec04cf27d3
No account linked to committer's email address
2 changed files with 10 additions and 4 deletions
  1. 1
    1
      Marlin/src/feature/bedlevel/bedlevel.cpp
  2. 9
    3
      Marlin/src/gcode/bedlevel/G26.cpp

+ 1
- 1
Marlin/src/feature/bedlevel/bedlevel.cpp View File

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

+ 9
- 3
Marlin/src/gcode/bedlevel/G26.cpp View File

146
       g26_layer_height,
146
       g26_layer_height,
147
       g26_prime_length;
147
       g26_prime_length;
148
 
148
 
149
+float g26_x_pos=0, g26_y_pos=0;
150
+
149
 int16_t g26_bed_temp,
151
 int16_t g26_bed_temp,
150
         g26_hotend_temp;
152
         g26_hotend_temp;
151
 
153
 
403
                   SERIAL_ECHOPAIR(", ey=", ey);
405
                   SERIAL_ECHOPAIR(", ey=", ey);
404
                   SERIAL_CHAR(')');
406
                   SERIAL_CHAR(')');
405
                   SERIAL_EOL();
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
                 print_line_from_here_to_there(sx, sy, g26_layer_height, ex, ey, g26_layer_height);
413
                 print_line_from_here_to_there(sx, sy, g26_layer_height, ex, ey, g26_layer_height);
409
               }
414
               }
675
     return G26_ERR;
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
   if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
686
   if (!position_is_reachable(g26_x_pos, g26_y_pos)) {
681
     SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
687
     SERIAL_PROTOCOLLNPGM("?Specified X,Y coordinate out of bounds.");
682
     return G26_ERR;
688
     return G26_ERR;

Loading…
Cancel
Save