chore: re-organise source files for color LCD UI (#5358)

.gitmodules

@@ -8,10 +8,10 @@
 [submodule "radio/src/thirdparty/Segger_RTT"]
 	path = radio/src/thirdparty/Segger_RTT
 	url = https://github.com/adfernandes/segger-rtt.git
-[submodule "radio/src/thirdparty/libopenui/thirdparty/stb"]
-    path = radio/src/thirdparty/libopenui/thirdparty/stb
+[submodule "radio/src/thirdparty/stb"]
+	path = radio/src/thirdparty/stb
     url = https://github.com/nothings/stb.git
-[submodule "radio/src/thirdparty/libopenui/thirdparty/lvgl"]
-    path = radio/src/thirdparty/libopenui/thirdparty/lvgl
+[submodule "radio/src/thirdparty/lvgl"]
+	path = radio/src/thirdparty/lvgl
     url = https://github.com/EdgeTX/lvgl.git
     branch = release/v8.2

cmake/Bitmaps.cmake

@@ -6,8 +6,8 @@ macro(add_bitmaps_target targetname filter format args)
     set(target ${target}.lbm)
     add_custom_command(
       OUTPUT ${target}
-      COMMAND ${PYTHON_EXECUTABLE} ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py --format ${format} ${args} ${bitmap} ${target}
-      DEPENDS ${bitmap} ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py
+      COMMAND ${PYTHON_EXECUTABLE} ${UTILS_DIR}/encode-bitmap.py --format ${format} ${args} ${bitmap} ${target}
+      DEPENDS ${bitmap} ${UTILS_DIR}/encode-bitmap.py
     )
     list(APPEND bitmaps_files ${target})
   endforeach()
@@ -57,7 +57,7 @@ macro(add_truetype_font_target name size subset effect args)
     OUTPUT ${target}.png ${target}.specs ${target}.lbm
     COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build-font-bitmap.py --subset ${subset} --size ${size} --font ${font} --output ${target}
     COMMAND ${PYTHON_EXECUTABLE} ${UTILS_DIR}/bin2lbm.py ${target}.png ${target}.lbm
-    DEPENDS ${TOOLS_DIR}/build-font-bitmap.py ${TOOLS_DIR}/charset.py ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py
+    DEPENDS ${TOOLS_DIR}/build-font-bitmap.py ${TOOLS_DIR}/charset.py ${UTILS_DIR}/encode-bitmap.py
   )
   add_custom_target(truetype_font_${name} DEPENDS ${target}.png ${target}.specs)
   set(truetype_fonts_targets ${truetype_fonts_targets} truetype_font_${name})

cmake/GenericDefinitions.cmake

@@ -41,7 +41,6 @@ set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
 set(SIMU_SRC_DIRECTORY ${COMPANION_SRC_DIRECTORY}/simulation)
 set(TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
 set(UTILS_DIR ${PROJECT_SOURCE_DIR}/radio/util)
-set(LIBOPENUI_TOOLS_DIR ${RADIO_SRC_DIR}/thirdparty/libopenui/tools)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})

radio/src/CMakeLists.txt

@@ -249,7 +249,7 @@ endif()
 
 if(SDCARD)
   add_definitions(-DSDCARD)
-  set(SRC ${SRC} sdcard.cpp rtc.cpp logs.cpp thirdparty/libopenui/src/libopenui_file.cpp)
+  set(SRC ${SRC} sdcard.cpp rtc.cpp logs.cpp lib_file.cpp)
   set(FIRMWARE_SRC ${FIRMWARE_SRC})
 endif()
 

radio/src/bluetooth.cpp

@@ -28,7 +28,7 @@
 #if defined(LIBOPENUI)
   #include "libopenui.h"
 #else
-  #include "libopenui/src/libopenui_file.h"
+  #include "lib_file.h"
 #endif
 
 #if defined(LOG_BLUETOOTH)

radio/src/datastructs_private.h

