ソースを参照

🎨 Add MKS UI goto_previous_ui

Scott Lahteine 3年前
コミット
2e0bde37d7

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_about.cpp ファイルの表示

39
   if (event != LV_EVENT_RELEASED) return;
39
   if (event != LV_EVENT_RELEASED) return;
40
   switch (obj->mks_obj_id) {
40
   switch (obj->mks_obj_id) {
41
     case ID_A_RETURN:
41
     case ID_A_RETURN:
42
-      clear_cur_ui();
43
-      draw_return_ui();
42
+      goto_previous_ui();
44
       break;
43
       break;
45
   }
44
   }
46
 }
45
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp ファイルの表示

107
         TERN_(EEPROM_SETTINGS, (void)settings.save());
107
         TERN_(EEPROM_SETTINGS, (void)settings.save());
108
         has_adjust_z = 0;
108
         has_adjust_z = 0;
109
       }
109
       }
110
-      clear_cur_ui();
111
-      draw_return_ui();
110
+      goto_previous_ui();
112
       break;
111
       break;
113
   }
112
   }
114
 }
113
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp ファイルの表示

110
       disp_speed_step();
110
       disp_speed_step();
111
       break;
111
       break;
112
     case ID_C_RETURN:
112
     case ID_C_RETURN:
113
-      clear_cur_ui();
114
-      draw_return_ui();
113
+      goto_previous_ui();
115
       break;
114
       break;
116
   }
115
   }
117
 }
116
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp ファイルの表示

49
   if (event != LV_EVENT_RELEASED) return;
49
   if (event != LV_EVENT_RELEASED) return;
50
   switch (obj->mks_obj_id) {
50
   switch (obj->mks_obj_id) {
51
     case ID_CLOUD_BIND_RETURN:
51
     case ID_CLOUD_BIND_RETURN:
52
-      clear_cur_ui();
53
-      draw_return_ui();
52
+      goto_previous_ui();
54
       break;
53
       break;
55
     case ID_CLOUD_RELEASE_BIND:
54
     case ID_CLOUD_RELEASE_BIND:
56
       if (cloud_para.state == 0x12) {
55
       if (cloud_para.state == 0x12) {

+ 10
- 20
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp ファイルの表示

136
     else if (DIALOG_IS(PAUSE_MESSAGE_OPTION))
136
     else if (DIALOG_IS(PAUSE_MESSAGE_OPTION))
137
       pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
137
       pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
138
     else if (DIALOG_IS(PAUSE_MESSAGE_RESUME)) {
138
     else if (DIALOG_IS(PAUSE_MESSAGE_RESUME)) {
139
-      clear_cur_ui();
140
-      draw_return_ui();
139
+      goto_previous_ui();
141
     }
140
     }
142
   #endif
141
   #endif
143
   else if (DIALOG_IS(STORE_EEPROM_TIPS)) {
142
   else if (DIALOG_IS(STORE_EEPROM_TIPS)) {
144
     TERN_(EEPROM_SETTINGS, (void)settings.save());
143
     TERN_(EEPROM_SETTINGS, (void)settings.save());
145
-    clear_cur_ui();
146
-    draw_return_ui();
144
+    goto_previous_ui();
147
   }
145
   }
148
   else if (DIALOG_IS(READ_EEPROM_TIPS)) {
146
   else if (DIALOG_IS(READ_EEPROM_TIPS)) {
149
     TERN_(EEPROM_SETTINGS, (void)settings.load());
147
     TERN_(EEPROM_SETTINGS, (void)settings.load());
150
-    clear_cur_ui();
151
-    draw_return_ui();
148
+    goto_previous_ui();
152
   }
149
   }
153
   else if (DIALOG_IS(REVERT_EEPROM_TIPS)) {
150
   else if (DIALOG_IS(REVERT_EEPROM_TIPS)) {
154
     TERN_(EEPROM_SETTINGS, (void)settings.reset());
151
     TERN_(EEPROM_SETTINGS, (void)settings.reset());
166
   }
163
   }
167
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
164
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
168
     uiCfg.configWifi = true;
165
     uiCfg.configWifi = true;
169
-    clear_cur_ui();
170
-    draw_return_ui();
166
+    goto_previous_ui();
171
   }
167
   }
172
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
168
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
173
     uiCfg.filament_heat_completed_load = true;
169
     uiCfg.filament_heat_completed_load = true;
174
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
170
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
175
     uiCfg.filament_heat_completed_unload = true;
171
     uiCfg.filament_heat_completed_unload = true;
176
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
172
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
177
-    clear_cur_ui();
178
-    draw_return_ui();
173
+    goto_previous_ui();
179
   }
174
   }
180
   #if ENABLED(MKS_WIFI_MODULE)
175
   #if ENABLED(MKS_WIFI_MODULE)
181
     else if (DIALOG_IS(TYPE_UNBIND)) {
176
     else if (DIALOG_IS(TYPE_UNBIND)) {
182
       cloud_unbind();
177
       cloud_unbind();
183
-      clear_cur_ui();
184
-      draw_return_ui();
178
+      goto_previous_ui();
185
     }
179
     }
