Skip to content

Commit 98bb2bb

Browse files
Fix syntax errors and enum bitwise warnings
1 parent 1bba83e commit 98bb2bb

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/driver/drv_display_demo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static void gui_build_main_screen() {
3232
lv_obj_t * tab_btns = lv_tabview_get_tab_btns(tabview);
3333
lv_obj_set_style_bg_color(tab_btns, lv_color_hex(0x1A1A2E), LV_PART_MAIN);
3434
lv_obj_set_style_text_color(tab_btns, lv_color_hex(0xAAAAAA), LV_PART_MAIN);
35-
lv_obj_set_style_text_color(tab_btns, lv_color_hex(0xFFFFFF), LV_PART_ITEMS | LV_STATE_CHECKED);
35+
lv_obj_set_style_text_color(tab_btns, lv_color_hex(0xFFFFFF), (lv_style_selector_t)((int)LV_PART_ITEMS | (int)LV_STATE_CHECKED));
3636

3737
// Add 3 tabs
3838
lv_obj_t * tab1 = lv_tabview_add_tab(tabview, "Controls");
@@ -50,7 +50,7 @@ static void gui_build_main_screen() {
5050
// A switch
5151
lv_obj_t * sw = lv_switch_create(tab1);
5252
lv_obj_align(sw, LV_ALIGN_CENTER, -60, 20);
53-
lv_obj_set_style_bg_color(sw, lv_color_hex(0xE94560), LV_PART_INDICATOR | LV_STATE_CHECKED);
53+
lv_obj_set_style_bg_color(sw, lv_color_hex(0xE94560), (lv_style_selector_t)((int)LV_PART_INDICATOR | (int)LV_STATE_CHECKED));
5454

5555
// An arc
5656
lv_obj_t * arc = lv_arc_create(tab1);

src/driver/drv_main.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,14 +1538,16 @@ static driver_t g_drivers[] = {
15381538
NULL, // appendInformationToHTTPIndexPage
15391539
NULL, // runQuickTick
15401540
DisplayHello_Shutdown, // stopFunction
1541-
NULL }, // onEveryMinute
1541+
NULL, // onChannelChanged
1542+
NULL, // onHassDiscovery
1543+
false, // loaded
1544+
},
15421545
{ "DisplayDemo", // Driver Name
15431546
DisplayDemo_Init, // Init
15441547
DisplayDemo_OnEverySecond, // onEverySecond
15451548
NULL, // appendInformationToHTTPIndexPage
15461549
NULL, // runQuickTick
15471550
DisplayDemo_Shutdown, // stopFunction
1548-
NULL }, // onEveryMinute
15491551
NULL, // onChannelChanged
15501552
NULL, // onHassDiscovery
15511553
false, // loaded

0 commit comments

Comments
 (0)