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

Merge branch 'master' into serial-cleanup

Browse source 
Conflicts:
	src/main/telemetry/hott.c
This commit is contained in:
Dominic Clifton 2015-03-03 17:21:43 +00:00
commit dca984ff88
10 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@ void serialSetMode(serialPort_t *instance, portMode_t mode) {
serialPort_t *openSerialPort(serialPortIdentifier_e identifier, serialPortFunction_e functionMask, serialReceiveCallbackPtr callback, baudRate_e baudRateIndex, portMode_t mode, serialInversion_e inversion) {
UNUSED(identifier);
UNUSED(functionMask);
UNUSED(baudRate);
UNUSED(baudRateIndex);
UNUSED(callback);
UNUSED(mode);
UNUSED(inversion);
@ -213,5 +213,13 @@ bool sensors(uint32_t mask) {
return false;
}
bool determineNewTelemetryEnabledState(portSharing_e) {
return true;
}
portSharing_e determinePortSharing(serialPortConfig_t *, serialPortFunction_e) {
return PORTSHARING_NOT_SHARED;
}
}