Browse Source

🎨 Fix up MKS UI defines

Scott Lahteine 2 years ago
parent
commit
d685cbd5c3
26 changed files with 126 additions and 132 deletions
  1. 31
    16
      Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp
  2. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
  3. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp
  4. 25
    25
      Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
  5. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp
  6. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp
  7. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp
  8. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
  9. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
  10. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp
  11. 10
    10
      Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
  12. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp
  13. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp
  14. 12
    20
      Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp
  15. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp
  16. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp
  17. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp
  18. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
  19. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp
  20. 6
    16
      Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp
  21. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
  22. 2
    2
      Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
  23. 13
    15
      Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
  24. 7
    8
      Marlin/src/lcd/extui/mks_ui/draw_ui.h
  25. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
  26. 3
    3
      Marlin/src/lcd/extui/mks_ui/wifi_module.cpp

+ 31
- 16
Marlin/src/lcd/extui/mks_ui/draw_acceleration_settings.cpp View File

@@ -110,38 +110,53 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
110 110
 
111 111
 void lv_draw_acceleration_settings() {
112 112
   scr = lv_screen_create(ACCELERATION_UI, machine_menu.AccelerationConfTitle);
113
+  lv_coord_t y = PARA_UI_POS_Y;
113 114
   if (!uiCfg.para_ui_page) {
114 115
     dtostrf(planner.settings.acceleration, 1, 1, public_buf_l);
115
-    lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
116
+    lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
116 117
 
118
+    y += PARA_UI_POS_Y;
117 119
     dtostrf(planner.settings.retract_acceleration, 1, 1, public_buf_l);
118
-    lv_screen_menu_item_1_edit(scr, machine_menu.RetractAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_RETRA, 1, public_buf_l);
120
+    lv_screen_menu_item_1_edit(scr, machine_menu.RetractAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_RETRA, 1, public_buf_l);
119 121
 
122
+    y += PARA_UI_POS_Y;
120 123
     dtostrf(planner.settings.travel_acceleration, 1, 1, public_buf_l);
121
-    lv_screen_menu_item_1_edit(scr, machine_menu.TravelAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_TRAVEL, 2, public_buf_l);
124
+    lv_screen_menu_item_1_edit(scr, machine_menu.TravelAcceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_TRAVEL, 2, public_buf_l);
122 125
 
126
+    y += PARA_UI_POS_Y;
123 127
     itoa(planner.settings.max_acceleration_mm_per_s2[X_AXIS], public_buf_l, 10);
124
-    lv_screen_menu_item_1_edit(scr, machine_menu.X_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_X, 3, public_buf_l);
128
+    lv_screen_menu_item_1_edit(scr, machine_menu.X_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_X, 3, public_buf_l);
125 129
 
126 130
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_ACCE_DOWN, true);
127 131
   }
128 132
   else {
129
-    itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_l, 10);
130
-    lv_screen_menu_item_1_edit(scr, machine_menu.Y_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_Y, 0, public_buf_l);
131
-
132
-    itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_l, 10);
133
-    lv_screen_menu_item_1_edit(scr, machine_menu.Z_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_ACCE_Z, 1, public_buf_l);
134
-
135
-    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_l, 10);
136
-    lv_screen_menu_item_1_edit(scr, machine_menu.E0_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_ACCE_E0, 2, public_buf_l);
137
-
138
-    itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_l, 10);
139
-    lv_screen_menu_item_1_edit(scr, machine_menu.E1_Acceleration, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_ACCE_E1, 3, public_buf_l);
133
+    #if HAS_Y_AXIS
134
+      itoa(planner.settings.max_acceleration_mm_per_s2[Y_AXIS], public_buf_l, 10);
135
+      lv_screen_menu_item_1_edit(scr, machine_menu.Y_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_Y, 0, public_buf_l);
136
+    #endif
137
+
138
+    #if HAS_Z_AXIS
139
+      y += PARA_UI_POS_Y;
140
+      itoa(planner.settings.max_acceleration_mm_per_s2[Z_AXIS], public_buf_l, 10);
141
+      lv_screen_menu_item_1_edit(scr, machine_menu.Z_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_Z, 1, public_buf_l);
142
+    #endif
143
+
144
+    #if HAS_HOTEND
145
+      y += PARA_UI_POS_Y;
146
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS], public_buf_l, 10);
147
+      lv_screen_menu_item_1_edit(scr, machine_menu.E0_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_E0, 2, public_buf_l);
148
+    #endif
149
+
150
+    #if ENABLED(DISTINCT_E_FACTORS)
151
+      y += PARA_UI_POS_Y;
152
+      itoa(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], public_buf_l, 10);
153
+      lv_screen_menu_item_1_edit(scr, machine_menu.E1_Acceleration, PARA_UI_POS_X, y, event_handler, ID_ACCE_E1, 3, public_buf_l);
154
+    #endif
140 155
 
141 156
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_ACCE_UP, true);
142 157
   }
143 158
 
144
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ACCE_RETURN, true);
159
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_ACCE_RETURN, true);
145 160
 }
146 161
 
