piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Some improvements

Browse Source
This commit is contained in:
3djc
2020-04-29 12:05:25 +02:00
parent 3d9256e555
commit 5d0805c665
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/radio_diaganas.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ bool menuRadioDiagAnalogs(event_t event)
#endif
}
#if (NUM_PWMSTICKS > 0) || defined(SIMU)
#if defined(SIMU) || NUM_PWMSTICKS > 0
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 8 * FH, STICKS_PWM_ENABLED() ? "Sticks: PWM" : "Sticks: ANA");
#endif
radio/src/gui/480x272/radio_hardware.cpp
+1 -1
View File
@@ -415,7 +415,7 @@ bool menuRadioHardware(event_t event)
if (menuHorizontalPosition == 0)
pushMenu(menuRadioDiagAnalogs);
else
pushMenu(menuRadioDiagKeys);break;
pushMenu(menuRadioDiagKeys);
}
break;
}
radio/src/gui/480x272/topbar.cpp
+2 -1
View File
@@ -91,8 +91,9 @@ void drawTopBar()
/* Tx battery */
uint8_t bars = GET_TXBATT_BARS(5);
#if defined(USB_CHARGER)
if (usbChargerLed() && BLINK_ON_PHASE)
if (usbChargerLed() && BLINK_ON_PHASE) {
lcdDrawBitmapPattern(LCD_W-130, 24, LBM_TOPMENU_TXBATT_CHARGING, MENU_TITLE_COLOR);
}
else {
#endif
lcdDrawBitmapPattern(LCD_W - 130, 24, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR);
radio/src/opentx.cpp
+1 -9
View File
@@ -293,11 +293,7 @@ void generalDefault()
g_eeGeneral.stickMode = DEFAULT_MODE - 1;
#endif
#if defined(FRSKY_RELEASE)
g_eeGeneral.templateSetup = 17; /* TAER */
#elif defined(RADIO_FAMILY_T16)
g_eeGeneral.templateSetup = 21; /* AETR to match bundled multi */
#endif
g_eeGeneral.templateSetup = DEFAULT_TEMPLATE_SETUP;
g_eeGeneral.backlightMode = e_backlight_mode_all;
g_eeGeneral.lightAutoOff = 2;
@@ -324,11 +320,7 @@ void generalDefault()
#endif
#if defined(COLORLCD)
#if defined(RADIO_TX16S)
strcpy(g_eeGeneral.themeName, "Darkblue");
#else
strcpy(g_eeGeneral.themeName, theme->getName());
#endif
theme->init();
#endif
radio/src/targets/horus/CMakeLists.txt
+7
View File
@@ -17,6 +17,7 @@ set(LINKER_SCRIPT targets/horus/stm32f4_flash.ld)
set(RTC_BACKUP_RAM YES)
set(PPM_LIMITS_SYMETRICAL YES)
set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
set(DEFAULT_TEMPLATE_SETUP "0" CACHE STRING "Default channel order")
# for size report script
set(CPU_TYPE_FULL STM32F429xI)
@@ -50,6 +51,7 @@ if (PCB STREQUAL X10)
elseif (PCBREV STREQUAL T16)
set(FLAVOUR t16)
set(LUA_EXPORT lua_export_t16)
set(DEFAULT_TEMPLATE_SETUP 21)
add_definitions(-DRADIO_T16)
add_definitions(-DRADIO_FAMILY_T16)
option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" OFF)
@@ -57,6 +59,7 @@ if (PCB STREQUAL X10)
elseif (PCBREV STREQUAL TX16S)
set(FLAVOUR tx16s)
set(LUA_EXPORT lua_export_t16)
set(DEFAULT_TEMPLATE_SETUP 21)
add_definitions(-DRADIO_TX16S)
add_definitions(-DRADIO_FAMILY_T16)
option(INTERNAL_MODULE_MULTI "Support for MULTI internal module" ON)
@@ -139,6 +142,10 @@ if(INTERNAL_MODULE_MULTI)
add_definitions(-DINTERNAL_MODULE_MULTI)
endif()
if(NOT DEFAULT_TEMPLATE_SETUP STREQUAL "")
add_definitions(-DDEFAULT_TEMPLATE_SETUP=${DEFAULT_TEMPLATE_SETUP})
endif()
include_directories(${RADIO_SRC_DIRECTORY}/fonts/480x272 gui/${GUI_DIR} gui/${GUI_DIR}/layouts)
file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIRECTORY}/gui/480x272 ${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.cpp)