From ea11fa4eef0834fee13e52590937a192942e1e09 Mon Sep 17 00:00:00 2001 From: marc Date: Thu, 17 Apr 2025 23:16:39 +0200 Subject: [PATCH] clean some globals --- main/ihm.c | 63 +++++++++++++++++++++++++----------------------------- main/ihm.h | 8 +++---- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/main/ihm.c b/main/ihm.c index cb13751..3127679 100644 --- a/main/ihm.c +++ b/main/ihm.c @@ -599,16 +599,11 @@ const lv_fragment_class_t meteoforecast_cls = { .instance_size = sizeof(struct meteoforecast_fragment_t), }; -lv_obj_t *tab0; -lv_obj_t *tabVolets; -lv_obj_t *tabMeteo; -lv_obj_t *tabCuve; -lv_obj_t *tabSettings; uint32_t oldTab; lv_fragment_manager_t *manager2; lv_fragment_t *fragment2; -void tabChgEvt(lv_event_t *event) +/*void tabChgEvt(lv_event_t *event) { uint32_t tabNr = lv_tabview_get_tab_active(event->user_data); @@ -658,7 +653,7 @@ void tabChgEvt(lv_event_t *event) default: break; } -} +}*/ void btnRestart_cb(lv_event_t * e){ lv_event_code_t code = lv_event_get_code(e); @@ -688,9 +683,9 @@ static void log_event_handler(lv_event_t * e) static lv_style_t style_lbvValue; static lv_style_t style_btn; -void draw_tabSettings() +void draw_tabSettings(lv_obj_t * parent) { - lv_obj_t *btnGrp = lv_obj_create(tabSettings); + lv_obj_t *btnGrp = lv_obj_create(parent); lv_obj_set_height(btnGrp, 400); lv_obj_set_flex_flow(btnGrp, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(btnGrp, LV_FLEX_ALIGN_END, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER); @@ -720,8 +715,8 @@ void draw_tabSettings() } -void draw_tabHome(){ - lv_obj_t *supmain = tab0; +void draw_tabHome(lv_obj_t* parent){ + lv_obj_t *supmain = parent; lv_obj_set_flex_flow(supmain, LV_FLEX_FLOW_COLUMN); lv_obj_t *main = lv_obj_create(supmain); @@ -836,30 +831,30 @@ void draw_tabHome(){ lv_fragment_manager_add(manager, fragment, &cont_col3); } -void draw_tabCuve() +void draw_tabCuve(lv_obj_t* parent) { - lv_obj_t *imgGraf = lv_image_create(tabCuve); + lv_obj_t *imgGraf = lv_image_create(parent); lv_image_set_src(imgGraf, "A:/sdcard/hello2.png"); } -void draw_tabMeteo() +void draw_tabMeteo(lv_obj_t * parent) { manager2 = lv_fragment_manager_create(NULL); fragment2 = lv_fragment_create(&meteodailyforecast_cls, (void *)1); - lv_fragment_manager_add(manager2, fragment2, &tabMeteo); + lv_fragment_manager_add(manager2, fragment2, &parent); } -void draw_tabVolets() +void draw_tabVolets(lv_obj_t* parent) { - lv_obj_t *tabMeteo = lv_obj_create(tabVolets); - lv_obj_set_flex_flow(tabMeteo, LV_FLEX_FLOW_COLUMN); - lv_obj_add_style(tabMeteo, &no_padding, 0); + lv_obj_t *tabVolet = lv_obj_create(parent); + lv_obj_set_flex_flow(tabVolet, LV_FLEX_FLOW_COLUMN); + lv_obj_add_style(tabVolet, &no_padding, 0); - lv_obj_set_size(tabMeteo, lv_pct(85), lv_pct(100)); - lv_obj_t *cont_rdc = lv_obj_create(tabMeteo); + lv_obj_set_size(tabVolet, lv_pct(85), lv_pct(100)); + lv_obj_t *cont_rdc = lv_obj_create(tabVolet); lv_obj_set_size(cont_rdc, lv_pct(100), lv_pct(100)); lv_obj_add_style(cont_rdc, &no_padding, 0); - lv_obj_add_style(tabMeteo, &no_padding, 0); + lv_obj_add_style(tabVolet, &no_padding, 0); lv_point_t positions_rdc[] = { {5, 105}, {55, 45}, @@ -884,7 +879,7 @@ void draw_tabVolets() lv_checkbox_set_text(btnVolet, ""); } - lv_obj_t *cont_btn_volets = lv_obj_create(tabVolets); + lv_obj_t *cont_btn_volets = lv_obj_create(parent); lv_obj_add_style(cont_btn_volets, &no_padding, 0); lv_obj_set_size(cont_btn_volets, lv_pct(15), lv_pct(100)); @@ -906,7 +901,7 @@ void draw_tabVolets() lv_obj_set_grid_cell(btnDwn_bis, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_STRETCH, 1, 1); - lv_obj_t *cont_etage = lv_obj_create(tabMeteo); + lv_obj_t *cont_etage = lv_obj_create(tabVolet); lv_obj_set_size(cont_etage, lv_pct(100), lv_pct(100)); lv_obj_add_style(cont_etage, &no_padding, 0); @@ -962,12 +957,12 @@ void draw_ihm() lv_obj_set_style_border_side(tab_buttons, LV_BORDER_SIDE_RIGHT, LV_PART_ITEMS | LV_STATE_CHECKED); //Add 3 tabs (the tabs are page (lv_page) and can be scrolled - tab0 = lv_tabview_add_tab(tabview, LV_SYMBOL_HOME); - tabVolets = lv_tabview_add_tab(tabview, "Volets"); - tabMeteo = lv_tabview_add_tab(tabview, "Météo"); - tabCuve = lv_tabview_add_tab(tabview, "\xEF\x95\xB5" + lv_obj_t* tab0 = lv_tabview_add_tab(tabview, LV_SYMBOL_HOME); + lv_obj_t* tabVolets = lv_tabview_add_tab(tabview, "Volets"); + lv_obj_t* tabMeteo = lv_tabview_add_tab(tabview, "Météo"); + lv_obj_t* tabCuve = lv_tabview_add_tab(tabview, "\xEF\x95\xB5" "Cuve"); - tabSettings = lv_tabview_add_tab(tabview, "Settings"); + lv_obj_t* tabSettings = lv_tabview_add_tab(tabview, "Settings"); // lv_obj_set_style_bg_color(tab2b, lv_palette_lighten(LV_PALETTE_AMBER, 3), 0); lv_obj_set_style_bg_opa(tabVolets, LV_OPA_COVER, 0); @@ -998,11 +993,11 @@ void draw_ihm() lv_style_init(&style_lbvValue); lv_style_set_text_font(&style_lbvValue, &lv_font_montserrat_40); - draw_tabHome(); - draw_tabVolets(); - draw_tabMeteo(); - draw_tabCuve(); - draw_tabSettings(); + draw_tabHome(tab0); + draw_tabVolets(tabVolets); + draw_tabMeteo(tabMeteo); + draw_tabCuve(tabCuve); + draw_tabSettings(tabSettings); lv_obj_set_flex_flow(tabVolets, LV_FLEX_FLOW_ROW); diff --git a/main/ihm.h b/main/ihm.h index a61fb61..d1bf8d7 100644 --- a/main/ihm.h +++ b/main/ihm.h @@ -23,10 +23,10 @@ void weather_data_retreived(meteodailyforecast_data dailyDatas[3], meteoforecast void draw_time(char * dateHeure); void show_temp(char * tempHumid); -void draw_tabMeteo(); +void draw_tabMeteo(lv_obj_t * parent); void tabChgEvt(lv_event_t *event); -void draw_tabCuve(); -void draw_tabHome(); -void draw_tabSettings(); +void draw_tabCuve(lv_obj_t * parent); +void draw_tabHome(lv_obj_t * parent); +void draw_tabSettings(lv_obj_t * parent);