[Taranis] Crossfire "Flight mode" telemetry sensor now OK

This commit is contained in:
Bertrand Songis
2016-06-06 21:59:49 +02:00
parent 14f4eec6f7
commit 4be6cfccab
4 changed files with 23 additions and 9 deletions
+3
View File
@@ -1055,6 +1055,9 @@ void putsTelemetryChannelValue(coord_t x, coord_t y, uint8_t channel, int32_t va
} }
} }
} }
else if (telemetrySensor.unit == UNIT_TEXT) {
lcdDrawSizedText(x, att & DBLSIZE ? y+1 : y, telemetryItem.text, sizeof(telemetryItem.text), att & ~DBLSIZE);
}
else { else {
LcdFlags flags = att; LcdFlags flags = att;
if (telemetrySensor.prec > 0) { if (telemetrySensor.prec > 0) {
+8 -3
View File
@@ -78,7 +78,7 @@ const CrossfireSensor crossfireSensors[] = {
{ATTITUDE_ID, 0, ZSTR_PITCH, UNIT_RADIANS, 3}, {ATTITUDE_ID, 0, ZSTR_PITCH, UNIT_RADIANS, 3},
{ATTITUDE_ID, 1, ZSTR_ROLL, UNIT_RADIANS, 3}, {ATTITUDE_ID, 1, ZSTR_ROLL, UNIT_RADIANS, 3},
{ATTITUDE_ID, 2, ZSTR_YAW, UNIT_RADIANS, 3}, {ATTITUDE_ID, 2, ZSTR_YAW, UNIT_RADIANS, 3},
{FLIGHT_MODE_ID, 2, ZSTR_FLIGHT_MODE, UNIT_TEXT, 0}, {FLIGHT_MODE_ID, 0, ZSTR_FLIGHT_MODE, UNIT_TEXT, 0},
{0, 0, "UNKNOWN", UNIT_RAW, 0}, {0, 0, "UNKNOWN", UNIT_RAW, 0},
}; };
@@ -184,9 +184,14 @@ void processCrossfireTelemetryFrame()
break; break;
case FLIGHT_MODE_ID: case FLIGHT_MODE_ID:
// TODO {
const CrossfireSensor & sensor = crossfireSensors[FLIGHT_MODE_INDEX];
for (int i=0; i<min<int>(16, telemetryRxBuffer[1]-2); i+=4) {
uint32_t value = *((uint32_t *)&telemetryRxBuffer[3+i]);
setTelemetryValue(TELEM_PROTO_CROSSFIRE, sensor.id, 0, sensor.subId, value, sensor.unit, i);
}
break; break;
}
} }
} }
@@ -163,6 +163,11 @@ void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t val, uint32
newVal = (newVal * sensor.custom.offset) / sensor.custom.ratio; newVal = (newVal * sensor.custom.offset) / sensor.custom.ratio;
} }
} }
else if (unit == UNIT_TEXT) {
*((uint32_t*)&text[prec]) = newVal;
lastReceived = now();
return;
}
else { else {
newVal = sensor.getValue(newVal, unit, prec); newVal = sensor.getValue(newVal, unit, prec);
if (sensor.autoOffset) { if (sensor.autoOffset) {
+1
View File
@@ -70,6 +70,7 @@ class TelemetryItem
// pilot latitude is stored in max // pilot latitude is stored in max
// distFromEarthAxis is stored in value // distFromEarthAxis is stored in value
} gps; } gps;
char text[16];
}; };
static uint8_t now() static uint8_t now()