From 2eee7cd0116bd2dfa540e35eceed0c9b3e71825d Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 2 Aug 2024 08:50:55 +1000 Subject: [PATCH] chore: re-organise source files for color LCD UI (#5358) --- .gitmodules | 8 +- cmake/Bitmaps.cmake | 6 +- cmake/GenericDefinitions.cmake | 1 - radio/src/CMakeLists.txt | 2 +- .../{thirdparty/libopenui/src => }/bitfield.h | 0 radio/src/bluetooth.cpp | 2 +- radio/src/datastructs_private.h | 4 +- radio/src/fonts/lvgl/lv_font_arimo_he_16.c | 2 +- radio/src/fonts/lvgl/lv_font_arimo_ru_16.c | 2 +- radio/src/fonts/lvgl/lv_font_arimo_ua_16.c | 2 +- radio/src/fonts/lvgl/lv_font_noto_cn_16.c | 2 +- radio/src/fonts/lvgl/lv_font_noto_jp_16.c | 2 +- radio/src/fonts/lvgl/lv_font_noto_tw_16.c | 2 +- radio/src/fonts/lvgl/lv_font_roboto_16.c | 2 +- radio/src/fonts/lvgl/lv_font_roboto_bl_16.c | 2 +- radio/src/fonts/lvgl/lz4_font.cpp | 2 +- radio/src/fonts/lvgl/make_fonts.sh | 4 +- radio/src/gui/128x64/lcd.cpp | 2 +- radio/src/gui/colorlcd/CMakeLists.txt | 225 +++++------- .../colorlcd/CMakeListsLVGL.txt} | 194 +++++----- radio/src/gui/colorlcd/LvglWrapper.cpp | 2 +- radio/src/gui/colorlcd/bitmaps.cpp | 2 +- radio/src/gui/colorlcd/colors.h | 4 - .../colorlcd/{ => controls}/channel_bar.cpp | 2 +- .../gui/colorlcd/{ => controls}/channel_bar.h | 0 .../colorlcd/{ => controls}/channel_range.cpp | 0 .../colorlcd/{ => controls}/channel_range.h | 0 .../colorlcd/{ => controls}/color_editor.cpp | 2 +- .../colorlcd/{ => controls}/color_editor.h | 0 .../colorlcd/{ => controls}/color_list.cpp | 2 +- .../gui/colorlcd/{ => controls}/color_list.h | 0 .../colorlcd/{ => controls}/color_picker.cpp | 2 +- .../colorlcd/{ => controls}/color_picker.h | 0 .../src/gui/colorlcd/{ => controls}/curve.cpp | 0 radio/src/gui/colorlcd/{ => controls}/curve.h | 0 .../colorlcd/{ => controls}/curve_param.cpp | 0 .../gui/colorlcd/{ => controls}/curve_param.h | 0 .../gui/colorlcd/{ => controls}/fm_matrix.cpp | 2 +- .../gui/colorlcd/{ => controls}/fm_matrix.h | 0 .../{ => controls}/gvar_numberedit.cpp | 0 .../colorlcd/{ => controls}/gvar_numberedit.h | 0 .../colorlcd/{ => controls}/input_source.cpp | 0 .../colorlcd/{ => controls}/input_source.h | 0 .../{ => controls}/source_numberedit.cpp | 0 .../{ => controls}/source_numberedit.h | 0 .../colorlcd/{ => controls}/sourcechoice.cpp | 0 .../colorlcd/{ => controls}/sourcechoice.h | 0 .../{ => controls}/switch_warn_dialog.cpp | 0 .../{ => controls}/switch_warn_dialog.h | 0 .../colorlcd/{ => controls}/switchchoice.cpp | 0 .../colorlcd/{ => controls}/switchchoice.h | 0 radio/src/gui/colorlcd/fonts.cpp | 2 +- radio/src/gui/colorlcd/lcd.cpp | 2 +- .../colorlcd/libui}/bitmapbuffer.cpp | 0 .../src => gui/colorlcd/libui}/bitmapbuffer.h | 0 .../libui}/bitmapbuffer_draw_extra.cpp | 0 .../colorlcd/libui}/bitmapbuffer_fileio.cpp | 2 +- .../src => gui/colorlcd/libui}/button.cpp | 2 +- .../src => gui/colorlcd/libui}/button.h | 0 .../colorlcd/libui}/button_matrix.cpp | 2 +- .../colorlcd/libui}/button_matrix.h | 0 .../src => gui/colorlcd/libui}/choice.cpp | 2 +- .../src => gui/colorlcd/libui}/choice.h | 0 .../src => gui/colorlcd/libui}/dialog.cpp | 2 +- .../src => gui/colorlcd/libui}/dialog.h | 0 .../{themes => libui}/etx_lv_theme.cpp | 0 .../colorlcd/{themes => libui}/etx_lv_theme.h | 0 .../gui/colorlcd/{ => libui}/file_browser.cpp | 2 +- .../gui/colorlcd/{ => libui}/file_browser.h | 0 .../colorlcd/{ => libui}/file_carosell.cpp | 0 .../gui/colorlcd/{ => libui}/file_carosell.h | 0 .../gui/colorlcd/{ => libui}/file_preview.cpp | 0 .../gui/colorlcd/{ => libui}/file_preview.h | 0 .../src => gui/colorlcd/libui}/filechoice.cpp | 2 +- .../src => gui/colorlcd/libui}/filechoice.h | 0 .../src => gui/colorlcd/libui}/form.cpp | 2 +- .../src => gui/colorlcd/libui}/form.h | 2 +- .../{ => libui}/fullscreen_dialog.cpp | 2 +- .../colorlcd/{ => libui}/fullscreen_dialog.h | 0 .../colorlcd/libui}/keyboard_base.cpp | 2 +- .../colorlcd/libui}/keyboard_base.h | 0 .../colorlcd/libui}/keyboard_number.cpp | 0 .../colorlcd/libui}/keyboard_number.h | 0 .../colorlcd/libui}/keyboard_text.cpp | 0 .../colorlcd/libui}/keyboard_text.h | 0 .../src => gui/colorlcd/libui}/layer.cpp | 0 .../src => gui/colorlcd/libui}/layer.h | 0 .../src/gui/colorlcd/{ => libui}/libopenui.h | 2 +- .../colorlcd/libui}/libopenui_defines.h | 0 .../colorlcd/{ => libui}/list_line_button.cpp | 2 +- .../colorlcd/{ => libui}/list_line_button.h | 0 .../src/gui/colorlcd/{ => libui}/listbox.cpp | 0 radio/src/gui/colorlcd/{ => libui}/listbox.h | 0 .../src => gui/colorlcd/libui}/mainwindow.cpp | 2 +- .../src => gui/colorlcd/libui}/mainwindow.h | 0 .../src => gui/colorlcd/libui}/menu.cpp | 2 +- .../src => gui/colorlcd/libui}/menu.h | 0 .../colorlcd/libui}/menutoolbar.cpp | 2 +- .../src => gui/colorlcd/libui}/menutoolbar.h | 0 .../colorlcd/libui}/modal_window.cpp | 2 +- .../src => gui/colorlcd/libui}/modal_window.h | 0 .../src => gui/colorlcd/libui}/numberedit.cpp | 2 +- .../src => gui/colorlcd/libui}/numberedit.h | 0 radio/src/gui/colorlcd/{ => libui}/page.cpp | 2 +- radio/src/gui/colorlcd/{ => libui}/page.h | 0 radio/src/gui/colorlcd/{ => libui}/popups.cpp | 2 +- radio/src/gui/colorlcd/{ => libui}/popups.h | 0 .../src => gui/colorlcd/libui}/progress.cpp | 2 +- .../src => gui/colorlcd/libui}/progress.h | 0 .../src => gui/colorlcd/libui}/slider.cpp | 2 +- .../src => gui/colorlcd/libui}/slider.h | 0 .../src => gui/colorlcd/libui}/static.cpp | 4 +- .../src => gui/colorlcd/libui}/static.h | 0 .../src => gui/colorlcd/libui}/table.cpp | 2 +- .../src => gui/colorlcd/libui}/table.h | 0 .../gui/colorlcd/{ => libui}/tabsgroup.cpp | 2 +- .../src/gui/colorlcd/{ => libui}/tabsgroup.h | 0 .../src => gui/colorlcd/libui}/textedit.cpp | 2 +- .../src => gui/colorlcd/libui}/textedit.h | 0 .../src/gui/colorlcd/{ => libui}/timeedit.cpp | 0 radio/src/gui/colorlcd/{ => libui}/timeedit.h | 0 .../colorlcd/libui}/toggleswitch.cpp | 2 +- .../src => gui/colorlcd/libui}/toggleswitch.h | 0 .../gui/colorlcd/{ => libui}/view_text.cpp | 2 +- .../src/gui/colorlcd/{ => libui}/view_text.h | 0 .../src => gui/colorlcd/libui}/window.cpp | 2 +- .../src => gui/colorlcd/libui}/window.h | 2 +- radio/src/{ => gui/colorlcd}/lv_conf.h | 0 .../gui/colorlcd/{ => mainview}/layout.cpp | 0 .../src/gui/colorlcd/{ => mainview}/layout.h | 0 .../layout_factory_impl.cpp | 4 +- .../layout_factory_impl.h | 0 .../colorlcd/{ => mainview}/menu_screen.cpp | 0 .../gui/colorlcd/{ => mainview}/menu_screen.h | 0 .../colorlcd/{ => mainview}/screen_setup.cpp | 2 +- .../colorlcd/{ => mainview}/screen_setup.h | 0 .../{ => mainview}/screen_user_interface.cpp | 0 .../{ => mainview}/screen_user_interface.h | 0 .../{ => mainview}/select_fab_carousel.cpp | 0 .../{ => mainview}/select_fab_carousel.h | 0 .../{layouts => mainview}/sliders.cpp | 0 .../colorlcd/{layouts => mainview}/sliders.h | 0 .../gui/colorlcd/{ => mainview}/topbar.cpp | 2 +- .../src/gui/colorlcd/{ => mainview}/topbar.h | 0 .../{layouts => mainview}/topbar_impl.cpp | 0 .../{layouts => mainview}/topbar_impl.h | 2 +- .../colorlcd/{layouts => mainview}/trims.cpp | 0 .../colorlcd/{layouts => mainview}/trims.h | 0 .../colorlcd/{ => mainview}/view_about.cpp | 0 .../gui/colorlcd/{ => mainview}/view_about.h | 0 .../colorlcd/{ => mainview}/view_channels.cpp | 0 .../colorlcd/{ => mainview}/view_channels.h | 0 .../{ => mainview}/view_logical_switches.cpp | 2 +- .../{ => mainview}/view_logical_switches.h | 0 .../gui/colorlcd/{ => mainview}/view_main.cpp | 0 .../gui/colorlcd/{ => mainview}/view_main.h | 0 .../{ => mainview}/view_main_decoration.cpp | 4 +- .../{ => mainview}/view_main_decoration.h | 0 .../{ => mainview}/view_main_menu.cpp | 2 +- .../colorlcd/{ => mainview}/view_main_menu.h | 0 .../{ => mainview}/view_statistics.cpp | 0 .../colorlcd/{ => mainview}/view_statistics.h | 0 .../gui/colorlcd/{ => mainview}/widget.cpp | 2 +- .../src/gui/colorlcd/{ => mainview}/widget.h | 0 .../{ => mainview}/widget_settings.cpp | 0 .../colorlcd/{ => mainview}/widget_settings.h | 0 .../{ => mainview}/widgets_container.h | 0 .../colorlcd/{ => mainview}/widgets_setup.cpp | 2 +- .../colorlcd/{ => mainview}/widgets_setup.h | 0 radio/src/gui/colorlcd/{ => mainview}/zone.h | 0 .../gui/colorlcd/{ => model}/curveedit.cpp | 2 +- .../src/gui/colorlcd/{ => model}/curveedit.h | 0 .../{ => model}/function_switches.cpp | 0 .../colorlcd/{ => model}/function_switches.h | 0 .../gui/colorlcd/{ => model}/input_edit.cpp | 2 +- .../src/gui/colorlcd/{ => model}/input_edit.h | 0 .../colorlcd/{ => model}/input_edit_adv.cpp | 2 +- .../gui/colorlcd/{ => model}/input_edit_adv.h | 0 .../gui/colorlcd/{ => model}/menu_model.cpp | 0 .../src/gui/colorlcd/{ => model}/menu_model.h | 0 .../gui/colorlcd/{ => model}/mixer_edit.cpp | 2 +- .../src/gui/colorlcd/{ => model}/mixer_edit.h | 0 .../colorlcd/{ => model}/mixer_edit_adv.cpp | 2 +- .../gui/colorlcd/{ => model}/mixer_edit_adv.h | 0 .../gui/colorlcd/{ => model}/model_curves.cpp | 0 .../gui/colorlcd/{ => model}/model_curves.h | 0 .../{ => model}/model_flightmodes.cpp | 2 +- .../colorlcd/{ => model}/model_flightmodes.h | 0 .../gui/colorlcd/{ => model}/model_gvars.cpp | 2 +- .../gui/colorlcd/{ => model}/model_gvars.h | 0 .../gui/colorlcd/{ => model}/model_heli.cpp | 0 .../src/gui/colorlcd/{ => model}/model_heli.h | 0 .../gui/colorlcd/{ => model}/model_inputs.cpp | 0 .../gui/colorlcd/{ => model}/model_inputs.h | 0 .../{ => model}/model_logical_switches.cpp | 2 +- .../{ => model}/model_logical_switches.h | 0 .../{ => model}/model_mixer_scripts.cpp | 2 +- .../{ => model}/model_mixer_scripts.h | 0 .../gui/colorlcd/{ => model}/model_mixes.cpp | 0 .../gui/colorlcd/{ => model}/model_mixes.h | 0 .../colorlcd/{ => model}/model_outputs.cpp | 2 +- .../gui/colorlcd/{ => model}/model_outputs.h | 0 .../gui/colorlcd/{ => model}/model_select.cpp | 2 +- .../gui/colorlcd/{ => model}/model_select.h | 2 +- .../gui/colorlcd/{ => model}/model_setup.cpp | 2 +- .../gui/colorlcd/{ => model}/model_setup.h | 0 .../colorlcd/{ => model}/model_telemetry.cpp | 2 +- .../colorlcd/{ => model}/model_telemetry.h | 0 .../colorlcd/{ => model}/model_templates.cpp | 2 +- .../colorlcd/{ => model}/model_templates.h | 0 .../{ => model}/model_usbjoystick.cpp | 2 +- .../colorlcd/{ => model}/model_usbjoystick.h | 0 .../gui/colorlcd/{ => model}/output_edit.cpp | 2 +- .../gui/colorlcd/{ => model}/output_edit.h | 0 .../colorlcd/{ => model}/preflight_checks.cpp | 2 +- .../colorlcd/{ => model}/preflight_checks.h | 0 .../{ => model}/special_functions.cpp | 0 .../colorlcd/{ => model}/special_functions.h | 0 .../colorlcd/{ => model}/throttle_params.cpp | 0 .../colorlcd/{ => model}/throttle_params.h | 0 .../gui/colorlcd/{ => model}/timer_setup.cpp | 0 .../gui/colorlcd/{ => model}/timer_setup.h | 0 .../{ => model}/trainer_bluetooth.cpp | 0 .../colorlcd/{ => model}/trainer_bluetooth.h | 0 .../colorlcd/{ => model}/trainer_setup.cpp | 0 .../gui/colorlcd/{ => model}/trainer_setup.h | 0 .../gui/colorlcd/{ => model}/trims_setup.cpp | 0 .../gui/colorlcd/{ => model}/trims_setup.h | 0 .../colorlcd/{ => module}/access_settings.cpp | 0 .../colorlcd/{ => module}/access_settings.h | 0 .../{ => module}/afhds2a_settings.cpp | 0 .../colorlcd/{ => module}/afhds2a_settings.h | 0 .../colorlcd/{ => module}/afhds3_options.cpp | 0 .../colorlcd/{ => module}/afhds3_options.h | 0 .../colorlcd/{ => module}/afhds3_settings.cpp | 0 .../colorlcd/{ => module}/afhds3_settings.h | 0 .../colorlcd/{ => module}/bind_menu_d16.cpp | 0 .../gui/colorlcd/{ => module}/bind_menu_d16.h | 0 .../{ => module}/crossfire_settings.cpp | 0 .../{ => module}/crossfire_settings.h | 0 .../colorlcd/{ => module}/custom_failsafe.cpp | 2 +- .../colorlcd/{ => module}/custom_failsafe.h | 0 .../colorlcd/{ => module}/module_setup.cpp | 2 +- .../gui/colorlcd/{ => module}/module_setup.h | 0 .../colorlcd/{ => module}/mpm_settings.cpp | 0 .../gui/colorlcd/{ => module}/mpm_settings.h | 0 .../colorlcd/{ => module}/multi_rfprotos.cpp | 0 .../colorlcd/{ => module}/multi_rfprotos.h | 0 .../colorlcd/{ => module}/ppm_settings.cpp | 0 .../gui/colorlcd/{ => module}/ppm_settings.h | 0 .../colorlcd/{ => module}/pxx1_settings.cpp | 0 .../gui/colorlcd/{ => module}/pxx1_settings.h | 0 .../gui/colorlcd/{ => radio}/hw_bluetooth.cpp | 0 .../gui/colorlcd/{ => radio}/hw_bluetooth.h | 0 .../gui/colorlcd/{ => radio}/hw_extmodule.cpp | 0 .../gui/colorlcd/{ => radio}/hw_extmodule.h | 0 .../gui/colorlcd/{ => radio}/hw_inputs.cpp | 0 .../src/gui/colorlcd/{ => radio}/hw_inputs.h | 0 .../gui/colorlcd/{ => radio}/hw_intmodule.cpp | 0 .../gui/colorlcd/{ => radio}/hw_intmodule.h | 0 .../gui/colorlcd/{ => radio}/hw_serial.cpp | 0 .../src/gui/colorlcd/{ => radio}/hw_serial.h | 0 .../gui/colorlcd/{ => radio}/menu_radio.cpp | 0 .../src/gui/colorlcd/{ => radio}/menu_radio.h | 0 .../colorlcd/{ => radio}/preview_window.cpp | 2 +- .../gui/colorlcd/{ => radio}/preview_window.h | 0 .../{ => radio}/radio_calibration.cpp | 0 .../colorlcd/{ => radio}/radio_calibration.h | 0 .../colorlcd/{ => radio}/radio_diaganas.cpp | 2 +- .../gui/colorlcd/{ => radio}/radio_diaganas.h | 0 .../{ => radio}/radio_diagcustswitches.cpp | 0 .../{ => radio}/radio_diagcustswitches.h | 0 .../colorlcd/{ => radio}/radio_diagkeys.cpp | 0 .../gui/colorlcd/{ => radio}/radio_diagkeys.h | 0 .../{ => radio}/radio_ghost_module_config.cpp | 0 .../{ => radio}/radio_ghost_module_config.h | 0 .../colorlcd/{ => radio}/radio_hardware.cpp | 0 .../gui/colorlcd/{ => radio}/radio_hardware.h | 0 .../colorlcd/{ => radio}/radio_sdmanager.cpp | 4 +- .../colorlcd/{ => radio}/radio_sdmanager.h | 0 .../gui/colorlcd/{ => radio}/radio_setup.cpp | 0 .../gui/colorlcd/{ => radio}/radio_setup.h | 0 .../{ => radio}/radio_spectrum_analyser.cpp | 0 .../{ => radio}/radio_spectrum_analyser.h | 0 .../gui/colorlcd/{ => radio}/radio_theme.cpp | 2 +- .../gui/colorlcd/{ => radio}/radio_theme.h | 0 .../gui/colorlcd/{ => radio}/radio_tools.cpp | 2 +- .../gui/colorlcd/{ => radio}/radio_tools.h | 0 .../colorlcd/{ => radio}/radio_trainer.cpp | 0 .../gui/colorlcd/{ => radio}/radio_trainer.h | 0 .../colorlcd/{ => radio}/radio_version.cpp | 2 +- .../gui/colorlcd/{ => radio}/radio_version.h | 0 .../colorlcd/{ => themes}/theme_manager.cpp | 2 +- .../gui/colorlcd/{ => themes}/theme_manager.h | 0 .../src/gui/common/stdlcd/radio_sdmanager.cpp | 2 +- radio/src/io/bootloader_flash.cpp | 2 +- radio/src/io/frsky_firmware_update.cpp | 2 +- radio/src/io/multi_firmware_update.cpp | 2 +- .../src/libopenui_file.cpp => lib_file.cpp} | 2 +- .../src/libopenui_file.h => lib_file.h} | 0 radio/src/lua/interface.cpp | 2 +- radio/src/lua/lua_widget_factory.h | 2 +- radio/src/lua/widgets.cpp | 2 +- radio/src/main.cpp | 6 +- radio/src/myeeprom.h | 2 +- radio/src/opentx.cpp | 2 +- radio/src/opentx.h | 2 +- radio/src/pulses/afhds3.h | 2 +- radio/src/pulses/modules_helpers.h | 2 +- radio/src/pulses/pxx2.cpp | 2 +- radio/src/sdcard.cpp | 2 +- radio/src/targets/simu/CMakeLists.txt | 2 +- radio/src/thirdparty/libopenui/.clang-format | 6 - radio/src/thirdparty/libopenui/.gitignore | 1 - radio/src/thirdparty/libopenui/.gitmodules | 7 - .../libopenui/.idea/codeStyles/Project.xml | 32 -- .../.idea/codeStyles/codeStyleConfig.xml | 5 - radio/src/thirdparty/libopenui/LICENSE | 339 ------------------ radio/src/thirdparty/libopenui/README.md | 4 - .../thirdparty/libopenui/src/CMakeLists.txt | 42 --- .../{libopenui/thirdparty => }/lvgl | 0 .../{libopenui/thirdparty => }/lz4/LICENSE | 0 .../{libopenui/thirdparty => }/lz4/README.md | 0 .../{libopenui/thirdparty => }/lz4/lz4.c | 0 .../{libopenui/thirdparty => }/lz4/lz4.h | 0 .../{libopenui/thirdparty => }/lz4/lz4hc.c | 0 .../{libopenui/thirdparty => }/lz4/lz4hc.h | 0 .../thirdparty/{libopenui/thirdparty => }/stb | 0 .../libopenui/tools => util}/encode-bitmap.py | 0 329 files changed, 298 insertions(+), 804 deletions(-) rename radio/src/{thirdparty/libopenui/src => }/bitfield.h (100%) rename radio/src/{thirdparty/libopenui/thirdparty/CMakeLists.txt => gui/colorlcd/CMakeListsLVGL.txt} (61%) rename radio/src/gui/colorlcd/{ => controls}/channel_bar.cpp (99%) rename radio/src/gui/colorlcd/{ => controls}/channel_bar.h (100%) rename radio/src/gui/colorlcd/{ => controls}/channel_range.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/channel_range.h (100%) rename radio/src/gui/colorlcd/{ => controls}/color_editor.cpp (99%) rename radio/src/gui/colorlcd/{ => controls}/color_editor.h (100%) rename radio/src/gui/colorlcd/{ => controls}/color_list.cpp (99%) rename radio/src/gui/colorlcd/{ => controls}/color_list.h (100%) rename radio/src/gui/colorlcd/{ => controls}/color_picker.cpp (99%) rename radio/src/gui/colorlcd/{ => controls}/color_picker.h (100%) rename radio/src/gui/colorlcd/{ => controls}/curve.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/curve.h (100%) rename radio/src/gui/colorlcd/{ => controls}/curve_param.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/curve_param.h (100%) rename radio/src/gui/colorlcd/{ => controls}/fm_matrix.cpp (98%) rename radio/src/gui/colorlcd/{ => controls}/fm_matrix.h (100%) rename radio/src/gui/colorlcd/{ => controls}/gvar_numberedit.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/gvar_numberedit.h (100%) rename radio/src/gui/colorlcd/{ => controls}/input_source.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/input_source.h (100%) rename radio/src/gui/colorlcd/{ => controls}/source_numberedit.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/source_numberedit.h (100%) rename radio/src/gui/colorlcd/{ => controls}/sourcechoice.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/sourcechoice.h (100%) rename radio/src/gui/colorlcd/{ => controls}/switch_warn_dialog.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/switch_warn_dialog.h (100%) rename radio/src/gui/colorlcd/{ => controls}/switchchoice.cpp (100%) rename radio/src/gui/colorlcd/{ => controls}/switchchoice.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/bitmapbuffer.cpp (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/bitmapbuffer.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/bitmapbuffer_draw_extra.cpp (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/bitmapbuffer_fileio.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/button.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/button.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/button_matrix.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/button_matrix.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/choice.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/choice.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/dialog.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/dialog.h (100%) rename radio/src/gui/colorlcd/{themes => libui}/etx_lv_theme.cpp (100%) rename radio/src/gui/colorlcd/{themes => libui}/etx_lv_theme.h (100%) rename radio/src/gui/colorlcd/{ => libui}/file_browser.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/file_browser.h (100%) rename radio/src/gui/colorlcd/{ => libui}/file_carosell.cpp (100%) rename radio/src/gui/colorlcd/{ => libui}/file_carosell.h (100%) rename radio/src/gui/colorlcd/{ => libui}/file_preview.cpp (100%) rename radio/src/gui/colorlcd/{ => libui}/file_preview.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/filechoice.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/filechoice.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/form.cpp (98%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/form.h (98%) rename radio/src/gui/colorlcd/{ => libui}/fullscreen_dialog.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/fullscreen_dialog.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_base.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_base.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_number.cpp (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_number.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_text.cpp (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/keyboard_text.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/layer.cpp (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/layer.h (100%) rename radio/src/gui/colorlcd/{ => libui}/libopenui.h (97%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/libopenui_defines.h (100%) rename radio/src/gui/colorlcd/{ => libui}/list_line_button.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/list_line_button.h (100%) rename radio/src/gui/colorlcd/{ => libui}/listbox.cpp (100%) rename radio/src/gui/colorlcd/{ => libui}/listbox.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/mainwindow.cpp (98%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/mainwindow.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/menu.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/menu.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/menutoolbar.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/menutoolbar.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/modal_window.cpp (98%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/modal_window.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/numberedit.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/numberedit.h (100%) rename radio/src/gui/colorlcd/{ => libui}/page.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/page.h (100%) rename radio/src/gui/colorlcd/{ => libui}/popups.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/popups.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/progress.cpp (98%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/progress.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/slider.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/slider.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/static.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/static.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/table.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/table.h (100%) rename radio/src/gui/colorlcd/{ => libui}/tabsgroup.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/tabsgroup.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/textedit.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/textedit.h (100%) rename radio/src/gui/colorlcd/{ => libui}/timeedit.cpp (100%) rename radio/src/gui/colorlcd/{ => libui}/timeedit.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/toggleswitch.cpp (98%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/toggleswitch.h (100%) rename radio/src/gui/colorlcd/{ => libui}/view_text.cpp (99%) rename radio/src/gui/colorlcd/{ => libui}/view_text.h (100%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/window.cpp (99%) rename radio/src/{thirdparty/libopenui/src => gui/colorlcd/libui}/window.h (99%) rename radio/src/{ => gui/colorlcd}/lv_conf.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/layout.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/layout.h (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/layout_factory_impl.cpp (98%) rename radio/src/gui/colorlcd/{layouts => mainview}/layout_factory_impl.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/menu_screen.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/menu_screen.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/screen_setup.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/screen_setup.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/screen_user_interface.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/screen_user_interface.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/select_fab_carousel.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/select_fab_carousel.h (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/sliders.cpp (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/sliders.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/topbar.cpp (98%) rename radio/src/gui/colorlcd/{ => mainview}/topbar.h (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/topbar_impl.cpp (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/topbar_impl.h (97%) rename radio/src/gui/colorlcd/{layouts => mainview}/trims.cpp (100%) rename radio/src/gui/colorlcd/{layouts => mainview}/trims.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_about.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_about.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_channels.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_channels.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_logical_switches.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/view_logical_switches.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_main.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_main.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_main_decoration.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/view_main_decoration.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_main_menu.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/view_main_menu.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_statistics.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/view_statistics.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/widget.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/widget.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/widget_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => mainview}/widget_settings.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/widgets_container.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/widgets_setup.cpp (99%) rename radio/src/gui/colorlcd/{ => mainview}/widgets_setup.h (100%) rename radio/src/gui/colorlcd/{ => mainview}/zone.h (100%) rename radio/src/gui/colorlcd/{ => model}/curveedit.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/curveedit.h (100%) rename radio/src/gui/colorlcd/{ => model}/function_switches.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/function_switches.h (100%) rename radio/src/gui/colorlcd/{ => model}/input_edit.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/input_edit.h (100%) rename radio/src/gui/colorlcd/{ => model}/input_edit_adv.cpp (98%) rename radio/src/gui/colorlcd/{ => model}/input_edit_adv.h (100%) rename radio/src/gui/colorlcd/{ => model}/menu_model.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/menu_model.h (100%) rename radio/src/gui/colorlcd/{ => model}/mixer_edit.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/mixer_edit.h (100%) rename radio/src/gui/colorlcd/{ => model}/mixer_edit_adv.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/mixer_edit_adv.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_curves.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/model_curves.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_flightmodes.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_flightmodes.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_gvars.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_gvars.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_heli.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/model_heli.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_inputs.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/model_inputs.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_logical_switches.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_logical_switches.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_mixer_scripts.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_mixer_scripts.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_mixes.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/model_mixes.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_outputs.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_outputs.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_select.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_select.h (98%) rename radio/src/gui/colorlcd/{ => model}/model_setup.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_setup.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_telemetry.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_telemetry.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_templates.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_templates.h (100%) rename radio/src/gui/colorlcd/{ => model}/model_usbjoystick.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/model_usbjoystick.h (100%) rename radio/src/gui/colorlcd/{ => model}/output_edit.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/output_edit.h (100%) rename radio/src/gui/colorlcd/{ => model}/preflight_checks.cpp (99%) rename radio/src/gui/colorlcd/{ => model}/preflight_checks.h (100%) rename radio/src/gui/colorlcd/{ => model}/special_functions.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/special_functions.h (100%) rename radio/src/gui/colorlcd/{ => model}/throttle_params.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/throttle_params.h (100%) rename radio/src/gui/colorlcd/{ => model}/timer_setup.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/timer_setup.h (100%) rename radio/src/gui/colorlcd/{ => model}/trainer_bluetooth.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/trainer_bluetooth.h (100%) rename radio/src/gui/colorlcd/{ => model}/trainer_setup.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/trainer_setup.h (100%) rename radio/src/gui/colorlcd/{ => model}/trims_setup.cpp (100%) rename radio/src/gui/colorlcd/{ => model}/trims_setup.h (100%) rename radio/src/gui/colorlcd/{ => module}/access_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/access_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/afhds2a_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/afhds2a_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/afhds3_options.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/afhds3_options.h (100%) rename radio/src/gui/colorlcd/{ => module}/afhds3_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/afhds3_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/bind_menu_d16.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/bind_menu_d16.h (100%) rename radio/src/gui/colorlcd/{ => module}/crossfire_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/crossfire_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/custom_failsafe.cpp (99%) rename radio/src/gui/colorlcd/{ => module}/custom_failsafe.h (100%) rename radio/src/gui/colorlcd/{ => module}/module_setup.cpp (99%) rename radio/src/gui/colorlcd/{ => module}/module_setup.h (100%) rename radio/src/gui/colorlcd/{ => module}/mpm_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/mpm_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/multi_rfprotos.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/multi_rfprotos.h (100%) rename radio/src/gui/colorlcd/{ => module}/ppm_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/ppm_settings.h (100%) rename radio/src/gui/colorlcd/{ => module}/pxx1_settings.cpp (100%) rename radio/src/gui/colorlcd/{ => module}/pxx1_settings.h (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_bluetooth.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_bluetooth.h (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_extmodule.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_extmodule.h (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_inputs.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_inputs.h (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_intmodule.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_intmodule.h (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_serial.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/hw_serial.h (100%) rename radio/src/gui/colorlcd/{ => radio}/menu_radio.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/menu_radio.h (100%) rename radio/src/gui/colorlcd/{ => radio}/preview_window.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/preview_window.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_calibration.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_calibration.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_diaganas.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/radio_diaganas.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_diagcustswitches.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_diagcustswitches.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_diagkeys.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_diagkeys.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_ghost_module_config.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_ghost_module_config.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_hardware.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_hardware.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_sdmanager.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/radio_sdmanager.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_setup.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_setup.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_spectrum_analyser.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_spectrum_analyser.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_theme.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/radio_theme.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_tools.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/radio_tools.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_trainer.cpp (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_trainer.h (100%) rename radio/src/gui/colorlcd/{ => radio}/radio_version.cpp (99%) rename radio/src/gui/colorlcd/{ => radio}/radio_version.h (100%) rename radio/src/gui/colorlcd/{ => themes}/theme_manager.cpp (99%) rename radio/src/gui/colorlcd/{ => themes}/theme_manager.h (100%) rename radio/src/{thirdparty/libopenui/src/libopenui_file.cpp => lib_file.cpp} (99%) rename radio/src/{thirdparty/libopenui/src/libopenui_file.h => lib_file.h} (100%) delete mode 100644 radio/src/thirdparty/libopenui/.clang-format delete mode 100644 radio/src/thirdparty/libopenui/.gitignore delete mode 100644 radio/src/thirdparty/libopenui/.gitmodules delete mode 100644 radio/src/thirdparty/libopenui/.idea/codeStyles/Project.xml delete mode 100644 radio/src/thirdparty/libopenui/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 radio/src/thirdparty/libopenui/LICENSE delete mode 100644 radio/src/thirdparty/libopenui/README.md delete mode 100644 radio/src/thirdparty/libopenui/src/CMakeLists.txt rename radio/src/thirdparty/{libopenui/thirdparty => }/lvgl (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/LICENSE (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/README.md (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/lz4.c (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/lz4.h (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/lz4hc.c (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/lz4/lz4hc.h (100%) rename radio/src/thirdparty/{libopenui/thirdparty => }/stb (100%) rename radio/{src/thirdparty/libopenui/tools => util}/encode-bitmap.py (100%) diff --git a/.gitmodules b/.gitmodules index da779449f..73b6c2bc4 100644 --- a/.gitmodules +++ b/.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 diff --git a/cmake/Bitmaps.cmake b/cmake/Bitmaps.cmake index f44e09517..fe294f7ae 100644 --- a/cmake/Bitmaps.cmake +++ b/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}) diff --git a/cmake/GenericDefinitions.cmake b/cmake/GenericDefinitions.cmake index d1924d40b..1476b4f60 100644 --- a/cmake/GenericDefinitions.cmake +++ b/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}) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index bdb7b9a4d..176b66639 100644 --- a/radio/src/CMakeLists.txt +++ b/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() diff --git a/radio/src/thirdparty/libopenui/src/bitfield.h b/radio/src/bitfield.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/bitfield.h rename to radio/src/bitfield.h diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp index 7f325c15f..d126f580b 100644 --- a/radio/src/bluetooth.cpp +++ b/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) diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 3386f156c..4a22abd82 100644 --- a/radio/src/datastructs_private.h +++ b/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]; diff --git a/radio/src/fonts/lvgl/lv_font_arimo_he_16.c b/radio/src/fonts/lvgl/lv_font_arimo_he_16.c index da03f2ea3..02853963f 100644 --- a/radio/src/fonts/lvgl/lv_font_arimo_he_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lv_font_arimo_ru_16.c b/radio/src/fonts/lvgl/lv_font_arimo_ru_16.c index 54e14724f..e96195a58 100644 --- a/radio/src/fonts/lvgl/lv_font_arimo_ru_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lv_font_arimo_ua_16.c b/radio/src/fonts/lvgl/lv_font_arimo_ua_16.c index 108b5712e..5a6948933 100644 --- a/radio/src/fonts/lvgl/lv_font_arimo_ua_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lv_font_noto_cn_16.c b/radio/src/fonts/lvgl/lv_font_noto_cn_16.c index 715c06bb5..903afa592 100644 --- a/radio/src/fonts/lvgl/lv_font_noto_cn_16.c +++ b/radio/src/fonts/lvgl/lv_font_noto_cn_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,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e0e,0x4e2a,0x4e2d,0x4e32,0x4e39,0x4e3a,0x4e3b,0x4e49,0x4e4b,0x4e4c,0x4e50,0x4e58,0x4e8c,0x4e8e,0x4ea4,0x4eab,0x4eae,0x4ec5,0x4ecb,0x4ece,0x4ed6,0x4ee5,0x4eea,0x4ef0,0x4ef6,0x4efb,0x4efd,0x4f10,0x4f20,0x4f2f,0x4f4d,0x4f4e,0x4f4f,0x4f53,0x4f55,0x4f5c,0x4f7f,0x4f8b,0x4f9b,0x4fa7,0x4fc4,0x4fdd,0x4fe1,0x4fee,0x4fef,0x500d,0x5012,0x503c,0x504f,0x505c,0x507f,0x50a8,0x50cf,0x5145,0x5149,0x514b,0x5165,0x5168,0x516c,0x5170,0x5173,0x5176,0x5177,0x5178,0x517c,0x5185,0x518c,0x5199,0x51b2,0x51c6,0x51cf,0x51e0,0x51fa,0x51fb,0x51fd,0x5206,0x5207,0x5217,0x521b,0x521d,0x5220,0x5229,0x522b,0x5230,0x5236,0x5237,0x5239,0x524d,0x526f,0x529f,0x52a0,0x52a8,0x5305,0x5308,0x5316,0x5339,0x533a,0x5347,0x534a,0x534f,0x5355,0x5361,0x536b,0x5382,0x538b,0x539f,0x53c2,0x53c9,0x53ca,0x53cc,0x53cd,0x53d1,0x53d6,0x53d8,0x53e0,0x53e3,0x53ea,0x53ef,0x53f0,0x53f3,0x53f7,0x5408,0x540c,0x540d,0x540e,0x5411,0x5417,0x5426,0x542b,0x542f,0x544a,0x5468,0x547d,0x548c,0x54cd,0x5668,0x56de,0x56e0,0x56f4,0x56fa,0x56fd,0x56fe,0x5706,0x5728,0x5730,0x5740,0x5747,0x5757,0x578b,0x57fa,0x586b,0x589e,0x58f0,0x5907,0x590d,0x5916,0x591a,0x5927,0x5929,0x592a,0x5931,0x5939,0x597d,0x59cb,0x5b50,0x5b57,0x5b58,0x5b66,0x5b83,0x5b89,0x5b8c,0x5b9a,0x5b9e,0x5bb9,0x5bbd,0x5bf8,0x5bf9,0x5bfc,0x5c04,0x5c06,0x5c0f,0x5c3a,0x5c3e,0x5c40,0x5c4f,0x5c55,0x5de5,0x5de6,0x5dee,0x5df2,0x5e03,0x5e0c,0x5e26,0x5e27,0x5e38,0x5e3d,0x5e45,0x5e55,0x5e73,0x5e76,0x5e8f,0x5e94,0x5ea6,0x5ef6,0x5efa,0x5f00,0x5f02,0x5f0f,0x5f15,0x5f31,0x5f39,0x5f3a,0x5f53,0x5f55,0x5f62,0x5f71,0x5f84,0x5f85,0x5f88,0x5faa,0x5fae,0x5fb7,0x5fc3,0x5fc5,0x5fd7,0x5feb,0x5ffd,0x6001,0x6020,0x6025,0x603b,0x6062,0x606f,0x60ac,0x60c5,0x610f,0x611f,0x6162,0x620f,0x6210,0x6216,0x622a,0x6240,0x6247,0x624b,0x6253,0x6267,0x6269,0x626b,0x626c,0x627e,0x62a4,0x62a5,0x62c9,0x62d2,0x62df,0x62e8,0x62e9,0x62fe,0x6301,0x6307,0x6309,0x632f,0x6362,0x636e,0x6377,0x6392,0x63a5,0x63a7,0x63a8,0x63cf,0x63d0,0x63d2,0x63f4,0x6447,0x6478,0x64ad,0x64cd,0x64e6,0x652f,0x6536,0x6539,0x653e,0x6545,0x6548,0x654f,0x6551,0x6559,0x6570,0x6574,0x6587,0x659c,0x65ad,0x65af,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x661f,0x6620,0x662f,0x663e,0x666e,0x666f,0x6682,0x66f2,0x66f4,0x66ff,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x6746,0x6761,0x6765,0x677f,0x6781,0x679c,0x67c4,0x67e5,0x6807,0x680f,0x6821,0x6837,0x683c,0x6846,0x68c0,0x6a21,0x6a2a,0x6b27,0x6b62,0x6b63,0x6b64,0x6b65,0x6b7b,0x6b8a,0x6bb5,0x6bd4,0x6c34,0x6c60,0x6ca1,0x6cb9,0x6cbf,0x6cd5,0x6ce2,0x6ce8,0x6d1b,0x6d32,0x6d3b,0x6d41,0x6d4b,0x6d88,0x6df7,0x6dfb,0x6e05,0x6e10,0x6e29,0x6e38,0x6e7e,0x6e90,0x6ed1,0x6eda,0x6ede,0x6ee1,0x6ee4,0x6fc0,0x706b,0x706f,0x7075,0x70b9,0x7126,0x7136,0x7184,0x722c,0x7247,0x7248,0x7259,0x7279,0x72b6,0x7387,0x73af,0x73b0,0x73ed,0x7406,0x745e,0x751f,0x7528,0x7535,0x754c,0x7565,0x767d,0x7684,0x76ca,0x76d1,0x76d6,0x76d8,0x76ee,0x76f4,0x76f8,0x770b,0x771f,0x77ac,0x77e5,0x7801,0x786c,0x786e,0x793a,0x7981,0x79bb,0x79d2,0x79ef,0x79f0,0x79fb,0x7a0b,0x7a33,0x7a7a,0x7a81,0x7a97,0x7ade,0x7aef,0x7b2c,0x7b49,0x7b7e,0x7b97,0x7ba1,0x7c7b,0x7c98,0x7cbe,0x7cfb,0x7d27,0x7d2f,0x7ea2,0x7ea7,0x7eb5,0x7ebf,0x7ec3,0x7ec4,0x7ec6,0x7ec8,0x7ecf,0x7ed1,0x7ed3,0x7edd,0x7edf,0x7eed,0x7eff,0x7f13,0x7f16,0x7f29,0x7f6e,0x7f8e,0x7ffb,0x7ffc,0x8005,0x8017,0x8026,0x8054,0x80cc,0x80fd,0x8109,0x811a,0x81ea,0x81f3,0x822a,0x8235,0x8272,0x8282,0x82f1,0x8303,0x8377,0x83dc,0x8404,0x843d,0x8461,0x84dd,0x85cf,0x8702,0x87ba,0x884c,0x8865,0x8868,0x8870,0x88ab,0x88c5,0x897f,0x8981,0x8986,0x89c4,0x89c6,0x89c8,0x89d2,0x89e3,0x89e6,0x8a00,0x8b66,0x8ba1,0x8ba4,0x8bae,0x8bb0,0x8bbe,0x8bbf,0x8bc1,0x8bd5,0x8bdd,0x8be2,0x8be6,0x8bed,0x8bef,0x8bf4,0x8bf7,0x8bfb,0x8c03,0x8c31,0x8d1f,0x8d25,0x8d34,0x8d77,0x8d85,0x8db3,0x8ddd,0x8ddf,0x8def,0x8df3,0x8e2a,0x8eab,0x8f66,0x8f6c,0x8f6e,0x8f74,0x8f7d,0x8f83,0x8f91,0x8f93,0x8fb9,0x8fc7,0x8fd0,0x8fdb,0x8fde,0x8fdf,0x8ff0,0x9000,0x9006,0x9009,0x901a,0x901f,0x903b,0x9053,0x9065,0x90e8,0x914d,0x91c7,0x91ca,0x91cd,0x91cf,0x9274,0x9488,0x949f,0x94ae,0x9501,0x9519,0x952e,0x955c,0x957f,0x95e8,0x95ed,0x95ee,0x95f2,0x95f4,0x9634,0x9636,0x9640,0x9644,0x964d,0x9650,0x9664,0x9677,0x968f,0x9694,0x969c,0x96c6,0x96f6,0x9700,0x9707,0x9759,0x975e,0x9762,0x97f3,0x9875,0x9876,0x9879,0x987a,0x987b,0x9884,0x9891,0x9898,0x989c,0x98de,0x9988,0x9a71,0x9a76,0x9a7e,0x9a8c,0x9ad8,0x9e23,0x9ea6,0x9ed8,0x9f50 --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_cn_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,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e0e,0x4e2a,0x4e2d,0x4e32,0x4e39,0x4e3a,0x4e3b,0x4e49,0x4e4b,0x4e4c,0x4e50,0x4e58,0x4e8c,0x4e8e,0x4ea4,0x4eab,0x4eae,0x4ec5,0x4ecb,0x4ece,0x4ed6,0x4ee5,0x4eea,0x4ef0,0x4ef6,0x4efb,0x4efd,0x4f10,0x4f20,0x4f2f,0x4f4d,0x4f4e,0x4f4f,0x4f53,0x4f55,0x4f5c,0x4f7f,0x4f8b,0x4f9b,0x4fa7,0x4fc4,0x4fdd,0x4fe1,0x4fee,0x4fef,0x500d,0x5012,0x503c,0x504f,0x505c,0x507f,0x50a8,0x50cf,0x5145,0x5149,0x514b,0x5165,0x5168,0x516c,0x5170,0x5173,0x5176,0x5177,0x5178,0x517c,0x5185,0x518c,0x5199,0x51b2,0x51c6,0x51cf,0x51e0,0x51fa,0x51fb,0x51fd,0x5206,0x5207,0x5217,0x521b,0x521d,0x5220,0x5229,0x522b,0x5230,0x5236,0x5237,0x5239,0x524d,0x526f,0x529f,0x52a0,0x52a8,0x5305,0x5308,0x5316,0x5339,0x533a,0x5347,0x534a,0x534f,0x5355,0x5361,0x536b,0x5382,0x538b,0x539f,0x53c2,0x53c9,0x53ca,0x53cc,0x53cd,0x53d1,0x53d6,0x53d8,0x53e0,0x53e3,0x53ea,0x53ef,0x53f0,0x53f3,0x53f7,0x5408,0x540c,0x540d,0x540e,0x5411,0x5417,0x5426,0x542b,0x542f,0x544a,0x5468,0x547d,0x548c,0x54cd,0x5668,0x56de,0x56e0,0x56f4,0x56fa,0x56fd,0x56fe,0x5706,0x5728,0x5730,0x5740,0x5747,0x5757,0x578b,0x57fa,0x586b,0x589e,0x58f0,0x5907,0x590d,0x5916,0x591a,0x5927,0x5929,0x592a,0x5931,0x5939,0x597d,0x59cb,0x5b50,0x5b57,0x5b58,0x5b66,0x5b83,0x5b89,0x5b8c,0x5b9a,0x5b9e,0x5bb9,0x5bbd,0x5bf8,0x5bf9,0x5bfc,0x5c04,0x5c06,0x5c0f,0x5c3a,0x5c3e,0x5c40,0x5c4f,0x5c55,0x5de5,0x5de6,0x5dee,0x5df2,0x5e03,0x5e0c,0x5e26,0x5e27,0x5e38,0x5e3d,0x5e45,0x5e55,0x5e73,0x5e76,0x5e8f,0x5e94,0x5ea6,0x5ef6,0x5efa,0x5f00,0x5f02,0x5f0f,0x5f15,0x5f31,0x5f39,0x5f3a,0x5f53,0x5f55,0x5f62,0x5f71,0x5f84,0x5f85,0x5f88,0x5faa,0x5fae,0x5fb7,0x5fc3,0x5fc5,0x5fd7,0x5feb,0x5ffd,0x6001,0x6020,0x6025,0x603b,0x6062,0x606f,0x60ac,0x60c5,0x610f,0x611f,0x6162,0x620f,0x6210,0x6216,0x622a,0x6240,0x6247,0x624b,0x6253,0x6267,0x6269,0x626b,0x626c,0x627e,0x62a4,0x62a5,0x62c9,0x62d2,0x62df,0x62e8,0x62e9,0x62fe,0x6301,0x6307,0x6309,0x632f,0x6362,0x636e,0x6377,0x6392,0x63a5,0x63a7,0x63a8,0x63cf,0x63d0,0x63d2,0x63f4,0x6447,0x6478,0x64ad,0x64cd,0x64e6,0x652f,0x6536,0x6539,0x653e,0x6545,0x6548,0x654f,0x6551,0x6559,0x6570,0x6574,0x6587,0x659c,0x65ad,0x65af,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x661f,0x6620,0x662f,0x663e,0x666e,0x666f,0x6682,0x66f2,0x66f4,0x66ff,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x6746,0x6761,0x6765,0x677f,0x6781,0x679c,0x67c4,0x67e5,0x6807,0x680f,0x6821,0x6837,0x683c,0x6846,0x68c0,0x6a21,0x6a2a,0x6b27,0x6b62,0x6b63,0x6b64,0x6b65,0x6b7b,0x6b8a,0x6bb5,0x6bd4,0x6c34,0x6c60,0x6ca1,0x6cb9,0x6cbf,0x6cd5,0x6ce2,0x6ce8,0x6d1b,0x6d32,0x6d3b,0x6d41,0x6d4b,0x6d88,0x6df7,0x6dfb,0x6e05,0x6e10,0x6e29,0x6e38,0x6e7e,0x6e90,0x6ed1,0x6eda,0x6ede,0x6ee1,0x6ee4,0x6fc0,0x706b,0x706f,0x7075,0x70b9,0x7126,0x7136,0x7184,0x722c,0x7247,0x7248,0x7259,0x7279,0x72b6,0x7387,0x73af,0x73b0,0x73ed,0x7406,0x745e,0x751f,0x7528,0x7535,0x754c,0x7565,0x767d,0x7684,0x76ca,0x76d1,0x76d6,0x76d8,0x76ee,0x76f4,0x76f8,0x770b,0x771f,0x77ac,0x77e5,0x7801,0x786c,0x786e,0x793a,0x7981,0x79bb,0x79d2,0x79ef,0x79f0,0x79fb,0x7a0b,0x7a33,0x7a7a,0x7a81,0x7a97,0x7ade,0x7aef,0x7b2c,0x7b49,0x7b7e,0x7b97,0x7ba1,0x7c7b,0x7c98,0x7cbe,0x7cfb,0x7d27,0x7d2f,0x7ea2,0x7ea7,0x7eb5,0x7ebf,0x7ec3,0x7ec4,0x7ec6,0x7ec8,0x7ecf,0x7ed1,0x7ed3,0x7edd,0x7edf,0x7eed,0x7eff,0x7f13,0x7f16,0x7f29,0x7f6e,0x7f8e,0x7ffb,0x7ffc,0x8005,0x8017,0x8026,0x8054,0x80cc,0x80fd,0x8109,0x811a,0x81ea,0x81f3,0x822a,0x8235,0x8272,0x8282,0x82f1,0x8303,0x8377,0x83dc,0x8404,0x843d,0x8461,0x84dd,0x85cf,0x8702,0x87ba,0x884c,0x8865,0x8868,0x8870,0x88ab,0x88c5,0x897f,0x8981,0x8986,0x89c4,0x89c6,0x89c8,0x89d2,0x89e3,0x89e6,0x8a00,0x8b66,0x8ba1,0x8ba4,0x8bae,0x8bb0,0x8bbe,0x8bbf,0x8bc1,0x8bd5,0x8bdd,0x8be2,0x8be6,0x8bed,0x8bef,0x8bf4,0x8bf7,0x8bfb,0x8c03,0x8c31,0x8d1f,0x8d25,0x8d34,0x8d77,0x8d85,0x8db3,0x8ddd,0x8ddf,0x8def,0x8df3,0x8e2a,0x8eab,0x8f66,0x8f6c,0x8f6e,0x8f74,0x8f7d,0x8f83,0x8f91,0x8f93,0x8fb9,0x8fc7,0x8fd0,0x8fdb,0x8fde,0x8fdf,0x8ff0,0x9000,0x9006,0x9009,0x901a,0x901f,0x903b,0x9053,0x9065,0x90e8,0x914d,0x91c7,0x91ca,0x91cd,0x91cf,0x9274,0x9488,0x949f,0x94ae,0x9501,0x9519,0x952e,0x955c,0x957f,0x95e8,0x95ed,0x95ee,0x95f2,0x95f4,0x9634,0x9636,0x9640,0x9644,0x964d,0x9650,0x9664,0x9677,0x968f,0x9694,0x969c,0x96c6,0x96f6,0x9700,0x9707,0x9759,0x975e,0x9762,0x97f3,0x9875,0x9876,0x9879,0x987a,0x987b,0x9884,0x9891,0x9898,0x989c,0x98de,0x9988,0x9a71,0x9a76,0x9a7e,0x9a8c,0x9ad8,0x9e23,0x9ea6,0x9ed8,0x9f50 --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_cn_16.c --force-fast-kern-format --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_16.c b/radio/src/fonts/lvgl/lv_font_noto_jp_16.c index d912da571..a25cc300b 100644 --- a/radio/src/fonts/lvgl/lv_font_noto_jp_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_16.c b/radio/src/fonts/lvgl/lv_font_noto_tw_16.c index 37ff5054e..8f173e250 100644 --- a/radio/src/fonts/lvgl/lv_font_noto_tw_16.c +++ b/radio/src/fonts/lvgl/lv_font_noto_tw_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,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e26,0x4e2d,0x4e32,0x4e39,0x4e3b,0x4e4b,0x4e58,0x4e8c,0x4ea4,0x4eab,0x4eae,0x4ecb,0x4ed6,0x4ee5,0x4ef0,0x4ef6,0x4efb,0x4efd,0x4f10,0x4f2f,0x4f48,0x4f4d,0x4f4e,0x4f4f,0x4f55,0x4f5c,0x4f7f,0x4f86,0x4f8b,0x4f9b,0x4fc4,0x4fdd,0x4fe1,0x4fee,0x4fef,0x500b,0x500d,0x5012,0x503c,0x504f,0x505c,0x5074,0x5099,0x50b3,0x50c5,0x50cf,0x5100,0x511f,0x5132,0x5145,0x5149,0x514b,0x5165,0x5167,0x5168,0x516c,0x5176,0x5177,0x5178,0x517c,0x518a,0x51c6,0x51fa,0x51fd,0x5206,0x5207,0x5217,0x521d,0x5225,0x5229,0x522a,0x5230,0x5236,0x5237,0x524d,0x524e,0x526f,0x5275,0x529f,0x52a0,0x52d5,0x5305,0x5308,0x5316,0x5339,0x5340,0x5347,0x534a,0x5354,0x5361,0x539f,0x53c3,0x53c9,0x53ca,0x53cd,0x53d6,0x53e3,0x53ea,0x53ef,0x53f0,0x53f3,0x5408,0x540c,0x540d,0x540e,0x5411,0x5426,0x542b,0x542f,0x544a,0x548c,0x554f,0x555f,0x55ae,0x55ce,0x5668,0x56de,0x56e0,0x56fa,0x56fe,0x570b,0x570d,0x5713,0x5716,0x5728,0x5730,0x5740,0x5747,0x578b,0x57f7,0x57fa,0x5831,0x584a,0x586b,0x589e,0x58d3,0x5916,0x591a,0x5927,0x5929,0x592a,0x5931,0x593e,0x597d,0x59cb,0x5b50,0x5b57,0x5b58,0x5b78,0x5b83,0x5b89,0x5b8c,0x5b9a,0x5bb9,0x5be6,0x5beb,0x5bec,0x5bf8,0x5bf9,0x5c04,0x5c07,0x5c0d,0x5c0e,0x5c0f,0x5c3a,0x5c3e,0x5c40,0x5c4f,0x5c55,0x5de5,0x5de6,0x5dee,0x5df2,0x5e0c,0x5e36,0x5e38,0x5e3d,0x5e40,0x5e45,0x5e55,0x5e73,0x5e7e,0x5e8f,0x5ea6,0x5ee0,0x5ef6,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f31,0x5f37,0x5f48,0x5f62,0x5f71,0x5f85,0x5f88,0x5f8c,0x5f91,0x5f9e,0x5fa9,0x5faa,0x5fae,0x5fb7,0x5fc3,0x5fc5,0x5feb,0x5ffd,0x6020,0x6025,0x6062,0x606f,0x60c5,0x610f,0x611f,0x614b,0x6162,0x61c9,0x61f8,0x6210,0x6216,0x622a,0x6232,0x6236,0x6240,0x6247,0x624b,0x6253,0x627e,0x62c9,0x62d2,0x62fe,0x6301,0x6307,0x6309,0x632f,0x6377,0x6383,0x6392,0x63a1,0x63a5,0x63a7,0x63a8,0x63cf,0x63d0,0x63d2,0x63da,0x63db,0x63f4,0x6416,0x6478,0x64a5,0x64ad,0x64c7,0x64ca,0x64cd,0x64da,0x64e6,0x64ec,0x64f4,0x652f,0x6536,0x6539,0x653e,0x6545,0x6548,0x654f,0x6551,0x6557,0x6559,0x6574,0x6578,0x6587,0x659c,0x65af,0x65b0,0x65b7,0x65b9,0x65bc,0x65cb,0x65e5,0x660e,0x661f,0x6620,0x662f,0x6642,0x666e,0x666f,0x66ab,0x66f2,0x66f4,0x66ff,0x6700,0x6709,0x671f,0x672a,0x672c,0x677f,0x679c,0x67c4,0x67e5,0x6821,0x683c,0x6846,0x6848,0x687f,0x689d,0x6975,0x6a02,0x6a19,0x6a21,0x6a23,0x6a5f,0x6a6b,0x6a94,0x6aa2,0x6b04,0x6b50,0x6b62,0x6b63,0x6b64,0x6b65,0x6b7b,0x6b8a,0x6bb5,0x6bd4,0x6c34,0x6c60,0x6c92,0x6ca1,0x6cb9,0x6cbf,0x6cd5,0x6ce2,0x6ce8,0x6d1b,0x6d32,0x6d3b,0x6d41,0x6d88,0x6df7,0x6dfb,0x6e05,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6eab,0x6ed1,0x6eef,0x6efe,0x6eff,0x6f38,0x6fc0,0x6ffe,0x7063,0x706b,0x70b9,0x70ba,0x70cf,0x7121,0x7126,0x7136,0x7184,0x71c8,0x722c,0x7247,0x7248,0x7259,0x7279,0x72c0,0x7387,0x73ed,0x73fe,0x7406,0x745e,0x74b0,0x751f,0x7528,0x754c,0x7565,0x7570,0x7576,0x758a,0x767c,0x767d,0x7684,0x76ca,0x76e3,0x76e4,0x76ee,0x76f4,0x76f8,0x770b,0x771f,0x77ac,0x77e5,0x786c,0x78ba,0x78bc,0x793a,0x7981,0x79d2,0x79f0,0x79fb,0x7a0b,0x7a31,0x7a4d,0x7a69,0x7a7a,0x7a81,0x7a97,0x7aef,0x7af6,0x7b2c,0x7b49,0x7b97,0x7ba1,0x7bc0,0x7bc4,0x7c3d,0x7c64,0x7c98,0x7cbe,0x7cfb,0x7d05,0x7d1a,0x7d2f,0x7d30,0x7d42,0x7d44,0x7d50,0x7d55,0x7d71,0x7d81,0x7d93,0x7da0,0x7dca,0x7dda,0x7de8,0x7de9,0x7df4,0x7e2e,0x7e31,0x7e3d,0x7e8c,0x7f16,0x7f6e,0x7f8e,0x7fa9,0x7ffb,0x7ffc,0x8005,0x8017,0x8026,0x806f,0x8072,0x80cc,0x80fd,0x8108,0x8173,0x81ea,0x81f3,0x8207,0x822a,0x8235,0x8272,0x82f1,0x8377,0x83dc,0x8404,0x843d,0x8461,0x84cb,0x85cd,0x85cf,0x862d,0x865f,0x8702,0x87ba,0x884c,0x885b,0x885d,0x8868,0x8870,0x88ab,0x88dc,0x88dd,0x88fd,0x8907,0x897f,0x8981,0x8986,0x898f,0x8996,0x89c8,0x89d2,0x89e3,0x89f8,0x8a00,0x8a08,0x8a18,0x8a2a,0x8a2d,0x8a3b,0x8a62,0x8a66,0x8a71,0x8a73,0x8a8c,0x8a8d,0x8a9e,0x8aa4,0x8aaa,0x8abf,0x8acb,0x8b49,0x8b5c,0x8b66,0x8b70,0x8b77,0x8b80,0x8b8a,0x8ca0,0x8cbc,0x8d25,0x8d77,0x8d85,0x8db3,0x8ddd,0x8ddf,0x8def,0x8df3,0x8e64,0x8eab,0x8eca,0x8ef8,0x8f03,0x8f09,0x8f2a,0x8f2f,0x8f38,0x8f49,0x8f74,0x8f91,0x8ff0,0x9000,0x9006,0x901a,0x901f,0x9023,0x9031,0x9032,0x904a,0x904b,0x904e,0x9053,0x9059,0x9072,0x9078,0x908a,0x908f,0x90e8,0x914d,0x91cb,0x91cd,0x91cf,0x91dd,0x9215,0x9304,0x932f,0x9375,0x9396,0x93e1,0x9418,0x9451,0x9577,0x9580,0x9589,0x958b,0x9592,0x9593,0x95dc,0x9640,0x9644,0x964d,0x9650,0x9664,0x9670,0x9677,0x968e,0x9694,0x969c,0x96a8,0x96c6,0x96d9,0x96e2,0x96f6,0x96fb,0x9700,0x9707,0x9748,0x975c,0x975e,0x9762,0x97cc,0x97f3,0x97ff,0x9801,0x9802,0x9805,0x9806,0x9808,0x9810,0x983b,0x984c,0x984f,0x985e,0x986f,0x9884,0x989c,0x98db,0x994b,0x99d5,0x99db,0x9a45,0x9a57,0x9ad4,0x9ad8,0x9cf4,0x9ea5,0x9ed8,0x9ede,0x9f4a,0x9f50 --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_tw_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,0x4e00,0x4e0a,0x4e0b,0x4e0d,0x4e26,0x4e2d,0x4e32,0x4e39,0x4e3b,0x4e4b,0x4e58,0x4e8c,0x4ea4,0x4eab,0x4eae,0x4ecb,0x4ed6,0x4ee5,0x4ef0,0x4ef6,0x4efb,0x4efd,0x4f10,0x4f2f,0x4f48,0x4f4d,0x4f4e,0x4f4f,0x4f55,0x4f5c,0x4f7f,0x4f86,0x4f8b,0x4f9b,0x4fc4,0x4fdd,0x4fe1,0x4fee,0x4fef,0x500b,0x500d,0x5012,0x503c,0x504f,0x505c,0x5074,0x5099,0x50b3,0x50c5,0x50cf,0x5100,0x511f,0x5132,0x5145,0x5149,0x514b,0x5165,0x5167,0x5168,0x516c,0x5176,0x5177,0x5178,0x517c,0x518a,0x51c6,0x51fa,0x51fd,0x5206,0x5207,0x5217,0x521d,0x5225,0x5229,0x522a,0x5230,0x5236,0x5237,0x524d,0x524e,0x526f,0x5275,0x529f,0x52a0,0x52d5,0x5305,0x5308,0x5316,0x5339,0x5340,0x5347,0x534a,0x5354,0x5361,0x539f,0x53c3,0x53c9,0x53ca,0x53cd,0x53d6,0x53e3,0x53ea,0x53ef,0x53f0,0x53f3,0x5408,0x540c,0x540d,0x540e,0x5411,0x5426,0x542b,0x542f,0x544a,0x548c,0x554f,0x555f,0x55ae,0x55ce,0x5668,0x56de,0x56e0,0x56fa,0x56fe,0x570b,0x570d,0x5713,0x5716,0x5728,0x5730,0x5740,0x5747,0x578b,0x57f7,0x57fa,0x5831,0x584a,0x586b,0x589e,0x58d3,0x5916,0x591a,0x5927,0x5929,0x592a,0x5931,0x593e,0x597d,0x59cb,0x5b50,0x5b57,0x5b58,0x5b78,0x5b83,0x5b89,0x5b8c,0x5b9a,0x5bb9,0x5be6,0x5beb,0x5bec,0x5bf8,0x5bf9,0x5c04,0x5c07,0x5c0d,0x5c0e,0x5c0f,0x5c3a,0x5c3e,0x5c40,0x5c4f,0x5c55,0x5de5,0x5de6,0x5dee,0x5df2,0x5e0c,0x5e36,0x5e38,0x5e3d,0x5e40,0x5e45,0x5e55,0x5e73,0x5e7e,0x5e8f,0x5ea6,0x5ee0,0x5ef6,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f31,0x5f37,0x5f48,0x5f62,0x5f71,0x5f85,0x5f88,0x5f8c,0x5f91,0x5f9e,0x5fa9,0x5faa,0x5fae,0x5fb7,0x5fc3,0x5fc5,0x5feb,0x5ffd,0x6020,0x6025,0x6062,0x606f,0x60c5,0x610f,0x611f,0x614b,0x6162,0x61c9,0x61f8,0x6210,0x6216,0x622a,0x6232,0x6236,0x6240,0x6247,0x624b,0x6253,0x627e,0x62c9,0x62d2,0x62fe,0x6301,0x6307,0x6309,0x632f,0x6377,0x6383,0x6392,0x63a1,0x63a5,0x63a7,0x63a8,0x63cf,0x63d0,0x63d2,0x63da,0x63db,0x63f4,0x6416,0x6478,0x64a5,0x64ad,0x64c7,0x64ca,0x64cd,0x64da,0x64e6,0x64ec,0x64f4,0x652f,0x6536,0x6539,0x653e,0x6545,0x6548,0x654f,0x6551,0x6557,0x6559,0x6574,0x6578,0x6587,0x659c,0x65af,0x65b0,0x65b7,0x65b9,0x65bc,0x65cb,0x65e5,0x660e,0x661f,0x6620,0x662f,0x6642,0x666e,0x666f,0x66ab,0x66f2,0x66f4,0x66ff,0x6700,0x6709,0x671f,0x672a,0x672c,0x677f,0x679c,0x67c4,0x67e5,0x6821,0x683c,0x6846,0x6848,0x687f,0x689d,0x6975,0x6a02,0x6a19,0x6a21,0x6a23,0x6a5f,0x6a6b,0x6a94,0x6aa2,0x6b04,0x6b50,0x6b62,0x6b63,0x6b64,0x6b65,0x6b7b,0x6b8a,0x6bb5,0x6bd4,0x6c34,0x6c60,0x6c92,0x6ca1,0x6cb9,0x6cbf,0x6cd5,0x6ce2,0x6ce8,0x6d1b,0x6d32,0x6d3b,0x6d41,0x6d88,0x6df7,0x6dfb,0x6e05,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6eab,0x6ed1,0x6eef,0x6efe,0x6eff,0x6f38,0x6fc0,0x6ffe,0x7063,0x706b,0x70b9,0x70ba,0x70cf,0x7121,0x7126,0x7136,0x7184,0x71c8,0x722c,0x7247,0x7248,0x7259,0x7279,0x72c0,0x7387,0x73ed,0x73fe,0x7406,0x745e,0x74b0,0x751f,0x7528,0x754c,0x7565,0x7570,0x7576,0x758a,0x767c,0x767d,0x7684,0x76ca,0x76e3,0x76e4,0x76ee,0x76f4,0x76f8,0x770b,0x771f,0x77ac,0x77e5,0x786c,0x78ba,0x78bc,0x793a,0x7981,0x79d2,0x79f0,0x79fb,0x7a0b,0x7a31,0x7a4d,0x7a69,0x7a7a,0x7a81,0x7a97,0x7aef,0x7af6,0x7b2c,0x7b49,0x7b97,0x7ba1,0x7bc0,0x7bc4,0x7c3d,0x7c64,0x7c98,0x7cbe,0x7cfb,0x7d05,0x7d1a,0x7d2f,0x7d30,0x7d42,0x7d44,0x7d50,0x7d55,0x7d71,0x7d81,0x7d93,0x7da0,0x7dca,0x7dda,0x7de8,0x7de9,0x7df4,0x7e2e,0x7e31,0x7e3d,0x7e8c,0x7f16,0x7f6e,0x7f8e,0x7fa9,0x7ffb,0x7ffc,0x8005,0x8017,0x8026,0x806f,0x8072,0x80cc,0x80fd,0x8108,0x8173,0x81ea,0x81f3,0x8207,0x822a,0x8235,0x8272,0x82f1,0x8377,0x83dc,0x8404,0x843d,0x8461,0x84cb,0x85cd,0x85cf,0x862d,0x865f,0x8702,0x87ba,0x884c,0x885b,0x885d,0x8868,0x8870,0x88ab,0x88dc,0x88dd,0x88fd,0x8907,0x897f,0x8981,0x8986,0x898f,0x8996,0x89c8,0x89d2,0x89e3,0x89f8,0x8a00,0x8a08,0x8a18,0x8a2a,0x8a2d,0x8a3b,0x8a62,0x8a66,0x8a71,0x8a73,0x8a8c,0x8a8d,0x8a9e,0x8aa4,0x8aaa,0x8abf,0x8acb,0x8b49,0x8b5c,0x8b66,0x8b70,0x8b77,0x8b80,0x8b8a,0x8ca0,0x8cbc,0x8d25,0x8d77,0x8d85,0x8db3,0x8ddd,0x8ddf,0x8def,0x8df3,0x8e64,0x8eab,0x8eca,0x8ef8,0x8f03,0x8f09,0x8f2a,0x8f2f,0x8f38,0x8f49,0x8f74,0x8f91,0x8ff0,0x9000,0x9006,0x901a,0x901f,0x9023,0x9031,0x9032,0x904a,0x904b,0x904e,0x9053,0x9059,0x9072,0x9078,0x908a,0x908f,0x90e8,0x914d,0x91cb,0x91cd,0x91cf,0x91dd,0x9215,0x9304,0x932f,0x9375,0x9396,0x93e1,0x9418,0x9451,0x9577,0x9580,0x9589,0x958b,0x9592,0x9593,0x95dc,0x9640,0x9644,0x964d,0x9650,0x9664,0x9670,0x9677,0x968e,0x9694,0x969c,0x96a8,0x96c6,0x96d9,0x96e2,0x96f6,0x96fb,0x9700,0x9707,0x9748,0x975c,0x975e,0x9762,0x97cc,0x97f3,0x97ff,0x9801,0x9802,0x9805,0x9806,0x9808,0x9810,0x983b,0x984c,0x984f,0x985e,0x986f,0x9884,0x989c,0x98db,0x994b,0x99d5,0x99db,0x9a45,0x9a57,0x9ad4,0x9ad8,0x9cf4,0x9ea5,0x9ed8,0x9ede,0x9f4a,0x9f50 --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_tw_16.c --force-fast-kern-format --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/radio/src/fonts/lvgl/lv_font_roboto_16.c b/radio/src/fonts/lvgl/lv_font_roboto_16.c index 58ee1b3ac..8c046612d 100644 --- a/radio/src/fonts/lvgl/lv_font_roboto_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lv_font_roboto_bl_16.c b/radio/src/fonts/lvgl/lv_font_roboto_bl_16.c index 287f8da2e..859f86a2f 100644 --- a/radio/src/fonts/lvgl/lv_font_roboto_bl_16.c +++ b/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 diff --git a/radio/src/fonts/lvgl/lz4_font.cpp b/radio/src/fonts/lvgl/lz4_font.cpp index 2321c2eed..57dad2cce 100644 --- a/radio/src/fonts/lvgl/lz4_font.cpp +++ b/radio/src/fonts/lvgl/lz4_font.cpp @@ -49,7 +49,7 @@ #include #include -#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" diff --git a/radio/src/fonts/lvgl/make_fonts.sh b/radio/src/fonts/lvgl/make_fonts.sh index acb2ca542..7cf3c3e30 100755 --- a/radio/src/fonts/lvgl/make_fonts.sh +++ b/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} } diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 456b51092..d3ed2399c 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -23,7 +23,7 @@ #include #include "lcd.h" -#include "thirdparty/libopenui/src/bitfield.h" +#include "bitfield.h" #include "gui/common/stdlcd/fonts.h" #include "gui/common/stdlcd/utf8.h" diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index e53d73256..cd607eb63 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/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) diff --git a/radio/src/thirdparty/libopenui/thirdparty/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeListsLVGL.txt similarity index 61% rename from radio/src/thirdparty/libopenui/thirdparty/CMakeLists.txt rename to radio/src/gui/colorlcd/CMakeListsLVGL.txt index 4960e4251..d5b0b54ff 100644 --- a/radio/src/thirdparty/libopenui/thirdparty/CMakeLists.txt +++ b/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() diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp index 7be938b27..14d04bef5 100644 --- a/radio/src/gui/colorlcd/LvglWrapper.cpp +++ b/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" diff --git a/radio/src/gui/colorlcd/bitmaps.cpp b/radio/src/gui/colorlcd/bitmaps.cpp index 938d606b9..dfd3bb459 100644 --- a/radio/src/gui/colorlcd/bitmaps.cpp +++ b/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) : diff --git a/radio/src/gui/colorlcd/colors.h b/radio/src/gui/colorlcd/colors.h index 27faf4eb2..99260cfb5 100644 --- a/radio/src/gui/colorlcd/colors.h +++ b/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; diff --git a/radio/src/gui/colorlcd/channel_bar.cpp b/radio/src/gui/colorlcd/controls/channel_bar.cpp similarity index 99% rename from radio/src/gui/colorlcd/channel_bar.cpp rename to radio/src/gui/colorlcd/controls/channel_bar.cpp index b1aa26346..b82fdc3ca 100644 --- a/radio/src/gui/colorlcd/channel_bar.cpp +++ b/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) diff --git a/radio/src/gui/colorlcd/channel_bar.h b/radio/src/gui/colorlcd/controls/channel_bar.h similarity index 100% rename from radio/src/gui/colorlcd/channel_bar.h rename to radio/src/gui/colorlcd/controls/channel_bar.h diff --git a/radio/src/gui/colorlcd/channel_range.cpp b/radio/src/gui/colorlcd/controls/channel_range.cpp similarity index 100% rename from radio/src/gui/colorlcd/channel_range.cpp rename to radio/src/gui/colorlcd/controls/channel_range.cpp diff --git a/radio/src/gui/colorlcd/channel_range.h b/radio/src/gui/colorlcd/controls/channel_range.h similarity index 100% rename from radio/src/gui/colorlcd/channel_range.h rename to radio/src/gui/colorlcd/controls/channel_range.h diff --git a/radio/src/gui/colorlcd/color_editor.cpp b/radio/src/gui/colorlcd/controls/color_editor.cpp similarity index 99% rename from radio/src/gui/colorlcd/color_editor.cpp rename to radio/src/gui/colorlcd/controls/color_editor.cpp index 11fd142c6..559610fa7 100644 --- a/radio/src/gui/colorlcd/color_editor.cpp +++ b/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"}; diff --git a/radio/src/gui/colorlcd/color_editor.h b/radio/src/gui/colorlcd/controls/color_editor.h similarity index 100% rename from radio/src/gui/colorlcd/color_editor.h rename to radio/src/gui/colorlcd/controls/color_editor.h diff --git a/radio/src/gui/colorlcd/color_list.cpp b/radio/src/gui/colorlcd/controls/color_list.cpp similarity index 99% rename from radio/src/gui/colorlcd/color_list.cpp rename to radio/src/gui/colorlcd/controls/color_list.cpp index 431560f02..c37210dd1 100644 --- a/radio/src/gui/colorlcd/color_list.cpp +++ b/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 colors) : diff --git a/radio/src/gui/colorlcd/color_list.h b/radio/src/gui/colorlcd/controls/color_list.h similarity index 100% rename from radio/src/gui/colorlcd/color_list.h rename to radio/src/gui/colorlcd/controls/color_list.h diff --git a/radio/src/gui/colorlcd/color_picker.cpp b/radio/src/gui/colorlcd/controls/color_picker.cpp similarity index 99% rename from radio/src/gui/colorlcd/color_picker.cpp rename to radio/src/gui/colorlcd/controls/color_picker.cpp index b7236768f..d57d796f4 100644 --- a/radio/src/gui/colorlcd/color_picker.cpp +++ b/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 diff --git a/radio/src/gui/colorlcd/color_picker.h b/radio/src/gui/colorlcd/controls/color_picker.h similarity index 100% rename from radio/src/gui/colorlcd/color_picker.h rename to radio/src/gui/colorlcd/controls/color_picker.h diff --git a/radio/src/gui/colorlcd/curve.cpp b/radio/src/gui/colorlcd/controls/curve.cpp similarity index 100% rename from radio/src/gui/colorlcd/curve.cpp rename to radio/src/gui/colorlcd/controls/curve.cpp diff --git a/radio/src/gui/colorlcd/curve.h b/radio/src/gui/colorlcd/controls/curve.h similarity index 100% rename from radio/src/gui/colorlcd/curve.h rename to radio/src/gui/colorlcd/controls/curve.h diff --git a/radio/src/gui/colorlcd/curve_param.cpp b/radio/src/gui/colorlcd/controls/curve_param.cpp similarity index 100% rename from radio/src/gui/colorlcd/curve_param.cpp rename to radio/src/gui/colorlcd/controls/curve_param.cpp diff --git a/radio/src/gui/colorlcd/curve_param.h b/radio/src/gui/colorlcd/controls/curve_param.h similarity index 100% rename from radio/src/gui/colorlcd/curve_param.h rename to radio/src/gui/colorlcd/controls/curve_param.h diff --git a/radio/src/gui/colorlcd/fm_matrix.cpp b/radio/src/gui/colorlcd/controls/fm_matrix.cpp similarity index 98% rename from radio/src/gui/colorlcd/fm_matrix.cpp rename to radio/src/gui/colorlcd/controls/fm_matrix.cpp index 385d48f28..5ff8a75ab 100644 --- a/radio/src/gui/colorlcd/fm_matrix.cpp +++ b/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 FMMatrix::FMMatrix(Window* parent, const rect_t& r, T* input) : diff --git a/radio/src/gui/colorlcd/fm_matrix.h b/radio/src/gui/colorlcd/controls/fm_matrix.h similarity index 100% rename from radio/src/gui/colorlcd/fm_matrix.h rename to radio/src/gui/colorlcd/controls/fm_matrix.h diff --git a/radio/src/gui/colorlcd/gvar_numberedit.cpp b/radio/src/gui/colorlcd/controls/gvar_numberedit.cpp similarity index 100% rename from radio/src/gui/colorlcd/gvar_numberedit.cpp rename to radio/src/gui/colorlcd/controls/gvar_numberedit.cpp diff --git a/radio/src/gui/colorlcd/gvar_numberedit.h b/radio/src/gui/colorlcd/controls/gvar_numberedit.h similarity index 100% rename from radio/src/gui/colorlcd/gvar_numberedit.h rename to radio/src/gui/colorlcd/controls/gvar_numberedit.h diff --git a/radio/src/gui/colorlcd/input_source.cpp b/radio/src/gui/colorlcd/controls/input_source.cpp similarity index 100% rename from radio/src/gui/colorlcd/input_source.cpp rename to radio/src/gui/colorlcd/controls/input_source.cpp diff --git a/radio/src/gui/colorlcd/input_source.h b/radio/src/gui/colorlcd/controls/input_source.h similarity index 100% rename from radio/src/gui/colorlcd/input_source.h rename to radio/src/gui/colorlcd/controls/input_source.h diff --git a/radio/src/gui/colorlcd/source_numberedit.cpp b/radio/src/gui/colorlcd/controls/source_numberedit.cpp similarity index 100% rename from radio/src/gui/colorlcd/source_numberedit.cpp rename to radio/src/gui/colorlcd/controls/source_numberedit.cpp diff --git a/radio/src/gui/colorlcd/source_numberedit.h b/radio/src/gui/colorlcd/controls/source_numberedit.h similarity index 100% rename from radio/src/gui/colorlcd/source_numberedit.h rename to radio/src/gui/colorlcd/controls/source_numberedit.h diff --git a/radio/src/gui/colorlcd/sourcechoice.cpp b/radio/src/gui/colorlcd/controls/sourcechoice.cpp similarity index 100% rename from radio/src/gui/colorlcd/sourcechoice.cpp rename to radio/src/gui/colorlcd/controls/sourcechoice.cpp diff --git a/radio/src/gui/colorlcd/sourcechoice.h b/radio/src/gui/colorlcd/controls/sourcechoice.h similarity index 100% rename from radio/src/gui/colorlcd/sourcechoice.h rename to radio/src/gui/colorlcd/controls/sourcechoice.h diff --git a/radio/src/gui/colorlcd/switch_warn_dialog.cpp b/radio/src/gui/colorlcd/controls/switch_warn_dialog.cpp similarity index 100% rename from radio/src/gui/colorlcd/switch_warn_dialog.cpp rename to radio/src/gui/colorlcd/controls/switch_warn_dialog.cpp diff --git a/radio/src/gui/colorlcd/switch_warn_dialog.h b/radio/src/gui/colorlcd/controls/switch_warn_dialog.h similarity index 100% rename from radio/src/gui/colorlcd/switch_warn_dialog.h rename to radio/src/gui/colorlcd/controls/switch_warn_dialog.h diff --git a/radio/src/gui/colorlcd/switchchoice.cpp b/radio/src/gui/colorlcd/controls/switchchoice.cpp similarity index 100% rename from radio/src/gui/colorlcd/switchchoice.cpp rename to radio/src/gui/colorlcd/controls/switchchoice.cpp diff --git a/radio/src/gui/colorlcd/switchchoice.h b/radio/src/gui/colorlcd/controls/switchchoice.h similarity index 100% rename from radio/src/gui/colorlcd/switchchoice.h rename to radio/src/gui/colorlcd/controls/switchchoice.h diff --git a/radio/src/gui/colorlcd/fonts.cpp b/radio/src/gui/colorlcd/fonts.cpp index 4966fe2e5..980e35859 100644 --- a/radio/src/gui/colorlcd/fonts.cpp +++ b/radio/src/gui/colorlcd/fonts.cpp @@ -23,7 +23,7 @@ #include #include "fonts.h" -#include "libopenui/thirdparty/lz4/lz4.h" +#include "lz4/lz4.h" #include "libopenui_defines.h" #include "lz4_fonts.h" diff --git a/radio/src/gui/colorlcd/lcd.cpp b/radio/src/gui/colorlcd/lcd.cpp index ff6b80a58..fde4992a1 100644 --- a/radio/src/gui/colorlcd/lcd.cpp +++ b/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; diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer.cpp similarity index 100% rename from radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp rename to radio/src/gui/colorlcd/libui/bitmapbuffer.cpp diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h b/radio/src/gui/colorlcd/libui/bitmapbuffer.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/bitmapbuffer.h rename to radio/src/gui/colorlcd/libui/bitmapbuffer.h diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer_draw_extra.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp similarity index 100% rename from radio/src/thirdparty/libopenui/src/bitmapbuffer_draw_extra.cpp rename to radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer_fileio.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/bitmapbuffer_fileio.cpp rename to radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp index 1122fe2ab..09f576214 100644 --- a/radio/src/thirdparty/libopenui/src/bitmapbuffer_fileio.cpp +++ b/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; diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/gui/colorlcd/libui/button.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/button.cpp rename to radio/src/gui/colorlcd/libui/button.cpp index 75bd2d794..6ef224404 100644 --- a/radio/src/thirdparty/libopenui/src/button.cpp +++ b/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) { diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/gui/colorlcd/libui/button.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/button.h rename to radio/src/gui/colorlcd/libui/button.h diff --git a/radio/src/thirdparty/libopenui/src/button_matrix.cpp b/radio/src/gui/colorlcd/libui/button_matrix.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/button_matrix.cpp rename to radio/src/gui/colorlcd/libui/button_matrix.cpp index 9b50750f2..b59f102c0 100644 --- a/radio/src/thirdparty/libopenui/src/button_matrix.cpp +++ b/radio/src/gui/colorlcd/libui/button_matrix.cpp @@ -20,7 +20,7 @@ #include -#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) { diff --git a/radio/src/thirdparty/libopenui/src/button_matrix.h b/radio/src/gui/colorlcd/libui/button_matrix.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/button_matrix.h rename to radio/src/gui/colorlcd/libui/button_matrix.h diff --git a/radio/src/thirdparty/libopenui/src/choice.cpp b/radio/src/gui/colorlcd/libui/choice.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/choice.cpp rename to radio/src/gui/colorlcd/libui/choice.cpp index 947a72c76..6b24edc9b 100644 --- a/radio/src/thirdparty/libopenui/src/choice.cpp +++ b/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) diff --git a/radio/src/thirdparty/libopenui/src/choice.h b/radio/src/gui/colorlcd/libui/choice.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/choice.h rename to radio/src/gui/colorlcd/libui/choice.h diff --git a/radio/src/thirdparty/libopenui/src/dialog.cpp b/radio/src/gui/colorlcd/libui/dialog.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/dialog.cpp rename to radio/src/gui/colorlcd/libui/dialog.cpp index 627e215ff..36789bad3 100644 --- a/radio/src/thirdparty/libopenui/src/dialog.cpp +++ b/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" //----------------------------------------------------------------------------- diff --git a/radio/src/thirdparty/libopenui/src/dialog.h b/radio/src/gui/colorlcd/libui/dialog.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/dialog.h rename to radio/src/gui/colorlcd/libui/dialog.h diff --git a/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp b/radio/src/gui/colorlcd/libui/etx_lv_theme.cpp similarity index 100% rename from radio/src/gui/colorlcd/themes/etx_lv_theme.cpp rename to radio/src/gui/colorlcd/libui/etx_lv_theme.cpp diff --git a/radio/src/gui/colorlcd/themes/etx_lv_theme.h b/radio/src/gui/colorlcd/libui/etx_lv_theme.h similarity index 100% rename from radio/src/gui/colorlcd/themes/etx_lv_theme.h rename to radio/src/gui/colorlcd/libui/etx_lv_theme.h diff --git a/radio/src/gui/colorlcd/file_browser.cpp b/radio/src/gui/colorlcd/libui/file_browser.cpp similarity index 99% rename from radio/src/gui/colorlcd/file_browser.cpp rename to radio/src/gui/colorlcd/libui/file_browser.cpp index 36ff68cd4..287effb23 100644 --- a/radio/src/gui/colorlcd/file_browser.cpp +++ b/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 diff --git a/radio/src/gui/colorlcd/file_browser.h b/radio/src/gui/colorlcd/libui/file_browser.h similarity index 100% rename from radio/src/gui/colorlcd/file_browser.h rename to radio/src/gui/colorlcd/libui/file_browser.h diff --git a/radio/src/gui/colorlcd/file_carosell.cpp b/radio/src/gui/colorlcd/libui/file_carosell.cpp similarity index 100% rename from radio/src/gui/colorlcd/file_carosell.cpp rename to radio/src/gui/colorlcd/libui/file_carosell.cpp diff --git a/radio/src/gui/colorlcd/file_carosell.h b/radio/src/gui/colorlcd/libui/file_carosell.h similarity index 100% rename from radio/src/gui/colorlcd/file_carosell.h rename to radio/src/gui/colorlcd/libui/file_carosell.h diff --git a/radio/src/gui/colorlcd/file_preview.cpp b/radio/src/gui/colorlcd/libui/file_preview.cpp similarity index 100% rename from radio/src/gui/colorlcd/file_preview.cpp rename to radio/src/gui/colorlcd/libui/file_preview.cpp diff --git a/radio/src/gui/colorlcd/file_preview.h b/radio/src/gui/colorlcd/libui/file_preview.h similarity index 100% rename from radio/src/gui/colorlcd/file_preview.h rename to radio/src/gui/colorlcd/libui/file_preview.h diff --git a/radio/src/thirdparty/libopenui/src/filechoice.cpp b/radio/src/gui/colorlcd/libui/filechoice.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/filechoice.cpp rename to radio/src/gui/colorlcd/libui/filechoice.cpp index 3d73b7261..88de737f9 100644 --- a/radio/src/thirdparty/libopenui/src/filechoice.cpp +++ b/radio/src/gui/colorlcd/libui/filechoice.cpp @@ -21,7 +21,7 @@ #include #include "opentx.h" -#include "libopenui_file.h" +#include "lib_file.h" #include "menu.h" #include "menutoolbar.h" diff --git a/radio/src/thirdparty/libopenui/src/filechoice.h b/radio/src/gui/colorlcd/libui/filechoice.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/filechoice.h rename to radio/src/gui/colorlcd/libui/filechoice.h diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/gui/colorlcd/libui/form.cpp similarity index 98% rename from radio/src/thirdparty/libopenui/src/form.cpp rename to radio/src/gui/colorlcd/libui/form.cpp index 8150169ee..1f8ac49d7 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/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) { diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/gui/colorlcd/libui/form.h similarity index 98% rename from radio/src/thirdparty/libopenui/src/form.h rename to radio/src/gui/colorlcd/libui/form.h index e672e1f3f..ff855756c 100644 --- a/radio/src/thirdparty/libopenui/src/form.h +++ b/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 diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp similarity index 99% rename from radio/src/gui/colorlcd/fullscreen_dialog.cpp rename to radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp index 2e071de65..d83f94304 100644 --- a/radio/src/gui/colorlcd/fullscreen_dialog.cpp +++ b/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" diff --git a/radio/src/gui/colorlcd/fullscreen_dialog.h b/radio/src/gui/colorlcd/libui/fullscreen_dialog.h similarity index 100% rename from radio/src/gui/colorlcd/fullscreen_dialog.h rename to radio/src/gui/colorlcd/libui/fullscreen_dialog.h diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp b/radio/src/gui/colorlcd/libui/keyboard_base.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/keyboard_base.cpp rename to radio/src/gui/colorlcd/libui/keyboard_base.cpp index 4b33cdf88..07e4c31ab 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp +++ b/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) { diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.h b/radio/src/gui/colorlcd/libui/keyboard_base.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/keyboard_base.h rename to radio/src/gui/colorlcd/libui/keyboard_base.h diff --git a/radio/src/thirdparty/libopenui/src/keyboard_number.cpp b/radio/src/gui/colorlcd/libui/keyboard_number.cpp similarity index 100% rename from radio/src/thirdparty/libopenui/src/keyboard_number.cpp rename to radio/src/gui/colorlcd/libui/keyboard_number.cpp diff --git a/radio/src/thirdparty/libopenui/src/keyboard_number.h b/radio/src/gui/colorlcd/libui/keyboard_number.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/keyboard_number.h rename to radio/src/gui/colorlcd/libui/keyboard_number.h diff --git a/radio/src/thirdparty/libopenui/src/keyboard_text.cpp b/radio/src/gui/colorlcd/libui/keyboard_text.cpp similarity index 100% rename from radio/src/thirdparty/libopenui/src/keyboard_text.cpp rename to radio/src/gui/colorlcd/libui/keyboard_text.cpp diff --git a/radio/src/thirdparty/libopenui/src/keyboard_text.h b/radio/src/gui/colorlcd/libui/keyboard_text.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/keyboard_text.h rename to radio/src/gui/colorlcd/libui/keyboard_text.h diff --git a/radio/src/thirdparty/libopenui/src/layer.cpp b/radio/src/gui/colorlcd/libui/layer.cpp similarity index 100% rename from radio/src/thirdparty/libopenui/src/layer.cpp rename to radio/src/gui/colorlcd/libui/layer.cpp diff --git a/radio/src/thirdparty/libopenui/src/layer.h b/radio/src/gui/colorlcd/libui/layer.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/layer.h rename to radio/src/gui/colorlcd/libui/layer.h diff --git a/radio/src/gui/colorlcd/libopenui.h b/radio/src/gui/colorlcd/libui/libopenui.h similarity index 97% rename from radio/src/gui/colorlcd/libopenui.h rename to radio/src/gui/colorlcd/libui/libopenui.h index efee729ed..09d782dfb 100644 --- a/radio/src/gui/colorlcd/libopenui.h +++ b/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" diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/gui/colorlcd/libui/libopenui_defines.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/libopenui_defines.h rename to radio/src/gui/colorlcd/libui/libopenui_defines.h diff --git a/radio/src/gui/colorlcd/list_line_button.cpp b/radio/src/gui/colorlcd/libui/list_line_button.cpp similarity index 99% rename from radio/src/gui/colorlcd/list_line_button.cpp rename to radio/src/gui/colorlcd/libui/list_line_button.cpp index 630f0d1b3..0bbb51c64 100644 --- a/radio/src/gui/colorlcd/list_line_button.cpp +++ b/radio/src/gui/colorlcd/libui/list_line_button.cpp @@ -24,7 +24,7 @@ #include #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) diff --git a/radio/src/gui/colorlcd/list_line_button.h b/radio/src/gui/colorlcd/libui/list_line_button.h similarity index 100% rename from radio/src/gui/colorlcd/list_line_button.h rename to radio/src/gui/colorlcd/libui/list_line_button.h diff --git a/radio/src/gui/colorlcd/listbox.cpp b/radio/src/gui/colorlcd/libui/listbox.cpp similarity index 100% rename from radio/src/gui/colorlcd/listbox.cpp rename to radio/src/gui/colorlcd/libui/listbox.cpp diff --git a/radio/src/gui/colorlcd/listbox.h b/radio/src/gui/colorlcd/libui/listbox.h similarity index 100% rename from radio/src/gui/colorlcd/listbox.h rename to radio/src/gui/colorlcd/libui/listbox.h diff --git a/radio/src/thirdparty/libopenui/src/mainwindow.cpp b/radio/src/gui/colorlcd/libui/mainwindow.cpp similarity index 98% rename from radio/src/thirdparty/libopenui/src/mainwindow.cpp rename to radio/src/gui/colorlcd/libui/mainwindow.cpp index 770eaea8c..e4103d6a3 100644 --- a/radio/src/thirdparty/libopenui/src/mainwindow.cpp +++ b/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 diff --git a/radio/src/thirdparty/libopenui/src/mainwindow.h b/radio/src/gui/colorlcd/libui/mainwindow.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/mainwindow.h rename to radio/src/gui/colorlcd/libui/mainwindow.h diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/gui/colorlcd/libui/menu.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/menu.cpp rename to radio/src/gui/colorlcd/libui/menu.cpp index d4440b6da..b88b7db3e 100644 --- a/radio/src/thirdparty/libopenui/src/menu.cpp +++ b/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; diff --git a/radio/src/thirdparty/libopenui/src/menu.h b/radio/src/gui/colorlcd/libui/menu.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/menu.h rename to radio/src/gui/colorlcd/libui/menu.h diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp b/radio/src/gui/colorlcd/libui/menutoolbar.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/menutoolbar.cpp rename to radio/src/gui/colorlcd/libui/menutoolbar.cpp index 80e0060e0..b9dbe2902 100644 --- a/radio/src/thirdparty/libopenui/src/menutoolbar.cpp +++ b/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 = { diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.h b/radio/src/gui/colorlcd/libui/menutoolbar.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/menutoolbar.h rename to radio/src/gui/colorlcd/libui/menutoolbar.h diff --git a/radio/src/thirdparty/libopenui/src/modal_window.cpp b/radio/src/gui/colorlcd/libui/modal_window.cpp similarity index 98% rename from radio/src/thirdparty/libopenui/src/modal_window.cpp rename to radio/src/gui/colorlcd/libui/modal_window.cpp index 72fa3f912..aa135f82e 100644 --- a/radio/src/thirdparty/libopenui/src/modal_window.cpp +++ b/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) diff --git a/radio/src/thirdparty/libopenui/src/modal_window.h b/radio/src/gui/colorlcd/libui/modal_window.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/modal_window.h rename to radio/src/gui/colorlcd/libui/modal_window.h diff --git a/radio/src/thirdparty/libopenui/src/numberedit.cpp b/radio/src/gui/colorlcd/libui/numberedit.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/numberedit.cpp rename to radio/src/gui/colorlcd/libui/numberedit.cpp index 207011857..a763ba971 100644 --- a/radio/src/thirdparty/libopenui/src/numberedit.cpp +++ b/radio/src/gui/colorlcd/libui/numberedit.cpp @@ -21,7 +21,7 @@ #include "audio.h" #include "keyboard_number.h" #include "strhelpers.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" class NumberArea : public FormField { diff --git a/radio/src/thirdparty/libopenui/src/numberedit.h b/radio/src/gui/colorlcd/libui/numberedit.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/numberedit.h rename to radio/src/gui/colorlcd/libui/numberedit.h diff --git a/radio/src/gui/colorlcd/page.cpp b/radio/src/gui/colorlcd/libui/page.cpp similarity index 99% rename from radio/src/gui/colorlcd/page.cpp rename to radio/src/gui/colorlcd/libui/page.cpp index 263ece076..5f8b917f4 100644 --- a/radio/src/gui/colorlcd/page.cpp +++ b/radio/src/gui/colorlcd/libui/page.cpp @@ -22,7 +22,7 @@ #include "page.h" #include "theme_manager.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_main.h" PageHeader::PageHeader(Window* parent, EdgeTxIcon icon) : diff --git a/radio/src/gui/colorlcd/page.h b/radio/src/gui/colorlcd/libui/page.h similarity index 100% rename from radio/src/gui/colorlcd/page.h rename to radio/src/gui/colorlcd/libui/page.h diff --git a/radio/src/gui/colorlcd/popups.cpp b/radio/src/gui/colorlcd/libui/popups.cpp similarity index 99% rename from radio/src/gui/colorlcd/popups.cpp rename to radio/src/gui/colorlcd/libui/popups.cpp index 51fa865a8..ad68f16c2 100644 --- a/radio/src/gui/colorlcd/popups.cpp +++ b/radio/src/gui/colorlcd/libui/popups.cpp @@ -25,7 +25,7 @@ #include "opentx.h" #include "pwr.h" #include "hal/watchdog_driver.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" static void _run_popup_dialog(const char* title, const char* msg, const char* info = nullptr) diff --git a/radio/src/gui/colorlcd/popups.h b/radio/src/gui/colorlcd/libui/popups.h similarity index 100% rename from radio/src/gui/colorlcd/popups.h rename to radio/src/gui/colorlcd/libui/popups.h diff --git a/radio/src/thirdparty/libopenui/src/progress.cpp b/radio/src/gui/colorlcd/libui/progress.cpp similarity index 98% rename from radio/src/thirdparty/libopenui/src/progress.cpp rename to radio/src/gui/colorlcd/libui/progress.cpp index 3488dcc95..399fe5d97 100644 --- a/radio/src/thirdparty/libopenui/src/progress.cpp +++ b/radio/src/gui/colorlcd/libui/progress.cpp @@ -18,7 +18,7 @@ #include "progress.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" static void etx_bar_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj) { diff --git a/radio/src/thirdparty/libopenui/src/progress.h b/radio/src/gui/colorlcd/libui/progress.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/progress.h rename to radio/src/gui/colorlcd/libui/progress.h diff --git a/radio/src/thirdparty/libopenui/src/slider.cpp b/radio/src/gui/colorlcd/libui/slider.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/slider.cpp rename to radio/src/gui/colorlcd/libui/slider.cpp index 9fa55c3b3..8f67a6db6 100644 --- a/radio/src/thirdparty/libopenui/src/slider.cpp +++ b/radio/src/gui/colorlcd/libui/slider.cpp @@ -19,7 +19,7 @@ #include "slider.h" #include "form.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" // Slider const lv_style_const_prop_t slider_knob_props[] = { diff --git a/radio/src/thirdparty/libopenui/src/slider.h b/radio/src/gui/colorlcd/libui/slider.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/slider.h rename to radio/src/gui/colorlcd/libui/slider.h diff --git a/radio/src/thirdparty/libopenui/src/static.cpp b/radio/src/gui/colorlcd/libui/static.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/static.cpp rename to radio/src/gui/colorlcd/libui/static.cpp index b3c43a65d..74838d2b7 100644 --- a/radio/src/thirdparty/libopenui/src/static.cpp +++ b/radio/src/gui/colorlcd/libui/static.cpp @@ -19,9 +19,9 @@ #include "static.h" #include "bitmaps.h" -#include "libopenui/thirdparty/lz4/lz4.h" +#include "lz4/lz4.h" #include "sdcard.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" //----------------------------------------------------------------------------- diff --git a/radio/src/thirdparty/libopenui/src/static.h b/radio/src/gui/colorlcd/libui/static.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/static.h rename to radio/src/gui/colorlcd/libui/static.h diff --git a/radio/src/thirdparty/libopenui/src/table.cpp b/radio/src/gui/colorlcd/libui/table.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/table.cpp rename to radio/src/gui/colorlcd/libui/table.cpp index b9ce5f942..3dcf7d9a0 100644 --- a/radio/src/thirdparty/libopenui/src/table.cpp +++ b/radio/src/gui/colorlcd/libui/table.cpp @@ -18,7 +18,7 @@ #include "table.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" static void table_event(const lv_obj_class_t* class_p, lv_event_t* e); diff --git a/radio/src/thirdparty/libopenui/src/table.h b/radio/src/gui/colorlcd/libui/table.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/table.h rename to radio/src/gui/colorlcd/libui/table.h diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/libui/tabsgroup.cpp similarity index 99% rename from radio/src/gui/colorlcd/tabsgroup.cpp rename to radio/src/gui/colorlcd/libui/tabsgroup.cpp index 7f962d65b..5664100cc 100644 --- a/radio/src/gui/colorlcd/tabsgroup.cpp +++ b/radio/src/gui/colorlcd/libui/tabsgroup.cpp @@ -22,7 +22,7 @@ #include "tabsgroup.h" #include "theme_manager.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_main.h" #include "topbar_impl.h" diff --git a/radio/src/gui/colorlcd/tabsgroup.h b/radio/src/gui/colorlcd/libui/tabsgroup.h similarity index 100% rename from radio/src/gui/colorlcd/tabsgroup.h rename to radio/src/gui/colorlcd/libui/tabsgroup.h diff --git a/radio/src/thirdparty/libopenui/src/textedit.cpp b/radio/src/gui/colorlcd/libui/textedit.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/textedit.cpp rename to radio/src/gui/colorlcd/libui/textedit.cpp index 95710f173..f5f0a3486 100644 --- a/radio/src/thirdparty/libopenui/src/textedit.cpp +++ b/radio/src/gui/colorlcd/libui/textedit.cpp @@ -21,7 +21,7 @@ #include "keyboard_text.h" #include "myeeprom.h" #include "storage/storage.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #if defined(HARDWARE_KEYS) #include "menu.h" diff --git a/radio/src/thirdparty/libopenui/src/textedit.h b/radio/src/gui/colorlcd/libui/textedit.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/textedit.h rename to radio/src/gui/colorlcd/libui/textedit.h diff --git a/radio/src/gui/colorlcd/timeedit.cpp b/radio/src/gui/colorlcd/libui/timeedit.cpp similarity index 100% rename from radio/src/gui/colorlcd/timeedit.cpp rename to radio/src/gui/colorlcd/libui/timeedit.cpp diff --git a/radio/src/gui/colorlcd/timeedit.h b/radio/src/gui/colorlcd/libui/timeedit.h similarity index 100% rename from radio/src/gui/colorlcd/timeedit.h rename to radio/src/gui/colorlcd/libui/timeedit.h diff --git a/radio/src/thirdparty/libopenui/src/toggleswitch.cpp b/radio/src/gui/colorlcd/libui/toggleswitch.cpp similarity index 98% rename from radio/src/thirdparty/libopenui/src/toggleswitch.cpp rename to radio/src/gui/colorlcd/libui/toggleswitch.cpp index 336ac47f7..46c8920ef 100644 --- a/radio/src/thirdparty/libopenui/src/toggleswitch.cpp +++ b/radio/src/gui/colorlcd/libui/toggleswitch.cpp @@ -18,7 +18,7 @@ #include "toggleswitch.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" // Animation LV_STYLE_CONST_SINGLE_INIT(anim_fast, LV_STYLE_ANIM_TIME, 120); diff --git a/radio/src/thirdparty/libopenui/src/toggleswitch.h b/radio/src/gui/colorlcd/libui/toggleswitch.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/toggleswitch.h rename to radio/src/gui/colorlcd/libui/toggleswitch.h diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/libui/view_text.cpp similarity index 99% rename from radio/src/gui/colorlcd/view_text.cpp rename to radio/src/gui/colorlcd/libui/view_text.cpp index 93f02d37d..81276dc2d 100644 --- a/radio/src/gui/colorlcd/view_text.cpp +++ b/radio/src/gui/colorlcd/libui/view_text.cpp @@ -23,7 +23,7 @@ #include "menu.h" #include "opentx.h" #include "sdcard.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "fullscreen_dialog.h" // Used on startup to block until checlist is closed. diff --git a/radio/src/gui/colorlcd/view_text.h b/radio/src/gui/colorlcd/libui/view_text.h similarity index 100% rename from radio/src/gui/colorlcd/view_text.h rename to radio/src/gui/colorlcd/libui/view_text.h diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/gui/colorlcd/libui/window.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/window.cpp rename to radio/src/gui/colorlcd/libui/window.cpp index dbd25d8a7..6520d8d06 100644 --- a/radio/src/thirdparty/libopenui/src/window.cpp +++ b/radio/src/gui/colorlcd/libui/window.cpp @@ -21,7 +21,7 @@ #include "button.h" #include "form.h" #include "static.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" std::list Window::trash; bool Window::_longPressed = false; diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/gui/colorlcd/libui/window.h similarity index 99% rename from radio/src/thirdparty/libopenui/src/window.h rename to radio/src/gui/colorlcd/libui/window.h index ae9f069ab..1ad311873 100644 --- a/radio/src/thirdparty/libopenui/src/window.h +++ b/radio/src/gui/colorlcd/libui/window.h @@ -26,7 +26,7 @@ #include "bitmapbuffer.h" #include "libopenui_defines.h" #include "opentx_helpers.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" typedef uint32_t WindowFlags; diff --git a/radio/src/lv_conf.h b/radio/src/gui/colorlcd/lv_conf.h similarity index 100% rename from radio/src/lv_conf.h rename to radio/src/gui/colorlcd/lv_conf.h diff --git a/radio/src/gui/colorlcd/layout.cpp b/radio/src/gui/colorlcd/mainview/layout.cpp similarity index 100% rename from radio/src/gui/colorlcd/layout.cpp rename to radio/src/gui/colorlcd/mainview/layout.cpp diff --git a/radio/src/gui/colorlcd/layout.h b/radio/src/gui/colorlcd/mainview/layout.h similarity index 100% rename from radio/src/gui/colorlcd/layout.h rename to radio/src/gui/colorlcd/mainview/layout.h diff --git a/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp b/radio/src/gui/colorlcd/mainview/layout_factory_impl.cpp similarity index 98% rename from radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp rename to radio/src/gui/colorlcd/mainview/layout_factory_impl.cpp index e20549251..19c4d6c5f 100644 --- a/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp +++ b/radio/src/gui/colorlcd/mainview/layout_factory_impl.cpp @@ -21,8 +21,8 @@ #include "layout_factory_impl.h" -#include "layouts/sliders.h" -#include "layouts/trims.h" +#include "sliders.h" +#include "trims.h" #include "view_main.h" Layout::Layout(Window* parent, const LayoutFactory* factory, diff --git a/radio/src/gui/colorlcd/layouts/layout_factory_impl.h b/radio/src/gui/colorlcd/mainview/layout_factory_impl.h similarity index 100% rename from radio/src/gui/colorlcd/layouts/layout_factory_impl.h rename to radio/src/gui/colorlcd/mainview/layout_factory_impl.h diff --git a/radio/src/gui/colorlcd/menu_screen.cpp b/radio/src/gui/colorlcd/mainview/menu_screen.cpp similarity index 100% rename from radio/src/gui/colorlcd/menu_screen.cpp rename to radio/src/gui/colorlcd/mainview/menu_screen.cpp diff --git a/radio/src/gui/colorlcd/menu_screen.h b/radio/src/gui/colorlcd/mainview/menu_screen.h similarity index 100% rename from radio/src/gui/colorlcd/menu_screen.h rename to radio/src/gui/colorlcd/mainview/menu_screen.h diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/mainview/screen_setup.cpp similarity index 99% rename from radio/src/gui/colorlcd/screen_setup.cpp rename to radio/src/gui/colorlcd/mainview/screen_setup.cpp index cdc5088d0..2d96c0d47 100644 --- a/radio/src/gui/colorlcd/screen_setup.cpp +++ b/radio/src/gui/colorlcd/mainview/screen_setup.cpp @@ -24,7 +24,7 @@ #include #include "color_picker.h" -#include "layouts/layout_factory_impl.h" +#include "layout_factory_impl.h" #include "libopenui.h" #include "opentx.h" #include "topbar.h" diff --git a/radio/src/gui/colorlcd/screen_setup.h b/radio/src/gui/colorlcd/mainview/screen_setup.h similarity index 100% rename from radio/src/gui/colorlcd/screen_setup.h rename to radio/src/gui/colorlcd/mainview/screen_setup.h diff --git a/radio/src/gui/colorlcd/screen_user_interface.cpp b/radio/src/gui/colorlcd/mainview/screen_user_interface.cpp similarity index 100% rename from radio/src/gui/colorlcd/screen_user_interface.cpp rename to radio/src/gui/colorlcd/mainview/screen_user_interface.cpp diff --git a/radio/src/gui/colorlcd/screen_user_interface.h b/radio/src/gui/colorlcd/mainview/screen_user_interface.h similarity index 100% rename from radio/src/gui/colorlcd/screen_user_interface.h rename to radio/src/gui/colorlcd/mainview/screen_user_interface.h diff --git a/radio/src/gui/colorlcd/select_fab_carousel.cpp b/radio/src/gui/colorlcd/mainview/select_fab_carousel.cpp similarity index 100% rename from radio/src/gui/colorlcd/select_fab_carousel.cpp rename to radio/src/gui/colorlcd/mainview/select_fab_carousel.cpp diff --git a/radio/src/gui/colorlcd/select_fab_carousel.h b/radio/src/gui/colorlcd/mainview/select_fab_carousel.h similarity index 100% rename from radio/src/gui/colorlcd/select_fab_carousel.h rename to radio/src/gui/colorlcd/mainview/select_fab_carousel.h diff --git a/radio/src/gui/colorlcd/layouts/sliders.cpp b/radio/src/gui/colorlcd/mainview/sliders.cpp similarity index 100% rename from radio/src/gui/colorlcd/layouts/sliders.cpp rename to radio/src/gui/colorlcd/mainview/sliders.cpp diff --git a/radio/src/gui/colorlcd/layouts/sliders.h b/radio/src/gui/colorlcd/mainview/sliders.h similarity index 100% rename from radio/src/gui/colorlcd/layouts/sliders.h rename to radio/src/gui/colorlcd/mainview/sliders.h diff --git a/radio/src/gui/colorlcd/topbar.cpp b/radio/src/gui/colorlcd/mainview/topbar.cpp similarity index 98% rename from radio/src/gui/colorlcd/topbar.cpp rename to radio/src/gui/colorlcd/mainview/topbar.cpp index 975a576f9..6dbc091d0 100644 --- a/radio/src/gui/colorlcd/topbar.cpp +++ b/radio/src/gui/colorlcd/mainview/topbar.cpp @@ -25,7 +25,7 @@ #include "menu_screen.h" #include "opentx.h" #include "storage/storage.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "topbar_impl.h" #include "view_main.h" #include "widgets_setup.h" diff --git a/radio/src/gui/colorlcd/topbar.h b/radio/src/gui/colorlcd/mainview/topbar.h similarity index 100% rename from radio/src/gui/colorlcd/topbar.h rename to radio/src/gui/colorlcd/mainview/topbar.h diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/mainview/topbar_impl.cpp similarity index 100% rename from radio/src/gui/colorlcd/layouts/topbar_impl.cpp rename to radio/src/gui/colorlcd/mainview/topbar_impl.cpp diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.h b/radio/src/gui/colorlcd/mainview/topbar_impl.h similarity index 97% rename from radio/src/gui/colorlcd/layouts/topbar_impl.h rename to radio/src/gui/colorlcd/mainview/topbar_impl.h index 242946a53..0a57adaec 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.h +++ b/radio/src/gui/colorlcd/mainview/topbar_impl.h @@ -22,7 +22,7 @@ #pragma once #include "topbar.h" -#include "layouts/layout_factory_impl.h" +#include "layout_factory_impl.h" class HeaderIcon; diff --git a/radio/src/gui/colorlcd/layouts/trims.cpp b/radio/src/gui/colorlcd/mainview/trims.cpp similarity index 100% rename from radio/src/gui/colorlcd/layouts/trims.cpp rename to radio/src/gui/colorlcd/mainview/trims.cpp diff --git a/radio/src/gui/colorlcd/layouts/trims.h b/radio/src/gui/colorlcd/mainview/trims.h similarity index 100% rename from radio/src/gui/colorlcd/layouts/trims.h rename to radio/src/gui/colorlcd/mainview/trims.h diff --git a/radio/src/gui/colorlcd/view_about.cpp b/radio/src/gui/colorlcd/mainview/view_about.cpp similarity index 100% rename from radio/src/gui/colorlcd/view_about.cpp rename to radio/src/gui/colorlcd/mainview/view_about.cpp diff --git a/radio/src/gui/colorlcd/view_about.h b/radio/src/gui/colorlcd/mainview/view_about.h similarity index 100% rename from radio/src/gui/colorlcd/view_about.h rename to radio/src/gui/colorlcd/mainview/view_about.h diff --git a/radio/src/gui/colorlcd/view_channels.cpp b/radio/src/gui/colorlcd/mainview/view_channels.cpp similarity index 100% rename from radio/src/gui/colorlcd/view_channels.cpp rename to radio/src/gui/colorlcd/mainview/view_channels.cpp diff --git a/radio/src/gui/colorlcd/view_channels.h b/radio/src/gui/colorlcd/mainview/view_channels.h similarity index 100% rename from radio/src/gui/colorlcd/view_channels.h rename to radio/src/gui/colorlcd/mainview/view_channels.h diff --git a/radio/src/gui/colorlcd/view_logical_switches.cpp b/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp similarity index 99% rename from radio/src/gui/colorlcd/view_logical_switches.cpp rename to radio/src/gui/colorlcd/mainview/view_logical_switches.cpp index 395db838f..11ae108fd 100644 --- a/radio/src/gui/colorlcd/view_logical_switches.cpp +++ b/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp @@ -23,7 +23,7 @@ #include "opentx.h" #include "switches.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #if PORTRAIT_LCD diff --git a/radio/src/gui/colorlcd/view_logical_switches.h b/radio/src/gui/colorlcd/mainview/view_logical_switches.h similarity index 100% rename from radio/src/gui/colorlcd/view_logical_switches.h rename to radio/src/gui/colorlcd/mainview/view_logical_switches.h diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/mainview/view_main.cpp similarity index 100% rename from radio/src/gui/colorlcd/view_main.cpp rename to radio/src/gui/colorlcd/mainview/view_main.cpp diff --git a/radio/src/gui/colorlcd/view_main.h b/radio/src/gui/colorlcd/mainview/view_main.h similarity index 100% rename from radio/src/gui/colorlcd/view_main.h rename to radio/src/gui/colorlcd/mainview/view_main.h diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp similarity index 99% rename from radio/src/gui/colorlcd/view_main_decoration.cpp rename to radio/src/gui/colorlcd/mainview/view_main_decoration.cpp index 50eb27861..c50ca012a 100644 --- a/radio/src/gui/colorlcd/view_main_decoration.cpp +++ b/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp @@ -25,8 +25,8 @@ #include "opentx.h" // these 2 need things from opentx.h -#include "layouts/sliders.h" -#include "layouts/trims.h" +#include "sliders.h" +#include "trims.h" #include "hal/adc_driver.h" diff --git a/radio/src/gui/colorlcd/view_main_decoration.h b/radio/src/gui/colorlcd/mainview/view_main_decoration.h similarity index 100% rename from radio/src/gui/colorlcd/view_main_decoration.h rename to radio/src/gui/colorlcd/mainview/view_main_decoration.h diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/mainview/view_main_menu.cpp similarity index 99% rename from radio/src/gui/colorlcd/view_main_menu.cpp rename to radio/src/gui/colorlcd/mainview/view_main_menu.cpp index 28b1bf532..e99c01d0e 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/mainview/view_main_menu.cpp @@ -27,7 +27,7 @@ #include "model_select.h" #include "opentx.h" #include "select_fab_carousel.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_about.h" #include "view_channels.h" #include "view_statistics.h" diff --git a/radio/src/gui/colorlcd/view_main_menu.h b/radio/src/gui/colorlcd/mainview/view_main_menu.h similarity index 100% rename from radio/src/gui/colorlcd/view_main_menu.h rename to radio/src/gui/colorlcd/mainview/view_main_menu.h diff --git a/radio/src/gui/colorlcd/view_statistics.cpp b/radio/src/gui/colorlcd/mainview/view_statistics.cpp similarity index 100% rename from radio/src/gui/colorlcd/view_statistics.cpp rename to radio/src/gui/colorlcd/mainview/view_statistics.cpp diff --git a/radio/src/gui/colorlcd/view_statistics.h b/radio/src/gui/colorlcd/mainview/view_statistics.h similarity index 100% rename from radio/src/gui/colorlcd/view_statistics.h rename to radio/src/gui/colorlcd/mainview/view_statistics.h diff --git a/radio/src/gui/colorlcd/widget.cpp b/radio/src/gui/colorlcd/mainview/widget.cpp similarity index 99% rename from radio/src/gui/colorlcd/widget.cpp rename to radio/src/gui/colorlcd/mainview/widget.cpp index f3073ea79..424a97467 100644 --- a/radio/src/gui/colorlcd/widget.cpp +++ b/radio/src/gui/colorlcd/mainview/widget.cpp @@ -22,7 +22,7 @@ #include "widget.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_main.h" #include "widget_settings.h" diff --git a/radio/src/gui/colorlcd/widget.h b/radio/src/gui/colorlcd/mainview/widget.h similarity index 100% rename from radio/src/gui/colorlcd/widget.h rename to radio/src/gui/colorlcd/mainview/widget.h diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/mainview/widget_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/widget_settings.cpp rename to radio/src/gui/colorlcd/mainview/widget_settings.cpp diff --git a/radio/src/gui/colorlcd/widget_settings.h b/radio/src/gui/colorlcd/mainview/widget_settings.h similarity index 100% rename from radio/src/gui/colorlcd/widget_settings.h rename to radio/src/gui/colorlcd/mainview/widget_settings.h diff --git a/radio/src/gui/colorlcd/widgets_container.h b/radio/src/gui/colorlcd/mainview/widgets_container.h similarity index 100% rename from radio/src/gui/colorlcd/widgets_container.h rename to radio/src/gui/colorlcd/mainview/widgets_container.h diff --git a/radio/src/gui/colorlcd/widgets_setup.cpp b/radio/src/gui/colorlcd/mainview/widgets_setup.cpp similarity index 99% rename from radio/src/gui/colorlcd/widgets_setup.cpp rename to radio/src/gui/colorlcd/mainview/widgets_setup.cpp index 84c4b2608..524847122 100644 --- a/radio/src/gui/colorlcd/widgets_setup.cpp +++ b/radio/src/gui/colorlcd/mainview/widgets_setup.cpp @@ -26,7 +26,7 @@ #include "menu_screen.h" #include "myeeprom.h" #include "storage/storage.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_main.h" #include "widget_settings.h" diff --git a/radio/src/gui/colorlcd/widgets_setup.h b/radio/src/gui/colorlcd/mainview/widgets_setup.h similarity index 100% rename from radio/src/gui/colorlcd/widgets_setup.h rename to radio/src/gui/colorlcd/mainview/widgets_setup.h diff --git a/radio/src/gui/colorlcd/zone.h b/radio/src/gui/colorlcd/mainview/zone.h similarity index 100% rename from radio/src/gui/colorlcd/zone.h rename to radio/src/gui/colorlcd/mainview/zone.h diff --git a/radio/src/gui/colorlcd/curveedit.cpp b/radio/src/gui/colorlcd/model/curveedit.cpp similarity index 99% rename from radio/src/gui/colorlcd/curveedit.cpp rename to radio/src/gui/colorlcd/model/curveedit.cpp index 504d580d6..bd08d2b06 100644 --- a/radio/src/gui/colorlcd/curveedit.cpp +++ b/radio/src/gui/colorlcd/model/curveedit.cpp @@ -23,7 +23,7 @@ #include "libopenui.h" #include "opentx.h" // TODO for applyCustomCurve -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/curveedit.h b/radio/src/gui/colorlcd/model/curveedit.h similarity index 100% rename from radio/src/gui/colorlcd/curveedit.h rename to radio/src/gui/colorlcd/model/curveedit.h diff --git a/radio/src/gui/colorlcd/function_switches.cpp b/radio/src/gui/colorlcd/model/function_switches.cpp similarity index 100% rename from radio/src/gui/colorlcd/function_switches.cpp rename to radio/src/gui/colorlcd/model/function_switches.cpp diff --git a/radio/src/gui/colorlcd/function_switches.h b/radio/src/gui/colorlcd/model/function_switches.h similarity index 100% rename from radio/src/gui/colorlcd/function_switches.h rename to radio/src/gui/colorlcd/model/function_switches.h diff --git a/radio/src/gui/colorlcd/input_edit.cpp b/radio/src/gui/colorlcd/model/input_edit.cpp similarity index 99% rename from radio/src/gui/colorlcd/input_edit.cpp rename to radio/src/gui/colorlcd/model/input_edit.cpp index 7554decbd..3b5d1d509 100644 --- a/radio/src/gui/colorlcd/input_edit.cpp +++ b/radio/src/gui/colorlcd/model/input_edit.cpp @@ -28,7 +28,7 @@ #include "input_edit_adv.h" #include "input_source.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "switchchoice.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/input_edit.h b/radio/src/gui/colorlcd/model/input_edit.h similarity index 100% rename from radio/src/gui/colorlcd/input_edit.h rename to radio/src/gui/colorlcd/model/input_edit.h diff --git a/radio/src/gui/colorlcd/input_edit_adv.cpp b/radio/src/gui/colorlcd/model/input_edit_adv.cpp similarity index 98% rename from radio/src/gui/colorlcd/input_edit_adv.cpp rename to radio/src/gui/colorlcd/model/input_edit_adv.cpp index 1515cbcef..2e3e12ead 100644 --- a/radio/src/gui/colorlcd/input_edit_adv.cpp +++ b/radio/src/gui/colorlcd/model/input_edit_adv.cpp @@ -23,7 +23,7 @@ #include "fm_matrix.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/input_edit_adv.h b/radio/src/gui/colorlcd/model/input_edit_adv.h similarity index 100% rename from radio/src/gui/colorlcd/input_edit_adv.h rename to radio/src/gui/colorlcd/model/input_edit_adv.h diff --git a/radio/src/gui/colorlcd/menu_model.cpp b/radio/src/gui/colorlcd/model/menu_model.cpp similarity index 100% rename from radio/src/gui/colorlcd/menu_model.cpp rename to radio/src/gui/colorlcd/model/menu_model.cpp diff --git a/radio/src/gui/colorlcd/menu_model.h b/radio/src/gui/colorlcd/model/menu_model.h similarity index 100% rename from radio/src/gui/colorlcd/menu_model.h rename to radio/src/gui/colorlcd/model/menu_model.h diff --git a/radio/src/gui/colorlcd/mixer_edit.cpp b/radio/src/gui/colorlcd/model/mixer_edit.cpp similarity index 99% rename from radio/src/gui/colorlcd/mixer_edit.cpp rename to radio/src/gui/colorlcd/model/mixer_edit.cpp index d8071df6f..7a1ee2516 100644 --- a/radio/src/gui/colorlcd/mixer_edit.cpp +++ b/radio/src/gui/colorlcd/model/mixer_edit.cpp @@ -28,7 +28,7 @@ #include "mixer_edit_adv.h" #include "mixes.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "sourcechoice.h" #include "switchchoice.h" #include "curveedit.h" diff --git a/radio/src/gui/colorlcd/mixer_edit.h b/radio/src/gui/colorlcd/model/mixer_edit.h similarity index 100% rename from radio/src/gui/colorlcd/mixer_edit.h rename to radio/src/gui/colorlcd/model/mixer_edit.h diff --git a/radio/src/gui/colorlcd/mixer_edit_adv.cpp b/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp similarity index 99% rename from radio/src/gui/colorlcd/mixer_edit_adv.cpp rename to radio/src/gui/colorlcd/model/mixer_edit_adv.cpp index a8f73c090..0cb6126c9 100644 --- a/radio/src/gui/colorlcd/mixer_edit_adv.cpp +++ b/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp @@ -25,7 +25,7 @@ #include "mixes.h" #include "numberedit.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/mixer_edit_adv.h b/radio/src/gui/colorlcd/model/mixer_edit_adv.h similarity index 100% rename from radio/src/gui/colorlcd/mixer_edit_adv.h rename to radio/src/gui/colorlcd/model/mixer_edit_adv.h diff --git a/radio/src/gui/colorlcd/model_curves.cpp b/radio/src/gui/colorlcd/model/model_curves.cpp similarity index 100% rename from radio/src/gui/colorlcd/model_curves.cpp rename to radio/src/gui/colorlcd/model/model_curves.cpp diff --git a/radio/src/gui/colorlcd/model_curves.h b/radio/src/gui/colorlcd/model/model_curves.h similarity index 100% rename from radio/src/gui/colorlcd/model_curves.h rename to radio/src/gui/colorlcd/model/model_curves.h diff --git a/radio/src/gui/colorlcd/model_flightmodes.cpp b/radio/src/gui/colorlcd/model/model_flightmodes.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_flightmodes.cpp rename to radio/src/gui/colorlcd/model/model_flightmodes.cpp index 841e12ec7..a2c55902b 100644 --- a/radio/src/gui/colorlcd/model_flightmodes.cpp +++ b/radio/src/gui/colorlcd/model/model_flightmodes.cpp @@ -26,7 +26,7 @@ #include "opentx.h" #include "page.h" #include "switchchoice.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_flightmodes.h b/radio/src/gui/colorlcd/model/model_flightmodes.h similarity index 100% rename from radio/src/gui/colorlcd/model_flightmodes.h rename to radio/src/gui/colorlcd/model/model_flightmodes.h diff --git a/radio/src/gui/colorlcd/model_gvars.cpp b/radio/src/gui/colorlcd/model/model_gvars.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_gvars.cpp rename to radio/src/gui/colorlcd/model/model_gvars.cpp index 79adaa9bd..c9a45df4b 100644 --- a/radio/src/gui/colorlcd/model_gvars.cpp +++ b/radio/src/gui/colorlcd/model/model_gvars.cpp @@ -26,7 +26,7 @@ #include "numberedit.h" #include "opentx.h" #include "page.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_gvars.h b/radio/src/gui/colorlcd/model/model_gvars.h similarity index 100% rename from radio/src/gui/colorlcd/model_gvars.h rename to radio/src/gui/colorlcd/model/model_gvars.h diff --git a/radio/src/gui/colorlcd/model_heli.cpp b/radio/src/gui/colorlcd/model/model_heli.cpp similarity index 100% rename from radio/src/gui/colorlcd/model_heli.cpp rename to radio/src/gui/colorlcd/model/model_heli.cpp diff --git a/radio/src/gui/colorlcd/model_heli.h b/radio/src/gui/colorlcd/model/model_heli.h similarity index 100% rename from radio/src/gui/colorlcd/model_heli.h rename to radio/src/gui/colorlcd/model/model_heli.h diff --git a/radio/src/gui/colorlcd/model_inputs.cpp b/radio/src/gui/colorlcd/model/model_inputs.cpp similarity index 100% rename from radio/src/gui/colorlcd/model_inputs.cpp rename to radio/src/gui/colorlcd/model/model_inputs.cpp diff --git a/radio/src/gui/colorlcd/model_inputs.h b/radio/src/gui/colorlcd/model/model_inputs.h similarity index 100% rename from radio/src/gui/colorlcd/model_inputs.h rename to radio/src/gui/colorlcd/model/model_inputs.h diff --git a/radio/src/gui/colorlcd/model_logical_switches.cpp b/radio/src/gui/colorlcd/model/model_logical_switches.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_logical_switches.cpp rename to radio/src/gui/colorlcd/model/model_logical_switches.cpp index 550b5f6db..1c0e56547 100644 --- a/radio/src/gui/colorlcd/model_logical_switches.cpp +++ b/radio/src/gui/colorlcd/model/model_logical_switches.cpp @@ -28,7 +28,7 @@ #include "sourcechoice.h" #include "switchchoice.h" #include "switches.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_logical_switches.h b/radio/src/gui/colorlcd/model/model_logical_switches.h similarity index 100% rename from radio/src/gui/colorlcd/model_logical_switches.h rename to radio/src/gui/colorlcd/model/model_logical_switches.h diff --git a/radio/src/gui/colorlcd/model_mixer_scripts.cpp b/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_mixer_scripts.cpp rename to radio/src/gui/colorlcd/model/model_mixer_scripts.cpp index efc1ef9a6..15995bbaf 100644 --- a/radio/src/gui/colorlcd/model_mixer_scripts.cpp +++ b/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp @@ -30,7 +30,7 @@ #include "opentx.h" #include "page.h" #include "sourcechoice.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "translations.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_mixer_scripts.h b/radio/src/gui/colorlcd/model/model_mixer_scripts.h similarity index 100% rename from radio/src/gui/colorlcd/model_mixer_scripts.h rename to radio/src/gui/colorlcd/model/model_mixer_scripts.h diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model/model_mixes.cpp similarity index 100% rename from radio/src/gui/colorlcd/model_mixes.cpp rename to radio/src/gui/colorlcd/model/model_mixes.cpp diff --git a/radio/src/gui/colorlcd/model_mixes.h b/radio/src/gui/colorlcd/model/model_mixes.h similarity index 100% rename from radio/src/gui/colorlcd/model_mixes.h rename to radio/src/gui/colorlcd/model/model_mixes.h diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model/model_outputs.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_outputs.cpp rename to radio/src/gui/colorlcd/model/model_outputs.cpp index e90ff8ce7..560ee3b55 100644 --- a/radio/src/gui/colorlcd/model_outputs.cpp +++ b/radio/src/gui/colorlcd/model/model_outputs.cpp @@ -25,7 +25,7 @@ #include "list_line_button.h" #include "opentx.h" #include "output_edit.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_outputs.h b/radio/src/gui/colorlcd/model/model_outputs.h similarity index 100% rename from radio/src/gui/colorlcd/model_outputs.h rename to radio/src/gui/colorlcd/model/model_outputs.h diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model/model_select.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_select.cpp rename to radio/src/gui/colorlcd/model/model_select.cpp index 8ebf7a55f..24ac56157 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model/model_select.cpp @@ -28,7 +28,7 @@ #include "model_templates.h" #include "opentx.h" #include "standalone_lua.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "view_channels.h" inline tmr10ms_t getTicks() { return g_tmr10ms; } diff --git a/radio/src/gui/colorlcd/model_select.h b/radio/src/gui/colorlcd/model/model_select.h similarity index 98% rename from radio/src/gui/colorlcd/model_select.h rename to radio/src/gui/colorlcd/model/model_select.h index 6abc734da..254ea13f3 100644 --- a/radio/src/gui/colorlcd/model_select.h +++ b/radio/src/gui/colorlcd/model/model_select.h @@ -24,7 +24,7 @@ #include "listbox.h" #include "storage/modelslist.h" #include "page.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" class ModelsPageBody; class ModelLayoutButton; diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model/model_setup.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_setup.cpp rename to radio/src/gui/colorlcd/model/model_setup.cpp index cc46c7f2b..ff1f221ac 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model/model_setup.cpp @@ -43,7 +43,7 @@ #include "module_setup.h" #include "opentx.h" #include "storage/modelslist.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #if defined(USBJ_EX) #include "model_usbjoystick.h" diff --git a/radio/src/gui/colorlcd/model_setup.h b/radio/src/gui/colorlcd/model/model_setup.h similarity index 100% rename from radio/src/gui/colorlcd/model_setup.h rename to radio/src/gui/colorlcd/model/model_setup.h diff --git a/radio/src/gui/colorlcd/model_telemetry.cpp b/radio/src/gui/colorlcd/model/model_telemetry.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_telemetry.cpp rename to radio/src/gui/colorlcd/model/model_telemetry.cpp index 9f988b58e..13a749203 100644 --- a/radio/src/gui/colorlcd/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model/model_telemetry.cpp @@ -27,7 +27,7 @@ #include "opentx.h" #include "page.h" #include "sourcechoice.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_telemetry.h b/radio/src/gui/colorlcd/model/model_telemetry.h similarity index 100% rename from radio/src/gui/colorlcd/model_telemetry.h rename to radio/src/gui/colorlcd/model/model_telemetry.h diff --git a/radio/src/gui/colorlcd/model_templates.cpp b/radio/src/gui/colorlcd/model/model_templates.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_templates.cpp rename to radio/src/gui/colorlcd/model/model_templates.cpp index ecf81e911..d53bf8402 100644 --- a/radio/src/gui/colorlcd/model_templates.cpp +++ b/radio/src/gui/colorlcd/model/model_templates.cpp @@ -22,7 +22,7 @@ #include "model_templates.h" #include "standalone_lua.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define ETX_STATE_NO_INFO_COLOR LV_STATE_USER_1 diff --git a/radio/src/gui/colorlcd/model_templates.h b/radio/src/gui/colorlcd/model/model_templates.h similarity index 100% rename from radio/src/gui/colorlcd/model_templates.h rename to radio/src/gui/colorlcd/model/model_templates.h diff --git a/radio/src/gui/colorlcd/model_usbjoystick.cpp b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp similarity index 99% rename from radio/src/gui/colorlcd/model_usbjoystick.cpp rename to radio/src/gui/colorlcd/model/model_usbjoystick.cpp index c521368df..09ce6bf67 100644 --- a/radio/src/gui/colorlcd/model_usbjoystick.cpp +++ b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp @@ -25,7 +25,7 @@ #include "channel_bar.h" #include "list_line_button.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "usb_joystick.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model_usbjoystick.h b/radio/src/gui/colorlcd/model/model_usbjoystick.h similarity index 100% rename from radio/src/gui/colorlcd/model_usbjoystick.h rename to radio/src/gui/colorlcd/model/model_usbjoystick.h diff --git a/radio/src/gui/colorlcd/output_edit.cpp b/radio/src/gui/colorlcd/model/output_edit.cpp similarity index 99% rename from radio/src/gui/colorlcd/output_edit.cpp rename to radio/src/gui/colorlcd/model/output_edit.cpp index 026ec3950..1cfaed942 100644 --- a/radio/src/gui/colorlcd/output_edit.cpp +++ b/radio/src/gui/colorlcd/model/output_edit.cpp @@ -24,7 +24,7 @@ #include "channel_bar.h" #include "gvar_numberedit.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/output_edit.h b/radio/src/gui/colorlcd/model/output_edit.h similarity index 100% rename from radio/src/gui/colorlcd/output_edit.h rename to radio/src/gui/colorlcd/model/output_edit.h diff --git a/radio/src/gui/colorlcd/preflight_checks.cpp b/radio/src/gui/colorlcd/model/preflight_checks.cpp similarity index 99% rename from radio/src/gui/colorlcd/preflight_checks.cpp rename to radio/src/gui/colorlcd/model/preflight_checks.cpp index 9265c7be6..8268741ff 100644 --- a/radio/src/gui/colorlcd/preflight_checks.cpp +++ b/radio/src/gui/colorlcd/model/preflight_checks.cpp @@ -26,7 +26,7 @@ #include "hal/switch_driver.h" #include "opentx.h" #include "strhelpers.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/preflight_checks.h b/radio/src/gui/colorlcd/model/preflight_checks.h similarity index 100% rename from radio/src/gui/colorlcd/preflight_checks.h rename to radio/src/gui/colorlcd/model/preflight_checks.h diff --git a/radio/src/gui/colorlcd/special_functions.cpp b/radio/src/gui/colorlcd/model/special_functions.cpp similarity index 100% rename from radio/src/gui/colorlcd/special_functions.cpp rename to radio/src/gui/colorlcd/model/special_functions.cpp diff --git a/radio/src/gui/colorlcd/special_functions.h b/radio/src/gui/colorlcd/model/special_functions.h similarity index 100% rename from radio/src/gui/colorlcd/special_functions.h rename to radio/src/gui/colorlcd/model/special_functions.h diff --git a/radio/src/gui/colorlcd/throttle_params.cpp b/radio/src/gui/colorlcd/model/throttle_params.cpp similarity index 100% rename from radio/src/gui/colorlcd/throttle_params.cpp rename to radio/src/gui/colorlcd/model/throttle_params.cpp diff --git a/radio/src/gui/colorlcd/throttle_params.h b/radio/src/gui/colorlcd/model/throttle_params.h similarity index 100% rename from radio/src/gui/colorlcd/throttle_params.h rename to radio/src/gui/colorlcd/model/throttle_params.h diff --git a/radio/src/gui/colorlcd/timer_setup.cpp b/radio/src/gui/colorlcd/model/timer_setup.cpp similarity index 100% rename from radio/src/gui/colorlcd/timer_setup.cpp rename to radio/src/gui/colorlcd/model/timer_setup.cpp diff --git a/radio/src/gui/colorlcd/timer_setup.h b/radio/src/gui/colorlcd/model/timer_setup.h similarity index 100% rename from radio/src/gui/colorlcd/timer_setup.h rename to radio/src/gui/colorlcd/model/timer_setup.h diff --git a/radio/src/gui/colorlcd/trainer_bluetooth.cpp b/radio/src/gui/colorlcd/model/trainer_bluetooth.cpp similarity index 100% rename from radio/src/gui/colorlcd/trainer_bluetooth.cpp rename to radio/src/gui/colorlcd/model/trainer_bluetooth.cpp diff --git a/radio/src/gui/colorlcd/trainer_bluetooth.h b/radio/src/gui/colorlcd/model/trainer_bluetooth.h similarity index 100% rename from radio/src/gui/colorlcd/trainer_bluetooth.h rename to radio/src/gui/colorlcd/model/trainer_bluetooth.h diff --git a/radio/src/gui/colorlcd/trainer_setup.cpp b/radio/src/gui/colorlcd/model/trainer_setup.cpp similarity index 100% rename from radio/src/gui/colorlcd/trainer_setup.cpp rename to radio/src/gui/colorlcd/model/trainer_setup.cpp diff --git a/radio/src/gui/colorlcd/trainer_setup.h b/radio/src/gui/colorlcd/model/trainer_setup.h similarity index 100% rename from radio/src/gui/colorlcd/trainer_setup.h rename to radio/src/gui/colorlcd/model/trainer_setup.h diff --git a/radio/src/gui/colorlcd/trims_setup.cpp b/radio/src/gui/colorlcd/model/trims_setup.cpp similarity index 100% rename from radio/src/gui/colorlcd/trims_setup.cpp rename to radio/src/gui/colorlcd/model/trims_setup.cpp diff --git a/radio/src/gui/colorlcd/trims_setup.h b/radio/src/gui/colorlcd/model/trims_setup.h similarity index 100% rename from radio/src/gui/colorlcd/trims_setup.h rename to radio/src/gui/colorlcd/model/trims_setup.h diff --git a/radio/src/gui/colorlcd/access_settings.cpp b/radio/src/gui/colorlcd/module/access_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/access_settings.cpp rename to radio/src/gui/colorlcd/module/access_settings.cpp diff --git a/radio/src/gui/colorlcd/access_settings.h b/radio/src/gui/colorlcd/module/access_settings.h similarity index 100% rename from radio/src/gui/colorlcd/access_settings.h rename to radio/src/gui/colorlcd/module/access_settings.h diff --git a/radio/src/gui/colorlcd/afhds2a_settings.cpp b/radio/src/gui/colorlcd/module/afhds2a_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/afhds2a_settings.cpp rename to radio/src/gui/colorlcd/module/afhds2a_settings.cpp diff --git a/radio/src/gui/colorlcd/afhds2a_settings.h b/radio/src/gui/colorlcd/module/afhds2a_settings.h similarity index 100% rename from radio/src/gui/colorlcd/afhds2a_settings.h rename to radio/src/gui/colorlcd/module/afhds2a_settings.h diff --git a/radio/src/gui/colorlcd/afhds3_options.cpp b/radio/src/gui/colorlcd/module/afhds3_options.cpp similarity index 100% rename from radio/src/gui/colorlcd/afhds3_options.cpp rename to radio/src/gui/colorlcd/module/afhds3_options.cpp diff --git a/radio/src/gui/colorlcd/afhds3_options.h b/radio/src/gui/colorlcd/module/afhds3_options.h similarity index 100% rename from radio/src/gui/colorlcd/afhds3_options.h rename to radio/src/gui/colorlcd/module/afhds3_options.h diff --git a/radio/src/gui/colorlcd/afhds3_settings.cpp b/radio/src/gui/colorlcd/module/afhds3_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/afhds3_settings.cpp rename to radio/src/gui/colorlcd/module/afhds3_settings.cpp diff --git a/radio/src/gui/colorlcd/afhds3_settings.h b/radio/src/gui/colorlcd/module/afhds3_settings.h similarity index 100% rename from radio/src/gui/colorlcd/afhds3_settings.h rename to radio/src/gui/colorlcd/module/afhds3_settings.h diff --git a/radio/src/gui/colorlcd/bind_menu_d16.cpp b/radio/src/gui/colorlcd/module/bind_menu_d16.cpp similarity index 100% rename from radio/src/gui/colorlcd/bind_menu_d16.cpp rename to radio/src/gui/colorlcd/module/bind_menu_d16.cpp diff --git a/radio/src/gui/colorlcd/bind_menu_d16.h b/radio/src/gui/colorlcd/module/bind_menu_d16.h similarity index 100% rename from radio/src/gui/colorlcd/bind_menu_d16.h rename to radio/src/gui/colorlcd/module/bind_menu_d16.h diff --git a/radio/src/gui/colorlcd/crossfire_settings.cpp b/radio/src/gui/colorlcd/module/crossfire_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/crossfire_settings.cpp rename to radio/src/gui/colorlcd/module/crossfire_settings.cpp diff --git a/radio/src/gui/colorlcd/crossfire_settings.h b/radio/src/gui/colorlcd/module/crossfire_settings.h similarity index 100% rename from radio/src/gui/colorlcd/crossfire_settings.h rename to radio/src/gui/colorlcd/module/crossfire_settings.h diff --git a/radio/src/gui/colorlcd/custom_failsafe.cpp b/radio/src/gui/colorlcd/module/custom_failsafe.cpp similarity index 99% rename from radio/src/gui/colorlcd/custom_failsafe.cpp rename to radio/src/gui/colorlcd/module/custom_failsafe.cpp index fe30d7adf..332f2c298 100644 --- a/radio/src/gui/colorlcd/custom_failsafe.cpp +++ b/radio/src/gui/colorlcd/module/custom_failsafe.cpp @@ -23,7 +23,7 @@ #include "channel_bar.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/custom_failsafe.h b/radio/src/gui/colorlcd/module/custom_failsafe.h similarity index 100% rename from radio/src/gui/colorlcd/custom_failsafe.h rename to radio/src/gui/colorlcd/module/custom_failsafe.h diff --git a/radio/src/gui/colorlcd/module_setup.cpp b/radio/src/gui/colorlcd/module/module_setup.cpp similarity index 99% rename from radio/src/gui/colorlcd/module_setup.cpp rename to radio/src/gui/colorlcd/module/module_setup.cpp index b24e67c4e..032dbae2b 100644 --- a/radio/src/gui/colorlcd/module_setup.cpp +++ b/radio/src/gui/colorlcd/module/module_setup.cpp @@ -31,7 +31,7 @@ #include "opentx.h" #include "ppm_settings.h" #include "storage/modelslist.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA) #include "pxx1_settings.h" diff --git a/radio/src/gui/colorlcd/module_setup.h b/radio/src/gui/colorlcd/module/module_setup.h similarity index 100% rename from radio/src/gui/colorlcd/module_setup.h rename to radio/src/gui/colorlcd/module/module_setup.h diff --git a/radio/src/gui/colorlcd/mpm_settings.cpp b/radio/src/gui/colorlcd/module/mpm_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/mpm_settings.cpp rename to radio/src/gui/colorlcd/module/mpm_settings.cpp diff --git a/radio/src/gui/colorlcd/mpm_settings.h b/radio/src/gui/colorlcd/module/mpm_settings.h similarity index 100% rename from radio/src/gui/colorlcd/mpm_settings.h rename to radio/src/gui/colorlcd/module/mpm_settings.h diff --git a/radio/src/gui/colorlcd/multi_rfprotos.cpp b/radio/src/gui/colorlcd/module/multi_rfprotos.cpp similarity index 100% rename from radio/src/gui/colorlcd/multi_rfprotos.cpp rename to radio/src/gui/colorlcd/module/multi_rfprotos.cpp diff --git a/radio/src/gui/colorlcd/multi_rfprotos.h b/radio/src/gui/colorlcd/module/multi_rfprotos.h similarity index 100% rename from radio/src/gui/colorlcd/multi_rfprotos.h rename to radio/src/gui/colorlcd/module/multi_rfprotos.h diff --git a/radio/src/gui/colorlcd/ppm_settings.cpp b/radio/src/gui/colorlcd/module/ppm_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/ppm_settings.cpp rename to radio/src/gui/colorlcd/module/ppm_settings.cpp diff --git a/radio/src/gui/colorlcd/ppm_settings.h b/radio/src/gui/colorlcd/module/ppm_settings.h similarity index 100% rename from radio/src/gui/colorlcd/ppm_settings.h rename to radio/src/gui/colorlcd/module/ppm_settings.h diff --git a/radio/src/gui/colorlcd/pxx1_settings.cpp b/radio/src/gui/colorlcd/module/pxx1_settings.cpp similarity index 100% rename from radio/src/gui/colorlcd/pxx1_settings.cpp rename to radio/src/gui/colorlcd/module/pxx1_settings.cpp diff --git a/radio/src/gui/colorlcd/pxx1_settings.h b/radio/src/gui/colorlcd/module/pxx1_settings.h similarity index 100% rename from radio/src/gui/colorlcd/pxx1_settings.h rename to radio/src/gui/colorlcd/module/pxx1_settings.h diff --git a/radio/src/gui/colorlcd/hw_bluetooth.cpp b/radio/src/gui/colorlcd/radio/hw_bluetooth.cpp similarity index 100% rename from radio/src/gui/colorlcd/hw_bluetooth.cpp rename to radio/src/gui/colorlcd/radio/hw_bluetooth.cpp diff --git a/radio/src/gui/colorlcd/hw_bluetooth.h b/radio/src/gui/colorlcd/radio/hw_bluetooth.h similarity index 100% rename from radio/src/gui/colorlcd/hw_bluetooth.h rename to radio/src/gui/colorlcd/radio/hw_bluetooth.h diff --git a/radio/src/gui/colorlcd/hw_extmodule.cpp b/radio/src/gui/colorlcd/radio/hw_extmodule.cpp similarity index 100% rename from radio/src/gui/colorlcd/hw_extmodule.cpp rename to radio/src/gui/colorlcd/radio/hw_extmodule.cpp diff --git a/radio/src/gui/colorlcd/hw_extmodule.h b/radio/src/gui/colorlcd/radio/hw_extmodule.h similarity index 100% rename from radio/src/gui/colorlcd/hw_extmodule.h rename to radio/src/gui/colorlcd/radio/hw_extmodule.h diff --git a/radio/src/gui/colorlcd/hw_inputs.cpp b/radio/src/gui/colorlcd/radio/hw_inputs.cpp similarity index 100% rename from radio/src/gui/colorlcd/hw_inputs.cpp rename to radio/src/gui/colorlcd/radio/hw_inputs.cpp diff --git a/radio/src/gui/colorlcd/hw_inputs.h b/radio/src/gui/colorlcd/radio/hw_inputs.h similarity index 100% rename from radio/src/gui/colorlcd/hw_inputs.h rename to radio/src/gui/colorlcd/radio/hw_inputs.h diff --git a/radio/src/gui/colorlcd/hw_intmodule.cpp b/radio/src/gui/colorlcd/radio/hw_intmodule.cpp similarity index 100% rename from radio/src/gui/colorlcd/hw_intmodule.cpp rename to radio/src/gui/colorlcd/radio/hw_intmodule.cpp diff --git a/radio/src/gui/colorlcd/hw_intmodule.h b/radio/src/gui/colorlcd/radio/hw_intmodule.h similarity index 100% rename from radio/src/gui/colorlcd/hw_intmodule.h rename to radio/src/gui/colorlcd/radio/hw_intmodule.h diff --git a/radio/src/gui/colorlcd/hw_serial.cpp b/radio/src/gui/colorlcd/radio/hw_serial.cpp similarity index 100% rename from radio/src/gui/colorlcd/hw_serial.cpp rename to radio/src/gui/colorlcd/radio/hw_serial.cpp diff --git a/radio/src/gui/colorlcd/hw_serial.h b/radio/src/gui/colorlcd/radio/hw_serial.h similarity index 100% rename from radio/src/gui/colorlcd/hw_serial.h rename to radio/src/gui/colorlcd/radio/hw_serial.h diff --git a/radio/src/gui/colorlcd/menu_radio.cpp b/radio/src/gui/colorlcd/radio/menu_radio.cpp similarity index 100% rename from radio/src/gui/colorlcd/menu_radio.cpp rename to radio/src/gui/colorlcd/radio/menu_radio.cpp diff --git a/radio/src/gui/colorlcd/menu_radio.h b/radio/src/gui/colorlcd/radio/menu_radio.h similarity index 100% rename from radio/src/gui/colorlcd/menu_radio.h rename to radio/src/gui/colorlcd/radio/menu_radio.h diff --git a/radio/src/gui/colorlcd/preview_window.cpp b/radio/src/gui/colorlcd/radio/preview_window.cpp similarity index 99% rename from radio/src/gui/colorlcd/preview_window.cpp rename to radio/src/gui/colorlcd/radio/preview_window.cpp index 30104bec8..01dc9a752 100644 --- a/radio/src/gui/colorlcd/preview_window.cpp +++ b/radio/src/gui/colorlcd/radio/preview_window.cpp @@ -24,7 +24,7 @@ #include "libopenui.h" #include "opentx.h" #include "sliders.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "trims.h" #include "topbar_impl.h" diff --git a/radio/src/gui/colorlcd/preview_window.h b/radio/src/gui/colorlcd/radio/preview_window.h similarity index 100% rename from radio/src/gui/colorlcd/preview_window.h rename to radio/src/gui/colorlcd/radio/preview_window.h diff --git a/radio/src/gui/colorlcd/radio_calibration.cpp b/radio/src/gui/colorlcd/radio/radio_calibration.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_calibration.cpp rename to radio/src/gui/colorlcd/radio/radio_calibration.cpp diff --git a/radio/src/gui/colorlcd/radio_calibration.h b/radio/src/gui/colorlcd/radio/radio_calibration.h similarity index 100% rename from radio/src/gui/colorlcd/radio_calibration.h rename to radio/src/gui/colorlcd/radio/radio_calibration.h diff --git a/radio/src/gui/colorlcd/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio/radio_diaganas.cpp similarity index 99% rename from radio/src/gui/colorlcd/radio_diaganas.cpp rename to radio/src/gui/colorlcd/radio/radio_diaganas.cpp index a73f6257f..a256e8d34 100644 --- a/radio/src/gui/colorlcd/radio_diaganas.cpp +++ b/radio/src/gui/colorlcd/radio/radio_diaganas.cpp @@ -24,7 +24,7 @@ #include "hal/adc_driver.h" #include "libopenui.h" #include "opentx.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" // #if defined(IMU_LSM6DS33) // #include "imu_lsm6ds33.h" diff --git a/radio/src/gui/colorlcd/radio_diaganas.h b/radio/src/gui/colorlcd/radio/radio_diaganas.h similarity index 100% rename from radio/src/gui/colorlcd/radio_diaganas.h rename to radio/src/gui/colorlcd/radio/radio_diaganas.h diff --git a/radio/src/gui/colorlcd/radio_diagcustswitches.cpp b/radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_diagcustswitches.cpp rename to radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp diff --git a/radio/src/gui/colorlcd/radio_diagcustswitches.h b/radio/src/gui/colorlcd/radio/radio_diagcustswitches.h similarity index 100% rename from radio/src/gui/colorlcd/radio_diagcustswitches.h rename to radio/src/gui/colorlcd/radio/radio_diagcustswitches.h diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_diagkeys.cpp rename to radio/src/gui/colorlcd/radio/radio_diagkeys.cpp diff --git a/radio/src/gui/colorlcd/radio_diagkeys.h b/radio/src/gui/colorlcd/radio/radio_diagkeys.h similarity index 100% rename from radio/src/gui/colorlcd/radio_diagkeys.h rename to radio/src/gui/colorlcd/radio/radio_diagkeys.h diff --git a/radio/src/gui/colorlcd/radio_ghost_module_config.cpp b/radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_ghost_module_config.cpp rename to radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp diff --git a/radio/src/gui/colorlcd/radio_ghost_module_config.h b/radio/src/gui/colorlcd/radio/radio_ghost_module_config.h similarity index 100% rename from radio/src/gui/colorlcd/radio_ghost_module_config.h rename to radio/src/gui/colorlcd/radio/radio_ghost_module_config.h diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio/radio_hardware.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_hardware.cpp rename to radio/src/gui/colorlcd/radio/radio_hardware.cpp diff --git a/radio/src/gui/colorlcd/radio_hardware.h b/radio/src/gui/colorlcd/radio/radio_hardware.h similarity index 100% rename from radio/src/gui/colorlcd/radio_hardware.h rename to radio/src/gui/colorlcd/radio/radio_hardware.h diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp similarity index 99% rename from radio/src/gui/colorlcd/radio_sdmanager.cpp rename to radio/src/gui/colorlcd/radio/radio_sdmanager.cpp index 73a914202..36bbc6b0f 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp @@ -22,7 +22,7 @@ #include "radio_sdmanager.h" #include "opentx.h" #include "libopenui.h" -#include "gui/colorlcd/LvglWrapper.h" +#include "LvglWrapper.h" #include "io/frsky_firmware_update.h" #include "io/multi_firmware_update.h" #include "io/bootloader_flash.h" @@ -32,7 +32,7 @@ #include "file_preview.h" #include "file_browser.h" #include "progress.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "fullscreen_dialog.h" constexpr int WARN_FILE_LENGTH = 40 * 1024; diff --git a/radio/src/gui/colorlcd/radio_sdmanager.h b/radio/src/gui/colorlcd/radio/radio_sdmanager.h similarity index 100% rename from radio/src/gui/colorlcd/radio_sdmanager.h rename to radio/src/gui/colorlcd/radio/radio_sdmanager.h diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio/radio_setup.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_setup.cpp rename to radio/src/gui/colorlcd/radio/radio_setup.cpp diff --git a/radio/src/gui/colorlcd/radio_setup.h b/radio/src/gui/colorlcd/radio/radio_setup.h similarity index 100% rename from radio/src/gui/colorlcd/radio_setup.h rename to radio/src/gui/colorlcd/radio/radio_setup.h diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_spectrum_analyser.cpp rename to radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.h b/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.h similarity index 100% rename from radio/src/gui/colorlcd/radio_spectrum_analyser.h rename to radio/src/gui/colorlcd/radio/radio_spectrum_analyser.h diff --git a/radio/src/gui/colorlcd/radio_theme.cpp b/radio/src/gui/colorlcd/radio/radio_theme.cpp similarity index 99% rename from radio/src/gui/colorlcd/radio_theme.cpp rename to radio/src/gui/colorlcd/radio/radio_theme.cpp index abad386d3..ea607b339 100644 --- a/radio/src/gui/colorlcd/radio_theme.cpp +++ b/radio/src/gui/colorlcd/radio/radio_theme.cpp @@ -28,7 +28,7 @@ #include "opentx.h" #include "page.h" #include "preview_window.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" class ThemeColorPreview : public Window { diff --git a/radio/src/gui/colorlcd/radio_theme.h b/radio/src/gui/colorlcd/radio/radio_theme.h similarity index 100% rename from radio/src/gui/colorlcd/radio_theme.h rename to radio/src/gui/colorlcd/radio/radio_theme.h diff --git a/radio/src/gui/colorlcd/radio_tools.cpp b/radio/src/gui/colorlcd/radio/radio_tools.cpp similarity index 99% rename from radio/src/gui/colorlcd/radio_tools.cpp rename to radio/src/gui/colorlcd/radio/radio_tools.cpp index d3a437df8..2948c5bb6 100644 --- a/radio/src/gui/colorlcd/radio_tools.cpp +++ b/radio/src/gui/colorlcd/radio/radio_tools.cpp @@ -30,7 +30,7 @@ #include "radio_ghost_module_config.h" #include "radio_spectrum_analyser.h" #include "standalone_lua.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/colorlcd/radio_tools.h b/radio/src/gui/colorlcd/radio/radio_tools.h similarity index 100% rename from radio/src/gui/colorlcd/radio_tools.h rename to radio/src/gui/colorlcd/radio/radio_tools.h diff --git a/radio/src/gui/colorlcd/radio_trainer.cpp b/radio/src/gui/colorlcd/radio/radio_trainer.cpp similarity index 100% rename from radio/src/gui/colorlcd/radio_trainer.cpp rename to radio/src/gui/colorlcd/radio/radio_trainer.cpp diff --git a/radio/src/gui/colorlcd/radio_trainer.h b/radio/src/gui/colorlcd/radio/radio_trainer.h similarity index 100% rename from radio/src/gui/colorlcd/radio_trainer.h rename to radio/src/gui/colorlcd/radio/radio_trainer.h diff --git a/radio/src/gui/colorlcd/radio_version.cpp b/radio/src/gui/colorlcd/radio/radio_version.cpp similarity index 99% rename from radio/src/gui/colorlcd/radio_version.cpp rename to radio/src/gui/colorlcd/radio/radio_version.cpp index 7f5427487..651f6b564 100644 --- a/radio/src/gui/colorlcd/radio_version.cpp +++ b/radio/src/gui/colorlcd/radio/radio_version.cpp @@ -26,7 +26,7 @@ #include "libopenui.h" #include "opentx.h" #include "options.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #if defined(CROSSFIRE) #include "mixer_scheduler.h" diff --git a/radio/src/gui/colorlcd/radio_version.h b/radio/src/gui/colorlcd/radio/radio_version.h similarity index 100% rename from radio/src/gui/colorlcd/radio_version.h rename to radio/src/gui/colorlcd/radio/radio_version.h diff --git a/radio/src/gui/colorlcd/theme_manager.cpp b/radio/src/gui/colorlcd/themes/theme_manager.cpp similarity index 99% rename from radio/src/gui/colorlcd/theme_manager.cpp rename to radio/src/gui/colorlcd/themes/theme_manager.cpp index b3de31e07..a41b0f02d 100644 --- a/radio/src/gui/colorlcd/theme_manager.cpp +++ b/radio/src/gui/colorlcd/themes/theme_manager.cpp @@ -24,7 +24,7 @@ #include "../../storage/sdcard_common.h" #include "../../storage/yaml/yaml_bits.h" #include "../../storage/yaml/yaml_tree_walker.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #include "topbar_impl.h" #include "view_main.h" #include "storage/sdcard_yaml.h" diff --git a/radio/src/gui/colorlcd/theme_manager.h b/radio/src/gui/colorlcd/themes/theme_manager.h similarity index 100% rename from radio/src/gui/colorlcd/theme_manager.h rename to radio/src/gui/colorlcd/themes/theme_manager.h diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index c1d7cb1cc..f72641410 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -24,7 +24,7 @@ #include "io/frsky_firmware_update.h" #include "io/multi_firmware_update.h" #include "io/bootloader_flash.h" -#include "libopenui/src/libopenui_file.h" +#include "lib_file.h" #include "hal/storage.h" #define NODE_TYPE(fname) fname[SD_SCREEN_FILE_LENGTH+1] diff --git a/radio/src/io/bootloader_flash.cpp b/radio/src/io/bootloader_flash.cpp index 69401ce91..b25919ebe 100644 --- a/radio/src/io/bootloader_flash.cpp +++ b/radio/src/io/bootloader_flash.cpp @@ -31,7 +31,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif bool isBootloader(const char * filename) diff --git a/radio/src/io/frsky_firmware_update.cpp b/radio/src/io/frsky_firmware_update.cpp index f6cd833d4..edb418afb 100644 --- a/radio/src/io/frsky_firmware_update.cpp +++ b/radio/src/io/frsky_firmware_update.cpp @@ -29,7 +29,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif #include "hal/module_port.h" diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp index fdaf864c0..cf8c44a1d 100644 --- a/radio/src/io/multi_firmware_update.cpp +++ b/radio/src/io/multi_firmware_update.cpp @@ -38,7 +38,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif #if defined(MULTI_PROTOLIST) diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.cpp b/radio/src/lib_file.cpp similarity index 99% rename from radio/src/thirdparty/libopenui/src/libopenui_file.cpp rename to radio/src/lib_file.cpp index 20db6690c..5e2bc415c 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_file.cpp +++ b/radio/src/lib_file.cpp @@ -16,7 +16,7 @@ * GNU General Public License for more details. */ -#include "libopenui_file.h" +#include "lib_file.h" #include #include diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.h b/radio/src/lib_file.h similarity index 100% rename from radio/src/thirdparty/libopenui/src/libopenui_file.h rename to radio/src/lib_file.h diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp index e3fa2db94..56a3b5880 100644 --- a/radio/src/lua/interface.cpp +++ b/radio/src/lua/interface.cpp @@ -42,7 +42,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif extern "C" { diff --git a/radio/src/lua/lua_widget_factory.h b/radio/src/lua/lua_widget_factory.h index b37a26c98..f4e763269 100644 --- a/radio/src/lua/lua_widget_factory.h +++ b/radio/src/lua/lua_widget_factory.h @@ -21,7 +21,7 @@ #pragma once -#include "gui/colorlcd/widget.h" +#include "widget.h" class LuaWidgetFactory : public WidgetFactory { diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp index f7746c89f..ba0ade164 100644 --- a/radio/src/lua/widgets.cpp +++ b/radio/src/lua/widgets.cpp @@ -26,7 +26,7 @@ #include "lua_api.h" #include "widget.h" -#include "libopenui_file.h" +#include "lib_file.h" #include "view_main.h" #include "lua_widget.h" diff --git a/radio/src/main.cpp b/radio/src/main.cpp index a7cdbae9b..c55511541 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -27,11 +27,11 @@ #if defined(LIBOPENUI) #include "libopenui.h" -#include "gui/colorlcd/LvglWrapper.h" -#include "gui/colorlcd/view_main.h" +#include "LvglWrapper.h" +#include "view_main.h" #include "startup_shutdown.h" #include "theme_manager.h" -#include "themes/etx_lv_theme.h" +#include "etx_lv_theme.h" #endif #if defined(CLI) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index fef8f775a..5621ff0fd 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -23,7 +23,7 @@ #define _MYEEPROM_H_ #include "datastructs.h" -#include "libopenui/src/bitfield.h" +#include "bitfield.h" #include "storage/yaml/yaml_defs.h" #include "hal/switch_driver.h" diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 66ce3b3d1..8b5183a93 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -57,7 +57,7 @@ #include "switch_warn_dialog.h" #include "startup_shutdown.h" - #include "gui/colorlcd/LvglWrapper.h" + #include "LvglWrapper.h" #endif #if defined(CROSSFIRE) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 41c51e05b..8680200ea 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -41,7 +41,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif #if defined(FAI) diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h index 26f7f32ef..b884ed09c 100644 --- a/radio/src/pulses/afhds3.h +++ b/radio/src/pulses/afhds3.h @@ -21,7 +21,7 @@ #pragma once -#include "libopenui/src/bitfield.h" +#include "bitfield.h" #include "definitions.h" #include "dataconstants.h" #include "opentx_types.h" diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 034e25b03..512f45401 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/radio/src/pulses/modules_helpers.h @@ -21,7 +21,7 @@ #pragma once -#include "libopenui/src/bitfield.h" +#include "bitfield.h" #include "definitions.h" #include "opentx_helpers.h" #include "storage/storage.h" diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp index 5ae7a0acd..96d34d202 100644 --- a/radio/src/pulses/pxx2.cpp +++ b/radio/src/pulses/pxx2.cpp @@ -22,7 +22,7 @@ #include #include "opentx.h" #include "io/frsky_firmware_update.h" -#include "libopenui/src/libopenui_file.h" +#include "lib_file.h" #include "mixer_scheduler.h" #include "heartbeat_driver.h" #include "timers_driver.h" diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index 28abefa30..982285a80 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -30,7 +30,7 @@ #if defined(LIBOPENUI) #include "libopenui.h" #else - #include "libopenui/src/libopenui_file.h" + #include "lib_file.h" #endif #if FF_MAX_SS != FF_MIN_SS diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt index 7d6e20a9e..31f74595c 100644 --- a/radio/src/targets/simu/CMakeLists.txt +++ b/radio/src/targets/simu/CMakeLists.txt @@ -66,7 +66,7 @@ if(SIMU_BOOTLOADER) ../../targets/common/arm/stm32/bootloader/bin_files.cpp ../../targets/common/arm/stm32/bootloader/boot.cpp ../../targets/${TARGET_DIR}/bootloader/boot_menu.cpp - ../../thirdparty/libopenui/thirdparty/lz4/lz4.c + ../../thirdparty/lz4/lz4.c ) endif() diff --git a/radio/src/thirdparty/libopenui/.clang-format b/radio/src/thirdparty/libopenui/.clang-format deleted file mode 100644 index 913141780..000000000 --- a/radio/src/thirdparty/libopenui/.clang-format +++ /dev/null @@ -1,6 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -BreakBeforeBraces: Linux -BreakConstructorInitializers: AfterColon -... diff --git a/radio/src/thirdparty/libopenui/.gitignore b/radio/src/thirdparty/libopenui/.gitignore deleted file mode 100644 index e5d594669..000000000 --- a/radio/src/thirdparty/libopenui/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src/thirdparty/stb/ diff --git a/radio/src/thirdparty/libopenui/.gitmodules b/radio/src/thirdparty/libopenui/.gitmodules deleted file mode 100644 index 825bab72f..000000000 --- a/radio/src/thirdparty/libopenui/.gitmodules +++ /dev/null @@ -1,7 +0,0 @@ -[submodule "thirdparty/stb"] - path = thirdparty/stb - url = https://github.com/nothings/stb.git -[submodule "thirdparty/lvgl"] - path = thirdparty/lvgl - url = https://github.com/EdgeTX/lvgl.git - branch = release/v8.2 diff --git a/radio/src/thirdparty/libopenui/.idea/codeStyles/Project.xml b/radio/src/thirdparty/libopenui/.idea/codeStyles/Project.xml deleted file mode 100644 index efad3ce27..000000000 --- a/radio/src/thirdparty/libopenui/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui/.idea/codeStyles/codeStyleConfig.xml b/radio/src/thirdparty/libopenui/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c2..000000000 --- a/radio/src/thirdparty/libopenui/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui/LICENSE b/radio/src/thirdparty/libopenui/LICENSE deleted file mode 100644 index d159169d1..000000000 --- a/radio/src/thirdparty/libopenui/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/radio/src/thirdparty/libopenui/README.md b/radio/src/thirdparty/libopenui/README.md deleted file mode 100644 index 6d17b6d92..000000000 --- a/radio/src/thirdparty/libopenui/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# libopenui -C++ UI Library primarily used in EdgeTX for Colour LCD targets. - -Was forked from [OpenTX/libopenui](https://github.com/opentx/libopenui) and detached so that contributors can easily work on both if they wish to do so. diff --git a/radio/src/thirdparty/libopenui/src/CMakeLists.txt b/radio/src/thirdparty/libopenui/src/CMakeLists.txt deleted file mode 100644 index 588fa50a8..000000000 --- a/radio/src/thirdparty/libopenui/src/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -if(HARDWARE_KEYS) - add_definitions(-DHARDWARE_KEYS) -endif() - -if(HARWARE_TOUCH) - add_definitions(-DHARDWARE_TOUCH) -endif() - -set(LIBOPENUI_SOURCES - libopenui_file.cpp - bitmapbuffer.cpp - bitmapbuffer_fileio.cpp - bitmapbuffer_draw_extra.cpp - window.cpp - layer.cpp - form.cpp - button.cpp - button_matrix.cpp - static.cpp - toggleswitch.cpp - slider.cpp - mainwindow.cpp - menu.cpp - menutoolbar.cpp - choice.cpp - filechoice.cpp - numberedit.cpp - textedit.cpp - progress.cpp - table.cpp - modal_window.cpp - dialog.cpp - keyboard_text.cpp - keyboard_number.cpp - keyboard_base.cpp - ) - -list(TRANSFORM LIBOPENUI_SOURCES PREPEND ${LIBOPENUI_SRC_DIR}/src/) - -set(LIBOPENUI_SOURCES ${LIBOPENUI_SOURCES} - ${LIBOPENUI_SRC_DIR}/thirdparty/lz4/lz4.c -) diff --git a/radio/src/thirdparty/libopenui/thirdparty/lvgl b/radio/src/thirdparty/lvgl similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lvgl rename to radio/src/thirdparty/lvgl diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/LICENSE b/radio/src/thirdparty/lz4/LICENSE similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/LICENSE rename to radio/src/thirdparty/lz4/LICENSE diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/README.md b/radio/src/thirdparty/lz4/README.md similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/README.md rename to radio/src/thirdparty/lz4/README.md diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/lz4.c b/radio/src/thirdparty/lz4/lz4.c similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/lz4.c rename to radio/src/thirdparty/lz4/lz4.c diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/lz4.h b/radio/src/thirdparty/lz4/lz4.h similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/lz4.h rename to radio/src/thirdparty/lz4/lz4.h diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/lz4hc.c b/radio/src/thirdparty/lz4/lz4hc.c similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/lz4hc.c rename to radio/src/thirdparty/lz4/lz4hc.c diff --git a/radio/src/thirdparty/libopenui/thirdparty/lz4/lz4hc.h b/radio/src/thirdparty/lz4/lz4hc.h similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/lz4/lz4hc.h rename to radio/src/thirdparty/lz4/lz4hc.h diff --git a/radio/src/thirdparty/libopenui/thirdparty/stb b/radio/src/thirdparty/stb similarity index 100% rename from radio/src/thirdparty/libopenui/thirdparty/stb rename to radio/src/thirdparty/stb diff --git a/radio/src/thirdparty/libopenui/tools/encode-bitmap.py b/radio/util/encode-bitmap.py similarity index 100% rename from radio/src/thirdparty/libopenui/tools/encode-bitmap.py rename to radio/util/encode-bitmap.py