Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d3a88913d68d5b8e8ebd1f91986b46d3318b0395
Choose a base ref
..
head repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2028e5ed48e8e346ecd74ec0859eb1b302f610bc
Choose a head ref
Showing with 6 additions and 3 deletions.
  1. +4 −1 Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
  2. +2 −2 Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
5 changes: 4 additions & 1 deletion Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp
Original file line number Diff line number Diff line change
@@ -167,7 +167,10 @@ static void btn_ok_event_cb(lv_obj_t *btn, lv_event_t event) {
TERN_(EEPROM_SETTINGS, (void)settings.reset());
clear_cur_ui();
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
if (touch_calibration.need_calibration()) lv_draw_touch_calibration_screen();
if (touch_calibration.need_calibration()) {
disp_state_stack._disp_index--; // We are asynchronous from the dialog, so let's remove the dialog from the stack
lv_draw_touch_calibration_screen();
}
else
#endif
draw_return_ui();
4 changes: 2 additions & 2 deletions Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
Original file line number Diff line number Diff line change
@@ -101,8 +101,8 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
}

void lv_draw_touch_calibration_screen() {
disp_state_stack._disp_index = 0;
ZERO(disp_state_stack._disp_state);
// disp_state_stack._disp_index = 0;
// ZERO(disp_state_stack._disp_state);
scr = lv_screen_create(TOUCH_CALIBRATION_UI, "");

status_label = lv_label_create(scr, "");