Rename serial2 to aux_serial
This commit is contained in:
@@ -118,7 +118,7 @@ if(INTERNAL_GPS)
|
||||
message("Horus: Internal GPS enabled")
|
||||
endif()
|
||||
|
||||
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)
|
||||
|
||||
|
||||
@@ -178,7 +178,7 @@ void boardInit()
|
||||
delaysInit();
|
||||
|
||||
#if defined(DEBUG)
|
||||
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
|
||||
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
|
||||
#endif
|
||||
|
||||
__enable_irq();
|
||||
@@ -261,7 +261,7 @@ void checkTrainerSettings()
|
||||
stop_trainer_ppm();
|
||||
break;
|
||||
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
|
||||
serial2Stop();
|
||||
auxSerialStop();
|
||||
}
|
||||
|
||||
currentTrainerMode = requiredTrainerMode;
|
||||
@@ -270,8 +270,8 @@ void checkTrainerSettings()
|
||||
init_trainer_ppm();
|
||||
break;
|
||||
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
|
||||
|
||||
@@ -631,18 +631,18 @@ void gpsSendByte(uint8_t byte);
|
||||
// Second serial port driver
|
||||
#define AUX_SERIAL
|
||||
#define DEBUG_BAUDRATE 115200
|
||||
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);
|
||||
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
|
||||
|
||||
// BT driver
|
||||
#define BT_TX_FIFO_SIZE 64
|
||||
#define BT_RX_FIFO_SIZE 128
|
||||
#define BLUETOOTH_BOOTLOADER_BAUDRATE 230400
|
||||
#define BLUETOOTH_BOOTLOADER_BAUDRATE 230400
|
||||
#define BLUETOOTH_FACTORY_BAUDRATE 57600
|
||||
#define BLUETOOTH_DEFAULT_BAUDRATE 115200
|
||||
void bluetoothInit(uint32_t baudrate, bool enable);
|
||||
@@ -657,7 +657,7 @@ void checkTrainerSettings(void);
|
||||
#include "fifo.h"
|
||||
#include "dmafifo.h"
|
||||
extern DMAFifo<512> telemetryFifo;
|
||||
extern DMAFifo<32> serial2RxFifo;
|
||||
extern DMAFifo<32> auxSerialRxFifo;
|
||||
#endif
|
||||
|
||||
#if NUM_PWMSTICKS > 0
|
||||
|
||||
Reference in New Issue
Block a user