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

chore: cleanup strings (#7590)

Browse Source
This commit is contained in:
philmoz
2026-08-11 08:24:16 +10:00
committed by GitHub
parent 2848cc1cae
commit 73652d0a99
138 changed files with 227438 additions and 232397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/crossfire.cpp
+41 -40
View File
@@ -24,6 +24,7 @@
#include "math.h"
#include "trainer.h"
#include "sensor_names.h"
// clang-format off
#define CS(id,subId,name,unit,precision) {id,subId,unit,precision,name}
@@ -37,48 +38,48 @@ struct CrossfireSensor {
const uint8_t subId;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
const CrossfireSensor crossfireSensors[] = {
CS(LINK_ID, 0, STR_DEF(STR_SENSOR_RX_RSSI1), UNIT_DB, 0),
CS(LINK_ID, 1, STR_DEF(STR_SENSOR_RX_RSSI2), UNIT_DB, 0),
CS(LINK_ID, 2, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0),
CS(LINK_ID, 3, STR_DEF(STR_SENSOR_RX_SNR), UNIT_DB, 0),
CS(LINK_ID, 4, STR_DEF(STR_SENSOR_ANTENNA), UNIT_RAW, 0),
CS(LINK_ID, 5, STR_DEF(STR_SENSOR_RF_MODE), UNIT_RAW, 0),
CS(LINK_ID, 6, STR_DEF(STR_SENSOR_TX_POWER), UNIT_MILLIWATTS, 0),
CS(LINK_ID, 7, STR_DEF(STR_SENSOR_TX_RSSI), UNIT_DB, 0),
CS(LINK_ID, 8, STR_DEF(STR_SENSOR_TX_QUALITY), UNIT_PERCENT, 0),
CS(LINK_ID, 9, STR_DEF(STR_SENSOR_TX_SNR), UNIT_DB, 0),
CS(LINK_RX_ID, 0, STR_DEF(STR_SENSOR_RX_RSSI_PERC), UNIT_PERCENT, 0),
CS(LINK_RX_ID, 1, STR_DEF(STR_SENSOR_RX_RF_POWER), UNIT_DBM, 0),
CS(LINK_TX_ID, 0, STR_DEF(STR_SENSOR_TX_RSSI_PERC), UNIT_PERCENT, 0),
CS(LINK_TX_ID, 1, STR_DEF(STR_SENSOR_TX_POWER), UNIT_DBM, 0),
CS(LINK_TX_ID, 2, STR_DEF(STR_SENSOR_TX_FPS), UNIT_HERTZ, 0),
CS(BATTERY_ID, 0, STR_DEF(STR_SENSOR_BATT), UNIT_VOLTS, 1),
CS(BATTERY_ID, 1, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 1),
CS(BATTERY_ID, 2, STR_DEF(STR_SENSOR_CAPACITY), UNIT_MAH, 0),
CS(BATTERY_ID, 3, STR_DEF(STR_SENSOR_BATT_PERCENT), UNIT_PERCENT, 0),
CS(GPS_ID, 0, STR_DEF(STR_SENSOR_GPS), UNIT_GPS_LATITUDE, 0),
CS(GPS_ID, 0, STR_DEF(STR_SENSOR_GPS), UNIT_GPS_LONGITUDE, 0),
CS(GPS_ID, 2, STR_DEF(STR_SENSOR_GSPD), UNIT_KMH, 1),
CS(GPS_ID, 3, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 2),
CS(GPS_ID, 4, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 0),
CS(GPS_ID, 5, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0),
CS(GPS_TIME_ID, 0, STR_DEF(STR_SENSOR_GPSDATETIME), UNIT_DATETIME, 0),
CS(ATTITUDE_ID, 0, STR_DEF(STR_SENSOR_PITCH), UNIT_RADIANS, 3),
CS(ATTITUDE_ID, 1, STR_DEF(STR_SENSOR_ROLL), UNIT_RADIANS, 3),
CS(ATTITUDE_ID, 2, STR_DEF(STR_SENSOR_YAW), UNIT_RADIANS, 3),
CS(FLIGHT_MODE_ID, 0, STR_DEF(STR_SENSOR_FLIGHT_MODE), UNIT_TEXT, 0),
CS(CF_VARIO_ID, 0, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 2),
CS(BARO_ALT_ID, 0, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 2),
CS(AIRSPEED_ID, 0, STR_DEF(STR_SENSOR_ASPD), UNIT_KMH, 1),
CS(CF_RPM_ID, 0, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0),
CS(TEMP_ID, 0, STR_DEF(STR_SENSOR_TEMP), UNIT_DEGREE, 1),
CS(CELLS_ID, 0, STR_DEF(STR_SENSOR_CELLS), UNIT_CELLS, 2),
CS(VOLT_ARRAY_ID, 0, STR_DEF(STR_SENSOR_VOLT), UNIT_VOLTS, 2),
CS(0, 0, STR_DEF(STR_UNKNOWN), UNIT_RAW, 0),
CS(LINK_ID, 0, STR_SENSOR_RX_RSSI1, UNIT_DB, 0),
CS(LINK_ID, 1, STR_SENSOR_RX_RSSI2, UNIT_DB, 0),
CS(LINK_ID, 2, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0),
CS(LINK_ID, 3, STR_SENSOR_RX_SNR, UNIT_DB, 0),
CS(LINK_ID, 4, STR_SENSOR_ANTENNA, UNIT_RAW, 0),
CS(LINK_ID, 5, STR_SENSOR_RF_MODE, UNIT_RAW, 0),
CS(LINK_ID, 6, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0),
CS(LINK_ID, 7, STR_SENSOR_TX_RSSI, UNIT_DB, 0),
CS(LINK_ID, 8, STR_SENSOR_TX_QUALITY, UNIT_PERCENT, 0),
CS(LINK_ID, 9, STR_SENSOR_TX_SNR, UNIT_DB, 0),
CS(LINK_RX_ID, 0, STR_SENSOR_RX_RSSI_PERC, UNIT_PERCENT, 0),
CS(LINK_RX_ID, 1, STR_SENSOR_RX_RF_POWER, UNIT_DBM, 0),
CS(LINK_TX_ID, 0, STR_SENSOR_TX_RSSI_PERC, UNIT_PERCENT, 0),
CS(LINK_TX_ID, 1, STR_SENSOR_TX_POWER, UNIT_DBM, 0),
CS(LINK_TX_ID, 2, STR_SENSOR_TX_FPS, UNIT_HERTZ, 0),
CS(BATTERY_ID, 0, STR_SENSOR_BATT, UNIT_VOLTS, 1),
CS(BATTERY_ID, 1, STR_SENSOR_CURR, UNIT_AMPS, 1),
CS(BATTERY_ID, 2, STR_SENSOR_CAPACITY, UNIT_MAH, 0),
CS(BATTERY_ID, 3, STR_SENSOR_BATT_PERCENT, UNIT_PERCENT, 0),
CS(GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0),
CS(GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0),
CS(GPS_ID, 2, STR_SENSOR_GSPD, UNIT_KMH, 1),
CS(GPS_ID, 3, STR_SENSOR_HDG, UNIT_DEGREE, 2),
CS(GPS_ID, 4, STR_SENSOR_GPSALT, UNIT_METERS, 0),
CS(GPS_ID, 5, STR_SENSOR_SATELLITES, UNIT_RAW, 0),
CS(GPS_TIME_ID, 0, STR_SENSOR_GPSDATETIME, UNIT_DATETIME, 0),
CS(ATTITUDE_ID, 0, STR_SENSOR_PITCH, UNIT_RADIANS, 3),
CS(ATTITUDE_ID, 1, STR_SENSOR_ROLL, UNIT_RADIANS, 3),
CS(ATTITUDE_ID, 2, STR_SENSOR_YAW, UNIT_RADIANS, 3),
CS(FLIGHT_MODE_ID, 0, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0),
CS(CF_VARIO_ID, 0, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2),
CS(BARO_ALT_ID, 0, STR_SENSOR_ALT, UNIT_METERS, 2),
CS(AIRSPEED_ID, 0, STR_SENSOR_ASPD, UNIT_KMH, 1),
CS(CF_RPM_ID, 0, STR_SENSOR_RPM, UNIT_RPMS, 0),
CS(TEMP_ID, 0, STR_SENSOR_TEMP, UNIT_DEGREE, 1),
CS(CELLS_ID, 0, STR_SENSOR_CELLS, UNIT_CELLS, 2),
CS(VOLT_ARRAY_ID, 0, STR_SENSOR_VOLT, UNIT_VOLTS, 2),
CS(0, 0, STR_SENSOR_UNKNOWN, UNIT_RAW, 0),
};
// clang-format on
@@ -455,7 +456,7 @@ void crossfireSetDefault(int index, uint16_t id, uint8_t subId)
if (unit == UNIT_GPS_LATITUDE || unit == UNIT_GPS_LONGITUDE)
unit = UNIT_GPS;
uint8_t prec = min<uint8_t>(2, sensor.precision);
telemetrySensor.init(STR_VAL(sensor.name), unit, prec);
telemetrySensor.init(sensor.name, unit, prec);
if (id == LINK_ID) {
telemetrySensor.logs = true;
}