diff --git a/cmake/Bitmaps.cmake b/cmake/Bitmaps.cmake index d7c846a30..48818edae 100644 --- a/cmake/Bitmaps.cmake +++ b/cmake/Bitmaps.cmake @@ -1,18 +1,3 @@ -set(FONT "Roboto/Roboto-Regular") -set(FONT_BOLD "Roboto/Roboto-Bold") -set(FONT_OFFSET 1) -set(CJK_FONT "Noto/NotoSansCJKsc-Regular") -set(CJK_FONT_BOLD "Noto/NotoSansCJKsc-Bold") -set(CJK_FONT_OFFSET -3) - -#set(FONT "Kanit/Kanit-Regular") -#set(FONT_BOLD "Kanit/Kanit-Bold") -#set(FONT_OFFSET -2) - -#set(FONT "Ubuntu/Ubuntu-Regular") -#set(FONT_BOLD "Ubuntu/Ubuntu-Bold") -#set(FONT_OFFSET 1) - macro(add_bitmaps_target targetname filter format args) set(bitmaps_files) file(GLOB bitmaps ${filter}) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 91449345d..8b8239460 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -504,11 +504,7 @@ if(NOT MSVC) set(SRC ${SRC} bin_allocator.cpp) endif() - if(BOOTLOADER) - add_subdirectory(targets/common/arm/stm32/bootloader) - include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/common/arm/stm32/bootloader) - set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} bootloader) - elseif(OPENRC_BOOTLOADER) + if(OPENRC_BOOTLOADER) # We fetch Mike's bootloader as it is not included inside OpenTX message(STATUS "Downloading Mike's bootloader: https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/${OPENRC_BOOTLOADER}") file(DOWNLOAD https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/${OPENRC_BOOTLOADER} ${CMAKE_CURRENT_BINARY_DIR}/bootloader.lbm STATUS status) @@ -517,6 +513,10 @@ if(NOT MSVC) list(GET status 1 error_message) message(FATAL_ERROR "Download failed: ${error_message}") endif() + elseif(BOOTLOADER) + add_subdirectory(targets/common/arm/stm32/bootloader) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/common/arm/stm32/bootloader) + set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} bootloader) endif() add_definitions(-DRTOS_COOS) diff --git a/radio/src/fonts/CMakeLists.txt b/radio/src/fonts/CMakeLists.txt index 33625a3fe..fe84892cd 100644 --- a/radio/src/fonts/CMakeLists.txt +++ b/radio/src/fonts/CMakeLists.txt @@ -1,3 +1,18 @@ +set(FONT "Roboto/Roboto-Regular") +set(FONT_BOLD "Roboto/Roboto-Bold") +set(FONT_OFFSET 1) +set(CJK_FONT "Noto/NotoSansCJKsc-Regular") +set(CJK_FONT_BOLD "Noto/NotoSansCJKsc-Bold") +set(CJK_FONT_OFFSET -3) + +#set(FONT "Kanit/Kanit-Regular") +#set(FONT_BOLD "Kanit/Kanit-Bold") +#set(FONT_OFFSET -2) + +#set(FONT "Ubuntu/Ubuntu-Regular") +#set(FONT_BOLD "Ubuntu/Ubuntu-Bold") +#set(FONT_OFFSET 1) + if(TRANSLATIONS STREQUAL CN) set(subset all) else() diff --git a/radio/src/gui/colorlcd/screens_setup_old.cpp b/radio/src/gui/colorlcd/screens_setup_old.cpp index cc89330cf..21fe29e6f 100644 --- a/radio/src/gui/colorlcd/screens_setup_old.cpp +++ b/radio/src/gui/colorlcd/screens_setup_old.cpp @@ -296,10 +296,10 @@ bool menuWidgetChoice(event_t event) currentScreen->refresh(); Zone zone = currentContainer->getZone(currentZone); - lcdDrawFilledRect(0, 0, zone.x-2, LCD_H, SOLID, OVERLAY_COLOR | (8<<24)); - lcdDrawFilledRect(zone.x+zone.w+2, 0, LCD_W-zone.x-zone.w-2, LCD_H, SOLID, OVERLAY_COLOR | (8<<24)); - lcdDrawFilledRect(zone.x-2, 0, zone.w+4, zone.y-2, SOLID, OVERLAY_COLOR | (8<<24)); - lcdDrawFilledRect(zone.x-2, zone.y+zone.h+2, zone.w+4, LCD_H-zone.y-zone.h-2, SOLID, OVERLAY_COLOR | (8<<24)); + lcdDrawFilledRect(0, 0, zone.x-2, LCD_H, SOLID, OVERLAY_COLOR | OPACITY(8)); + lcdDrawFilledRect(zone.x+zone.w+2, 0, LCD_W-zone.x-zone.w-2, LCD_H, SOLID, OVERLAY_COLOR | OPACITY(8)); + lcdDrawFilledRect(zone.x-2, 0, zone.w+4, zone.y-2, SOLID, OVERLAY_COLOR | OPACITY(8)); + lcdDrawFilledRect(zone.x-2, zone.y+zone.h+2, zone.w+4, LCD_H-zone.y-zone.h-2, SOLID, OVERLAY_COLOR | OPACITY(8)); if (currentWidget) currentWidget->refresh(); diff --git a/radio/src/gui/colorlcd/theme.cpp b/radio/src/gui/colorlcd/theme.cpp index dcfa0ff5c..80042a4af 100644 --- a/radio/src/gui/colorlcd/theme.cpp +++ b/radio/src/gui/colorlcd/theme.cpp @@ -93,7 +93,7 @@ void ThemeBase::drawThumb(BitmapBuffer * dc, coord_t x, coord_t y, uint32_t flag } lcd->drawBitmap(x, y, thumb); if (flags == LINE_COLOR) { - dc->drawFilledRect(x, y, THUMB_WIDTH, THUMB_HEIGHT, SOLID, OVERLAY_COLOR | OPACITY(10)); + dc->drawFilledRect(x, y, THUMB_WIDTH, THUMB_HEIGHT, SOLID, OVERLAY_COLOR); } } diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index eaf640636..ad663f7c1 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -354,7 +354,7 @@ void menuRadioSdManager(event_t _event) break; } #endif - TCHAR lfn[_MAX_LFN + 1]; + TCHAR lfn[FF_MAX_LFN + 1]; getSelectionFullPath(lfn); if (SD_CARD_PRESENT() && s_editMode <= 0) { diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 0889cf59e..2d2a68012 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -18,8 +18,8 @@ * GNU General Public License for more details. */ -#include #include "opentx.h" +#include #if defined(LIBOPENUI) // #include "shutdown_animation.h" diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 90e748fd4..d864b2b58 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -78,8 +78,6 @@ const char RADIO_SETTINGS_YAML_PATH[] = RADIO_PATH "/radio.yml"; #define MULTI_FIRMWARE_EXT ".bin" #define YAML_EXT ".yml" -#define LEN_FILE_EXTENSION_MAX 5 // longest used, including the dot, excluding null term. - #if defined(COLORLCD) #define BITMAPS_EXT BMP_EXT JPG_EXT PNG_EXT #define LEN_BITMAPS_EXT 4 diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index d228cd003..7ef33ceef 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -161,6 +161,8 @@ constexpr coord_t SCROLLBAR_WIDTH = 3; constexpr coord_t TABLE_LINE_HEIGHT = 50; constexpr coord_t TABLE_HEADER_HEIGHT = 48; +constexpr LcdFlags MENU_HEADER_FONT = FONT(BOLD); +constexpr LcdFlags MENU_FONT = FONT(STD); constexpr LcdFlags TABLE_HEADER_FONT = FONT(STD); constexpr LcdFlags TABLE_BODY_FONT = FONT(STD); diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index b51e94dc2..3452ecd59 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -161,6 +161,8 @@ constexpr coord_t SCROLLBAR_WIDTH = 3; constexpr coord_t TABLE_LINE_HEIGHT = 50; constexpr coord_t TABLE_HEADER_HEIGHT = 48; +constexpr LcdFlags MENU_HEADER_FONT = FONT(BOLD); +constexpr LcdFlags MENU_FONT = FONT(STD); constexpr LcdFlags TABLE_HEADER_FONT = FONT(STD); constexpr LcdFlags TABLE_BODY_FONT = FONT(STD); diff --git a/radio/src/targets/sky9x/CMakeLists.txt b/radio/src/targets/sky9x/CMakeLists.txt index 36de9dcc9..a5d839fa1 100644 --- a/radio/src/targets/sky9x/CMakeLists.txt +++ b/radio/src/targets/sky9x/CMakeLists.txt @@ -7,6 +7,7 @@ set(STORAGE EEPROM) set(STORAGE_FORMAT RAW) set(GUI_DIR 128x64) set(NAVIGATION_TYPE 9x) +set(BITMAPS_TARGET 9x_bitmaps) set(TARGET_DIR sky9x) set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} 9x_bitmaps) set(PPM_LIMITS_SYMETRICAL YES) diff --git a/radio/src/targets/sky9x/audio_driver.h b/radio/src/targets/sky9x/audio_driver.h index dc2e14008..1a9198efa 100644 --- a/radio/src/targets/sky9x/audio_driver.h +++ b/radio/src/targets/sky9x/audio_driver.h @@ -21,8 +21,8 @@ #ifndef _AUDIO_DRIVER_H_ #define _AUDIO_DRIVER_H_ -void audioInit( void ) ; -void audioEnd( void ) ; +void audioInit() ; +void audioEnd() ; void audioConsumeCurrentBuffer(); #define audioDisableIrq() __disable_irq() #define audioEnableIrq() __enable_irq() diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index fcabf7e06..aa0c2f149 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit fcabf7e0654ee7ca5aaf2ac50c8fbe338a5fb19d +Subproject commit aa0c2f1496faa22fa4d0abf579c67b7eaf4f177b diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f0508ed75..f17c9887c 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -666,7 +666,6 @@ const char STR_REG_OK[] = TR_REG_OK; const char STR_BIND_OK[] = TR_BIND_OK; #endif -#if defined(MULTIMODULE) const char STR_MULTI_CUSTOM[] = TR_MULTI_CUSTOM; const char STR_MULTI_RFTUNE[] = TR_MULTI_RFTUNE; const char STR_MULTI_TELEMETRY[] = TR_MULTI_TELEMETRY; @@ -688,7 +687,6 @@ const char STR_MULTI_SERVOFREQ[] = TR_MULTI_SERVOFREQ; const char STR_NEEDS_FILE[] = TR_NEEDS_FILE; const char STR_EXT_MULTI_SPEC[] = TR_EXT_MULTI_SPEC; const char STR_INT_MULTI_SPEC[] = TR_INT_MULTI_SPEC; -#endif #if LCD_W < 212 const char STR_SUBTYPE[] = TR_SUBTYPE;