🎨 Add MKS UI goto_previous_ui

thinkyhead · thinkyhead · commit de77dfcbbd39 · 2021-12-25T00:45:05.000-06:00
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_about.cpp b/Marlin/src/lcd/extui/mks_ui/draw_about.cpp
@@ -39,8 +39,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_A_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp b/Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
@@ -107,8 +107,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         TERN_(EEPROM_SETTINGS, (void)settings.save());
         has_adjust_z = 0;
       }
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp b/Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp
@@ -110,8 +110,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_speed_step();
       break;
     case ID_C_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp b/Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.cpp
@@ -49,8 +49,7 @@ static void event_handler(lv_obj_t * obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_CLOUD_BIND_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_CLOUD_RELEASE_BIND:
       if (cloud_para.state == 0x12) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp b/Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
@@ -136,19 +136,16 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
     else if (DIALOG_IS(PAUSE_MESSAGE_OPTION))
       pause_menu_response = PAUSE_RESPONSE_EXTRUDE_MORE;
     else if (DIALOG_IS(PAUSE_MESSAGE_RESUME)) {
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
     }
   #endif
   else if (DIALOG_IS(STORE_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.save());
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(READ_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.load());
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(REVERT_EEPROM_TIPS)) {
     TERN_(EEPROM_SETTINGS, (void)settings.reset());
@@ -166,27 +163,23 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
   }
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
     uiCfg.configWifi = true;
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
     uiCfg.filament_heat_completed_load = true;
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
     uiCfg.filament_heat_completed_unload = true;
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   #if ENABLED(MKS_WIFI_MODULE)
     else if (DIALOG_IS(TYPE_UNBIND)) {
       cloud_unbind();
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
     }
   #endif
   else {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
 }
 
@@ -197,8 +190,7 @@ static void btn_cancel_event_cb(lv_obj_t *btn, lv_event_t event) {
   }
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT, TYPE_FILAMENT_HEAT_LOAD_COMPLETED, TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED)) {
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
     queue.enqueue_one(F("M410"));
@@ -210,12 +202,10 @@ static void btn_cancel_event_cb(lv_obj_t *btn, lv_event_t event) {
     uiCfg.filament_unloading_time_flg  = false;
     uiCfg.filament_unloading_time_cnt  = 0;
     thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
   else {
-    clear_cur_ui();
-    draw_return_ui();
+    goto_previous_ui();
   }
 }
 
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp b/Marlin/src/lcd/extui/mks_ui/draw_extrusion.cpp
@@ -106,8 +106,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_ext_speed();
       break;
     case ID_E_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp b/Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
@@ -55,7 +55,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_F_HIGH: fanPercent = 100; break;
     case ID_F_MID:  fanPercent =  50; break;
     case ID_F_OFF:  fanPercent =   0; break;
-    case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
+    case ID_F_RETURN: goto_previous_ui(); return;
   }
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
   if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp b/Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
@@ -101,8 +101,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
         planner.set_e_position_mm((destination.e = current_position.e = uiCfg.current_e_position_bak));
       thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);
 
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_home.cpp b/Marlin/src/lcd/extui/mks_ui/draw_home.cpp
@@ -67,8 +67,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       queue.inject(F("M84XY"));
       break;
     case ID_H_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp b/Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
@@ -105,8 +105,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
   }
   else if (strcmp_P(txt, PSTR(LV_SYMBOL_CLOSE)) == 0) {
     if (kb->event_cb != lv_kb_def_event_cb) {
-      lv_clear_keyboard();
-      draw_return_ui();
+      goto_previous_ui();
     }
     else {
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide its cursor if needed
@@ -122,13 +121,11 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
         #if ENABLED(MKS_WIFI_MODULE)
           case wifiName:
             memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
-            lv_clear_keyboard();
-            draw_return_ui();
+            goto_previous_ui();
             break;
           case wifiPassWord:
             memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
-            lv_clear_keyboard();
-            draw_return_ui();
+            goto_previous_ui();
             break;
           case wifiConfig:
             ZERO(uiCfg.wifi_name);
@@ -160,8 +157,7 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
           uint8_t buf[100];
           strncpy((char *)buf, ret_ta_txt, sizeof(buf));
           update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
-          lv_clear_keyboard();
-          draw_return_ui();
+          goto_previous_ui();
           break;
         case GCodeCommand:
           if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp b/Marlin/src/lcd/extui/mks_ui/draw_move_motor.cpp
@@ -83,8 +83,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_move_dist();
       break;
     case ID_M_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       return;
   }
   disp_cur_pos();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -453,8 +453,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
     case ID_NUM_CONFIRM:
       last_disp_state = NUMBER_KEY_UI;
       if (strlen(key_value) != 0) set_value_confirm();
-      lv_clear_number_key();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp b/Marlin/src/lcd/extui/mks_ui/draw_operation.cpp
@@ -90,8 +90,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       lv_draw_change_speed();
       break;
     case ID_O_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_O_POWER_OFF:
       if (gCfgItems.finish_power_off) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp b/Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
@@ -159,8 +159,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
       disp_desire_temp();
       break;
     case ID_P_RETURN:
-      clear_cur_ui();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_P_ABS:
       if (uiCfg.curTempType == 0) {
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp b/Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
@@ -99,8 +99,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_TC_RETURN:
       TERN_(MKS_TEST, current_disp_ui = 1);
-      lv_clear_touch_calibration_screen();
-      draw_return_ui();
+      goto_previous_ui();
       break;
   }
 }
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_tramming_pos_settings.cpp
@@ -54,8 +54,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   switch (obj->mks_obj_id) {
     case ID_MANUAL_POS_RETURN:
       uiCfg.para_ui_page = false;
-      lv_clear_tramming_pos_settings();
-      draw_return_ui();
+      goto_previous_ui();
       return;
     case ID_MANUAL_POS_X1:
       value = level_pos_x1;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -1082,6 +1082,11 @@ void draw_return_ui() {
   }
 }
 
