Merge fixes
This commit is contained in:
@@ -23,7 +23,7 @@ set(RTC_BACKUP_RAM YES)
|
||||
set(PPM_LIMITS_SYMETRICAL YES)
|
||||
set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
|
||||
set(ROTARY_ENCODER YES)
|
||||
set(EXTERNAL_MODULE YES)
|
||||
set(HARDWARE_EXTERNAL_MODULE YES)
|
||||
|
||||
if(BOOTLOADER)
|
||||
set(LINKER_SCRIPT targets/horus/stm32f4_flash_bootloader.ld)
|
||||
@@ -177,6 +177,10 @@ if(HARDWARE_EXTERNAL_ACCESS_MOD)
|
||||
add_definitions(-DHARDWARE_EXTERNAL_ACCESS_MOD)
|
||||
endif()
|
||||
|
||||
if(HARDWARE_EXTERNAL_MODULE)
|
||||
add_definitions(-DHARDWARE_EXTERNAL_MODULE)
|
||||
endif()
|
||||
|
||||
if(INTERNAL_MODULE_PXX1)
|
||||
add_definitions(-DHARDWARE_INTERNAL_MODULE)
|
||||
add_definitions(-DINTERNAL_MODULE_PXX1)
|
||||
@@ -217,7 +221,6 @@ set(TARGET_SRC
|
||||
extmodule_driver.cpp
|
||||
trainer_driver.cpp
|
||||
../common/arm/stm32/mixer_scheduler_driver.cpp
|
||||
../common/arm/stm32/heartbeat_driver.cpp
|
||||
../common/arm/stm32/timers_driver.cpp
|
||||
../common/arm/stm32/intmodule_serial_driver.cpp
|
||||
../common/arm/stm32/rotary_encoder_driver.cpp
|
||||
|
||||
@@ -151,7 +151,7 @@ static void LCD_NRSTConfig(void)
|
||||
GPIO_Init(LCD_GPIO_NRST, &GPIO_InitStructure);
|
||||
}
|
||||
|
||||
static void lcd_reset(void)
|
||||
static void lcdReset(void)
|
||||
{
|
||||
#if defined(RADIO_T18) // T18 screen has issues if NRST is ever brought low
|
||||
NRST_HIGH();
|
||||
|
||||
Reference in New Issue
Block a user