|
@@ -49,7 +49,9 @@
|
49
|
49
|
#error "Seriously? High resolution TFT screen without menu?"
|
50
|
50
|
#endif
|
51
|
51
|
|
52
|
|
-static bool draw_menu_navigation = false;
|
|
52
|
+#if ENABLED(TOUCH_SCREEN)
|
|
53
|
+ static bool draw_menu_navigation = false;
|
|
54
|
+#endif
|
53
|
55
|
|
54
|
56
|
void MarlinUI::tft_idle() {
|
55
|
57
|
#if ENABLED(TOUCH_SCREEN)
|
|
@@ -897,35 +899,37 @@ static void z_minus() {
|
897
|
899
|
moveAxis(Z_AXIS, -1);
|
898
|
900
|
}
|
899
|
901
|
|
900
|
|
-static void e_select() {
|
901
|
|
- motionAxisState.e_selection++;
|
902
|
|
- if (motionAxisState.e_selection >= EXTRUDERS) {
|
903
|
|
- motionAxisState.e_selection = 0;
|
904
|
|
- }
|
|
902
|
+#if ENABLED(TOUCH_SCREEN)
|
|
903
|
+ static void e_select() {
|
|
904
|
+ motionAxisState.e_selection++;
|
|
905
|
+ if (motionAxisState.e_selection >= EXTRUDERS) {
|
|
906
|
+ motionAxisState.e_selection = 0;
|
|
907
|
+ }
|
905
|
908
|
|
906
|
|
- quick_feedback();
|
907
|
|
- drawCurESelection();
|
908
|
|
- drawAxisValue(E_AXIS);
|
909
|
|
-}
|
|
909
|
+ quick_feedback();
|
|
910
|
+ drawCurESelection();
|
|
911
|
+ drawAxisValue(E_AXIS);
|
|
912
|
+ }
|
910
|
913
|
|
911
|
|
-static void do_home() {
|
912
|
|
- quick_feedback();
|
913
|
|
- drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
|
914
|
|
- queue.inject_P(G28_STR);
|
915
|
|
- // Disable touch until home is done
|
916
|
|
- TERN_(HAS_TFT_XPT2046, touch.disable());
|
917
|
|
- drawAxisValue(E_AXIS);
|
918
|
|
- drawAxisValue(X_AXIS);
|
919
|
|
- drawAxisValue(Y_AXIS);
|
920
|
|
- drawAxisValue(Z_AXIS);
|
921
|
|
-}
|
|
914
|
+ static void do_home() {
|
|
915
|
+ quick_feedback();
|
|
916
|
+ drawMessage(GET_TEXT(MSG_LEVEL_BED_HOMING));
|
|
917
|
+ queue.inject_P(G28_STR);
|
|
918
|
+ // Disable touch until home is done
|
|
919
|
+ TERN_(HAS_TFT_XPT2046, touch.disable());
|
|
920
|
+ drawAxisValue(E_AXIS);
|
|
921
|
+ drawAxisValue(X_AXIS);
|
|
922
|
+ drawAxisValue(Y_AXIS);
|
|
923
|
+ drawAxisValue(Z_AXIS);
|
|
924
|
+ }
|
922
|
925
|
|
923
|
|
-static void step_size() {
|
924
|
|
- motionAxisState.currentStepSize = motionAxisState.currentStepSize / 10.0;
|
925
|
|
- if (motionAxisState.currentStepSize < 0.0015) motionAxisState.currentStepSize = 10.0;
|
926
|
|
- quick_feedback();
|
927
|
|
- drawCurStepValue();
|
928
|
|
-}
|
|
926
|
+ static void step_size() {
|
|
927
|
+ motionAxisState.currentStepSize = motionAxisState.currentStepSize / 10.0;
|
|
928
|
+ if (motionAxisState.currentStepSize < 0.0015) motionAxisState.currentStepSize = 10.0;
|
|
929
|
+ quick_feedback();
|
|
930
|
+ drawCurStepValue();
|
|
931
|
+ }
|
|
932
|
+#endif
|
929
|
933
|
|
930
|
934
|
#if HAS_BED_PROBE
|
931
|
935
|
static void z_select() {
|
|
@@ -1021,7 +1025,7 @@ void MarlinUI::move_axis_screen() {
|
1021
|
1025
|
motionAxisState.zTypePos.x = x;
|
1022
|
1026
|
motionAxisState.zTypePos.y = y;
|
1023
|
1027
|
drawCurZSelection();
|
1024
|
|
- #if HAS_BED_PROBE
|
|
1028
|
+ #if BOTH(HAS_BED_PROBE, TOUCH_SCREEN)
|
1025
|
1029
|
if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, 34 * 2, (intptr_t)z_select);
|
1026
|
1030
|
#endif
|
1027
|
1031
|
|