diff --git a/src/font/ascii/robotocondensed_regular_12_ascii.cpp b/src/font/ascii/robotocondensed_regular_12_ascii.cpp index d5a35840..93823019 100644 --- a/src/font/ascii/robotocondensed_regular_12_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_12_ascii.cpp @@ -1637,7 +1637,7 @@ lv_font_t robotocondensed_regular_12_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_14_ascii.cpp b/src/font/ascii/robotocondensed_regular_14_ascii.cpp index e2382a67..c2a350e8 100644 --- a/src/font/ascii/robotocondensed_regular_14_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_14_ascii.cpp @@ -1839,7 +1839,7 @@ lv_font_t robotocondensed_regular_14_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_16_ascii.cpp b/src/font/ascii/robotocondensed_regular_16_ascii.cpp index c09e9978..3f7db61f 100644 --- a/src/font/ascii/robotocondensed_regular_16_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_16_ascii.cpp @@ -1999,7 +1999,7 @@ lv_font_t robotocondensed_regular_16_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_20_ascii.cpp b/src/font/ascii/robotocondensed_regular_20_ascii.cpp index 120b565b..109bce47 100644 --- a/src/font/ascii/robotocondensed_regular_20_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_20_ascii.cpp @@ -2421,7 +2421,7 @@ lv_font_t robotocondensed_regular_20_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_22_ascii.cpp b/src/font/ascii/robotocondensed_regular_22_ascii.cpp index 4ad6e525..74cbfccc 100644 --- a/src/font/ascii/robotocondensed_regular_22_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_22_ascii.cpp @@ -2660,7 +2660,7 @@ lv_font_t robotocondensed_regular_22_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_24_ascii.cpp b/src/font/ascii/robotocondensed_regular_24_ascii.cpp index 31151f1a..0251489b 100644 --- a/src/font/ascii/robotocondensed_regular_24_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_24_ascii.cpp @@ -2745,7 +2745,7 @@ lv_font_t robotocondensed_regular_24_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_26_ascii.cpp b/src/font/ascii/robotocondensed_regular_26_ascii.cpp index c9722094..ef0f77ee 100644 --- a/src/font/ascii/robotocondensed_regular_26_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_26_ascii.cpp @@ -3100,7 +3100,7 @@ lv_font_t robotocondensed_regular_26_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_28_ascii.cpp b/src/font/ascii/robotocondensed_regular_28_ascii.cpp index 364f6f9e..47ea59bb 100644 --- a/src/font/ascii/robotocondensed_regular_28_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_28_ascii.cpp @@ -3366,7 +3366,7 @@ lv_font_t robotocondensed_regular_28_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/ascii/robotocondensed_regular_32_ascii.cpp b/src/font/ascii/robotocondensed_regular_32_ascii.cpp index b754e4b9..14769f94 100644 --- a/src/font/ascii/robotocondensed_regular_32_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_32_ascii.cpp @@ -3836,7 +3836,7 @@ lv_font_t robotocondensed_regular_32_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/ascii/robotocondensed_regular_36_ascii.cpp b/src/font/ascii/robotocondensed_regular_36_ascii.cpp index b59a7d20..0888b3df 100644 --- a/src/font/ascii/robotocondensed_regular_36_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_36_ascii.cpp @@ -4416,7 +4416,7 @@ lv_font_t robotocondensed_regular_36_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/ascii/robotocondensed_regular_38_ascii.cpp b/src/font/ascii/robotocondensed_regular_38_ascii.cpp index dd24d354..d509fc73 100644 --- a/src/font/ascii/robotocondensed_regular_38_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_38_ascii.cpp @@ -4682,7 +4682,7 @@ lv_font_t robotocondensed_regular_38_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/ascii/robotocondensed_regular_40_ascii.cpp b/src/font/ascii/robotocondensed_regular_40_ascii.cpp index 1ca02af5..e84c2a96 100644 --- a/src/font/ascii/robotocondensed_regular_40_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_40_ascii.cpp @@ -4942,7 +4942,7 @@ lv_font_t robotocondensed_regular_40_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/ascii/robotocondensed_regular_44_ascii.cpp b/src/font/ascii/robotocondensed_regular_44_ascii.cpp index bcae9d7f..192a8a2c 100644 --- a/src/font/ascii/robotocondensed_regular_44_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_44_ascii.cpp @@ -5465,7 +5465,7 @@ lv_font_t robotocondensed_regular_44_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/ascii/robotocondensed_regular_48_ascii.cpp b/src/font/ascii/robotocondensed_regular_48_ascii.cpp index 44c1ea9e..4b342ff0 100644 --- a/src/font/ascii/robotocondensed_regular_48_ascii.cpp +++ b/src/font/ascii/robotocondensed_regular_48_ascii.cpp @@ -5791,7 +5791,7 @@ lv_font_t robotocondensed_regular_48_ascii = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_12_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_12_cyrillic.cpp index 8bcf8fc6..05795677 100644 --- a/src/font/cyrillic/robotocondensed_regular_12_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_12_cyrillic.cpp @@ -2202,7 +2202,7 @@ lv_font_t robotocondensed_regular_12_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_14_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_14_cyrillic.cpp index def95713..72c3c1ba 100644 --- a/src/font/cyrillic/robotocondensed_regular_14_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_14_cyrillic.cpp @@ -2462,7 +2462,7 @@ lv_font_t robotocondensed_regular_14_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_16_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_16_cyrillic.cpp index 7783e98a..09b8dc19 100644 --- a/src/font/cyrillic/robotocondensed_regular_16_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_16_cyrillic.cpp @@ -2675,7 +2675,7 @@ lv_font_t robotocondensed_regular_16_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_20_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_20_cyrillic.cpp index a8fe2e7f..a050a54a 100644 --- a/src/font/cyrillic/robotocondensed_regular_20_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_20_cyrillic.cpp @@ -3213,7 +3213,7 @@ lv_font_t robotocondensed_regular_20_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_22_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_22_cyrillic.cpp index 7e543a93..7b1f732c 100644 --- a/src/font/cyrillic/robotocondensed_regular_22_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_22_cyrillic.cpp @@ -3507,7 +3507,7 @@ lv_font_t robotocondensed_regular_22_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_24_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_24_cyrillic.cpp index 96f69d6e..21fcbfc5 100644 --- a/src/font/cyrillic/robotocondensed_regular_24_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_24_cyrillic.cpp @@ -3639,7 +3639,7 @@ lv_font_t robotocondensed_regular_24_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_26_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_26_cyrillic.cpp index 712ace84..9c23344b 100644 --- a/src/font/cyrillic/robotocondensed_regular_26_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_26_cyrillic.cpp @@ -4068,7 +4068,7 @@ lv_font_t robotocondensed_regular_26_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_28_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_28_cyrillic.cpp index 3ae7e13d..b8ee3432 100644 --- a/src/font/cyrillic/robotocondensed_regular_28_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_28_cyrillic.cpp @@ -4418,7 +4418,7 @@ lv_font_t robotocondensed_regular_28_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_32_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_32_cyrillic.cpp index a4e9b6b6..7cdaba0e 100644 --- a/src/font/cyrillic/robotocondensed_regular_32_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_32_cyrillic.cpp @@ -5046,7 +5046,7 @@ lv_font_t robotocondensed_regular_32_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_36_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_36_cyrillic.cpp index 149c2bfd..707a41e6 100644 --- a/src/font/cyrillic/robotocondensed_regular_36_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_36_cyrillic.cpp @@ -5822,7 +5822,7 @@ lv_font_t robotocondensed_regular_36_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_38_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_38_cyrillic.cpp index ce665d7c..2f37c341 100644 --- a/src/font/cyrillic/robotocondensed_regular_38_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_38_cyrillic.cpp @@ -6159,7 +6159,7 @@ lv_font_t robotocondensed_regular_38_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_40_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_40_cyrillic.cpp index 42cfcf6b..73a37955 100644 --- a/src/font/cyrillic/robotocondensed_regular_40_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_40_cyrillic.cpp @@ -6514,7 +6514,7 @@ lv_font_t robotocondensed_regular_40_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_44_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_44_cyrillic.cpp index c8723601..ad57732a 100644 --- a/src/font/cyrillic/robotocondensed_regular_44_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_44_cyrillic.cpp @@ -7216,7 +7216,7 @@ lv_font_t robotocondensed_regular_44_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/cyrillic/robotocondensed_regular_48_cyrillic.cpp b/src/font/cyrillic/robotocondensed_regular_48_cyrillic.cpp index 3701021b..454dcb73 100644 --- a/src/font/cyrillic/robotocondensed_regular_48_cyrillic.cpp +++ b/src/font/cyrillic/robotocondensed_regular_48_cyrillic.cpp @@ -7701,7 +7701,7 @@ lv_font_t robotocondensed_regular_48_cyrillic = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_12_greek.cpp b/src/font/greek/robotocondensed_regular_12_greek.cpp index 583b8d8a..b417c0cc 100644 --- a/src/font/greek/robotocondensed_regular_12_greek.cpp +++ b/src/font/greek/robotocondensed_regular_12_greek.cpp @@ -2050,7 +2050,7 @@ lv_font_t robotocondensed_regular_12_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_14_greek.cpp b/src/font/greek/robotocondensed_regular_14_greek.cpp index afc0e62d..6238d3b9 100644 --- a/src/font/greek/robotocondensed_regular_14_greek.cpp +++ b/src/font/greek/robotocondensed_regular_14_greek.cpp @@ -2302,7 +2302,7 @@ lv_font_t robotocondensed_regular_14_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_16_greek.cpp b/src/font/greek/robotocondensed_regular_16_greek.cpp index 60a93771..d6d73290 100644 --- a/src/font/greek/robotocondensed_regular_16_greek.cpp +++ b/src/font/greek/robotocondensed_regular_16_greek.cpp @@ -2497,7 +2497,7 @@ lv_font_t robotocondensed_regular_16_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_20_greek.cpp b/src/font/greek/robotocondensed_regular_20_greek.cpp index 575b710c..90df33ed 100644 --- a/src/font/greek/robotocondensed_regular_20_greek.cpp +++ b/src/font/greek/robotocondensed_regular_20_greek.cpp @@ -3007,7 +3007,7 @@ lv_font_t robotocondensed_regular_20_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_22_greek.cpp b/src/font/greek/robotocondensed_regular_22_greek.cpp index ca644da3..f3a49986 100644 --- a/src/font/greek/robotocondensed_regular_22_greek.cpp +++ b/src/font/greek/robotocondensed_regular_22_greek.cpp @@ -3286,7 +3286,7 @@ lv_font_t robotocondensed_regular_22_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_24_greek.cpp b/src/font/greek/robotocondensed_regular_24_greek.cpp index ba963a3d..fb7794af 100644 --- a/src/font/greek/robotocondensed_regular_24_greek.cpp +++ b/src/font/greek/robotocondensed_regular_24_greek.cpp @@ -3428,7 +3428,7 @@ lv_font_t robotocondensed_regular_24_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_26_greek.cpp b/src/font/greek/robotocondensed_regular_26_greek.cpp index bb648a80..49acaee9 100644 --- a/src/font/greek/robotocondensed_regular_26_greek.cpp +++ b/src/font/greek/robotocondensed_regular_26_greek.cpp @@ -3837,7 +3837,7 @@ lv_font_t robotocondensed_regular_26_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_28_greek.cpp b/src/font/greek/robotocondensed_regular_28_greek.cpp index c7b4a388..9b875a46 100644 --- a/src/font/greek/robotocondensed_regular_28_greek.cpp +++ b/src/font/greek/robotocondensed_regular_28_greek.cpp @@ -4169,7 +4169,7 @@ lv_font_t robotocondensed_regular_28_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/greek/robotocondensed_regular_32_greek.cpp b/src/font/greek/robotocondensed_regular_32_greek.cpp index b8377801..cbf11ab0 100644 --- a/src/font/greek/robotocondensed_regular_32_greek.cpp +++ b/src/font/greek/robotocondensed_regular_32_greek.cpp @@ -4768,7 +4768,7 @@ lv_font_t robotocondensed_regular_32_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_36_greek.cpp b/src/font/greek/robotocondensed_regular_36_greek.cpp index 04ed8b65..a59122a6 100644 --- a/src/font/greek/robotocondensed_regular_36_greek.cpp +++ b/src/font/greek/robotocondensed_regular_36_greek.cpp @@ -5512,7 +5512,7 @@ lv_font_t robotocondensed_regular_36_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_38_greek.cpp b/src/font/greek/robotocondensed_regular_38_greek.cpp index 395fa48a..5d1bf033 100644 --- a/src/font/greek/robotocondensed_regular_38_greek.cpp +++ b/src/font/greek/robotocondensed_regular_38_greek.cpp @@ -5842,7 +5842,7 @@ lv_font_t robotocondensed_regular_38_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_40_greek.cpp b/src/font/greek/robotocondensed_regular_40_greek.cpp index 2d8114f0..138fa8bb 100644 --- a/src/font/greek/robotocondensed_regular_40_greek.cpp +++ b/src/font/greek/robotocondensed_regular_40_greek.cpp @@ -6175,7 +6175,7 @@ lv_font_t robotocondensed_regular_40_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_44_greek.cpp b/src/font/greek/robotocondensed_regular_44_greek.cpp index f338f1bf..8ce82d1a 100644 --- a/src/font/greek/robotocondensed_regular_44_greek.cpp +++ b/src/font/greek/robotocondensed_regular_44_greek.cpp @@ -6835,7 +6835,7 @@ lv_font_t robotocondensed_regular_44_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/greek/robotocondensed_regular_48_greek.cpp b/src/font/greek/robotocondensed_regular_48_greek.cpp index 45f8e7fb..ddcc8a2c 100644 --- a/src/font/greek/robotocondensed_regular_48_greek.cpp +++ b/src/font/greek/robotocondensed_regular_48_greek.cpp @@ -7296,7 +7296,7 @@ lv_font_t robotocondensed_regular_48_greek = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_12_latin1.cpp b/src/font/latin1/robotocondensed_regular_12_latin1.cpp index b9b8dae1..3f2ec4ff 100644 --- a/src/font/latin1/robotocondensed_regular_12_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_12_latin1.cpp @@ -2123,7 +2123,7 @@ lv_font_t robotocondensed_regular_12_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_12_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_12_vietnamese.cpp index 4603a004..eed6aa98 100644 --- a/src/font/latin1/robotocondensed_regular_12_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_12_vietnamese.cpp @@ -2554,7 +2554,7 @@ lv_font_t robotocondensed_regular_12_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_14_latin1.cpp b/src/font/latin1/robotocondensed_regular_14_latin1.cpp index 194954f8..6fb7ae64 100644 --- a/src/font/latin1/robotocondensed_regular_14_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_14_latin1.cpp @@ -2374,7 +2374,7 @@ lv_font_t robotocondensed_regular_14_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_14_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_14_vietnamese.cpp index d979dc0b..b1907a30 100644 --- a/src/font/latin1/robotocondensed_regular_14_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_14_vietnamese.cpp @@ -2846,7 +2846,7 @@ lv_font_t robotocondensed_regular_14_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_16_latin1.cpp b/src/font/latin1/robotocondensed_regular_16_latin1.cpp index 56666d4a..a406a7ed 100644 --- a/src/font/latin1/robotocondensed_regular_16_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_16_latin1.cpp @@ -2575,7 +2575,7 @@ lv_font_t robotocondensed_regular_16_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_16_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_16_vietnamese.cpp index cf04bb24..af797a54 100644 --- a/src/font/latin1/robotocondensed_regular_16_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_16_vietnamese.cpp @@ -3096,7 +3096,7 @@ lv_font_t robotocondensed_regular_16_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_20_latin1.cpp b/src/font/latin1/robotocondensed_regular_20_latin1.cpp index 6198d044..2c9bce73 100644 --- a/src/font/latin1/robotocondensed_regular_20_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_20_latin1.cpp @@ -3115,7 +3115,7 @@ lv_font_t robotocondensed_regular_20_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_20_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_20_vietnamese.cpp index 8e50f416..b3413890 100644 --- a/src/font/latin1/robotocondensed_regular_20_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_20_vietnamese.cpp @@ -3760,7 +3760,7 @@ lv_font_t robotocondensed_regular_20_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_22_latin1.cpp b/src/font/latin1/robotocondensed_regular_22_latin1.cpp index 1ec74432..53ddd6ac 100644 --- a/src/font/latin1/robotocondensed_regular_22_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_22_latin1.cpp @@ -3410,7 +3410,7 @@ lv_font_t robotocondensed_regular_22_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_22_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_22_vietnamese.cpp index 4210e10b..c9b8b898 100644 --- a/src/font/latin1/robotocondensed_regular_22_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_22_vietnamese.cpp @@ -4102,7 +4102,7 @@ lv_font_t robotocondensed_regular_22_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_24_latin1.cpp b/src/font/latin1/robotocondensed_regular_24_latin1.cpp index 70b8e27d..87217627 100644 --- a/src/font/latin1/robotocondensed_regular_24_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_24_latin1.cpp @@ -3566,7 +3566,7 @@ lv_font_t robotocondensed_regular_24_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_24_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_24_vietnamese.cpp index 4d394d9d..74f5be14 100644 --- a/src/font/latin1/robotocondensed_regular_24_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_24_vietnamese.cpp @@ -4353,7 +4353,7 @@ lv_font_t robotocondensed_regular_24_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_26_latin1.cpp b/src/font/latin1/robotocondensed_regular_26_latin1.cpp index 83dd586a..da013a5d 100644 --- a/src/font/latin1/robotocondensed_regular_26_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_26_latin1.cpp @@ -3991,7 +3991,7 @@ lv_font_t robotocondensed_regular_26_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_26_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_26_vietnamese.cpp index a08d1c3f..60893a84 100644 --- a/src/font/latin1/robotocondensed_regular_26_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_26_vietnamese.cpp @@ -4839,7 +4839,7 @@ lv_font_t robotocondensed_regular_26_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_28_latin1.cpp b/src/font/latin1/robotocondensed_regular_28_latin1.cpp index 63bd194c..a6a4fbbd 100644 --- a/src/font/latin1/robotocondensed_regular_28_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_28_latin1.cpp @@ -4348,7 +4348,7 @@ lv_font_t robotocondensed_regular_28_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_28_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_28_vietnamese.cpp index ecce7428..122f9635 100644 --- a/src/font/latin1/robotocondensed_regular_28_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_28_vietnamese.cpp @@ -5293,7 +5293,7 @@ lv_font_t robotocondensed_regular_28_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin1/robotocondensed_regular_32_latin1.cpp b/src/font/latin1/robotocondensed_regular_32_latin1.cpp index 0e02875c..278d8d14 100644 --- a/src/font/latin1/robotocondensed_regular_32_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_32_latin1.cpp @@ -4969,7 +4969,7 @@ lv_font_t robotocondensed_regular_32_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_32_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_32_vietnamese.cpp index 4ba59f21..16701c19 100644 --- a/src/font/latin1/robotocondensed_regular_32_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_32_vietnamese.cpp @@ -6081,7 +6081,7 @@ lv_font_t robotocondensed_regular_32_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_36_latin1.cpp b/src/font/latin1/robotocondensed_regular_36_latin1.cpp index 80bdaf56..817d62cb 100644 --- a/src/font/latin1/robotocondensed_regular_36_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_36_latin1.cpp @@ -5753,7 +5753,7 @@ lv_font_t robotocondensed_regular_36_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_36_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_36_vietnamese.cpp index 168fbd53..893b3dc7 100644 --- a/src/font/latin1/robotocondensed_regular_36_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_36_vietnamese.cpp @@ -7055,7 +7055,7 @@ lv_font_t robotocondensed_regular_36_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_38_latin1.cpp b/src/font/latin1/robotocondensed_regular_38_latin1.cpp index 5f0aadd5..46003551 100644 --- a/src/font/latin1/robotocondensed_regular_38_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_38_latin1.cpp @@ -6098,7 +6098,7 @@ lv_font_t robotocondensed_regular_38_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_38_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_38_vietnamese.cpp index adb434e9..03804006 100644 --- a/src/font/latin1/robotocondensed_regular_38_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_38_vietnamese.cpp @@ -7501,7 +7501,7 @@ lv_font_t robotocondensed_regular_38_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_40_latin1.cpp b/src/font/latin1/robotocondensed_regular_40_latin1.cpp index 6babc76e..f9503d55 100644 --- a/src/font/latin1/robotocondensed_regular_40_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_40_latin1.cpp @@ -6461,7 +6461,7 @@ lv_font_t robotocondensed_regular_40_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_40_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_40_vietnamese.cpp index dc9bb7f9..0be81779 100644 --- a/src/font/latin1/robotocondensed_regular_40_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_40_vietnamese.cpp @@ -7957,7 +7957,7 @@ lv_font_t robotocondensed_regular_40_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_44_latin1.cpp b/src/font/latin1/robotocondensed_regular_44_latin1.cpp index 58148454..42762e1d 100644 --- a/src/font/latin1/robotocondensed_regular_44_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_44_latin1.cpp @@ -7153,7 +7153,7 @@ lv_font_t robotocondensed_regular_44_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_44_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_44_vietnamese.cpp index 2eabb9b0..582f6452 100644 --- a/src/font/latin1/robotocondensed_regular_44_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_44_vietnamese.cpp @@ -8832,7 +8832,7 @@ lv_font_t robotocondensed_regular_44_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_48_latin1.cpp b/src/font/latin1/robotocondensed_regular_48_latin1.cpp index 1f33d5fb..b44aa725 100644 --- a/src/font/latin1/robotocondensed_regular_48_latin1.cpp +++ b/src/font/latin1/robotocondensed_regular_48_latin1.cpp @@ -7652,7 +7652,7 @@ lv_font_t robotocondensed_regular_48_latin1 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/font/latin1/robotocondensed_regular_48_vietnamese.cpp b/src/font/latin1/robotocondensed_regular_48_vietnamese.cpp index 7035ec3b..b782c894 100644 --- a/src/font/latin1/robotocondensed_regular_48_vietnamese.cpp +++ b/src/font/latin1/robotocondensed_regular_48_vietnamese.cpp @@ -9502,7 +9502,7 @@ lv_font_t robotocondensed_regular_48_vietnamese = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_12_latin2.cpp b/src/font/latin2/robotocondensed_regular_12_latin2.cpp index 8f4a6da8..705bd853 100644 --- a/src/font/latin2/robotocondensed_regular_12_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_12_latin2.cpp @@ -2321,7 +2321,7 @@ lv_font_t robotocondensed_regular_12_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_14_latin2.cpp b/src/font/latin2/robotocondensed_regular_14_latin2.cpp index 3b547e71..9e3acc30 100644 --- a/src/font/latin2/robotocondensed_regular_14_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_14_latin2.cpp @@ -2590,7 +2590,7 @@ lv_font_t robotocondensed_regular_14_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_16_latin2.cpp b/src/font/latin2/robotocondensed_regular_16_latin2.cpp index 43dbf47b..edf5511c 100644 --- a/src/font/latin2/robotocondensed_regular_16_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_16_latin2.cpp @@ -2792,7 +2792,7 @@ lv_font_t robotocondensed_regular_16_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_20_latin2.cpp b/src/font/latin2/robotocondensed_regular_20_latin2.cpp index 9825d26c..7c7b05b4 100644 --- a/src/font/latin2/robotocondensed_regular_20_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_20_latin2.cpp @@ -3388,7 +3388,7 @@ lv_font_t robotocondensed_regular_20_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -1, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_22_latin2.cpp b/src/font/latin2/robotocondensed_regular_22_latin2.cpp index e53fc5bb..232421a5 100644 --- a/src/font/latin2/robotocondensed_regular_22_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_22_latin2.cpp @@ -3689,7 +3689,7 @@ lv_font_t robotocondensed_regular_22_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_24_latin2.cpp b/src/font/latin2/robotocondensed_regular_24_latin2.cpp index 2fde934a..312dbce7 100644 --- a/src/font/latin2/robotocondensed_regular_24_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_24_latin2.cpp @@ -3879,7 +3879,7 @@ lv_font_t robotocondensed_regular_24_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_26_latin2.cpp b/src/font/latin2/robotocondensed_regular_26_latin2.cpp index de80b879..d10ccbe7 100644 --- a/src/font/latin2/robotocondensed_regular_26_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_26_latin2.cpp @@ -4322,7 +4322,7 @@ lv_font_t robotocondensed_regular_26_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_28_latin2.cpp b/src/font/latin2/robotocondensed_regular_28_latin2.cpp index ca079681..f6f71b87 100644 --- a/src/font/latin2/robotocondensed_regular_28_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_28_latin2.cpp @@ -4710,7 +4710,7 @@ lv_font_t robotocondensed_regular_28_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 1, #endif diff --git a/src/font/latin2/robotocondensed_regular_32_latin2.cpp b/src/font/latin2/robotocondensed_regular_32_latin2.cpp index 0891da80..f70adf73 100644 --- a/src/font/latin2/robotocondensed_regular_32_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_32_latin2.cpp @@ -5391,7 +5391,7 @@ lv_font_t robotocondensed_regular_32_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -2, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_36_latin2.cpp b/src/font/latin2/robotocondensed_regular_36_latin2.cpp index 135b527a..a578a736 100644 --- a/src/font/latin2/robotocondensed_regular_36_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_36_latin2.cpp @@ -6252,7 +6252,7 @@ lv_font_t robotocondensed_regular_36_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_38_latin2.cpp b/src/font/latin2/robotocondensed_regular_38_latin2.cpp index 6fb0f9dd..e8b5eeb0 100644 --- a/src/font/latin2/robotocondensed_regular_38_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_38_latin2.cpp @@ -6622,7 +6622,7 @@ lv_font_t robotocondensed_regular_38_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_40_latin2.cpp b/src/font/latin2/robotocondensed_regular_40_latin2.cpp index 5a06401a..c8497e08 100644 --- a/src/font/latin2/robotocondensed_regular_40_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_40_latin2.cpp @@ -7016,7 +7016,7 @@ lv_font_t robotocondensed_regular_40_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_44_latin2.cpp b/src/font/latin2/robotocondensed_regular_44_latin2.cpp index 93a762dd..487c8287 100644 --- a/src/font/latin2/robotocondensed_regular_44_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_44_latin2.cpp @@ -7754,7 +7754,7 @@ lv_font_t robotocondensed_regular_44_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -3, .underline_thickness = 2, #endif diff --git a/src/font/latin2/robotocondensed_regular_48_latin2.cpp b/src/font/latin2/robotocondensed_regular_48_latin2.cpp index 72399e1a..48db8acd 100644 --- a/src/font/latin2/robotocondensed_regular_48_latin2.cpp +++ b/src/font/latin2/robotocondensed_regular_48_latin2.cpp @@ -8315,7 +8315,7 @@ lv_font_t robotocondensed_regular_48_latin2 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = -4, .underline_thickness = 2, #endif diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index 1bbd4564..2633c250 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1895,7 +1895,7 @@ static void webHandleHaspConfig() while(file) { String filename = file.name(); - if(filename.endsWith(".zi")) httpMessage += getOption(filename, filename, main_font); + // if(filename.endsWith(".zi")) httpMessage += getOption(filename, filename, main_font); file = root.openNextFile(); } #elif defined(ARDUINO_ARCH_ESP8266) diff --git a/src/sys/svc/hasp_http_async.cpp b/src/sys/svc/hasp_http_async.cpp index 97aff3e0..b4d1d35c 100644 --- a/src/sys/svc/hasp_http_async.cpp +++ b/src/sys/svc/hasp_http_async.cpp @@ -1969,9 +1969,9 @@ void webHandleHaspConfig(AsyncWebServerRequest* request) while(file) { String filename = file.name(); - if(filename.endsWith(".zi")) - httpMessage += - getOption(file.name(), file.name(), filename == settings[FPSTR(FP_CONFIG_ZIFONT)].as()); + // if(filename.endsWith(".zi")) + // httpMessage += + // getOption(file.name(), file.name(), filename == settings[FPSTR(FP_CONFIG_ZIFONT)].as()); file = root.openNextFile(); } #elif defined(ARDUINO_ARCH_ESP8266) @@ -2145,7 +2145,7 @@ void httpHandleResetConfig(AsyncWebServerRequest* request) httpMessage += haspDevice.get_hostname(); httpMessage += F("
"); - if(resetConfirmed) { // User has confirmed, so reset everything + if(resetConfirmed) { // User has confirmed, so reset everything bool formatted = dispatch_factory_reset(); // configClearEeprom(); if(formatted) { httpMessage += F("Resetting all saved settings and restarting device"); @@ -2329,7 +2329,6 @@ void httpReconnect() IRAM_ATTR void httpLoop(void) {} - //////////////////////////////////////////////////////////////////////////////////////////////////// void httpEverySecond() {