+void goto_previous_ui() {
+  clear_cur_ui();
+  draw_return_ui();
+}
+
 // Set the same image for both Released and Pressed
 void lv_imgbtn_set_src_both(lv_obj_t *imgbtn, const void *src) {
   lv_imgbtn_set_src(imgbtn, LV_BTN_STATE_REL, src);
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/mks_ui/draw_ui.h
@@ -467,6 +467,7 @@ void lv_eom_hook(void *);
 void GUI_RefreshPage();
 void clear_cur_ui();
 void draw_return_ui();
+void goto_previous_ui();
 void sd_detection();
 void gCfg_to_spiFlah();
 void print_time_count();
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp b/Marlin/src/lcd/extui/mks_ui/draw_wifi_settings.cpp
@@ -47,8 +47,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
   if (event != LV_EVENT_RELEASED) return;
   switch (obj->mks_obj_id) {
     case ID_WIFI_RETURN:
-      lv_clear_wifi_settings();
-      draw_return_ui();
+      goto_previous_ui();
       break;
     case ID_WIFI_MODEL:
       if (gCfgItems.wifi_mode_sel == AP_MODEL) {

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`39`	`39`	`if (event != LV_EVENT_RELEASED) return;`
`40`	`40`	`switch (obj->mks_obj_id) {`
`41`	`41`	`case ID_A_RETURN:`
`42`		`- clear_cur_ui();`
`43`		`- draw_return_ui();`
	`42`	`+ goto_previous_ui();`
`44`	`43`	`break;`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`107`	`107`	`TERN_(EEPROM_SETTINGS, (void)settings.save());`
`108`	`108`	`has_adjust_z = 0;`
`109`	`109`	`}`
`110`		`- clear_cur_ui();`
`111`		`- draw_return_ui();`
	`110`	`+ goto_previous_ui();`
`112`	`111`	`break;`
`113`	`112`	`}`
`114`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`110`	`110`	`disp_speed_step();`
`111`	`111`	`break;`
`112`	`112`	`case ID_C_RETURN:`
`113`		`- clear_cur_ui();`
`114`		`- draw_return_ui();`
	`113`	`+ goto_previous_ui();`
`115`	`114`	`break;`
`116`	`115`	`}`
`117`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`106`	`106`	`disp_ext_speed();`
`107`	`107`	`break;`
`108`	`108`	`case ID_E_RETURN:`
`109`		`- clear_cur_ui();`
`110`		`- draw_return_ui();`
	`109`	`+ goto_previous_ui();`
`111`	`110`	`break;`
`112`	`111`	`}`
`113`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`55`	`55`	`case ID_F_HIGH: fanPercent = 100; break;`
`56`	`56`	`case ID_F_MID: fanPercent = 50; break;`
`57`	`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`	`60`	`thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));`
`61`	`61`	`if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`101`	`101`	`planner.set_e_position_mm((destination.e = current_position.e = uiCfg.current_e_position_bak));`
`102`	`102`	`thermalManager.setTargetHotend(uiCfg.hotendTargetTempBak, uiCfg.extruderIndex);`
`103`	`103`
`104`		`- clear_cur_ui();`
`105`		`- draw_return_ui();`
	`104`	`+ goto_previous_ui();`
`106`	`105`	`break;`
`107`	`106`	`}`
`108`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {`
`67`	`67`	`queue.inject(F("M84XY"));`
`68`	`68`	`break;`
`69`	`69`	`case ID_H_RETURN:`
`70`		`- clear_cur_ui();`
`71`		`- draw_return_ui();`
	`70`	`+ goto_previous_ui();`
`72`	`71`	`break;`
`73`	`72`	`}`
`74`	`73`	`}`