147 162
 void lv_clear_acceleration_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp View File

@@ -84,7 +84,7 @@ void lv_draw_advance_settings() {
84 84
     index++;
85 85
   #endif
86 86
 
87
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_ADVANCE_RETURN, true);
87
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_ADVANCE_RETURN, true);
88 88
 }
89 89
 
90 90
 void lv_clear_advance_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_auto_level_offset_settings.cpp View File

@@ -77,7 +77,7 @@ void lv_draw_auto_level_offset_settings() {
77 77
   dtostrf(TERN0(HAS_PROBE_XY_OFFSET, probe.offset.z), 1, 1, public_buf_l);
78 78
   lv_screen_menu_item_1_edit(scr, machine_menu.Zoffset, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_OFFSET_Z, 2, public_buf_l);
79 79
 
80
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_OFFSET_RETURN, true);
80
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_OFFSET_RETURN, true);
81 81
 }
82 82
 
83 83
 void lv_clear_auto_level_offset_settings() {

+ 25
- 25
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp View File

@@ -45,14 +45,14 @@ static lv_obj_t *scr;
45 45
 static lv_obj_t *labelV, *buttonV, *zOffsetText;
46 46
 
47 47
 enum {
48
-  ID_BABY_STEP_X_P = 1,
49
-  ID_BABY_STEP_X_N,
50
-  ID_BABY_STEP_Y_P,
51
-  ID_BABY_STEP_Y_N,
52
-  ID_BABY_STEP_Z_P,
53
-  ID_BABY_STEP_Z_N,
54
-  ID_BABY_STEP_DIST,
55
-  ID_BABY_STEP_RETURN
48
+  ID_BABYSTEP_X_P = 1,
49
+  ID_BABYSTEP_X_N,
50
+  ID_BABYSTEP_Y_P,
51
+  ID_BABYSTEP_Y_N,
52
+  ID_BABYSTEP_Z_P,
53
+  ID_BABYSTEP_Z_N,
54
+  ID_BABYSTEP_DIST,
55
+  ID_BABYSTEP_RETURN
56 56
 };
57 57
 
58 58
 static float babystep_dist  = 0.01;
@@ -63,37 +63,37 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
63 63
   char baby_buf[30] = { 0 };
64 64
   char str_1[16];
65 65
   switch (obj->mks_obj_id) {
66
-    case ID_BABY_STEP_X_P:
66
+    case ID_BABYSTEP_X_P:
67 67
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(babystep_dist, 1, 3, str_1));
68 68
       gcode.process_subcommands_now(F(baby_buf));
69 69
       has_adjust_z = 1;
70 70
       break;
71
-    case ID_BABY_STEP_X_N:
71
+    case ID_BABYSTEP_X_N:
72 72
       sprintf_P(baby_buf, PSTR("M290 X%s"), dtostrf(-babystep_dist, 1, 3, str_1));
73 73
       gcode.process_subcommands_now(F(baby_buf));
74 74
       has_adjust_z = 1;
75 75
       break;
76
-    case ID_BABY_STEP_Y_P:
76
+    case ID_BABYSTEP_Y_P:
77 77
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(babystep_dist, 1, 3, str_1));
78 78
       gcode.process_subcommands_now(F(baby_buf));
79 79
       has_adjust_z = 1;
80 80
       break;
81
-    case ID_BABY_STEP_Y_N:
81
+    case ID_BABYSTEP_Y_N:
82 82
       sprintf_P(baby_buf, PSTR("M290 Y%s"), dtostrf(-babystep_dist, 1, 3, str_1));
83 83
       gcode.process_subcommands_now(F(baby_buf));
84 84
       has_adjust_z = 1;
85 85
       break;
86
-    case ID_BABY_STEP_Z_P:
86
+    case ID_BABYSTEP_Z_P:
87 87
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(babystep_dist, 1, 3, str_1));
88 88
       gcode.process_subcommands_now(F(baby_buf));
89 89
       has_adjust_z = 1;
90 90
       break;
91
-    case ID_BABY_STEP_Z_N:
91
+    case ID_BABYSTEP_Z_N:
92 92
       sprintf_P(baby_buf, PSTR("M290 Z%s"), dtostrf(-babystep_dist, 1, 3, str_1));
93 93
       gcode.process_subcommands_now(F(baby_buf));
94 94
       has_adjust_z = 1;
95 95
       break;
96
-    case ID_BABY_STEP_DIST:
96
+    case ID_BABYSTEP_DIST:
97 97
       if (ABS((int)(100 * babystep_dist)) == 1)
98 98
         babystep_dist = 0.05;
99 99
       else if (ABS((int)(100 * babystep_dist)) == 5)
@@ -102,7 +102,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
102 102
         babystep_dist = 0.01;
103 103
       disp_baby_step_dist();
104 104
       break;
105
-    case ID_BABY_STEP_RETURN:
105
+    case ID_BABYSTEP_RETURN:
106 106
       if (has_adjust_z == 1) {
107 107
         TERN_(EEPROM_SETTINGS, (void)settings.save());
108 108
         has_adjust_z = 0;
@@ -114,21 +114,21 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
114 114
 }
