Menu overlay

2019-11-29 09:04:06 +01:00
parent 88222340c4
commit 54e2221535
14 changed files with 35 additions and 34 deletions
@@ -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})
@@ -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)
@@ -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()
@@ -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();
@@ -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);
  }
 }

@@ -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) {
@@ -18,8 +18,8 @@
 * GNU General Public License for more details.
 */

-#include <io/frsky_firmware_update.h>
 #include "opentx.h"
+#include <io/frsky_firmware_update.h>

 #if defined(LIBOPENUI)
 // #include "shutdown_animation.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
@@ -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);

@@ -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);

@@ -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)
@@ -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()
@@ -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;