bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix recent regressions, &c.

Browse Source 
- fix broken `M421` due to less-than-careful optimization
- add HOME_AFTER_DEACTIVATE define to advanced config so not everyone has to rehome after steppers are deactivated
- misc. cleanups (remove unused label, unused variables)
This commit is contained in:
Brian
2017-05-17 17:16:38 -04:00
parent aad1acc418
commit 43c24f0027
27 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/ubl_G29.cpp
View File

@ -307,7 +307,7 @@
static int g29_verbose_level, phase_value, repetition_cnt,
storage_slot = 0, map_type, grid_size;
static bool repeat_flag, c_flag, x_flag, y_flag;
static float x_pos, y_pos, measured_z, card_thickness = 0.0, ubl_constant = 0.0;
static float x_pos, y_pos, card_thickness = 0.0, ubl_constant = 0.0;
extern void lcd_setstatus(const char* message, const bool persist);
extern void lcd_setstatuspgm(const char* message, const uint8_t level);
@ -1026,7 +1026,6 @@
if (do_ubl_mesh_map) ubl.display_map(map_type);
LEAVE:
ubl.restore_ubl_active_state_and_leave();
KEEPALIVE_STATE(IN_HANDLER);
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);