piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2020-03-05 10:43:01 +01:00
parent 33b6efc40d ec56892de6
commit 6878ae4a9f
144 changed files with 3009 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/crossfire.cpp
+28 -25
View File
@@ -21,31 +21,32 @@
#include "opentx.h"
const CrossfireSensor crossfireSensors[] = {
{LINK_ID, 0, STR_SENSOR_RX_RSSI1, UNIT_DB, 0},
{LINK_ID, 1, STR_SENSOR_RX_RSSI2, UNIT_DB, 0},
{LINK_ID, 2, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0},
{LINK_ID, 3, STR_SENSOR_RX_SNR, UNIT_DB, 0},
{LINK_ID, 4, STR_SENSOR_ANTENNA, UNIT_RAW, 0},
{LINK_ID, 5, STR_SENSOR_RF_MODE, UNIT_RAW, 0},
{LINK_ID, 6, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0},
{LINK_ID, 7, STR_SENSOR_TX_RSSI, UNIT_DB, 0},
{LINK_ID, 8, STR_SENSOR_TX_QUALITY, UNIT_PERCENT, 0},
{LINK_ID, 9, STR_SENSOR_TX_SNR, UNIT_DB, 0},
{BATTERY_ID, 0, STR_SENSOR_BATT, UNIT_VOLTS, 1},
{BATTERY_ID, 1, STR_SENSOR_CURR, UNIT_AMPS, 1},
{BATTERY_ID, 2, STR_SENSOR_CAPACITY, UNIT_MAH, 0},
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0},
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0},
{GPS_ID, 2, STR_SENSOR_GSPD, UNIT_KMH, 1},
{GPS_ID, 3, STR_SENSOR_HDG, UNIT_DEGREE, 3},
{GPS_ID, 4, STR_SENSOR_ALT, UNIT_METERS, 0},
{GPS_ID, 5, STR_SENSOR_SATELLITES, UNIT_RAW, 0},
{ATTITUDE_ID, 0, STR_SENSOR_PITCH, UNIT_RADIANS, 3},
{ATTITUDE_ID, 1, STR_SENSOR_ROLL, UNIT_RADIANS, 3},
{ATTITUDE_ID, 2, STR_SENSOR_YAW, UNIT_RADIANS, 3},
{FLIGHT_MODE_ID, 0, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0},
{CF_VARIO_ID, 0, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2},
{0, 0, "UNKNOWN", UNIT_RAW, 0},
{LINK_ID, 0, STR_SENSOR_RX_RSSI1, UNIT_DB, 0},
{LINK_ID, 1, STR_SENSOR_RX_RSSI2, UNIT_DB, 0},
{LINK_ID, 2, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0},
{LINK_ID, 3, STR_SENSOR_RX_SNR, UNIT_DB, 0},
{LINK_ID, 4, STR_SENSOR_ANTENNA, UNIT_RAW, 0},
{LINK_ID, 5, STR_SENSOR_RF_MODE, UNIT_RAW, 0},
{LINK_ID, 6, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0},
{LINK_ID, 7, STR_SENSOR_TX_RSSI, UNIT_DB, 0},
{LINK_ID, 8, STR_SENSOR_TX_QUALITY, UNIT_PERCENT, 0},
{LINK_ID, 9, STR_SENSOR_TX_SNR, UNIT_DB, 0},
{BATTERY_ID, 0, STR_SENSOR_BATT, UNIT_VOLTS, 1},
{BATTERY_ID, 1, STR_SENSOR_CURR, UNIT_AMPS, 1},
{BATTERY_ID, 2, STR_SENSOR_CAPACITY, UNIT_MAH, 0},
{BATTERY_ID, 3, ZSTR_BATT_PERCENT, UNIT_PERCENT, 0},
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0},
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0},
{GPS_ID, 2, STR_SENSOR_GSPD, UNIT_KMH, 1},
{GPS_ID, 3, STR_SENSOR_HDG, UNIT_DEGREE, 3},
{GPS_ID, 4, STR_SENSOR_ALT, UNIT_METERS, 0},
{GPS_ID, 5, STR_SENSOR_SATELLITES, UNIT_RAW, 0},
{ATTITUDE_ID, 0, STR_SENSOR_PITCH, UNIT_RADIANS, 3},
{ATTITUDE_ID, 1, STR_SENSOR_ROLL, UNIT_RADIANS, 3},
{ATTITUDE_ID, 2, STR_SENSOR_YAW, UNIT_RADIANS, 3},
{FLIGHT_MODE_ID, 0, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0},
{CF_VARIO_ID, 0, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2},
{0, 0, "UNKNOWN", UNIT_RAW, 0},
};
const CrossfireSensor & getCrossfireSensor(uint8_t id, uint8_t subId)
@@ -157,6 +158,8 @@ void processCrossfireTelemetryFrame()
processCrossfireTelemetryValue(BATT_CURRENT_INDEX, value);
if (getCrossfireTelemetryValue<3>(7, value))
processCrossfireTelemetryValue(BATT_CAPACITY_INDEX, value);
if (getCrossfireTelemetryValue<1>(10, value))
processCrossfireTelemetryValue(BATT_REMAINING_INDEX, value);
break;
case ATTITUDE_ID: