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

Updated CRSF telemetry so that telemetry and RX frames do not overlap

Browse source
This commit is contained in:
Martin Budden 2016-11-15 15:35:00 +00:00
parent e4997353c8
commit 7249eefb9d
9 changed files with 137 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/Makefile
View file

@ -536,6 +536,7 @@ $(OBJECT_DIR)/telemetry_crsf_unittest.o : \
$(CXX) $(CXX_FLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/telemetry_crsf_unittest.cc -o $@
$(OBJECT_DIR)/telemetry_crsf_unittest : \
$(OBJECT_DIR)/rx/crsf.o \
$(OBJECT_DIR)/telemetry/crsf.o \
$(OBJECT_DIR)/telemetry_crsf_unittest.o \
$(OBJECT_DIR)/common/maths.o \

8
src/test/unit/rx_crsf_unittest.cc
View file

@ -251,7 +251,7 @@ TEST(CrossFireTest, TestCapturedData)
}
TEST(CrossFireTest, TestcrsfDataReceive)
TEST(CrossFireTest, TestCrsfDataReceive)
{
crsfFrameDone = false;
const uint8_t *pData = capturedData;
@ -275,11 +275,9 @@ extern "C" {
int16_t debug[DEBUG16_VALUE_COUNT];
uint32_t micros(void) {return dummyTimeUs;}
serialPort_t *openSerialPort(serialPortIdentifier_e, serialPortFunction_e, serialReceiveCallbackPtr, uint32_t, portMode_t, portOptions_t)
{
return NULL;
}
serialPort_t *openSerialPort(serialPortIdentifier_e, serialPortFunction_e, serialReceiveCallbackPtr, uint32_t, portMode_t, portOptions_t) {return NULL;}
serialPortConfig_t *findSerialPortConfig(serialPortFunction_e ) {return NULL;}
void serialWriteBuf(serialPort_t *, const uint8_t *, int) {}
bool telemetryCheckRxPortShared(const serialPortConfig_t *) {return false;}
serialPort_t *telemetrySharedPort = NULL;
}

4
src/test/unit/telemetry_crsf_unittest.cc
View file

@ -54,6 +54,7 @@ extern "C" {
#include "flight/gps_conversion.h"
bool airMode;
serialPort_t *telemetrySharedPort;
}
#include "unittest_macros.h"
@ -300,6 +301,8 @@ int32_t mAhDrawn;
void beeperConfirmationBeeps(uint8_t beepCount) {UNUSED(beepCount);}
uint32_t micros(void) {return 0;}
uint32_t serialRxBytesWaiting(const serialPort_t *) {return 0;}
uint32_t serialTxBytesFree(const serialPort_t *) {return 0;}
uint8_t serialRead(serialPort_t *) {return 0;}
@ -312,6 +315,7 @@ void closeSerialPort(serialPort_t *) {}
serialPortConfig_t *findSerialPortConfig(serialPortFunction_e) {return NULL;}
bool telemetryDetermineEnabledState(portSharing_e) {return true;}
bool telemetryCheckRxPortShared(const serialPortConfig_t *) {return true;}
portSharing_e determinePortSharing(serialPortConfig_t *, serialPortFunction_e) {return PORTSHARING_NOT_SHARED;}