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

IBUS telemetry for GPS combined frames fixed, IBUS telemetry co… (#8925)

Browse source 
IBUS telemetry for GPS combined frames fixed, IBUS telemetry code simplified.
This commit is contained in:
Michael Keller 2019-11-06 21:31:34 +13:00 • committed by GitHub
commit c77c593a14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/main/telemetry/ibus_shared.c
View file

@ -138,22 +138,41 @@ static uint8_t getSensorID(ibusAddress_t address)
return telemetryConfig()->flysky_sensors[index]; return telemetryConfig()->flysky_sensors[index];
} }
static uint8_t getSensorLength(uint8_t sensorID) #if defined(USE_TELEMETRY_IBUS_EXTENDED)
static const uint8_t* getSensorStruct(uint8_t sensorType, uint8_t* itemCount){
const uint8_t* structure = 0;
if (sensorType == IBUS_SENSOR_TYPE_GPS_FULL) {
structure = FULL_GPS_IDS;
*itemCount = sizeof(FULL_GPS_IDS);
}
if (sensorType == IBUS_SENSOR_TYPE_VOLT_FULL) {
structure = FULL_VOLT_IDS;
*itemCount = sizeof(FULL_VOLT_IDS);
}
if (sensorType == IBUS_SENSOR_TYPE_ACC_FULL) {
structure = FULL_ACC_IDS;
*itemCount = sizeof(FULL_ACC_IDS);
}
return structure;
}
#endif //defined(USE_TELEMETRY_IBUS_EXTENDED)
static uint8_t getSensorLength(uint8_t sensorType)
{ {
if (sensorID == IBUS_SENSOR_TYPE_PRES || (sensorID >= IBUS_SENSOR_TYPE_GPS_LAT && sensorID <= IBUS_SENSOR_TYPE_ALT_MAX)) { if (sensorType == IBUS_SENSOR_TYPE_PRES || (sensorType >= IBUS_SENSOR_TYPE_GPS_LAT && sensorType <= IBUS_SENSOR_TYPE_ALT_MAX)) {
return IBUS_4BYTE_SESNSOR; return IBUS_4BYTE_SESNSOR;
} }
#if defined(USE_TELEMETRY_IBUS_EXTENDED) #if defined(USE_TELEMETRY_IBUS_EXTENDED)
if (sensorID == IBUS_SENSOR_TYPE_GPS_FULL) { uint8_t itemCount;
return 14; const uint8_t* structure = getSensorStruct(sensorType, &itemCount);
if (structure != 0) {
uint8_t size = 0;
for (unsigned i = 0; i < itemCount; i++) {
size += getSensorLength(structure[i]);
}
return size;
} }
if (sensorID == IBUS_SENSOR_TYPE_VOLT_FULL) { #endif //defined(USE_TELEMETRY_IBUS_EXTENDED)
return 10;
}
if (sensorID == IBUS_SENSOR_TYPE_VOLT_FULL) {
return 12;
}
#endif
return IBUS_2BYTE_SESNSOR; return IBUS_2BYTE_SESNSOR;
} }
@ -336,35 +355,25 @@ static void setValue(uint8_t* bufferPtr, uint8_t sensorType, uint8_t length)
ibusTelemetry_s value; ibusTelemetry_s value;
#if defined(USE_TELEMETRY_IBUS_EXTENDED) #if defined(USE_TELEMETRY_IBUS_EXTENDED)
const uint8_t* structure = 0;
uint8_t itemCount; uint8_t itemCount;
if (sensorType == IBUS_SENSOR_TYPE_GPS_FULL) { const uint8_t* structure = getSensorStruct(sensorType, &itemCount);
structure = FULL_GPS_IDS;
itemCount = sizeof(FULL_GPS_IDS);
}
if (sensorType == IBUS_SENSOR_TYPE_VOLT_FULL) {
structure = FULL_VOLT_IDS;
itemCount = sizeof(FULL_VOLT_IDS);
}
if (sensorType == IBUS_SENSOR_TYPE_ACC_FULL) {
structure = FULL_ACC_IDS;
itemCount = sizeof(FULL_ACC_IDS);
}
if (structure != 0) { if (structure != 0) {
setCombinedFrame(bufferPtr, structure, sizeof(itemCount)); setCombinedFrame(bufferPtr, structure, itemCount);
return; return;
} }
#endif //defined(USE_TELEMETRY_IBUS_EXTENDED) #endif //defined(USE_TELEMETRY_IBUS_EXTENDED)
//clear result
#if defined(USE_GPS)
if (setGPS(sensorType, &value)) {
return;
}
#endif //defined(USE_TELEMETRY_IBUS_EXTENDED)
for (unsigned i = 0; i < length; i++) { for (unsigned i = 0; i < length; i++) {
bufferPtr[i] = value.byte[i] = 0; bufferPtr[i] = value.byte[i] = 0;
} }
#if defined(USE_GPS)
if (setGPS(sensorType, &value)) {
for (unsigned i = 0; i < length; i++) {
bufferPtr[i] = value.byte[i];
}
return;
}
#endif //defined(USE_TELEMETRY_IBUS_EXTENDED)
switch (sensorType) { switch (sensorType) {
case IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE: case IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE:
value.uint16 = getVoltage(); value.uint16 = getVoltage();