Browse Source

_lcd_level_bed_position => manual_probe_index

Scott Lahteine 8 years ago
parent
commit
11f1fdfab4
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      Marlin/ultralcd.cpp

+ 6
- 6
Marlin/ultralcd.cpp View File

@@ -1220,7 +1220,7 @@ void kill_screen(const char* lcd_msg) {
1220 1220
      *
1221 1221
      */
1222 1222
 
1223
-    static uint8_t _lcd_level_bed_position;
1223
+    static uint8_t manual_probe_index;
1224 1224
 
1225 1225
     // Utility to go to the next mesh point
1226 1226
     inline void _manual_probe_xy(float x, float y) {
@@ -1266,8 +1266,8 @@ void kill_screen(const char* lcd_msg) {
1266 1266
       }
1267 1267
 
1268 1268
       if (lcd_clicked) {
1269
-        mbl.set_zigzag_z(_lcd_level_bed_position++, current_position[Z_AXIS]);
1270
-        if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
1269
+        mbl.set_zigzag_z(manual_probe_index++, current_position[Z_AXIS]);
1270
+        if (manual_probe_index == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
1271 1271
           lcd_goto_screen(_lcd_level_bed_done);
1272 1272
 
1273 1273
           #if MANUAL_PROBE_HEIGHT > 0
@@ -1307,7 +1307,7 @@ KeepDrawing:
1307 1307
     void _lcd_level_bed_moving() {
1308 1308
       if (lcdDrawUpdate) {
1309 1309
         char msg[10];
1310
-        sprintf_P(msg, PSTR("%i / %u"), (int)(_lcd_level_bed_position + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS));
1310
+        sprintf_P(msg, PSTR("%i / %u"), (int)(manual_probe_index + 1), (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS));
1311 1311
         lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_NEXT_POINT), msg);
1312 1312
       }
1313 1313
 
@@ -1323,7 +1323,7 @@ KeepDrawing:
1323 1323
 
1324 1324
       // _manual_probe_xy runs the menu loop until the move is done
1325 1325
       int8_t px, py;
1326
-      mbl.zigzag(_lcd_level_bed_position, px, py);
1326
+      mbl.zigzag(manual_probe_index, px, py);
1327 1327
       _manual_probe_xy(mbl.get_probe_x(px), mbl.get_probe_y(py));
1328 1328
 
1329 1329
       // After the blocking function returns, change menus
@@ -1337,7 +1337,7 @@ KeepDrawing:
1337 1337
     void _lcd_level_bed_homing_done() {
1338 1338
       if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING));
1339 1339
       if (lcd_clicked) {
1340
-        _lcd_level_bed_position = 0;
1340
+        manual_probe_index = 0;
1341 1341
         lcd_goto_screen(_lcd_level_goto_next_point);
1342 1342
       }
1343 1343
     }

Loading…
Cancel
Save