186
   #endif
180
   #endif
187
   else {
181
   else {
188
-    clear_cur_ui();
189
-    draw_return_ui();
182
+    goto_previous_ui();
190
   }
183
   }
191
 }
184
 }
192
 
185
 
197
   }
190
   }
198
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT, TYPE_FILAMENT_HEAT_LOAD_COMPLETED, TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED)) {
191
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT, TYPE_FILAMENT_HEAT_LOAD_COMPLETED, TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED)) {
199
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
192
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
200
-    clear_cur_ui();
201
-    draw_return_ui();
193
+    goto_previous_ui();
202
   }
194
   }
203
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
195
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
204
     queue.enqueue_one(F("M410"));
196
     queue.enqueue_one(F("M410"));
210
     uiCfg.filament_unloading_time_flg  = false;
202
     uiCfg.filament_unloading_time_flg  = false;
211
     uiCfg.filament_unloading_time_cnt  = 0;
203
     uiCfg.filament_unloading_time_cnt  = 0;
212
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
204
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
213
-    clear_cur_ui();
214
-    draw_return_ui();
205
+    goto_previous_ui();
215
   }
206
   }
216
   else {
207
   else {
217
-    clear_cur_ui();
218
-    draw_return_ui();
208
+    goto_previous_ui();
219
   }
209
   }
220
 }
210
 }
221
 
211
 

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp ファイルの表示

106
       disp_ext_speed();
106
       disp_ext_speed();
107
       break;
107
       break;
108
     case ID_E_RETURN:
108
     case ID_E_RETURN:
109
-      clear_cur_ui();
110
-      draw_return_ui();
109
+      goto_previous_ui();
111
       break;
110
       break;
112
   }
111
   }
113
 }
112
 }

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_fan.cpp ファイルの表示

55
     case ID_F_HIGH: fanPercent = 100; break;
55
     case ID_F_HIGH: fanPercent = 100; break;
56
     case ID_F_MID:  fanPercent =  50; break;
56
     case ID_F_MID:  fanPercent =  50; break;
57
     case ID_F_OFF:  fanPercent =   0; break;
57
     case ID_F_OFF:  fanPercent =   0; break;
58
-    case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
58
+    case ID_F_RETURN: goto_previous_ui(); return;
59
   }
59
   }
60
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
60
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
61
   if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
61
   if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp ファイルの表示

101
         planner.set_e_position_mm((destination.e = current_position.e = uiCfg.current_e_position_bak));
101
         planner.set_e_position_mm((destination.e = current_position.e = uiCfg.current_e_position_bak));
102
       thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
102
       thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
103
 
103
 
104
-      clear_cur_ui();
105
-      draw_return_ui();
104
+      goto_previous_ui();
106
       break;
105
       break;
107
   }
106
   }
108
 }
107
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_home.cpp ファイルの表示

67
       queue.inject(F("M84XY"));
67
       queue.inject(F("M84XY"));
68
       break;
68
       break;
69
     case ID_H_RETURN:
69
     case ID_H_RETURN:
70
-      clear_cur_ui();
71
-      draw_return_ui();
70
+      goto_previous_ui();
72
       break;
71
       break;
73
   }
72
   }
74
 }
73
 }

+ 4
- 8
Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp ファイルの表示

105
   }
105
   }
106
   else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
106
   else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
107
     if (kb->event_cb != lv_kb_def_event_cb) {
107
     if (kb->event_cb != lv_kb_def_event_cb) {
108
-      lv_clear_keyboard();
109
-      draw_return_ui();
108
+      goto_previous_ui();
110
     }
109
     }
111
     else {
110
     else {
112
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide its cursor if needed
111
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide its cursor if needed
122
         #if ENABLED(MKS_WIFI_MODULE)
121
         #if ENABLED(MKS_WIFI_MODULE)
123
           case wifiName:
122
           case wifiName:
124
             memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
123
             memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
125
-            lv_clear_keyboard();
126
-            draw_return_ui();
124
+            goto_previous_ui();
127
             break;
125
             break;
128
           case wifiPassWord:
126
           case wifiPassWord:
129
             memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
127
             memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
130
-            lv_clear_keyboard();
131
-            draw_return_ui();
128
+            goto_previous_ui();
132
             break;
129
             break;
133
           case wifiConfig:
130
           case wifiConfig:
134
             ZERO(uiCfg.wifi_name);
131
             ZERO(uiCfg.wifi_name);
160
           uint8_t buf[100];
157
           uint8_t buf[100];
161
           strncpy((char *)buf, ret_ta_txt, sizeof(buf));
158
           strncpy((char *)buf, ret_ta_txt, sizeof(buf));
162
           update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
159
           update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
163
-          lv_clear_keyboard();
164
-          draw_return_ui();
160
+          goto_previous_ui();
165
           break;
161
           break;
166
         case GCodeCommand:
162
         case GCodeCommand:
167
           if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {
163
           if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp ファイルの表示

83
       disp_move_dist();
83
       disp_move_dist();
84
       break;
84
       break;
85
     case ID_M_RETURN:
85
     case ID_M_RETURN:
86
-      clear_cur_ui();
87
-      draw_return_ui();
86
+      goto_previous_ui();
88
       return;
87
       return;
89
   }
88
   }
90
   disp_cur_pos();
89
   disp_cur_pos();

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp ファイルの表示

453
     case ID_NUM_CONFIRM:
453
     case ID_NUM_CONFIRM:
454
       last_disp_state = NUMBER_KEY_UI;
454
       last_disp_state = NUMBER_KEY_UI;
455
       if (strlen(key_value) != 0) set_value_confirm();
455
       if (strlen(key_value) != 0) set_value_confirm();
456
-      lv_clear_number_key();
457
-      draw_return_ui();
456
+      goto_previous_ui();
458
       break;
457
       break;
459
   }