115 115
 
116 116
 void lv_draw_baby_stepping() {
117
-  scr = lv_screen_create(BABY_STEP_UI);
118
-  lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABY_STEP_X_P);
119
-  lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_X_N);
120
-  lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABY_STEP_Y_P);
121
-  lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Y_N);
122
-  lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABY_STEP_Z_P);
123
-  lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_Z_N);
124
-  buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
117
+  scr = lv_screen_create(BABYSTEP_UI);
118
+  lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABYSTEP_X_P);
119
+  lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
120
+  lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
121
+  lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
122
+  lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
123
+  lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
124
+  buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
125 125
   labelV = lv_label_create_empty(buttonV);
126 126
   #if HAS_ROTARY_ENCODER
127 127
     if (gCfgItems.encoder_enable)
128 128
       lv_group_add_obj(g, buttonV);
129 129
   #endif
130 130
 
131
-  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
131
+  lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
132 132
 
133 133
   disp_baby_step_dist();
134 134
 

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_eeprom_settings.cpp View File

@@ -70,7 +70,7 @@ void lv_draw_eeprom_settings() {
70 70
   scr = lv_screen_create(EEPROM_SETTINGS_UI);
71 71
   lv_screen_menu_item(scr, eeprom_menu.revert, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_EEPROM_REVERT, 0);
72 72
   lv_screen_menu_item(scr, eeprom_menu.store, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_EEPROM_STORE, 1);
73
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_EEPROM_RETURN, true);
73
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_EEPROM_RETURN, true);
74 74
 }
75 75
 
76 76
 void lv_clear_eeprom_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_encoder_settings.cpp View File

@@ -58,7 +58,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
58 58
 void lv_draw_encoder_settings() {
59 59
   scr = lv_screen_create(ENCODER_SETTINGS_UI, machine_menu.EncoderConfTitle);
60 60
   buttonEncoderState = lv_screen_menu_item_onoff(scr, machine_menu.EncoderConfText, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ENCODER_STATE, 0, gCfgItems.encoder_enable);
61
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_ENCODER_RETURN, true);
61
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_ENCODER_RETURN, true);
62 62
 }
63 63
 
64 64
 void lv_clear_encoder_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_filament_settings.cpp View File

@@ -114,7 +114,7 @@ void lv_draw_filament_settings() {
114 114
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FILAMENT_SET_UP, true);
115 115
   }
116 116
 
117
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_FILAMENT_SET_RETURN, true);
117
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_FILAMENT_SET_RETURN, true);
118 118
 }
119 119
 
120 120
 void lv_clear_filament_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp View File

@@ -96,7 +96,7 @@ void lv_draw_gcode(bool clear) {
96 96
   outL = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 2, "Result:");
97 97
   outV = lv_label_create(scr, PARA_UI_POS_X, PARA_UI_POS_Y * 3, (const char*)public_buf);
98 98
 
99
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_GCODE_RETURN, true);
99
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_GCODE_RETURN, true);
100 100
 }
101 101
 
102 102
 void lv_clear_gcode() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp View File

@@ -92,7 +92,7 @@ void lv_draw_homing_sensitivity_settings() {
92 92
     lv_screen_menu_item_1_edit(scr, machine_menu.Z2_Sensitivity, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_SENSITIVITY_Z2, 3, public_buf_l);
93 93
   #endif
94 94
 
95
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_SENSITIVITY_RETURN, true);
95
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_SENSITIVITY_RETURN, true);
96 96
 }
97 97
 
98 98
 void lv_clear_homing_sensitivity_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_jerk_settings.cpp View File

@@ -86,7 +86,7 @@ void lv_draw_jerk_settings() {
86 86
   dtostrf(planner.max_jerk[E_AXIS], 1, 1, public_buf_l);
87 87
   lv_screen_menu_item_1_edit(scr, machine_menu.E_Jerk, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_JERK_E, 3, public_buf_l);
88 88
 
89
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_JERK_RETURN, true);
89
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_JERK_RETURN, true);
90 90
 }
91 91
 
