CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mbl.active is a bool now

Browse Source
This commit is contained in:
Scott Lahteine 2016-04-13 01:25:17 -07:00
parent b05f448317
commit 0493fccc0b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -2465,7 +2465,7 @@ inline void gcode_G28() {
*/ */
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
uint8_t mbl_was_active = mbl.active; uint8_t mbl_was_active = mbl.active;
mbl.active = 0; mbl.active = false;
#endif #endif
setup_for_endstop_move(); setup_for_endstop_move();
@ -2896,7 +2896,7 @@ inline void gcode_G28() {
// After recording the last point, activate the mbl and home // After recording the last point, activate the mbl and home
SERIAL_PROTOCOLLNPGM("Mesh probing done."); SERIAL_PROTOCOLLNPGM("Mesh probing done.");
probe_point = -1; probe_point = -1;
mbl.active = 1; mbl.active = true;
enqueue_and_echo_commands_P(PSTR("G28")); enqueue_and_echo_commands_P(PSTR("G28"));
} }
break; break;

2
Marlin/configuration_store.cpp
View File

@ -551,7 +551,7 @@ void Config_ResetDefault() {
home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0; home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0;
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
mbl.active = 0; mbl.active = false;
#endif #endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE) #if ENABLED(AUTO_BED_LEVELING_FEATURE)

2
Marlin/mesh_bed_leveling.h
View File

@ -29,7 +29,7 @@
class mesh_bed_leveling { class mesh_bed_leveling {
public: public:
uint8_t active; bool active;
float z_offset; float z_offset;
float z_values[MESH_NUM_Y_POINTS][MESH_NUM_X_POINTS]; float z_values[MESH_NUM_Y_POINTS][MESH_NUM_X_POINTS];

2
Marlin/ultralcd.cpp
View File

@ -946,7 +946,7 @@ void lcd_cooldown() {
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
line_to_current(Z_AXIS); line_to_current(Z_AXIS);
st_synchronize(); st_synchronize();
mbl.active = 1; mbl.active = true;
enqueue_and_echo_commands_P(PSTR("G28")); enqueue_and_echo_commands_P(PSTR("G28"));
} }
else { else {