Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 12:25:12 +03:00
Code Issues Wiki Activity

Deactivate aux_serial on Horus targets (#6733)

Browse source 
Remove AUX_SERIAL on Horus
This commit is contained in:
Raphael Coeffic 2019-09-10 15:36:34 +02:00 • committed by Bertrand Songis
parent 6684a75d92
commit 0a8917cbe2
9 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/dataconstants.h
View file

@ -191,8 +191,8 @@ enum TrainerMode {
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE, TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
#endif
TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
#endif
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
TRAINER_MODE_MASTER_BLUETOOTH, TRAINER_MODE_MASTER_BLUETOOTH,
TRAINER_MODE_SLAVE_BLUETOOTH, TRAINER_MODE_SLAVE_BLUETOOTH,

2
radio/src/gui/gui_common.cpp
View file

@ -711,7 +711,7 @@ bool isTrainerModeAvailable(int mode)
return false; return false;
#endif #endif
#if !defined(PCBSKY9X) && !defined(TRAINER_BATTERY_COMPARTMENT) #if defined(PCBTARANIS) && !defined(TRAINER_BATTERY_COMPARTMENT)
if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT) if (mode == TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
return false; return false;
#endif #endif

4
radio/src/storage/conversions/conversions_218_219.cpp
View file

@ -123,6 +123,10 @@ void convertModelData_218_to_219(ModelData &model)
// 4 bytes more for the ModelHeader::bitmap // 4 bytes more for the ModelHeader::bitmap
memclear(&newModel.header.bitmap[10], 4); memclear(&newModel.header.bitmap[10], 4);
memcpy(newModel.timers, oldModel.timers, offsetof(ModelData_v218, mixData) - offsetof(ModelData_v218, timers)); memcpy(newModel.timers, oldModel.timers, offsetof(ModelData_v218, mixData) - offsetof(ModelData_v218, timers));
// trainer battery compartment removed
if (newModel.trainerData.mode >= TRAINER_MODE_MASTER_BLUETOOTH)
newModel.trainerData.mode -= 1;
#endif #endif
memclear(newModel.mixData, sizeof(ModelData_v219) - offsetof(ModelData_v219, mixData)); memclear(newModel.mixData, sizeof(ModelData_v219) - offsetof(ModelData_v219, mixData));

2
radio/src/targets/common/arm/stm32/bootloader/boot.cpp
View file

@ -233,7 +233,7 @@ int main()
delaysInit(); // needed for lcdInit() delaysInit(); // needed for lcdInit()
#if defined(DEBUG) #if defined(DEBUG) && defined(AUX_SERIAL)
auxSerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined) auxSerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
#endif #endif

1
radio/src/targets/horus/CMakeLists.txt
View file

@ -70,7 +70,6 @@ elseif (PCB STREQUAL X12S)
x12s_adc_driver.cpp x12s_adc_driver.cpp
gps_driver.cpp gps_driver.cpp
) )
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(BITMAPS_TARGET x12s_bitmaps) set(BITMAPS_TARGET x12s_bitmaps)
set(FONTS_TARGET x12s_fonts) set(FONTS_TARGET x12s_fonts)
set(LCD_DRIVER lcd_driver.cpp) set(LCD_DRIVER lcd_driver.cpp)

4
radio/src/targets/horus/board.cpp
View file

@ -128,10 +128,6 @@ void boardInit()
pwrOn(); pwrOn();
delaysInit(); delaysInit();
#if defined(DEBUG)
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
#endif
__enable_irq(); __enable_irq();
TRACE("\nHorus board started :)"); TRACE("\nHorus board started :)");

11
radio/src/targets/horus/board.h
View file

@ -586,17 +586,6 @@ void gpsSendByte(uint8_t byte);
#define PILOTPOS_MIN_HDOP 500 #define PILOTPOS_MIN_HDOP 500
#endif #endif
// Second serial port driver
#if defined(PCBX12S)
#define AUX_SERIAL
#define DEBUG_BAUDRATE 115200
extern uint8_t auxSerialMode;
void auxSerialInit(unsigned int mode, unsigned int protocol);
void auxSerialPutc(char c);
#define auxSerialTelemetryInit(protocol) auxSerialInit(UART_MODE_TELEMETRY, protocol)
void auxSerialSbusInit();
void auxSerialStop();
#endif
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE) #define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
// BT driver // BT driver

2
radio/src/translations/untranslated.h
View file

@ -72,7 +72,7 @@
#endif #endif
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define TR_VTRAINERMODES TR_VTRAINER_MASTER_JACK TR_VTRAINER_SLAVE_JACK TR_VTRAINER_MASTER_BATTERY TR_VTRAINER_BLUETOOTH #define TR_VTRAINERMODES TR_VTRAINER_MASTER_JACK TR_VTRAINER_SLAVE_JACK TR_VTRAINER_BLUETOOTH
#elif defined(PCBX9E) #elif defined(PCBX9E)
#define TR_VTRAINERMODES TR_VTRAINER_MASTER_JACK TR_VTRAINER_SLAVE_JACK TR_VTRAINER_MASTER_SBUS_MODULE TR_VTRAINER_MASTER_CPPM_MODULE TR_VTRAINER_MASTER_BATTERY TR_VTRAINER_BLUETOOTH #define TR_VTRAINERMODES TR_VTRAINER_MASTER_JACK TR_VTRAINER_SLAVE_JACK TR_VTRAINER_MASTER_SBUS_MODULE TR_VTRAINER_MASTER_CPPM_MODULE TR_VTRAINER_MASTER_BATTERY TR_VTRAINER_BLUETOOTH
#elif defined(PCBTARANIS) && defined(BLUETOOTH) #elif defined(PCBTARANIS) && defined(BLUETOOTH)