Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

More serial port cleanup to get build passing.

Browse source
This commit is contained in:
Dominic Clifton 2015-02-12 01:50:35 +00:00
parent 5163bef0b2
commit 6064a3d692
2 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/config/config.c
View file

@ -251,14 +251,12 @@ void resetSerialConfig(serialConfig_t *serialConfig)
} }
serialConfig->portConfigs[0].functionMask = FUNCTION_MSP; serialConfig->portConfigs[0].functionMask = FUNCTION_MSP;
serialConfig->portConfigs[0].identifier = serialPortIdentifiers[FIRST_PORT_INDEX];
serialConfig->portConfigs[0].baudrate = 115200; serialConfig->portConfigs[0].baudrate = 115200;
#ifdef CC3D #ifdef CC3D
// Temporary workaround for CC3D non-functional VCP when using OpenPilot bootloader. // Temporary workaround for CC3D non-functional VCP when using OpenPilot bootloader.
// This allows MSP connection via USART so the board can be reconfigured. // This allows MSP connection via USART so the board can be reconfigured.
serialConfig->portConfigs[1].functionMask = FUNCTION_MSP; serialConfig->portConfigs[1].functionMask = FUNCTION_MSP;
serialConfig->portConfigs[1].identifier = serialPortIdentifiers[SECOND_PORT_INDEX];
serialConfig->portConfigs[1].baudrate = 115200; serialConfig->portConfigs[1].baudrate = 115200;
#endif #endif
@ -467,9 +465,9 @@ static void resetConf(void)
featureSet(FEATURE_FAILSAFE); featureSet(FEATURE_FAILSAFE);
featureClear(FEATURE_VBAT); featureClear(FEATURE_VBAT);
#ifdef ALIENWIIF3 #ifdef ALIENWIIF3
masterConfig.serialConfig.serial_port_scenario[2] = lookupScenarioIndex(SCENARIO_SERIAL_RX_ONLY); masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_SERIAL_RX;
#else #else
masterConfig.serialConfig.serial_port_scenario[1] = lookupScenarioIndex(SCENARIO_SERIAL_RX_ONLY); masterConfig.serialConfig.portConfigs[1].functionMask = FUNCTION_SERIAL_RX;
#endif #endif
masterConfig.rxConfig.serialrx_provider = 1; masterConfig.rxConfig.serialrx_provider = 1;
masterConfig.rxConfig.spektrum_sat_bind = 5; masterConfig.rxConfig.spektrum_sat_bind = 5;

26
src/test/unit/telemetry_hott_unittest.cc
View file

@ -186,22 +186,9 @@ void serialSetMode(serialPort_t *instance, portMode_t mode) {
UNUSED(mode); UNUSED(mode);
} }
void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate) {
UNUSED(instance);
UNUSED(baudRate);
}
void beginSerialPortFunction(serialPort_t *port, serialPortFunction_e function) { serialPort_t *openSerialPort(serialPortIdentifier_e identifier, serialPortFunction_e functionMask, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, serialInversion_e inversion) {
UNUSED(port); UNUSED(identifier);
UNUSED(function);
}
void endSerialPortFunction(serialPort_t *port, serialPortFunction_e function) {
UNUSED(port);
UNUSED(function);
}
serialPort_t *openSerialPort(serialPortFunction_e functionMask, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, serialInversion_e inversion) {
UNUSED(functionMask); UNUSED(functionMask);
UNUSED(baudRate); UNUSED(baudRate);
UNUSED(callback); UNUSED(callback);
@ -211,8 +198,13 @@ serialPort_t *openSerialPort(serialPortFunction_e functionMask, serialReceiveCal
return NULL; return NULL;
} }
serialPort_t *findOpenSerialPort(uint16_t functionMask) { void closeSerialPort(serialPort_t *serialPort) {
UNUSED(functionMask); UNUSED(serialPort);
}
serialPortConfig_t *findSerialPortConfig(serialPortFunction_e function) {
UNUSED(function);
return NULL; return NULL;
} }