From 654ad8baad7c7d7a66ab52ed2df59b806d3c56a0 Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 9 Sep 2023 18:04:38 +0200 Subject: [PATCH] home screen load delete option --- Core/Inc/home_screen.h | 2 +- Core/Src/PSE_unit_edit_screen.c | 4 +--- Core/Src/home_screen.c | 4 ++-- Core/Src/main.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Core/Inc/home_screen.h b/Core/Inc/home_screen.h index 258fbef..1e569d7 100644 --- a/Core/Inc/home_screen.h +++ b/Core/Inc/home_screen.h @@ -10,6 +10,6 @@ #include "PSE_unit.h" -void Home_Screen_Gen(pse_unit* units, uint8_t pse_unit_num); +void Home_Screen_Gen(pse_unit* units, uint8_t pse_unit_num, uint8_t delete); #endif /* INC_HOME_SCREEN_H_ */ diff --git a/Core/Src/PSE_unit_edit_screen.c b/Core/Src/PSE_unit_edit_screen.c index 79516fe..9cc2e22 100644 --- a/Core/Src/PSE_unit_edit_screen.c +++ b/Core/Src/PSE_unit_edit_screen.c @@ -34,9 +34,7 @@ static void back_button_handler(lv_event_t * e){ pse_stepper_planer_compute_sps(c_pse_unit); // go back to the main menu - lv_obj_t* curr_scr = lv_scr_act(); - Home_Screen_Gen(c_pse_units, c_pse_units_num); - lv_obj_del(curr_scr); + Home_Screen_Gen(c_pse_units, c_pse_units_num, true); } } diff --git a/Core/Src/home_screen.c b/Core/Src/home_screen.c index d3cb64a..8745ac1 100644 --- a/Core/Src/home_screen.c +++ b/Core/Src/home_screen.c @@ -179,7 +179,7 @@ static lv_obj_t* PSE_unit_widget(lv_obj_t* parent, pse_unit* pse_unit){ return cont; } -void Home_Screen_Gen(pse_unit* pse_units, uint8_t pse_unit_num){ +void Home_Screen_Gen(pse_unit* pse_units, uint8_t pse_unit_num, uint8_t delete){ // Create a new screen lv_obj_t* scr = lv_obj_create(NULL); screen = scr; @@ -250,5 +250,5 @@ void Home_Screen_Gen(pse_unit* pse_units, uint8_t pse_unit_num){ } // fade in the new screen - lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 0, 0, false); + lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 0, 0, delete); } diff --git a/Core/Src/main.c b/Core/Src/main.c index 982df64..ac34293 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -293,7 +293,7 @@ int main(void) load_units(pse_units, pse_syringes, pse_stepper_confs, pse_home_displays, PSE_UNITS_NUM, 0); // Load the home screen - Home_Screen_Gen(pse_units, PSE_UNITS_NUM); + Home_Screen_Gen(pse_units, PSE_UNITS_NUM, false); /* USER CODE END 2 */ /* Infinite loop */