458
   }
460
 }
459
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_operation.cpp ファイルの表示

90
       lv_draw_change_speed();
90
       lv_draw_change_speed();
91
       break;
91
       break;
92
     case ID_O_RETURN:
92
     case ID_O_RETURN:
93
-      clear_cur_ui();
94
-      draw_return_ui();
93
+      goto_previous_ui();
95
       break;
94
       break;
96
     case ID_O_POWER_OFF:
95
     case ID_O_POWER_OFF:
97
       if (gCfgItems.finish_power_off) {
96
       if (gCfgItems.finish_power_off) {

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp ファイルの表示

159
       disp_desire_temp();
159
       disp_desire_temp();
160
       break;
160
       break;
161
     case ID_P_RETURN:
161
     case ID_P_RETURN:
162
-      clear_cur_ui();
163
-      draw_return_ui();
162
+      goto_previous_ui();
164
       break;
163
       break;
165
     case ID_P_ABS:
164
     case ID_P_ABS:
166
       if (uiCfg.curTempType == 0) {
165
       if (uiCfg.curTempType == 0) {

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp ファイルの表示

99
   switch (obj->mks_obj_id) {
99
   switch (obj->mks_obj_id) {
100
     case ID_TC_RETURN:
100
     case ID_TC_RETURN:
101
       TERN_(MKS_TEST, current_disp_ui = 1);
101
       TERN_(MKS_TEST, current_disp_ui = 1);
102
-      lv_clear_touch_calibration_screen();
103
-      draw_return_ui();
102
+      goto_previous_ui();
104
       break;
103
       break;
105
   }
104
   }
106
 }
105
 }

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp ファイルの表示

54
   switch (obj->mks_obj_id) {
54
   switch (obj->mks_obj_id) {
55
     case ID_MANUAL_POS_RETURN:
55
     case ID_MANUAL_POS_RETURN:
56
       uiCfg.para_ui_page = false;
56
       uiCfg.para_ui_page = false;
57
-      lv_clear_tramming_pos_settings();
58
-      draw_return_ui();
57
+      goto_previous_ui();
59
       return;
58
       return;
60
     case ID_MANUAL_POS_X1:
59
     case ID_MANUAL_POS_X1:
61
       value = level_pos_x1;
60
       value = level_pos_x1;

+ 5
- 0
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp ファイルの表示

1082
   }
1082
   }
1083
 }
1083
 }
1084
 
1084
 
1085
+void goto_previous_ui() {
1086
+  clear_cur_ui();
1087
+  draw_return_ui();
1088
+}
1089
+
1085
 // Set the same image for both Released and Pressed
1090
 // Set the same image for both Released and Pressed
1086
 void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src) {
1091
 void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src) {
1087
   lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_REL, src);
1092
   lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_REL, src);

+ 1
- 0
Marlin/src/lcd/extui/mks_ui/draw_ui.h ファイルの表示

467
 void GUI_RefreshPage();
467
 void GUI_RefreshPage();
468
 void clear_cur_ui();
468
 void clear_cur_ui();
469
 void draw_return_ui();
469
 void draw_return_ui();
470
+void goto_previous_ui();
470
 void sd_detection();
471
 void sd_detection();
471
 void gCfg_to_spiFlah();
472
 void gCfg_to_spiFlah();
472
 void print_time_count();
473
 void print_time_count();

+ 1
- 2
Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp ファイルの表示

47
   if (event != LV_EVENT_RELEASED) return;
47
   if (event != LV_EVENT_RELEASED) return;
48
   switch (obj->mks_obj_id) {
48
   switch (obj->mks_obj_id) {
49
     case ID_WIFI_RETURN:
49
     case ID_WIFI_RETURN:
50
-      lv_clear_wifi_settings();
51
-      draw_return_ui();
50
+      goto_previous_ui();
52
       break;
51
       break;
53
     case ID_WIFI_MODEL:
52
     case ID_WIFI_MODEL:
54
       if (gCfgItems.wifi_mode_sel == AP_MODEL) {
53
       if (gCfgItems.wifi_mode_sel == AP_MODEL) {

読み込み中…
キャンセル
保存