diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 0569d56..ee024e1 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -12,7 +12,7 @@ jobs: steps: # check out HEAD on the branch - name: checkout code - uses: actions/checkout@3 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} # format the latest commit diff --git a/include/liblvgl/lv_conf.h b/include/liblvgl/lv_conf.h index d4763fd..b83d8eb 100644 --- a/include/liblvgl/lv_conf.h +++ b/include/liblvgl/lv_conf.h @@ -485,15 +485,7 @@ typedef void * lv_font_user_data_t; * No flags. Set LV_THEME_DEFAULT_FLAG 0 */ #define LV_USE_THEME_MONO 1 -#define LV_THEME_DEFAULT_INCLUDE /*Include a header for the init. function*/ -#define LV_THEME_DEFAULT_INIT lv_theme_material_init -#define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0x01a2b1) -#define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0x44d1b6) -#define LV_THEME_DEFAULT_FLAG LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &lv_font_montserrat_10 -#define LV_THEME_DEFAULT_FONT_NORMAL &lv_font_montserrat_20 -#define LV_THEME_DEFAULT_FONT_SUBTITLE &lv_font_montserrat_10 -#define LV_THEME_DEFAULT_FONT_TITLE &lv_font_montserrat_30 +#define CONFIG_LV_THEME_DEFAULT_DARK 1 /*================= * Text settings @@ -647,9 +639,6 @@ typedef void * lv_obj_user_data_t; /*Label (dependencies: -*/ #define LV_USE_LABEL 1 #if LV_USE_LABEL != 0 -/*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_ROLL/ROLL_CIRC' mode*/ -# define LV_LABEL_DEF_SCROLL_SPEED 25 - /* Waiting period at beginning/end of animation cycle */ # define LV_LABEL_WAIT_CHAR_COUNT 3 diff --git a/src/liblvgl/display.c b/src/liblvgl/display.c index 8ab561e..3fb8d46 100644 --- a/src/liblvgl/display.c +++ b/src/liblvgl/display.c @@ -117,7 +117,6 @@ void display_initialize(void) { printf("Error initializing input driver\n"); } - // lv_theme_set_current(lv_theme_alien_init(40, NULL)); lv_obj_t* page = lv_obj_create(NULL); lv_obj_set_size(page, LV_HOR_RES_MAX, LV_VER_RES_MAX); lv_scr_load(page);