|
@ -49,7 +49,9 @@ |
|
|
#error "Seriously? High resolution TFT screen without menu?" |
|
|
#error "Seriously? High resolution TFT screen without menu?" |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
static bool draw_menu_navigation = false; |
|
|
static bool draw_menu_navigation = false; |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
void MarlinUI::tft_idle() { |
|
|
void MarlinUI::tft_idle() { |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
#if ENABLED(TOUCH_SCREEN) |
|
@ -897,6 +899,7 @@ static void z_minus() { |
|
|
moveAxis(Z_AXIS, -1); |
|
|
moveAxis(Z_AXIS, -1); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
static void e_select() { |
|
|
static void e_select() { |
|
|
motionAxisState.e_selection++; |
|
|
motionAxisState.e_selection++; |
|
|
if (motionAxisState.e_selection >= EXTRUDERS) { |
|
|
if (motionAxisState.e_selection >= EXTRUDERS) { |
|
@ -926,6 +929,7 @@ static void step_size() { |
|
|
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 |
|
|
|
|
|
|
|
|