Browse Source

mbl.active is a bool now

Scott Lahteine 8 years ago
parent
commit
0493fccc0b
4 changed files with 5 additions and 5 deletions
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/configuration_store.cpp
  3. 1
    1
      Marlin/mesh_bed_leveling.h
  4. 1
    1
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/Marlin_main.cpp View File

2465
    */
2465
    */
2466
   #if ENABLED(MESH_BED_LEVELING)
2466
   #if ENABLED(MESH_BED_LEVELING)
2467
     uint8_t mbl_was_active = mbl.active;
2467
     uint8_t mbl_was_active = mbl.active;
2468
-    mbl.active = 0;
2468
+    mbl.active = false;
2469
   #endif
2469
   #endif
2470
 
2470
 
2471
   setup_for_endstop_move();
2471
   setup_for_endstop_move();
2896
           // After recording the last point, activate the mbl and home
2896
           // After recording the last point, activate the mbl and home
2897
           SERIAL_PROTOCOLLNPGM("Mesh probing done.");
2897
           SERIAL_PROTOCOLLNPGM("Mesh probing done.");
2898
           probe_point = -1;
2898
           probe_point = -1;
2899
-          mbl.active = 1;
2899
+          mbl.active = true;
2900
           enqueue_and_echo_commands_P(PSTR("G28"));
2900
           enqueue_and_echo_commands_P(PSTR("G28"));
2901
         }
2901
         }
2902
         break;
2902
         break;

+ 1
- 1
Marlin/configuration_store.cpp View File

551
   home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0;
551
   home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0;
552
 
552
 
553
   #if ENABLED(MESH_BED_LEVELING)
553
   #if ENABLED(MESH_BED_LEVELING)
554
-    mbl.active = 0;
554
+    mbl.active = false;
555
   #endif
555
   #endif
556
 
556
 
557
   #if ENABLED(AUTO_BED_LEVELING_FEATURE)
557
   #if ENABLED(AUTO_BED_LEVELING_FEATURE)

+ 1
- 1
Marlin/mesh_bed_leveling.h View File

29
 
29
 
30
   class mesh_bed_leveling {
30
   class mesh_bed_leveling {
31
   public:
31
   public:
32
-    uint8_t active;
32
+    bool active;
33
     float z_offset;
33
     float z_offset;
34
     float z_values[MESH_NUM_Y_POINTS][MESH_NUM_X_POINTS];
34
     float z_values[MESH_NUM_Y_POINTS][MESH_NUM_X_POINTS];
35
 
35
 

+ 1
- 1
Marlin/ultralcd.cpp View File

946
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
946
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
947
           line_to_current(Z_AXIS);
947
           line_to_current(Z_AXIS);
948
           st_synchronize();
948
           st_synchronize();
949
-          mbl.active = 1;
949
+          mbl.active = true;
950
           enqueue_and_echo_commands_P(PSTR("G28"));
950
           enqueue_and_echo_commands_P(PSTR("G28"));
951
         }
951
         }
952
         else {
952
         else {

Loading…
Cancel
Save