92 92
 void lv_clear_jerk_settings() {

+ 10
- 10
Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp View File

@@ -88,22 +88,22 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
88 88
   if (!txt) return;
89 89
 
90 90
   // Do the corresponding action according to the text of the button
91
-  if (strcmp(txt, "abc") == 0) {
91
+  if (strcmp_P(txt, PSTR("abc")) == 0) {
92 92
     lv_btnm_set_map(kb, kb_map_lc);
93 93
     lv_btnm_set_ctrl_map(kb, kb_ctrl_lc_map);
94 94
     return;
95 95
   }
96
-  else if (strcmp(txt, "ABC") == 0) {
96
+  else if (strcmp_P(txt, PSTR("ABC")) == 0) {
97 97
     lv_btnm_set_map(kb, kb_map_uc);
98 98
     lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
99 99
     return;
100 100
   }
101
-  else if (strcmp(txt, "1#") == 0) {
101
+  else if (strcmp_P(txt, PSTR("1#")) == 0) {
102 102
     lv_btnm_set_map(kb, kb_map_spec);
103 103
     lv_btnm_set_ctrl_map(kb, kb_ctrl_spec_map);
104 104
     return;
105 105
   }
106
-  else if (strcmp(txt, LV_SYMBOL_CLOSE) == 0) {
106
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
107 107
     if (kb->event_cb != lv_kb_def_event_cb) {
108 108
       lv_clear_keyboard();
109 109
       draw_return_ui();
@@ -115,7 +115,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
115 115
     }
116 116
     return;
117 117
   }
118
-  else if (strcmp(txt, LV_SYMBOL_OK) == 0) {
118
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_OK)) == 0) {
119 119
     if (kb->event_cb != lv_kb_def_event_cb) {
120 120
       const char * ret_ta_txt = lv_ta_get_text(ext->ta);
121 121
       switch (keyboard_value) {
@@ -183,15 +183,15 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
183 183
   // Add the characters to the text area if set
184 184
   if (!ext->ta) return;
185 185
 
186
-  if (strcmp(txt, "Enter") == 0 || strcmp(txt, LV_SYMBOL_NEW_LINE) == 0)
186
+  if (strcmp_P(txt, PSTR("Enter")) == 0 || strcmp_P(txt, PSTR(LV_SYMBOL_NEW_LINE)) == 0)
187 187
     lv_ta_add_char(ext->ta, '\n');
188
-  else if (strcmp(txt, LV_SYMBOL_LEFT) == 0)
188
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_LEFT)) == 0)
189 189
     lv_ta_cursor_left(ext->ta);
190
-  else if (strcmp(txt, LV_SYMBOL_RIGHT) == 0)
190
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_RIGHT)) == 0)
191 191
     lv_ta_cursor_right(ext->ta);
192
-  else if (strcmp(txt, LV_SYMBOL_BACKSPACE) == 0)
192
+  else if (strcmp_P(txt, PSTR(LV_SYMBOL_BACKSPACE)) == 0)
193 193
     lv_ta_del_char(ext->ta);
194
-  else if (strcmp(txt, "+/-") == 0) {
194
+  else if (strcmp_P(txt, PSTR("+/-")) == 0) {
195 195
     uint16_t cur = lv_ta_get_cursor_pos(ext->ta);
196 196
     const char * ta_txt = lv_ta_get_text(ext->ta);
197 197
     if (ta_txt[0] == '-') {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_level_settings.cpp View File

@@ -68,7 +68,7 @@ void lv_draw_level_settings() {
68 68
   #if HAS_BED_PROBE
69 69
     lv_screen_menu_item(scr, machine_menu.LevelingAutoZoffsetConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_LEVEL_ZOFFSET, 2);
70 70
   #endif
71
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_LEVEL_RETURN, true);
71
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_LEVEL_RETURN, true);
72 72
 }
73 73
 
74 74
 void lv_clear_level_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_machine_para.cpp View File

@@ -72,7 +72,7 @@ void lv_draw_machine_para() {
72 72
   lv_screen_menu_item(scr, MachinePara_menu.MotorSetting, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_PARA_MOTOR, 1);
73 73
   lv_screen_menu_item(scr, MachinePara_menu.leveling, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_PARA_LEVEL, 2);
74 74
   lv_screen_menu_item(scr, MachinePara_menu.AdvanceSetting, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_PARA_ADVANCE, 3);
75
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_PARA_RETURN, true);
75
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_PARA_RETURN, true);
76 76
 }
77 77
 
78 78
 void lv_clear_machine_para() {

+ 12
- 20
Marlin/src/lcd/extui/mks_ui/draw_machine_settings.cpp View File

@@ -41,36 +41,28 @@ enum {
41 41
 
42 42
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
43 43
   if (event != LV_EVENT_RELEASED) return;
44
+  clear_cur_ui();
44 45
   switch (obj->mks_obj_id) {
45
-    case ID_MACHINE_RETURN:
46
-      lv_clear_machine_settings();
47
-      draw_return_ui();
48
-      break;
49
-    case ID_MACHINE_ACCELERATION:
50
-      lv_clear_machine_settings();
51
-      lv_draw_acceleration_settings();
52
-      break;
53
-    case ID_MACHINE_FEEDRATE:
54
-      lv_clear_machine_settings();
55
-      lv_draw_max_feedrate_settings();
56
-      break;
46
+    case ID_MACHINE_RETURN:       draw_return_ui(); break;
47
+    case ID_MACHINE_ACCELERATION: lv_draw_acceleration_settings(); break;
48
+    case ID_MACHINE_FEEDRATE:     lv_draw_max_feedrate_settings(); break;
57 49
     #if HAS_CLASSIC_JERK
58
-      case ID_MACHINE_JERK:
59
-        lv_clear_machine_settings();
60
-        lv_draw_jerk_settings();
61
-        break;
50
+      case ID_MACHINE_JERK:       lv_draw_jerk_settings(); break;
62 51
     #endif
63 52
   }
64 53
 }
65 54
 
66 55
 void lv_draw_machine_settings() {
67 56
   scr = lv_screen_create(MACHINE_SETTINGS_UI, machine_menu.MachineConfigTitle);
68
-  lv_screen_menu_item(scr, machine_menu.AccelerationConf, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MACHINE_ACCELERATION, 0);
69
-  lv_screen_menu_item(scr, machine_menu.MaxFeedRateConf, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_MACHINE_FEEDRATE, 1);
57
+  lv_coord_t y = PARA_UI_POS_Y;
58
+  lv_screen_menu_item(scr, machine_menu.AccelerationConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_ACCELERATION, 0);
59
+  y += PARA_UI_POS_Y;
60
+  lv_screen_menu_item(scr, machine_menu.MaxFeedRateConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_FEEDRATE, 1);
70 61
   #if HAS_CLASSIC_JERK
71
-    lv_screen_menu_item(scr, machine_menu.JerkConf, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_MACHINE_JERK, 2);
62
+    y += PARA_UI_POS_Y;
63
+    lv_screen_menu_item(scr, machine_menu.JerkConf, PARA_UI_POS_X, y, event_handler, ID_MACHINE_JERK, 2);
72 64
   #endif
73
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MACHINE_RETURN, true);
65
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MACHINE_RETURN, true);
74 66
 }
