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

chores(pl18/nv14): Clean up cmake and boot menu (#4475)

Browse Source
This commit is contained in:
richardclli
2024-01-01 11:53:33 +10:00
committed by GitHub
parent 6dc6ed5638
commit c0a385949d
7 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/CMakeLists.txt
-1
View File
@@ -20,7 +20,6 @@ set(GUI_DIR colorlcd)
set(BITMAPS_DIR 480x272)
set(NAVIGATION_TYPE horus)
set(TARGET_DIR horus)
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)")
radio/src/targets/nv14/CMakeLists.txt
+19 -28
View File
@@ -104,33 +104,8 @@ endif()
#set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(SRC
${SRC}
io/frsky_firmware_update.cpp
)
set(GVAR_SCREEN model_gvars.cpp)
if(BOOTLOADER)
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../common/arm/loadboot.cpp
)
endif()
set(SRC
${SRC}
io/frsky_firmware_update.cpp
io/multi_firmware_update.cpp
)
if (MULTIMODULE)
add_definitions(-DMULTI_PROTOLIST)
set(SRC ${SRC}
io/multi_protolist.cpp
)
endif()
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
board.cpp
@@ -150,6 +125,25 @@ set(FIRMWARE_SRC
targets/common/arm/stm32/vs1053b.cpp
)
if(BOOTLOADER)
set(FIRMWARE_SRC
${FIRMWARE_SRC}
targets/common/arm/loadboot.cpp
)
endif()
set(SRC ${SRC}
io/frsky_firmware_update.cpp
io/multi_firmware_update.cpp
)
if (MULTIMODULE)
add_definitions(-DMULTI_PROTOLIST)
set(SRC ${SRC}
io/multi_protolist.cpp
)
endif()
# Make malloc() thread-safe
add_definitions(-DTHREADSAFE_MALLOC)
@@ -158,8 +152,5 @@ set(STM32LIB_SRC
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
)
radio/src/targets/nv14/bootloader/boot_menu.cpp
+9 -2
View File
@@ -62,8 +62,6 @@ static bool rfUsbAccess = false;
void bootloaderInitScreen()
{
lcdInitDisplayDriver();
backlightInit();
backlightEnable(100);
setHatsAsKeys(true);
}
@@ -85,9 +83,16 @@ static void bootloaderDrawBackground()
void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
{
static bool _first_screen = true;
lcdInitDirectDrawing();
bootloaderDrawBackground();
if (!_first_screen) {
// ... and turn backlight ON
backlightEnable(BACKLIGHT_LEVEL_MAX);
}
int center = LCD_W/2;
if (st == ST_START) {
int yOffset = 0;
@@ -225,6 +230,8 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
pos -= 79;
lcd->drawSolidRect(79, 72 + (opt * 35), pos, 26, 2, BL_SELECTED);
}
_first_screen = false;
}
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
radio/src/targets/pl18/CMakeLists.txt
+19 -26
View File
@@ -104,33 +104,8 @@ file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui
file(GLOB LAYOUTS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.cpp)
file(GLOB WIDGETS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/widgets/*.cpp)
set(SRC
${SRC}
io/frsky_firmware_update.cpp
)
set(GVAR_SCREEN model_gvars.cpp)
if(BOOTLOADER)
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
../common/arm/loadboot.cpp
)
endif()
set(SRC
${SRC}
io/frsky_firmware_update.cpp
io/multi_firmware_update.cpp
)
if (MULTIMODULE)
add_definitions(-DMULTI_PROTOLIST)
set(SRC ${SRC}
io/multi_protolist.cpp
)
endif()
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
${LCD_DRIVER}
@@ -154,6 +129,25 @@ set(FIRMWARE_SRC
drivers/frftl.cpp
)
if(BOOTLOADER)
set(FIRMWARE_SRC
${FIRMWARE_SRC}
targets/common/arm/loadboot.cpp
)
endif()
set(SRC ${SRC}
io/frsky_firmware_update.cpp
io/multi_firmware_update.cpp
)
if (MULTIMODULE)
add_definitions(-DMULTI_PROTOLIST)
set(SRC ${SRC}
io/multi_protolist.cpp
)
endif()
# Make malloc() thread-safe
add_definitions(-DTHREADSAFE_MALLOC)
@@ -162,6 +156,5 @@ set(STM32LIB_SRC
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fmc.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c
)
radio/src/targets/pl18/board.cpp
+1
View File
@@ -77,6 +77,7 @@ void delay_self(int count)
TELEMETRY_RCC_AHB1Periph |\
TRAINER_RCC_AHB1Periph |\
HAPTIC_RCC_AHB1Periph |\
INTMODULE_RCC_AHB1Periph |\
EXTMODULE_RCC_AHB1Periph \
)
#define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
radio/src/targets/pl18/bootloader/boot_menu.cpp
+9 -4
View File
@@ -25,8 +25,8 @@
#include "translations.h"
#include "../../common/arm/stm32/bootloader/boot.h"
#include "../../common/arm/stm32/bootloader/bin_files.h"
#include "targets/common/arm/stm32/bootloader/boot.h"
#include "targets/common/arm/stm32/bootloader/bin_files.h"
#include <lvgl/lvgl.h>
@@ -56,8 +56,6 @@ extern BitmapBuffer * lcd;
void bootloaderInitScreen()
{
lcdInitDisplayDriver();
backlightInit();
backlightEnable(100);
setHatsAsKeys(true);
}
@@ -79,9 +77,15 @@ static void bootloaderDrawBackground()
void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
{
static bool _first_screen = true;
lcdInitDirectDrawing();
bootloaderDrawBackground();
if (!_first_screen) {
// ... and turn backlight ON
backlightEnable(BACKLIGHT_LEVEL_MAX);
}
int center = LCD_W/2;
if (st == ST_START) {
@@ -231,6 +235,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
LV_SYMBOL_NEW_LINE TR_BL_EXIT_KEY, BL_FOREGROUND);
}
}
_first_screen = false;
}
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
radio/src/targets/pl18/hal.h
+2
View File
@@ -592,6 +592,8 @@
#define INTMODULE_TIMER_IRQn TIM3_IRQn
#define INTMODULE_TIMER_IRQHandler TIM3_IRQHandler
#define INTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
#else
#define INTMODULE_RCC_AHB1Periph 0
#endif
// External Module