Rename serial2 to aux_serial
This commit is contained in:
@@ -23,7 +23,7 @@ if(PCB STREQUAL X9E)
|
||||
top_lcd_driver.cpp
|
||||
startup_stm32f40_41xxx.s
|
||||
)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
|
||||
if(STICKS STREQUAL HORUS)
|
||||
add_definitions(-DHORUS_STICKS)
|
||||
endif()
|
||||
@@ -48,7 +48,7 @@ elseif(PCB STREQUAL X9D+)
|
||||
set(BITMAPS_TARGET taranis_bitmaps)
|
||||
set(FONTS_TARGET taranis_fonts)
|
||||
set(LCD_DRIVER lcd_driver_spi.cpp)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
|
||||
set(GVAR_SCREEN model_gvars.cpp)
|
||||
set(STATUS_LEDS NO)
|
||||
elseif(PCB STREQUAL X9D)
|
||||
@@ -65,7 +65,7 @@ elseif(PCB STREQUAL X9D)
|
||||
set(BITMAPS_TARGET taranis_bitmaps)
|
||||
set(FONTS_TARGET taranis_fonts)
|
||||
set(LCD_DRIVER lcd_driver_aspi.cpp)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
|
||||
set(GVAR_SCREEN model_gvars.cpp)
|
||||
set(STATUS_LEDS NO)
|
||||
elseif(PCB STREQUAL X7)
|
||||
|
||||
@@ -228,7 +228,7 @@ void boardInit()
|
||||
usbInit();
|
||||
|
||||
#if defined(DEBUG) && defined(AUX_SERIAL_GPIO)
|
||||
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
|
||||
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
|
||||
TRACE("\nTaranis board started :)");
|
||||
#endif
|
||||
|
||||
@@ -369,7 +369,7 @@ void checkTrainerSettings()
|
||||
break;
|
||||
#if defined(TRAINER_BATTERY_COMPARTMENT)
|
||||
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
|
||||
serial2Stop();
|
||||
auxSerialStop();
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -386,8 +386,8 @@ void checkTrainerSettings()
|
||||
break;
|
||||
#if defined(TRAINER_BATTERY_COMPARTMENT)
|
||||
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
|
||||
if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) {
|
||||
serial2SbusInit();
|
||||
if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) {
|
||||
auxSerialSbusInit();
|
||||
break;
|
||||
}
|
||||
// no break
|
||||
|
||||
@@ -773,12 +773,12 @@ void hapticOff(void);
|
||||
#if defined(AUX_SERIAL_GPIO)
|
||||
#define DEBUG_BAUDRATE 115200
|
||||
#define AUX_SERIAL
|
||||
extern uint8_t serial2Mode;
|
||||
void serial2Init(unsigned int mode, unsigned int protocol);
|
||||
void serial2Putc(char c);
|
||||
#define serial2TelemetryInit(protocol) serial2Init(UART_MODE_TELEMETRY, protocol)
|
||||
void serial2SbusInit(void);
|
||||
void serial2Stop(void);
|
||||
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);
|
||||
void auxSerialStop(void);
|
||||
#endif
|
||||
|
||||
// BT driver
|
||||
@@ -876,7 +876,7 @@ void checkTrainerSettings(void);
|
||||
#endif
|
||||
|
||||
extern Fifo<uint8_t, TELEMETRY_FIFO_SIZE> telemetryFifo;
|
||||
extern DMAFifo<32> serial2RxFifo;
|
||||
extern DMAFifo<32> auxSerialRxFifo;
|
||||
#endif
|
||||
|
||||
// Gyro driver
|
||||
|
||||
@@ -186,8 +186,8 @@ uint8_t telemetryGetByte(uint8_t * byte)
|
||||
{
|
||||
#if defined(AUX_SERIAL)
|
||||
if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
|
||||
if (serial2Mode == UART_MODE_TELEMETRY)
|
||||
return serial2RxFifo.pop(*byte);
|
||||
if (auxSerialMode == UART_MODE_TELEMETRY)
|
||||
return auxSerialRxFifo.pop(*byte);
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -311,7 +311,7 @@ int sbusGetByte(uint8_t * byte)
|
||||
#endif
|
||||
#if defined(AUX_SERIAL_USART)
|
||||
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
|
||||
return serial2RxFifo.pop(*byte);
|
||||
return auxSerialRxFifo.pop(*byte);
|
||||
#endif
|
||||
default:
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user