75 67
 
76 68
 void lv_clear_machine_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_max_feedrate_settings.cpp View File

@@ -105,7 +105,7 @@ void lv_draw_max_feedrate_settings() {
105 105
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_FEED_UP, true);
106 106
   }
107 107
 
108
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_FEED_RETURN, true);
108
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_FEED_RETURN, true);
109 109
 }
110 110
 
111 111
 void lv_clear_max_feedrate_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_motor_settings.cpp View File

@@ -86,7 +86,7 @@ void lv_draw_motor_settings() {
86 86
       index++;
87 87
     #endif
88 88
   #endif
89
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MOTOR_RETURN, true);
89
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MOTOR_RETURN, true);
90 90
 }
91 91
 
92 92
 void lv_clear_motor_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_pause_position.cpp View File

@@ -72,7 +72,7 @@ void lv_draw_pause_position() {
72 72
   dtostrf(gCfgItems.pausePosZ, 1, 1, public_buf_l);
73 73
   lv_screen_menu_item_1_edit(scr, machine_menu.zPos, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_PAUSE_Z, 2, public_buf_l);
74 74
 
75
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_PAUSE_RETURN, true);
75
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_PAUSE_RETURN, true);
76 76
 }
77 77
 
78 78
 void lv_clear_pause_position() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp View File

@@ -188,7 +188,7 @@ void disp_add_dec() {
188 188
 }
189 189
 
190 190
 void lv_draw_preHeat() {
191
-  scr = lv_screen_create(PRE_HEAT_UI);
191
+  scr = lv_screen_create(PREHEAT_UI);
192 192
 
193 193
   // Create image buttons
194 194
   disp_add_dec();

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_step_settings.cpp View File

@@ -104,7 +104,7 @@ void lv_draw_step_settings() {
104 104
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_STEP_UP, true);
105 105
   }
106 106
 
107
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_STEP_RETURN, true);
107
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_STEP_RETURN, true);
108 108
 }
109 109
 
110 110
 void lv_clear_step_settings() {

+ 6
- 16
Marlin/src/lcd/extui/mks_ui/draw_tmc_current_settings.cpp View File

@@ -54,29 +54,19 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
54 54
       draw_return_ui();
55 55
       return;
56 56
     #if AXIS_IS_TMC(X)
57
-      case ID_TMC_CURRENT_X:
58
-        value = Xcurrent;
59
-        break;
57
+      case ID_TMC_CURRENT_X:  value = Xcurrent;  break;
60 58
     #endif
61 59
     #if AXIS_IS_TMC(Y)
62
-      case ID_TMC_CURRENT_Y:
63
-        value = Ycurrent;
64
-        break;
60
+      case ID_TMC_CURRENT_Y:  value = Ycurrent;  break;
65 61
     #endif
66 62
     #if AXIS_IS_TMC(Z)
67
-      case ID_TMC_CURRENT_Z:
68
-        value = Zcurrent;
69
-        break;
63
+      case ID_TMC_CURRENT_Z:  value = Zcurrent;  break;
70 64
     #endif
71 65
     #if AXIS_IS_TMC(E0)
72
-      case ID_TMC_CURRENT_E0:
73
-        value = E0current;
74
-        break;
66
+      case ID_TMC_CURRENT_E0: value = E0current; break;
75 67
     #endif
76 68
     #if AXIS_IS_TMC(E1)
77
-      case ID_TMC_CURRENT_E1:
78
-        value = E1current;
79
-        break;
69
+      case ID_TMC_CURRENT_E1: value = E1current; break;
80 70
     #endif
81 71
 
82 72
     case ID_TMC_CURRENT_UP:
@@ -143,7 +133,7 @@ void lv_draw_tmc_current_settings() {
143 133
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_CURRENT_UP, true);
144 134
   }
145 135
 
