From 0493fccc0bde14bdd390abcf2b1e59855faed7c7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 13 Apr 2016 01:25:17 -0700 Subject: [PATCH] mbl.active is a bool now --- Marlin/Marlin_main.cpp | 4 ++-- Marlin/configuration_store.cpp | 2 +- Marlin/mesh_bed_leveling.h | 2 +- Marlin/ultralcd.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 09c4b7747..4e01b3780 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2465,7 +2465,7 @@ inline void gcode_G28() { */ #if ENABLED(MESH_BED_LEVELING) uint8_t mbl_was_active = mbl.active; - mbl.active = 0; + mbl.active = false; #endif setup_for_endstop_move(); @@ -2896,7 +2896,7 @@ inline void gcode_G28() { // After recording the last point, activate the mbl and home SERIAL_PROTOCOLLNPGM("Mesh probing done."); probe_point = -1; - mbl.active = 1; + mbl.active = true; enqueue_and_echo_commands_P(PSTR("G28")); } break; diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 3f22b2f8c..7d5a1b4d6 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -551,7 +551,7 @@ void Config_ResetDefault() { home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0; #if ENABLED(MESH_BED_LEVELING) - mbl.active = 0; + mbl.active = false; #endif #if ENABLED(AUTO_BED_LEVELING_FEATURE) diff --git a/Marlin/mesh_bed_leveling.h b/Marlin/mesh_bed_leveling.h index 1df1c9899..7c1c0225e 100644 --- a/Marlin/mesh_bed_leveling.h +++ b/Marlin/mesh_bed_leveling.h @@ -29,7 +29,7 @@ class mesh_bed_leveling { public: - uint8_t active; + bool active; float z_offset; float z_values[MESH_NUM_Y_POINTS][MESH_NUM_X_POINTS]; diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index d2c3daccc..516292c5b 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -946,7 +946,7 @@ void lcd_cooldown() { current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; line_to_current(Z_AXIS); st_synchronize(); - mbl.active = 1; + mbl.active = true; enqueue_and_echo_commands_P(PSTR("G28")); } else {