|
|
@ -51,7 +51,7 @@ float mesh_edit_value, mesh_edit_accumulator; // We round mesh_edit_value to 2.5 |
|
|
// separate value that doesn't lose precision.
|
|
|
// separate value that doesn't lose precision.
|
|
|
static int16_t ubl_encoderPosition = 0; |
|
|
static int16_t ubl_encoderPosition = 0; |
|
|
|
|
|
|
|
|
static void _lcd_mesh_fine_tune(PGM_P msg) { |
|
|
static void _lcd_mesh_fine_tune(PGM_P const msg) { |
|
|
ui.defer_status_screen(); |
|
|
ui.defer_status_screen(); |
|
|
if (ubl.encoder_diff) { |
|
|
if (ubl.encoder_diff) { |
|
|
ubl_encoderPosition = (ubl.encoder_diff > 0) ? 1 : -1; |
|
|
ubl_encoderPosition = (ubl.encoder_diff > 0) ? 1 : -1; |
|
|
@ -74,12 +74,13 @@ static void _lcd_mesh_fine_tune(PGM_P msg) { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void _lcd_mesh_edit_NOP() { |
|
|
void lcd_limbo() { |
|
|
|
|
|
ui.currentScreen = []{}; |
|
|
ui.defer_status_screen(); |
|
|
ui.defer_status_screen(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
float lcd_mesh_edit() { |
|
|
float lcd_mesh_edit() { |
|
|
ui.goto_screen(_lcd_mesh_edit_NOP); |
|
|
lcd_limbo(); |
|
|
ui.refresh(LCDVIEW_CALL_REDRAW_NEXT); |
|
|
ui.refresh(LCDVIEW_CALL_REDRAW_NEXT); |
|
|
_lcd_mesh_fine_tune(GET_TEXT(MSG_MESH_EDITOR)); |
|
|
_lcd_mesh_fine_tune(GET_TEXT(MSG_MESH_EDITOR)); |
|
|
return mesh_edit_value; |
|
|
return mesh_edit_value; |
|
|
@ -87,7 +88,7 @@ float lcd_mesh_edit() { |
|
|
|
|
|
|
|
|
void lcd_mesh_edit_setup(const float &initial) { |
|
|
void lcd_mesh_edit_setup(const float &initial) { |
|
|
mesh_edit_value = mesh_edit_accumulator = initial; |
|
|
mesh_edit_value = mesh_edit_accumulator = initial; |
|
|
ui.goto_screen(_lcd_mesh_edit_NOP); |
|
|
lcd_limbo(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void _lcd_z_offset_edit() { |
|
|
void _lcd_z_offset_edit() { |
|
|
@ -437,10 +438,9 @@ void ubl_map_move_to_xy() { |
|
|
void set_current_from_steppers_for_axis(const AxisEnum axis); |
|
|
void set_current_from_steppers_for_axis(const AxisEnum axis); |
|
|
void sync_plan_position(); |
|
|
void sync_plan_position(); |
|
|
|
|
|
|
|
|
void _lcd_do_nothing() {} |
|
|
|
|
|
void _lcd_hard_stop() { |
|
|
void _lcd_hard_stop() { |
|
|
const screenFunc_t old_screen = ui.currentScreen; |
|
|
const screenFunc_t old_screen = ui.currentScreen; |
|
|
ui.currentScreen = _lcd_do_nothing; |
|
|
lcd_limbo(); |
|
|
planner.quick_stop(); |
|
|
planner.quick_stop(); |
|
|
ui.currentScreen = old_screen; |
|
|
ui.currentScreen = old_screen; |
|
|
set_current_from_steppers_for_axis(ALL_AXES); |
|
|
set_current_from_steppers_for_axis(ALL_AXES); |
|
|
|
Scott Lahteine
5 years ago
GitHub