|
@ -49,7 +49,9 @@ |
|
|
#error "Seriously? High resolution TFT screen without menu?" |
|
|
#error "Seriously? High resolution TFT screen without menu?" |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
static bool draw_menu_navigation = false; |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
|
|
|
static bool draw_menu_navigation = false; |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
void MarlinUI::tft_idle() { |
|
|
void MarlinUI::tft_idle() { |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
@ -897,7 +899,8 @@ static void z_minus() { |
|
|
moveAxis(Z_AXIS, -1); |
|
|
moveAxis(Z_AXIS, -1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void e_select() { |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
|
|
|
static void e_select() { |
|
|
motionAxisState.e_selection++; |
|
|
motionAxisState.e_selection++; |
|
|
if (motionAxisState.e_selection >= EXTRUDERS) { |
|
|
if (motionAxisState.e_selection >= EXTRUDERS) { |
|
|
motionAxisState.e_selection = 0; |
|
|
motionAxisState.e_selection = 0; |
|
@ -906,9 +909,9 @@ static void e_select() { |
|
|
quick_feedback(); |
|
|
quick_feedback(); |
|
|
drawCurESelection(); |
|
|
drawCurESelection(); |
|
|
drawAxisValue(E_AXIS); |
|
|
drawAxisValue(E_AXIS); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void do_home() { |
|
|
static void do_home() { |
|
|
quick_feedback(); |
|
|
quick_feedback(); |
|
|
drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING)); |
|
|
drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING)); |
|
|
queue.inject_P(G28_STR); |
|
|
queue.inject_P(G28_STR); |
|
@ -918,14 +921,15 @@ static void do_home() { |
|
|
drawAxisValue(X_AXIS); |
|
|
drawAxisValue(X_AXIS); |
|
|
drawAxisValue(Y_AXIS); |
|
|
drawAxisValue(Y_AXIS); |
|
|
drawAxisValue(Z_AXIS); |
|
|
drawAxisValue(Z_AXIS); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void step_size() { |
|
|
static void step_size() { |
|
|
motionAxisState.currentStepSize = motionAxisState.currentStepSize / 10.0; |
|
|
motionAxisState.currentStepSize = motionAxisState.currentStepSize / 10.0; |
|
|
if (motionAxisState.currentStepSize < 0.0015) motionAxisState.currentStepSize = 10.0; |
|
|
if (motionAxisState.currentStepSize < 0.0015) motionAxisState.currentStepSize = 10.0; |
|
|
quick_feedback(); |
|
|
quick_feedback(); |
|
|
drawCurStepValue(); |
|
|
drawCurStepValue(); |
|
|
} |
|
|
} |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
#if HAS_BED_PROBE |
|
|
#if HAS_BED_PROBE |
|
|
static void z_select() { |
|
|
static void z_select() { |
|
@ -1021,7 +1025,7 @@ void MarlinUI::move_axis_screen() { |
|
|
motionAxisState.zTypePos.x = x; |
|
|
motionAxisState.zTypePos.x = x; |
|
|
motionAxisState.zTypePos.y = y; |
|
|
motionAxisState.zTypePos.y = y; |
|
|
drawCurZSelection(); |
|
|
drawCurZSelection(); |
|
|
#if HAS_BED_PROBE |
|
|
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN) |
|
|
if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, 34 * 2, (intptr_t)z_select); |
|
|
if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, 34 * 2, (intptr_t)z_select); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|