Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Don't allow softserial ports to be opened if softserial isn't enabled

Browse source
This commit is contained in:
Nicholas Sherlock 2015-04-02 00:24:28 +13:00
parent 8a9d2e3708
commit 86ddf27515
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/io/serial.c
View file

@ -241,7 +241,7 @@ serialPort_t *openSerialPort(
portOptions_t options) portOptions_t options)
{ {
serialPortUsage_t *serialPortUsage = findSerialPortUsageByIdentifier(identifier); serialPortUsage_t *serialPortUsage = findSerialPortUsageByIdentifier(identifier);
if (serialPortUsage->function != FUNCTION_NONE) { if (!serialPortUsage->enabled || serialPortUsage->function != FUNCTION_NONE) {
// already in use // already in use
return NULL; return NULL;
} }
@ -312,7 +312,7 @@ void closeSerialPort(serialPort_t *serialPort) {
serialPortUsage->serialPort = NULL; serialPortUsage->serialPort = NULL;
} }
void serialInit(serialConfig_t *initialSerialConfig) void serialInit(serialConfig_t *initialSerialConfig, bool softserialEnabled)
{ {
uint8_t index; uint8_t index;
@ -322,6 +322,20 @@ void serialInit(serialConfig_t *initialSerialConfig)
for (index = 0; index < SERIAL_PORT_COUNT; index++) { for (index = 0; index < SERIAL_PORT_COUNT; index++) {
serialPortUsageList[index].identifier = serialPortIdentifiers[index]; serialPortUsageList[index].identifier = serialPortIdentifiers[index];
serialPortUsageList[index].enabled = true;
#ifdef USE_SOFTSERIAL1
if (serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1) {
serialPortUsageList[index].enabled = softserialEnabled;
}
#endif
#ifdef USE_SOFTSERIAL2
if (serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL2) {
serialPortUsageList[index].enabled = softserialEnabled;
}
#endif
} }
} }

1
src/main/io/serial.h
View file

@ -69,6 +69,7 @@ typedef struct serialPortUsage_s {
serialPortIdentifier_e identifier; serialPortIdentifier_e identifier;
serialPort_t *serialPort; serialPort_t *serialPort;
serialPortFunction_e function; serialPortFunction_e function;
bool enabled;
} serialPortUsage_t; } serialPortUsage_t;
serialPort_t *findSharedSerialPort(uint16_t functionMask, serialPortFunction_e sharedWithFunction); serialPort_t *findSharedSerialPort(uint16_t functionMask, serialPortFunction_e sharedWithFunction);

4
src/main/main.c
View file

@ -100,7 +100,7 @@ serialPort_t *loopbackPort;
void printfSupportInit(void); void printfSupportInit(void);
void timerInit(void); void timerInit(void);
void telemetryInit(void); void telemetryInit(void);
void serialInit(serialConfig_t *initialSerialConfig); void serialInit(serialConfig_t *initialSerialConfig, bool softserialEnabled);
void mspInit(serialConfig_t *serialConfig); void mspInit(serialConfig_t *serialConfig);
void cliInit(serialConfig_t *serialConfig); void cliInit(serialConfig_t *serialConfig);
void failsafeInit(rxConfig_t *intialRxConfig); void failsafeInit(rxConfig_t *intialRxConfig);
@ -191,7 +191,7 @@ void init(void)
timerInit(); // timer must be initialized before any channel is allocated timerInit(); // timer must be initialized before any channel is allocated
serialInit(&masterConfig.serialConfig); serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL));
mixerInit(masterConfig.mixerMode, masterConfig.customMixer); mixerInit(masterConfig.mixerMode, masterConfig.customMixer);