146
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_TMC_CURRENT_RETURN, true);
136
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_TMC_CURRENT_RETURN, true);
147 137
 }
148 138
 
149 139
 void lv_clear_tmc_current_settings() {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp View File

@@ -122,7 +122,7 @@ void lv_draw_tmc_step_mode_settings() {
122 122
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_UP, true);
123 123
   }
124 124
 
125
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_TMC_MODE_RETURN, true);
125
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_TMC_MODE_RETURN, true);
126 126
 }
127 127
 
128 128
 void lv_clear_tmc_step_mode_settings() {

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp View File

@@ -105,7 +105,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
105 105
 void lv_draw_tramming_pos_settings() {
106 106
   char buf2[50];
107 107
 
108
-  scr = lv_screen_create(MANUAL_LEVELING_POSIGION_UI, machine_menu.LevelingParaConfTitle);
108
+  scr = lv_screen_create(MANUAL_LEVELING_POSITION_UI, machine_menu.LevelingParaConfTitle);
109 109
 
110 110
   if (!uiCfg.para_ui_page) {
111 111
     itoa(gCfgItems.trammingPos[0].x, public_buf_l, 10);
@@ -134,7 +134,7 @@ void lv_draw_tramming_pos_settings() {
134 134
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.previous, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_MANUAL_POS_UP, true);
135 135
   }
136 136
 
137
-  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACL_POS_X + 10, PARA_UI_BACL_POS_Y, event_handler, ID_MANUAL_POS_RETURN, true);
137
+  lv_big_button_create(scr, "F:/bmp_back70x40.bin", common_menu.text_back, PARA_UI_BACK_POS_X + 10, PARA_UI_BACK_POS_Y, event_handler, ID_MANUAL_POS_RETURN, true);
138 138
 }
139 139
 