@@ -587,8 +587,8 @@ static_assert(sizeof(potwarnen_t) * 8 >= MAX_POTS,
 #if defined(COLORLCD) && defined(BACKUP)
 #define CUSTOM_SCREENS_DATA
 #elif defined(COLORLCD)
-#include "gui/colorlcd/layout.h"
-#include "gui/colorlcd/topbar.h"
+#include "layout.h"
+#include "topbar.h"
 #define LAYOUT_ID_LEN 12
 PACK(struct CustomScreenData {
   char LayoutId[LAYOUT_ID_LEN];

radio/src/fonts/lvgl/lv_font_arimo_he_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 4
- * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5f4 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_he_16.c --force-fast-kern-format --no-compress
+ * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5f4 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_he_16.c --force-fast-kern-format --no-compress
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lv_font_arimo_ru_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 4
- * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418,0x419,0x41a,0x41b,0x41c,0x41d,0x41e,0x41f,0x420,0x421,0x422,0x423,0x424,0x425,0x426,0x427,0x428,0x429,0x42b,0x42c,0x42d,0x42e,0x42f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44a,0x44b,0x44c,0x44d,0x44e,0x44f,0x451 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_ru_16.c --force-fast-kern-format --no-compress
+ * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418,0x419,0x41a,0x41b,0x41c,0x41d,0x41e,0x41f,0x420,0x421,0x422,0x423,0x424,0x425,0x426,0x427,0x428,0x429,0x42b,0x42c,0x42d,0x42e,0x42f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44a,0x44b,0x44c,0x44d,0x44e,0x44f,0x451 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_ru_16.c --force-fast-kern-format --no-compress
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lv_font_arimo_ua_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 4
- * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x404,0x406,0x407,0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418,0x419,0x41a,0x41b,0x41c,0x41d,0x41e,0x41f,0x420,0x421,0x422,0x423,0x424,0x425,0x426,0x427,0x428,0x429,0x42c,0x42e,0x42f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44c,0x44e,0x44f,0x454,0x456,0x457 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_ua_16.c --force-fast-kern-format --no-compress
+ * Opts: --no-prefilter --bpp 4 --size 16 --font ../Arimo/Arimo-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x404,0x406,0x407,0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418,0x419,0x41a,0x41b,0x41c,0x41d,0x41e,0x41f,0x420,0x421,0x422,0x423,0x424,0x425,0x426,0x427,0x428,0x429,0x42c,0x42e,0x42f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44c,0x44e,0x44f,0x454,0x456,0x457 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_arimo_ua_16.c --force-fast-kern-format --no-compress
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lv_font_noto_jp_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 4
- * Opts: --no-prefilter --bpp 4 --size 16 --font ../Noto/NotoSansCJKsc-Regular.otf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x3001,0x3002,0x3042,0x3044,0x3048,0x304a,0x304b,0x304c,0x304d,0x304e,0x304f,0x3051,0x3053,0x3055,0x3057,0x3058,0x3059,0x305a,0x305b,0x305d,0x305f,0x3060,0x3063,0x3064,0x3066,0x3067,0x3068,0x306a,0x306b,0x306e,0x306f,0x3078,0x3079,0x307e,0x307f,0x3080,0x3081,0x3082,0x3089,0x308a,0x308b,0x308c,0x308f,0x3092,0x3093,0x30a1,0x30a2,0x30a3,0x30a4,0x30a6,0x30a7,0x30a8,0x30a9,0x30aa,0x30ab,0x30ac,0x30ad,0x30af,0x30b0,0x30b1,0x30b2,0x30b3,0x30b5,0x30b6,0x30b7,0x30b8,0x30b9,0x30ba,0x30bb,0x30bc,0x30bd,0x30be,0x30bf,0x30c0,0x30c1,0x30c3,0x30c4,0x30c6,0x30c7,0x30c8,0x30c9,0x30ca,0x30cb,0x30cd,0x30ce,0x30cf,0x30d0,0x30d1,0x30d3,0x30d4,0x30d5,0x30d6,0x30d7,0x30d8,0x30d9,0x30da,0x30db,0x30dc,0x30dd,0x30de,0x30df,0x30e0,0x30e1,0x30e2,0x30e3,0x30e4,0x30e5,0x30e6,0x30e7,0x30e8,0x30e9,0x30ea,0x30eb,0x30ec,0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e21,0x4e2d,0x4e57,0x4e86,0x4ed6,0x4ed8,0x4ef6,0x4efb,0x4f4d,0x4f4e,0x4f53,0x4f5c,0x4f7f,0x4fdd,0x4fe1,0x4fee,0x500d,0x5024,0x504f,0x505c,0x5074,0x5099,0x50cf,0x5143,0x5145,0x5148,0x5165,0x5168,0x516c,0x5171,0x5177,0x5185,0x5186,0x518d,0x51fa,0x5206,0x521d,0x5225,0x5229,0x523b,0x524a,0x524d,0x5272,0x529b,0x529f,0x52a0,0x52b9,0x52d5,0x5316,0x5358,0x53bb,0x53d7,0x53f3,0x53f7,0x5408,0x540c,0x540d,0x5411,0x5426,0x542b,0x544a,0x5468,0x554f,0x5668,0x56de,0x56f2,0x56fa,0x5727,0x5728,0x5747,0x57cb,0x5831,0x5857,0x5897,0x58f0,0x5909,0x5916,0x591a,0x5927,0x592e,0x5931,0x5968,0x5b58,0x5b8c,0x5b9a,0x5b9f,0x5bb9,0x5bfe,0x5c0f,0x5c11,0x5de6,0x5dee,0x5e38,0x5e73,0x5ea6,0x5ea7,0x5ef6,0x5f0f,0x5f31,0x5f35,0x5f37,0x5f53,0x5f62,0x5f71,0x5f85,0x5f8c,0x5fa9,0x5fae,0x5fc5,0x5fdc,0x6025,0x60c5,0x60f3,0x610f,0x614b,0x6210,0x624b,0x629e,0x62bc,0x62d2,0x62e1,0x6301,0x633f,0x63a5,0x63a8,0x63c3,0x63db,0x64cd,0x6557,0x6570,0x6587,0x65b0,0x65b9,0x65e2,0x65e5,0x660e,0x6642,0x666f,0x66f4,0x66f8,0x6700,0x6709,0x671f,0x672a,0x672b,0x672c,0x6761,0x67a0,0x683c,0x691c,0x6975,0x6982,0x69cb,0x6a19,0x6a5f,0x6b62,0x6b63,0x6b8b,0x6bce,0x6bd4,0x6c17,0x6c60,0x6cd5,0x6ce2,0x6d88,0x6e1b,0x6e29,0x6e90,0x6e96,0x6f14,0x6f70,0x7121,0x72b6,0x7387,0x73fe,0x7406,0x751f,0x7528,0x753b,0x756a,0x767b,0x7740,0x78ba,0x793a,0x79d2,0x79f0,0x79fb,0x7a7a,0x7a81,0x7aef,0x7b2c,0x7b54,0x7b97,0x7ba1,0x7bc4,0x7cbe,0x7d20,0x7d22,0x7d30,0x7d42,0x7d4c,0x7d71,0x7d99,0x7d9a,0x7dca,0x7dd1,0x7dda,0x7de8,0x7f6e,0x7f72,0x8003,0x8005,0x80cc,0x80fd,0x81ea,0x826f,0x8272,0x8535,0x884c,0x885d,0x8868,0x8870,0x88c5,0x88fd,0x8907,0x8981,0x898b,0x898f,0x8996,0x89e3,0x8a00,0x8a08,0x8a18,0x8a2d,0x8a3c,0x8a72,0x8a73,0x8a8d,0x8a9e,0x8aac,0x8aad,0x8ad6,0x8b58,0x8b66,0x8cbb,0x8cbc,0x8d64,0x8d77,0x8d85,0x8ddd,0x8ef8,0x8f03,0x8f1d,0x8fbc,0x8ffd,0x9001,0x901a,0x901f,0x9045,0x904e,0x9069,0x9078,0x90e8,0x91cf,0x9332,0x9577,0x958b,0x9593,0x9664,0x96c6,0x96e2,0x96fb,0x9752,0x975e,0x9762,0x97f3,0x9806,0x984c,0x98db,0x9ad8 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_noto_jp_16.c --force-fast-kern-format --no-compress
+ * Opts: --no-prefilter --bpp 4 --size 16 --font ../Noto/NotoSansCJKsc-Regular.otf -r 0x20-0x7F,0xB0,0x2022,0x2265,0x3001,0x3002,0x3042,0x3044,0x3048,0x304a,0x304b,0x304c,0x304d,0x304e,0x304f,0x3051,0x3053,0x3055,0x3057,0x3058,0x3059,0x305a,0x305b,0x305d,0x305f,0x3060,0x3063,0x3064,0x3066,0x3067,0x3068,0x306a,0x306b,0x306e,0x306f,0x3078,0x3079,0x307e,0x307f,0x3080,0x3081,0x3082,0x3089,0x308a,0x308b,0x308c,0x308f,0x3092,0x3093,0x30a1,0x30a2,0x30a3,0x30a4,0x30a6,0x30a7,0x30a8,0x30a9,0x30aa,0x30ab,0x30ac,0x30ad,0x30af,0x30b0,0x30b1,0x30b2,0x30b3,0x30b5,0x30b6,0x30b7,0x30b8,0x30b9,0x30ba,0x30bb,0x30bc,0x30bd,0x30be,0x30bf,0x30c0,0x30c1,0x30c3,0x30c4,0x30c6,0x30c7,0x30c8,0x30c9,0x30ca,0x30cb,0x30cd,0x30ce,0x30cf,0x30d0,0x30d1,0x30d3,0x30d4,0x30d5,0x30d6,0x30d7,0x30d8,0x30d9,0x30da,0x30db,0x30dc,0x30dd,0x30de,0x30df,0x30e0,0x30e1,0x30e2,0x30e3,0x30e4,0x30e5,0x30e6,0x30e7,0x30e8,0x30e9,0x30ea,0x30eb,0x30ec,0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e21,0x4e2d,0x4e57,0x4e86,0x4ed6,0x4ed8,0x4ef6,0x4efb,0x4f4d,0x4f4e,0x4f53,0x4f5c,0x4f7f,0x4fdd,0x4fe1,0x4fee,0x500d,0x5024,0x504f,0x505c,0x5074,0x5099,0x50cf,0x5143,0x5145,0x5148,0x5165,0x5168,0x516c,0x5171,0x5177,0x5185,0x5186,0x518d,0x51fa,0x5206,0x521d,0x5225,0x5229,0x523b,0x524a,0x524d,0x5272,0x529b,0x529f,0x52a0,0x52b9,0x52d5,0x5316,0x5358,0x53bb,0x53d7,0x53f3,0x53f7,0x5408,0x540c,0x540d,0x5411,0x5426,0x542b,0x544a,0x5468,0x554f,0x5668,0x56de,0x56f2,0x56fa,0x5727,0x5728,0x5747,0x57cb,0x5831,0x5857,0x5897,0x58f0,0x5909,0x5916,0x591a,0x5927,0x592e,0x5931,0x5968,0x5b58,0x5b8c,0x5b9a,0x5b9f,0x5bb9,0x5bfe,0x5c0f,0x5c11,0x5de6,0x5dee,0x5e38,0x5e73,0x5ea6,0x5ea7,0x5ef6,0x5f0f,0x5f31,0x5f35,0x5f37,0x5f53,0x5f62,0x5f71,0x5f85,0x5f8c,0x5fa9,0x5fae,0x5fc5,0x5fdc,0x6025,0x60c5,0x60f3,0x610f,0x614b,0x6210,0x624b,0x629e,0x62bc,0x62d2,0x62e1,0x6301,0x633f,0x63a5,0x63a8,0x63c3,0x63db,0x64cd,0x6557,0x6570,0x6587,0x65b0,0x65b9,0x65e2,0x65e5,0x660e,0x6642,0x666f,0x66f4,0x66f8,0x6700,0x6709,0x671f,0x672a,0x672b,0x672c,0x6761,0x67a0,0x683c,0x691c,0x6975,0x6982,0x69cb,0x6a19,0x6a5f,0x6b62,0x6b63,0x6b8b,0x6bce,0x6bd4,0x6c17,0x6c60,0x6cd5,0x6ce2,0x6d88,0x6e1b,0x6e29,0x6e90,0x6e96,0x6f14,0x6f70,0x7121,0x72b6,0x7387,0x73fe,0x7406,0x751f,0x7528,0x753b,0x756a,0x767b,0x7740,0x78ba,0x793a,0x79d2,0x79f0,0x79fb,0x7a7a,0x7a81,0x7aef,0x7b2c,0x7b54,0x7b97,0x7ba1,0x7bc4,0x7cbe,0x7d20,0x7d22,0x7d30,0x7d42,0x7d4c,0x7d71,0x7d99,0x7d9a,0x7dca,0x7dd1,0x7dda,0x7de8,0x7f6e,0x7f72,0x8003,0x8005,0x80cc,0x80fd,0x81ea,0x826f,0x8272,0x8535,0x884c,0x885d,0x8868,0x8870,0x88c5,0x88fd,0x8907,0x8981,0x898b,0x898f,0x8996,0x89e3,0x8a00,0x8a08,0x8a18,0x8a2d,0x8a3c,0x8a72,0x8a73,0x8a8d,0x8a9e,0x8aac,0x8aad,0x8ad6,0x8b58,0x8b66,0x8cbb,0x8cbc,0x8d64,0x8d77,0x8d85,0x8ddd,0x8ef8,0x8f03,0x8f1d,0x8fbc,0x8ffd,0x9001,0x901a,0x901f,0x9045,0x904e,0x9069,0x9078,0x90e8,0x91cf,0x9332,0x9577,0x958b,0x9593,0x9664,0x96c6,0x96e2,0x96fb,0x9752,0x975e,0x9762,0x97f3,0x9806,0x984c,0x98db,0x9ad8 --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_noto_jp_16.c --force-fast-kern-format --no-compress
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lv_font_roboto_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 4
- * Opts: --no-prefilter --bpp 4 --size 16 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0xC0-0xFF,0x100-0x17F --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_16.c --force-fast-kern-format --no-compress
+ * Opts: --no-prefilter --bpp 4 --size 16 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0x2265,0xC0-0xFF,0x100-0x17F --font EdgeTX/extra.ttf -r 0x88-0x94 --font EdgeTX/OpenArrow-Regular.woff -r 0x21E8=>0x80,0x21E6=>0x81,0x21E7=>0x82,0x21E9=>0x83 --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_16.c --force-fast-kern-format --no-compress
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lv_font_roboto_bl_16.c

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 2
- * Opts: --no-prefilter --bpp 2 --size 16 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61671,63650,63426,61453,61787,61452,61931,62087 --format lvgl -o lv_font_roboto_bl_16.c --force-fast-kern-format
+ * Opts: --no-prefilter --bpp 2 --size 16 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61671,63650,63426,61453,61787,61452,61931,62087 --format lvgl -o lv_font_roboto_bl_16.c --force-fast-kern-format
  ******************************************************************************/
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE

radio/src/fonts/lvgl/lz4_font.cpp

@@ -49,7 +49,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../../lv_conf.h"
+#include "../../gui/colorlcd/lv_conf.h"
 #define LV_CONF_SKIP 1
 #include "../../gui/colorlcd/lz4_fonts.h"
 #include "lv_font.inc"

radio/src/fonts/lvgl/make_fonts.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LVGLDIR="../../thirdparty/libopenui/thirdparty/lvgl"
+LVGLDIR="../../thirdparty/lvgl"
 TTF_DIR="../"
 
 SYMBOLS_FONT="${LVGLDIR}/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff"
@@ -47,7 +47,7 @@ function make_font() {
 function compress_font() {
   local name=$1
 
-  gcc -I ../../thirdparty/libopenui/thirdparty lz4_font.cpp ../../thirdparty/libopenui/thirdparty/lz4/lz4hc.c ../../thirdparty/libopenui/thirdparty/lz4/lz4.c -o lz4_font
+  gcc -I ../../thirdparty lz4_font.cpp ../../thirdparty/lz4/lz4hc.c ../../thirdparty/lz4/lz4.c -o lz4_font
   ./lz4_font ${name}
 }
 

radio/src/gui/128x64/lcd.cpp

@@ -23,7 +23,7 @@
 #include <memory.h>
 
 #include "lcd.h"
-#include "thirdparty/libopenui/src/bitfield.h"
+#include "bitfield.h"
 #include "gui/common/stdlcd/fonts.h"
 #include "gui/common/stdlcd/utf8.h"
 

radio/src/gui/colorlcd/CMakeLists.txt

@@ -1,9 +1,21 @@
+if(HARDWARE_KEYS)
+  add_definitions(-DHARDWARE_KEYS)
+endif()
+
+if(HARWARE_TOUCH)
+  add_definitions(-DHARDWARE_TOUCH)
+endif()
+
 include_directories(
   ${RADIO_SRC_DIR}/gui/colorlcd
   ${RADIO_SRC_DIR}/gui/colorlcd/layouts
-  ${CMAKE_CURRENT_BINARY_DIR}/fonts
-  ${RADIO_SRC_DIR}/thirdparty/libopenui/src
-  ${RADIO_SRC_DIR}/thirdparty/libopenui/thirdparty
+  ${RADIO_SRC_DIR}/gui/colorlcd/libui
+  ${RADIO_SRC_DIR}/gui/colorlcd/model
+  ${RADIO_SRC_DIR}/gui/colorlcd/radio
+  ${RADIO_SRC_DIR}/gui/colorlcd/module
+  ${RADIO_SRC_DIR}/gui/colorlcd/mainview
+  ${RADIO_SRC_DIR}/gui/colorlcd/themes
+  ${RADIO_SRC_DIR}/gui/colorlcd/controls
 )
 
 file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
@@ -15,103 +27,76 @@ file(GLOB LAYOUTS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
 file(GLOB WIDGETS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
   ${RADIO_SRC_DIR}/gui/colorlcd/widgets/*.cpp)
 
+file(GLOB LIBUI_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
+  ${RADIO_SRC_DIR}/gui/colorlcd/libui/*.cpp)
+
+file(GLOB MAINVIEW_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
+  ${RADIO_SRC_DIR}/gui/colorlcd/mainview/*.cpp)
+
+file(GLOB CONTROLS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd
+  ${RADIO_SRC_DIR}/gui/colorlcd/controls/*.cpp)
+
 set(GUI_SRC
   ${GUI_SRC}
+  ${LIBUI_SRC}
   ${THEMES_SRC}
   ${LAYOUTS_SRC}
   ${WIDGETS_SRC}
+  ${MAINVIEW_SRC}
+  ${CONTROLS_SRC}
   bitmaps.cpp
-  channel_bar.cpp
-  channel_range.cpp
-  color_editor.cpp
-  color_list.cpp
-  color_picker.cpp
   colors.cpp
-  curve.cpp
-  file_browser.cpp
-  file_preview.cpp
   fonts.cpp
-  fullscreen_dialog.cpp
-  special_functions.cpp
-  layout.cpp
   lcd.cpp
-  list_line_button.cpp
-  listbox.cpp
   LvglWrapper.cpp
-  menu_model.cpp
-  menu_radio.cpp
-  menu_screen.cpp
-  page.cpp
-  popups.cpp
-  screen_setup.cpp
-  screen_user_interface.cpp
-  select_fab_carousel.cpp
-  sourcechoice.cpp
   startup_shutdown.cpp
-  switch_warn_dialog.cpp
-  switchchoice.cpp
-  tabsgroup.cpp
-  theme_manager.cpp
-  topbar.cpp
-  view_about.cpp
-  view_channels.cpp
-  view_logical_switches.cpp
-  view_main_decoration.cpp
-  view_main_menu.cpp
-  view_main.cpp
-  view_statistics.cpp
-  view_text.cpp
-  widget_settings.cpp
-  widget.cpp
-  widgets_setup.cpp
-  curve_param.cpp
-  curveedit.cpp
-  fm_matrix.cpp
-  gvar_numberedit.cpp
-  input_edit_adv.cpp
-  input_edit.cpp
-  input_source.cpp
-  mixer_edit_adv.cpp
-  mixer_edit.cpp
-  model_curves.cpp
-  model_flightmodes.cpp
-  model_gvars.cpp
-  model_inputs.cpp
-  model_logical_switches.cpp
-  model_mixes.cpp
-  model_outputs.cpp
-  model_select.cpp
-  model_setup.cpp
-  model_telemetry.cpp
-  model_templates.cpp
-  output_edit.cpp
-  preflight_checks.cpp
-  throttle_params.cpp
-  timeedit.cpp
-  timer_setup.cpp
-  trainer_setup.cpp
-  trims_setup.cpp
-  bind_menu_d16.cpp
-  custom_failsafe.cpp
-  hw_extmodule.cpp
-  hw_intmodule.cpp
-  module_setup.cpp
-  ppm_settings.cpp
-  file_carosell.cpp
-  hw_inputs.cpp
-  hw_serial.cpp
-  preview_window.cpp
-  radio_calibration.cpp
-  radio_diaganas.cpp
-  radio_diagkeys.cpp
-  radio_hardware.cpp
-  radio_sdmanager.cpp
-  radio_setup.cpp
-  radio_theme.cpp
-  radio_tools.cpp
-  radio_trainer.cpp
-  radio_version.cpp
-  source_numberedit.cpp
+
+  model/curveedit.cpp
+  model/input_edit_adv.cpp
+  model/input_edit.cpp
+  model/menu_model.cpp
+  model/mixer_edit_adv.cpp
+  model/mixer_edit.cpp
+  model/model_curves.cpp
+  model/model_flightmodes.cpp
+  model/model_gvars.cpp
+  model/model_inputs.cpp
+  model/model_logical_switches.cpp
+  model/model_mixes.cpp
+  model/model_outputs.cpp
+  model/model_select.cpp
+  model/model_setup.cpp
+  model/model_telemetry.cpp
+  model/model_templates.cpp
+  model/output_edit.cpp
+  model/preflight_checks.cpp
+  model/special_functions.cpp
+  model/throttle_params.cpp
+  model/timer_setup.cpp
+  model/trainer_setup.cpp
+  model/trims_setup.cpp
+
+  module/bind_menu_d16.cpp
+  module/custom_failsafe.cpp
+  module/module_setup.cpp
+  module/ppm_settings.cpp
+
+  radio/hw_extmodule.cpp
+  radio/hw_inputs.cpp
+  radio/hw_intmodule.cpp
+  radio/hw_serial.cpp
+  radio/menu_radio.cpp
+  radio/preview_window.cpp
+  radio/radio_calibration.cpp
+  radio/radio_diaganas.cpp
+  radio/radio_diagkeys.cpp
+  radio/radio_hardware.cpp
+  radio/radio_sdmanager.cpp
+  radio/radio_setup.cpp
+  radio/radio_theme.cpp
+  radio/radio_tools.cpp
+  radio/radio_trainer.cpp
+  radio/radio_version.cpp
   )
 
 macro(add_gui_src src)
@@ -132,86 +117,74 @@ if(LUA)
 endif()
 
 if(LUA_MIXER)
-  add_gui_src(model_mixer_scripts.cpp)
+  add_gui_src(model/model_mixer_scripts.cpp)
 endif()
 
 if(FUNCTION_SWITCHES)
-  add_gui_src(function_switches.cpp)
-  add_gui_src(radio_diagcustswitches.cpp)
+  add_gui_src(model/function_switches.cpp)
+  add_gui_src(radio/radio_diagcustswitches.cpp)
 endif()
 
 if(GVARS)
-  add_gui_src(model_gvars.cpp)
+  add_gui_src(model/model_gvars.cpp)
 endif()
 
 if(HELI)
-  add_gui_src(model_heli.cpp)
+  add_gui_src(model/model_heli.cpp)
 endif()
 
 if(PXX2 OR MULTIMODULE)
-  add_gui_src(radio_spectrum_analyser.cpp)
+  add_gui_src(radio/radio_spectrum_analyser.cpp)
 endif()
 
 if(CROSSFIRE)
-  add_gui_src(crossfire_settings.cpp)
+  add_gui_src(module/crossfire_settings.cpp)
 endif()
 
 if(AFHDS2)
-  add_gui_src(afhds2a_settings.cpp)
+  add_gui_src(module/afhds2a_settings.cpp)
 endif()
 
 if(AFHDS3)
-  add_gui_src(afhds3_settings.cpp)
-  add_gui_src(afhds3_options.cpp)
+  add_gui_src(module/afhds3_settings.cpp)
+  add_gui_src(module/afhds3_options.cpp)
 endif()
 
 if(MULTIMODULE)
-  add_gui_src(mpm_settings.cpp)
+  add_gui_src(module/mpm_settings.cpp)
+  add_gui_src(module/multi_rfprotos.cpp)
 endif()
 
 if(INTERNAL_MODULE_PXX1)
-  add_gui_src(pxx1_settings.cpp)
+  add_gui_src(module/pxx1_settings.cpp)
 endif()
 
 if(PXX2)
-  add_gui_src(access_settings.cpp)
-endif()
-
-if(MULTIMODULE)
-  add_gui_src(multi_rfprotos.cpp)
+  add_gui_src(module/access_settings.cpp)
 endif()
 
 if(GHOST)
-  add_gui_src(radio_ghost_module_config.cpp)
+  add_gui_src(radio/radio_ghost_module_config.cpp)
 endif()
 
 if(BLUETOOTH)
-  add_gui_src(trainer_bluetooth.cpp)
-  add_gui_src(hw_bluetooth.cpp)
+  add_gui_src(model/trainer_bluetooth.cpp)
+  add_gui_src(radio/hw_bluetooth.cpp)
 endif()
 
 if(USBJ_EX)
-  add_gui_src(model_usbjoystick.cpp)
+  add_gui_src(model/model_usbjoystick.cpp)
 endif()
 
 set(SRC ${SRC} storage/modelslist.cpp)
 
-option(WINDOWS_INSPECT_BORDERS "Draw bounding boxes around windows" OFF)
-if(WINDOWS_INSPECT_BORDERS)
-  add_definitions(-DWINDOWS_INSPECT_BORDERS)
-endif()
-
 option(UI_PERF_MONITOR "Draw frame rate and CPU usage" OFF)
 if(UI_PERF_MONITOR)
   add_definitions(-DUI_PERF_MONITOR)
 endif()
 
-# includes libopenui
-set(LIBOPENUI_SRC_DIR thirdparty/libopenui)
-set(LVGL_SRC_DIR ${LIBOPENUI_SRC_DIR}/thirdparty/lvgl/src)
-
-include(${LIBOPENUI_SRC_DIR}/src/CMakeLists.txt)
-include(${LIBOPENUI_SRC_DIR}/thirdparty/CMakeLists.txt)
+# include lvgl
+include(${RADIO_SRC_DIR}/gui/colorlcd/CMakeListsLVGL.txt)
 
 list(TRANSFORM LVGL_SOURCES_MINIMAL PREPEND ${RADIO_SRC_DIR}/)
 list(TRANSFORM LVGL_FONT_SOURCES_MINIMAL PREPEND ${RADIO_SRC_DIR}/)
@@ -223,18 +196,14 @@ set(BOOTLOADER_SRC ${BOOTLOADER_SRC}
   ${RADIO_SRC_DIR}/gui/colorlcd/fonts.cpp
   ${RADIO_SRC_DIR}/gui/colorlcd/colors.cpp
   ${RADIO_SRC_DIR}/gui/colorlcd/bitmaps.cpp
-  ${RADIO_SRC_DIR}/${LIBOPENUI_SRC_DIR}/thirdparty/lz4/lz4.c
-  ${RADIO_SRC_DIR}/${LIBOPENUI_SRC_DIR}/src/bitmapbuffer.cpp
+  ${RADIO_SRC_DIR}/gui/colorlcd/libui/bitmapbuffer.cpp
+  ${RADIO_SRC_DIR}/thirdparty/lz4/lz4.c
 )
 
 set(SRC ${SRC}
   ${LVGL_SOURCES}
   ${LVGL_FONT_SOURCES}
-  ${LIBOPENUI_SOURCES}
+  ${RADIO_SRC_DIR}/thirdparty/lz4/lz4.c
 )
 
-foreach(LVGL_FILE ${LVGL_SOURCES})
-  SET_SOURCE_FILES_PROPERTIES(${LVGL_FILE} PROPERTIES COMPILE_FLAGS -O3)
-endforeach()
-
 add_definitions(-DLIBOPENUI)

radio/src/gui/colorlcd/CMakeListsLVGL.txt

@@ -1,155 +1,121 @@
 set(LVGL_SOURCES_MINIMAL
   core/lv_refr.c
 
-  draw/lv_draw_mask.c
-  draw/lv_img_cache.c
-  draw/sw/lv_draw_sw_gradient.c
-  draw/sw/lv_draw_sw.c
-  draw/sw/lv_draw_sw_blend.c
-  draw/sw/lv_draw_sw_letter.c
-  draw/sw/lv_draw_sw_arc.c
-  draw/sw/lv_draw_sw_polygon.c
-  draw/sw/lv_draw_sw_img.c
-  draw/sw/lv_draw_sw_line.c
-  draw/sw/lv_draw_sw_dither.c
-  draw/sw/lv_draw_sw_rect.c
+  draw/lv_draw_img.c
+  draw/lv_draw_label.c
   draw/lv_draw_line.c
+  draw/lv_draw_mask.c
+  draw/lv_draw_rect.c
   draw/lv_draw.c
   draw/lv_img_buf.c
-  draw/lv_draw_rect.c
-  draw/lv_draw_label.c
-  draw/lv_draw_img.c
-  draw/lv_draw_arc.c
-  draw/lv_draw_triangle.c
+  draw/lv_img_cache.c
   draw/lv_img_decoder.c
 
+  draw/sw/lv_draw_sw_arc.c
+  draw/sw/lv_draw_sw_blend.c
+  draw/sw/lv_draw_sw_img.c
+  draw/sw/lv_draw_sw_letter.c
+  draw/sw/lv_draw_sw_line.c
+  draw/sw/lv_draw_sw_polygon.c
+  draw/sw/lv_draw_sw_rect.c
+  draw/sw/lv_draw_sw.c
+
   # STM32 specific
   draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
-
-  # SDL specific
-  draw/sdl/lv_draw_sdl_rect.c
-  draw/sdl/lv_draw_sdl_arc.c
-  draw/sdl/lv_draw_sdl.c
-  draw/sdl/lv_draw_sdl_mask.c
-  draw/sdl/lv_draw_sdl_polygon.c
-  draw/sdl/lv_draw_sdl_stack_blur.c
-  draw/sdl/lv_draw_sdl_utils.c
-  draw/sdl/lv_draw_sdl_img.c
-  draw/sdl/lv_draw_sdl_bg.c
-  draw/sdl/lv_draw_sdl_label.c
-  draw/sdl/lv_draw_sdl_texture_cache.c
-  draw/sdl/lv_draw_sdl_line.c
-  draw/sdl/lv_draw_sdl_composite.c
   
   hal/lv_hal_disp.c
   hal/lv_hal_tick.c
 
   font/lv_font.c
-  font/lv_font_loader.c
   font/lv_font_fmt_txt.c
   
+  misc/lv_area.c
+  misc/lv_async.c
+  misc/lv_color.c
+  misc/lv_gc.c
+  misc/lv_ll.c
+  misc/lv_math.c
+  misc/lv_mem.c
   misc/lv_timer.c
   misc/lv_txt.c
-  misc/lv_gc.c
-  misc/lv_style_gen.c
-  misc/lv_templ.c
-  misc/lv_color.c
-  misc/lv_fs.c
-  misc/lv_printf.c
-  misc/lv_style.c
-  misc/lv_log.c
-  misc/lv_area.c
-  misc/lv_math.c
-  misc/lv_lru.c
-  misc/lv_tlsf.c
-  misc/lv_anim_timeline.c
-  misc/lv_ll.c
-  misc/lv_bidi.c
-  misc/lv_mem.c
   misc/lv_utils.c
-  misc/lv_async.c
-  misc/lv_anim.c
-  misc/lv_txt_ap.c
-
-  extra/lv_extra.c
 )
 
 set(LVGL_SOURCES
   ${LVGL_SOURCES_MINIMAL}
-  core/lv_group.c
-  core/lv_obj.c
-  core/lv_event.c
-  core/lv_indev.c
-  core/lv_obj_scroll.c
-  core/lv_obj_draw.c
+
   core/lv_disp.c
-  core/lv_obj_style.c
-  core/lv_theme.c
-  core/lv_obj_style_gen.c
+  core/lv_event.c
+  core/lv_group.c
   core/lv_indev_scroll.c
+  core/lv_indev.c
   core/lv_obj_class.c
-  core/lv_obj_tree.c
+  core/lv_obj_draw.c
   core/lv_obj_pos.c
+  core/lv_obj_scroll.c
+  core/lv_obj_style_gen.c
+  core/lv_obj_style.c
+  core/lv_obj_tree.c
+  core/lv_obj.c
+  core/lv_theme.c
+
+  draw/lv_draw_arc.c
+  draw/lv_draw_triangle.c
+
+  draw/sw/lv_draw_sw_gradient.c
 
   hal/lv_hal_indev.c
 
-  widgets/lv_line.c
-  widgets/lv_dropdown.c
-  widgets/lv_objx_templ.c
-  widgets/lv_canvas.c
-  widgets/lv_switch.c
-  widgets/lv_btnmatrix.c
-  widgets/lv_bar.c
-  widgets/lv_roller.c
-  widgets/lv_img.c
-  widgets/lv_btn.c
-  widgets/lv_checkbox.c
-  widgets/lv_label.c
-  widgets/lv_table.c
-  widgets/lv_slider.c
-  widgets/lv_textarea.c
+  misc/lv_anim.c
+  misc/lv_bidi.c
+  misc/lv_fs.c
+  misc/lv_log.c
+  misc/lv_lru.c
+  misc/lv_printf.c
+  misc/lv_style_gen.c
+  misc/lv_style.c
+  misc/lv_templ.c
+  misc/lv_tlsf.c
+  misc/lv_txt_ap.c
+
   widgets/lv_arc.c
-  extra/others/monkey/lv_monkey.c
-  extra/others/gridnav/lv_gridnav.c
-  extra/others/snapshot/lv_snapshot.c
-  extra/layouts/grid/lv_grid.c
+  widgets/lv_bar.c
+  widgets/lv_btn.c
+  widgets/lv_btnmatrix.c
+  widgets/lv_canvas.c
+  widgets/lv_checkbox.c
+  widgets/lv_img.c
+  widgets/lv_label.c
+  widgets/lv_line.c
+  widgets/lv_objx_templ.c
+  widgets/lv_slider.c
+  widgets/lv_switch.c
+  widgets/lv_table.c
+  widgets/lv_textarea.c
+
+  extra/lv_extra.c
+
   extra/layouts/flex/lv_flex.c
-  extra/libs/bmp/lv_bmp.c
-  extra/libs/ffmpeg/lv_ffmpeg.c
-  extra/libs/gif/lv_gif.c
-  extra/libs/gif/gifdec.c
-  extra/libs/freetype/lv_freetype.c
+  extra/layouts/grid/lv_grid.c
+  extra/libs/fsdrv/lv_fs_fatfs.c
   extra/libs/qrcode/lv_qrcode.c
   extra/libs/qrcode/qrcodegen.c
-  extra/libs/sjpg/tjpgd.c
-  extra/libs/sjpg/lv_sjpg.c
-  extra/libs/fsdrv/lv_fs_win32.c
-  extra/libs/fsdrv/lv_fs_stdio.c
-  extra/libs/fsdrv/lv_fs_posix.c
-  extra/libs/fsdrv/lv_fs_fatfs.c
-  extra/libs/rlottie/lv_rlottie.c
-  extra/libs/png/lv_png.c
-  extra/libs/png/lodepng.c
+  extra/others/snapshot/lv_snapshot.c
   extra/widgets/imgbtn/lv_imgbtn.c
-  extra/widgets/menu/lv_menu.c
-  extra/widgets/win/lv_win.c
-  extra/widgets/colorwheel/lv_colorwheel.c
-  extra/widgets/list/lv_list.c
-  extra/widgets/chart/lv_chart.c
-  extra/widgets/calendar/lv_calendar_header_arrow.c
-  extra/widgets/calendar/lv_calendar.c
-  extra/widgets/calendar/lv_calendar_header_dropdown.c
-  extra/widgets/tileview/lv_tileview.c
-  extra/widgets/led/lv_led.c
-  extra/widgets/spinner/lv_spinner.c
-  extra/widgets/tabview/lv_tabview.c
-  extra/widgets/meter/lv_meter.c
-  extra/widgets/spinbox/lv_spinbox.c
-  extra/widgets/animimg/lv_animimg.c
-  extra/widgets/span/lv_span.c
   extra/widgets/keyboard/lv_keyboard.c
-  extra/widgets/msgbox/lv_msgbox.c
+  extra/widgets/list/lv_list.c
+  extra/widgets/menu/lv_menu.c
+  extra/widgets/meter/lv_meter.c
+  extra/widgets/tabview/lv_tabview.c
+  extra/widgets/tileview/lv_tileview.c
+  extra/widgets/win/lv_win.c
 )
 
+set(LVGL_SRC_DIR thirdparty/lvgl/src)
+
 list(TRANSFORM LVGL_SOURCES_MINIMAL PREPEND ${LVGL_SRC_DIR}/)
 list(TRANSFORM LVGL_SOURCES PREPEND ${LVGL_SRC_DIR}/)
+
+foreach(LVGL_FILE ${LVGL_SOURCES})
+  SET_SOURCE_FILES_PROPERTIES(${LVGL_FILE} PROPERTIES COMPILE_FLAGS -O3)
+endforeach()

radio/src/gui/colorlcd/LvglWrapper.cpp

@@ -23,7 +23,7 @@
 #include "hal/rotary_encoder.h"
 
 #include "LvglWrapper.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 #include "view_main.h"
 

radio/src/gui/colorlcd/bitmaps.cpp

@@ -22,7 +22,7 @@
 #include "bitmaps.h"
 
 #include "libopenui.h"
-#include "libopenui/thirdparty/lz4/lz4.h"
+#include "lz4/lz4.h"
 #include "opentx_helpers.h"
 
 LZ4BitmapBuffer::LZ4BitmapBuffer(uint8_t format, const LZ4Bitmap* lz4Data) :

radio/src/gui/colorlcd/colors.h

@@ -127,10 +127,6 @@ LcdColorIndex indexFromColor(uint32_t lcdFlags);
 #define COLOR_THEME_DISABLED COLOR(COLOR_THEME_DISABLED_INDEX)
 #define CUSTOM_COLOR COLOR(CUSTOM_COLOR_INDEX)
 
-#if defined(WINDOWS_INSPECT_BORDERS)
-#define WINDOWS_INSPECT_BORDER_COLOR COLOR_THEME_PRIMARY3
-#endif
-
 constexpr int MAX_SATURATION = 100;
 constexpr int MAX_HUE = 360;
 constexpr int MAX_BRIGHTNESS = 100;

radio/src/gui/colorlcd/controls/channel_bar.cpp

@@ -22,7 +22,7 @@
 #include "channel_bar.h"
 
 #include "bitmaps.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 #define VIEW_CHANNELS_LIMIT_PCT \
   (g_model.extendedLimits ? LIMIT_EXT_PERCENT : LIMIT_STD_PERCENT)

radio/src/gui/colorlcd/controls/color_editor.cpp

@@ -21,7 +21,7 @@
 #include "color_editor.h"
 
 #include "button.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 static const char* const RGBChars[MAX_BARS] = {"R", "G", "B"};
 static const char* const HSVChars[MAX_BARS] = {"H", "S", "V"};

radio/src/gui/colorlcd/controls/color_list.cpp

@@ -22,7 +22,7 @@
 #include "color_list.h"
 
 #include "color_editor.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 ColorList::ColorList(Window *parent, const rect_t &rect,
                      std::vector<ColorEntry> colors) :

radio/src/gui/colorlcd/controls/color_picker.cpp

@@ -23,7 +23,7 @@
 
 #include "color_editor.h"
 #include "color_list.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 #if !PORTRAIT_LCD
 // Landscape

radio/src/gui/colorlcd/controls/fm_matrix.cpp

@@ -22,7 +22,7 @@
 #include "fm_matrix.h"
 
 #include "opentx.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 template <class T>
 FMMatrix<T>::FMMatrix(Window* parent, const rect_t& r, T* input) :

radio/src/gui/colorlcd/fonts.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "fonts.h"
-#include "libopenui/thirdparty/lz4/lz4.h"
+#include "lz4/lz4.h"
 #include "libopenui_defines.h"
 #include "lz4_fonts.h"
 

radio/src/gui/colorlcd/lcd.cpp

@@ -30,7 +30,7 @@
 #include "bitmapbuffer.h"
 #include "board.h"
 #include "dma2d.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 pixel_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE] __SDRAM;
 pixel_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE] __SDRAM;

radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp

@@ -19,7 +19,7 @@
 #pragma GCC optimize("O3")
 
 #include "bitmapbuffer.h"
-#include "libopenui_file.h"
+#include "lib_file.h"
 #include "opentx_helpers.h"
 
 FIL imgFile __DMA;

radio/src/gui/colorlcd/libui/button.cpp

@@ -19,7 +19,7 @@
 #include "button.h"
 
 #include "static.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 static void button_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
 {

radio/src/gui/colorlcd/libui/button_matrix.cpp

@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 static void btnmatrix_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
 {

radio/src/gui/colorlcd/libui/choice.cpp

@@ -19,7 +19,7 @@
 #include "choice.h"
 
 #include "menu.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 // Choice
 static void choice_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)

radio/src/gui/colorlcd/libui/dialog.cpp

@@ -21,7 +21,7 @@
 #include "opentx.h"
 #include "mainwindow.h"
 #include "progress.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 //-----------------------------------------------------------------------------
 

radio/src/gui/colorlcd/libui/file_browser.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "file_browser.h"
-#include "libopenui_file.h"
+#include "lib_file.h"
 #include "fonts.h"
 
 #include <list>

radio/src/gui/colorlcd/libui/filechoice.cpp

@@ -21,7 +21,7 @@
 #include <algorithm>
 
 #include "opentx.h"
-#include "libopenui_file.h"
+#include "lib_file.h"
 #include "menu.h"
 #include "menutoolbar.h"
 

radio/src/gui/colorlcd/libui/form.cpp

@@ -18,7 +18,7 @@
 
 #include "form.h"
 
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 void FlexGridLayout::apply(Window* w)
 {

radio/src/gui/colorlcd/libui/form.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 #include "window.h"
 
 class FlexGridLayout

radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp

@@ -25,7 +25,7 @@
 #include "libopenui.h"
 #include "mainwindow.h"
 #include "opentx.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 #include "view_main.h"
 #include "hal/watchdog_driver.h"
 

radio/src/gui/colorlcd/libui/keyboard_base.cpp

@@ -20,7 +20,7 @@
 
 #include "form.h"
 #include "mainwindow.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 static void keyboard_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)
 {

radio/src/gui/colorlcd/libui/libopenui.h

@@ -23,7 +23,7 @@
 
 #if !defined(BOOT)
 #include "libopenui_defines.h"
-#include "libopenui_file.h"
+#include "lib_file.h"
 #include "myeeprom.h"
 #include "fonts.h"
 #include "window.h"

radio/src/gui/colorlcd/libui/list_line_button.cpp

@@ -24,7 +24,7 @@
 #include <algorithm>
 
 #include "opentx.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 static void input_mix_line_constructor(const lv_obj_class_t* class_p,
                                        lv_obj_t* obj)

radio/src/gui/colorlcd/libui/mainwindow.cpp

@@ -21,7 +21,7 @@
 #include "board.h"
 #include "keyboard_base.h"
 #include "layout.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 #include "sdcard.h"
 
 // timers_driver.h

radio/src/gui/colorlcd/libui/menu.cpp

@@ -23,7 +23,7 @@
 #include "menutoolbar.h"
 #include "opentx.h"
 #include "table.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 constexpr coord_t MENUS_WIDTH = 200;
 

radio/src/gui/colorlcd/libui/menutoolbar.cpp

@@ -19,7 +19,7 @@
 #include "menutoolbar.h"
 
 #include "menu.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 #include "translations.h"
 
 static const lv_obj_class_t menu_button_class = {

radio/src/gui/colorlcd/libui/modal_window.cpp

@@ -19,7 +19,7 @@
 #include "modal_window.h"
 
 #include "layer.h"
-#include "themes/etx_lv_theme.h"
+#include "etx_lv_theme.h"
 
 // Modal overlay style (for dimming background)
 void modal_window_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj)