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)
{
serialPortUsage_t *serialPortUsage = findSerialPortUsageByIdentifier(identifier);
if (serialPortUsage->function != FUNCTION_NONE) {
if (!serialPortUsage->enabled || serialPortUsage->function != FUNCTION_NONE) {
// already in use
return NULL;
}
@ -312,7 +312,7 @@ void closeSerialPort(serialPort_t *serialPort) {
serialPortUsage->serialPort = NULL;
}
void serialInit(serialConfig_t *initialSerialConfig)
void serialInit(serialConfig_t *initialSerialConfig, bool softserialEnabled)
{
uint8_t index;
@ -322,6 +322,20 @@ void serialInit(serialConfig_t *initialSerialConfig)
for (index = 0; index < SERIAL_PORT_COUNT; 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
}
}