140 140
 void lv_clear_tramming_pos_settings() {

+ 13
- 15
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp View File

@@ -475,7 +475,7 @@ char *getDispText(int index) {
475 475
     case EXTRUSION_UI:        strcpy(public_buf_l, extrude_menu.title); break;
476 476
     case CHANGE_SPEED_UI:     strcpy(public_buf_l, speed_menu.title); break;
477 477
     case FAN_UI:              strcpy(public_buf_l, fan_menu.title); break;
478
-    case PRE_HEAT_UI:
478
+    case PREHEAT_UI:
479 479
       switch (disp_state_stack._disp_state[disp_state_stack._disp_index]) {
480 480
         case OPERATE_UI:      strcpy(public_buf_l, preheat_menu.adjust_title);
481 481
         default:              strcpy(public_buf_l, preheat_menu.title); break;
@@ -500,7 +500,7 @@ char *getDispText(int index) {
500 500
     case TOOL_UI:             strcpy(public_buf_l, tool_menu.title); break;
501 501
     case WIFI_LIST_UI:        TERN_(MKS_WIFI_MODULE, strcpy(public_buf_l, list_menu.title)); break;
502 502
     case MACHINE_PARA_UI:     strcpy(public_buf_l, MachinePara_menu.title); break;
503
-    case BABY_STEP_UI:        strcpy(public_buf_l, operation_menu.babystep); break;
503
+    case BABYSTEP_UI:         strcpy(public_buf_l, operation_menu.babystep); break;
504 504
     case EEPROM_SETTINGS_UI:  strcpy(public_buf_l, eeprom_menu.title); break;
505 505
     case MEDIA_SELECT_UI:     strcpy(public_buf_l, media_select_menu.title); break;
506 506
     default: break;
@@ -742,7 +742,7 @@ void GUI_RefreshPage() {
742 742
         disp_hotend_temp();
743 743
       }
744 744
       break;
745
-    case PRE_HEAT_UI:
745
+    case PREHEAT_UI:
746 746
       if (temps_update_flag) {
747 747
         temps_update_flag = false;
748 748
         disp_desire_temp();
@@ -822,7 +822,7 @@ void GUI_RefreshPage() {
822 822
       case WIFI_TIPS_UI:
823 823
         switch (wifi_tips_type) {
824 824
           case TIPS_TYPE_JOINING:
825
-            if (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName,(const char *)wifi_list.wifiName[wifi_list.nameIndex]) == 0) {
825
+            if (wifi_link_state == WIFI_CONNECTED && strcmp((const char *)wifi_list.wifiConnectedName, (const char *)wifi_list.wifiName[wifi_list.nameIndex]) == 0) {
826 826
               tips_disp.timer = TIPS_TIMER_STOP;
827 827
               tips_disp.timer_count = 0;
828 828
 
@@ -864,7 +864,7 @@ void GUI_RefreshPage() {
864 864
         break;
865 865
     #endif
866 866
 
867
-    case BABY_STEP_UI:
867
+    case BABYSTEP_UI:
868 868
       if (temps_update_flag) {
869 869
         temps_update_flag = false;
870 870
         disp_z_offset_value();
@@ -888,7 +888,7 @@ void clear_cur_ui() {
888 888
     case OPERATE_UI:                  lv_clear_operation(); break;
889 889
     case PAUSE_UI:                    break;
890 890
     case EXTRUSION_UI:                lv_clear_extrusion(); break;
891
-    case PRE_HEAT_UI:                 lv_clear_preHeat(); break;
891
+    case PREHEAT_UI:                  lv_clear_preHeat(); break;
892 892
     case CHANGE_SPEED_UI:             lv_clear_change_speed(); break;
893 893
     case FAN_UI:                      lv_clear_fan(); break;
894 894
     case SET_UI:                      lv_clear_set(); break;
@@ -929,15 +929,14 @@ void clear_cur_ui() {
929 929
     case MACHINE_SETTINGS_UI:         lv_clear_machine_settings(); break;
930 930
     case TEMPERATURE_SETTINGS_UI:     break;
931 931
     case MOTOR_SETTINGS_UI:           lv_clear_motor_settings(); break;
932
-    case MACHINETYPE_UI:              break;
932
+    case MACHINE_TYPE_UI:             break;
933 933
     case STROKE_UI:                   break;
934 934
     case HOME_DIR_UI:                 break;
935 935
     case ENDSTOP_TYPE_UI:             break;
936 936
     case FILAMENT_SETTINGS_UI:        break;
937
-    case LEVELING_SETTIGNS_UI:        break;
938 937
     case LEVELING_PARA_UI:            lv_clear_level_settings(); break;
939 938
     case DELTA_LEVELING_PARA_UI:      break;
940
-    case MANUAL_LEVELING_POSIGION_UI: lv_clear_tramming_pos_settings(); break;
939
+    case MANUAL_LEVELING_POSITION_UI: lv_clear_tramming_pos_settings(); break;
941 940
     case MAXFEEDRATE_UI:              lv_clear_max_feedrate_settings(); break;
942 941
     case STEPS_UI:                    lv_clear_step_settings(); break;
943 942
     case ACCELERATION_UI:             lv_clear_acceleration_settings(); break;
@@ -950,7 +949,7 @@ void clear_cur_ui() {
950 949
     case DOUBLE_Z_UI:                 break;
951 950
     case ENABLE_INVERT_UI:            break;
952 951
     case NUMBER_KEY_UI:               lv_clear_number_key(); break;
953
-    case BABY_STEP_UI:                lv_clear_baby_stepping(); break;
952
+    case BABYSTEP_UI:                 lv_clear_baby_stepping(); break;
954 953
     case PAUSE_POS_UI:                lv_clear_pause_position(); break;
955 954
     #if HAS_TRINAMIC_CONFIG
956 955
       case TMC_CURRENT_UI:            lv_clear_tmc_current_settings(); break;
@@ -997,7 +996,7 @@ void draw_return_ui() {
997 996
       case OPERATE_UI:                  lv_draw_operation(); break;
998 997
       case PAUSE_UI:                    break;
999 998
       case EXTRUSION_UI:                lv_draw_extrusion(); break;
1000
-      case PRE_HEAT_UI:                 lv_draw_preHeat(); break;
999
+      case PREHEAT_UI:                  lv_draw_preHeat(); break;
1001 1000
       case CHANGE_SPEED_UI:             lv_draw_change_speed(); break;
1002 1001
       case FAN_UI:                      lv_draw_fan(); break;
1003 1002
       case SET_UI:                      lv_draw_set(); break;
@@ -1037,15 +1036,14 @@ void draw_return_ui() {
1037 1036
       case MACHINE_SETTINGS_UI:         lv_draw_machine_settings(); break;
1038 1037
       case TEMPERATURE_SETTINGS_UI:     break;
1039 1038
       case MOTOR_SETTINGS_UI:           lv_draw_motor_settings(); break;
1040
-      case MACHINETYPE_UI:              break;
1039
+      case MACHINE_TYPE_UI:             break;
1041 1040
       case STROKE_UI:                   break;
1042 1041
       case HOME_DIR_UI:                 break;
1043 1042
       case ENDSTOP_TYPE_UI:             break;
1044 1043
       case FILAMENT_SETTINGS_UI:        lv_draw_filament_settings(); break;
1045
-      case LEVELING_SETTIGNS_UI:        break;
1046 1044
       case LEVELING_PARA_UI:            lv_draw_level_settings(); break;
1047 1045
       case DELTA_LEVELING_PARA_UI:      break;
1048
-      case MANUAL_LEVELING_POSIGION_UI: lv_draw_tramming_pos_settings(); break;
1046
+      case MANUAL_LEVELING_POSITION_UI: lv_draw_tramming_pos_settings(); break;
1049 1047
       case MAXFEEDRATE_UI:              lv_draw_max_feedrate_settings(); break;
1050 1048
       case STEPS_UI:                    lv_draw_step_settings(); break;
1051 1049
       case ACCELERATION_UI:             lv_draw_acceleration_settings(); break;
@@ -1061,7 +1059,7 @@ void draw_return_ui() {
1061 1059
       case ENABLE_INVERT_UI:            break;
1062 1060
       case NUMBER_KEY_UI:               lv_draw_number_key(); break;
1063 1061
       case DIALOG_UI:                   break;
1064
-      case BABY_STEP_UI:                lv_draw_baby_stepping(); break;
1062
+      case BABYSTEP_UI:                 lv_draw_baby_stepping(); break;
1065 1063
       case PAUSE_POS_UI:                lv_draw_pause_position(); break;
1066 1064
       #if HAS_TRINAMIC_CONFIG
1067 1065
         case TMC_CURRENT_UI:            lv_draw_tmc_current_settings(); break;

+ 7
- 8
Marlin/src/lcd/extui/mks_ui/draw_ui.h View File

@@ -143,8 +143,8 @@
143 143
 
144 144
   #define PARA_UI_ARROW_V          12
145 145
 
146
-  #define PARA_UI_BACL_POS_X        400
147
-  #define PARA_UI_BACL_POS_Y        270
146
+  #define PARA_UI_BACK_POS_X        400
147
+  #define PARA_UI_BACK_POS_Y        270
148 148
 
149 149
   #define PARA_UI_TURN_PAGE_POS_X   320
150 150
   #define PARA_UI_TURN_PAGE_POS_Y   270
@@ -270,7 +270,7 @@ typedef enum {
270 270
   PAUSE_UI,
271 271
   EXTRUSION_UI,
272 272
   FAN_UI,
273
-  PRE_HEAT_UI,
273
+  PREHEAT_UI,
274 274
   CHANGE_SPEED_UI,
275 275
   TEMP_UI,
276 276
   SET_UI,
@@ -304,15 +304,14 @@ typedef enum {
304 304
   MACHINE_SETTINGS_UI,
305 305
   TEMPERATURE_SETTINGS_UI,
306 306
   MOTOR_SETTINGS_UI,
307
-  MACHINETYPE_UI,
307
+  MACHINE_TYPE_UI,
308 308
   STROKE_UI,
309 309
   HOME_DIR_UI,
310 310
   ENDSTOP_TYPE_UI,
311 311
   FILAMENT_SETTINGS_UI,
312
-  LEVELING_SETTIGNS_UI,
313 312
   LEVELING_PARA_UI,
314 313
   DELTA_LEVELING_PARA_UI,
315
-  MANUAL_LEVELING_POSIGION_UI,
314
+  MANUAL_LEVELING_POSITION_UI,
316 315
   MAXFEEDRATE_UI,
317 316
   STEPS_UI,
318 317
   ACCELERATION_UI,
@@ -325,7 +324,7 @@ typedef enum {
325 324
   DOUBLE_Z_UI,
326 325
   ENABLE_INVERT_UI,
327 326
   NUMBER_KEY_UI,
328
-  BABY_STEP_UI,
327
+  BABYSTEP_UI,
329 328
   ERROR_MESSAGE_UI,
330 329
   PAUSE_POS_UI,
331 330
   TMC_CURRENT_UI,
@@ -336,7 +335,7 @@ typedef enum {
336 335
   ENCODER_SETTINGS_UI,
337 336
   TOUCH_CALIBRATION_UI,
338 337
   GCODE_UI,
339
-  MEDIA_SELECT_UI,
338
+  MEDIA_SELECT_UI
340 339
 } DISP_STATE;
341 340
 
342 341
 typedef struct {

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp View File

@@ -130,7 +130,7 @@ void lv_draw_wifi_settings() {
130 130
   lv_obj_t *buttonConfig = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_WIFI_CONFIG);
131 131
   lv_obj_t *labelConfig = lv_label_create_empty(buttonConfig);
132 132
 
133
-  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACL_POS_X, PARA_UI_BACL_POS_Y, event_handler, ID_WIFI_RETURN);
133
+  lv_obj_t *buttonBack = lv_imgbtn_create(scr, "F:/bmp_back70x40.bin", PARA_UI_BACK_POS_X, PARA_UI_BACK_POS_Y, event_handler, ID_WIFI_RETURN);
134 134
   lv_obj_t *label_Back = lv_label_create_empty(buttonBack);
135 135
 
136 136
   if (gCfgItems.multiple_language) {

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/wifi_module.cpp View File

@@ -2026,12 +2026,12 @@ void get_wifi_commands() {
2026 2026
 
2027 2027
         #if DISABLED(EMERGENCY_PARSER)
2028 2028
           // Process critical commands early
2029
-          if (strcmp(command, "M108") == 0) {
2029
+          if (strcmp_P(command, PSTR("M108")) == 0) {
2030 2030
             wait_for_heatup = false;
2031 2031
             TERN_(HAS_LCD_MENU, wait_for_user = false);
2032 2032
           }
2033
-          if (strcmp(command, "M112") == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
2034
-          if (strcmp(command, "M410") == 0) quickstop_stepper();
2033
+          if (strcmp_P(command, PSTR("M112")) == 0) kill(FPSTR(M112_KILL_STR), nullptr, true);
2034
+          if (strcmp_P(command, PSTR("M410")) == 0) quickstop_stepper();
2035 2035
         #endif
2036 2036
 
2037 2037
         // Add the command to the queue

Loading…
Cancel
Save