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/hitec.cpp
+30 -29
View File
@@ -21,6 +21,7 @@
#include "edgetx.h"
#include "os/time.h"
#include "sensor_names.h"
/* Full telemetry
packet[0] = TX RSSI value
@@ -107,7 +108,7 @@ struct HitecSensor
const uint16_t id;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
// telemetry frames
@@ -166,45 +167,45 @@ enum
const HitecSensor hitecSensors[] = {
//frame 00
HS(HITEC_ID_RX_VOLTAGE, STR_DEF(STR_SENSOR_BATT), UNIT_VOLTS, 2), // RX_Batt Voltage
HS(HITEC_ID_RX_VOLTAGE, STR_SENSOR_BATT, UNIT_VOLTS, 2), // RX_Batt Voltage
//frame 11
//frame 12
HS(HITEC_ID_GPS_LAT_LONG, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0), // GPS position
HS(HITEC_ID_GPS_LAT_LONG, STR_SENSOR_GPS, UNIT_GPS, 0), // GPS position
//frame 13
HS(HITEC_ID_TEMP2, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 0), // Temperature sensor 2
HS(HITEC_ID_TEMP2, STR_SENSOR_TEMP2, UNIT_CELSIUS, 0), // Temperature sensor 2
//frame 14
HS(HITEC_ID_GPS_SPEED, STR_DEF(STR_SENSOR_GSPD), UNIT_KMH, 0), // GPS speed
HS(HITEC_ID_GPS_ALTITUDE, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 0), // GPS altitude sea level
HS(HITEC_ID_TEMP1, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 0), // Temperature sensor 1
HS(HITEC_ID_GPS_SPEED, STR_SENSOR_GSPD, UNIT_KMH, 0), // GPS speed
HS(HITEC_ID_GPS_ALTITUDE, STR_SENSOR_GPSALT, UNIT_METERS, 0), // GPS altitude sea level
HS(HITEC_ID_TEMP1, STR_SENSOR_TEMP1, UNIT_CELSIUS, 0), // Temperature sensor 1
//frame 15
HS(HITEC_ID_FUEL, STR_DEF(STR_SENSOR_FUEL), UNIT_PERCENT, 0), // Fuel
HS(HITEC_ID_RPM1, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0), // RPM1
HS(HITEC_ID_RPM2, STR_DEF(STR_SENSOR_RPM2), UNIT_RPMS, 0), // RPM2
HS(HITEC_ID_FUEL, STR_SENSOR_FUEL, UNIT_PERCENT, 0), // Fuel
HS(HITEC_ID_RPM1, STR_SENSOR_RPM, UNIT_RPMS, 0), // RPM1
HS(HITEC_ID_RPM2, STR_SENSOR_RPM2, UNIT_RPMS, 0), // RPM2
//frame 16
HS(HITEC_ID_GPS_DATETIME, STR_DEF(STR_SENSOR_GPS), UNIT_DATETIME, 0), // GPS date time
HS(HITEC_ID_GPS_DATETIME, STR_SENSOR_GPS, UNIT_DATETIME, 0), // GPS date time
//frame 17
HS(HITEC_ID_GPS_HEADING, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 0), // GPS Heading
HS(HITEC_ID_GPS_COUNT, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0), // GPS count
HS(HITEC_ID_TEMP3, STR_DEF(STR_SENSOR_TEMP3), UNIT_CELSIUS, 0), // Temperature sensor 3
HS(HITEC_ID_TEMP4, STR_DEF(STR_SENSOR_TEMP4), UNIT_CELSIUS, 0), // Temperature sensor 4
HS(HITEC_ID_GPS_HEADING, STR_SENSOR_HDG, UNIT_DEGREE, 0), // GPS Heading
HS(HITEC_ID_GPS_COUNT, STR_SENSOR_SATELLITES, UNIT_RAW, 0), // GPS count
HS(HITEC_ID_TEMP3, STR_SENSOR_TEMP3, UNIT_CELSIUS, 0), // Temperature sensor 3
HS(HITEC_ID_TEMP4, STR_SENSOR_TEMP4, UNIT_CELSIUS, 0), // Temperature sensor 4
//frame 18
HS(HITEC_ID_VOLTAGE, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 1), // Voltage sensor
HS(HITEC_ID_AMP, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 0), // Amp sensor
HS(HITEC_ID_C50, STR_DEF(STR_SENSOR_C50), UNIT_AMPS, 1), // Amp sensor C50
HS(HITEC_ID_C200, STR_DEF(STR_SENSOR_C200), UNIT_AMPS, 0), // Amp sensor C200
HS(HITEC_ID_VOLTAGE, STR_SENSOR_A1, UNIT_VOLTS, 1), // Voltage sensor
HS(HITEC_ID_AMP, STR_SENSOR_CURR, UNIT_AMPS, 0), // Amp sensor
HS(HITEC_ID_C50, STR_SENSOR_C50, UNIT_AMPS, 1), // Amp sensor C50
HS(HITEC_ID_C200, STR_SENSOR_C200, UNIT_AMPS, 0), // Amp sensor C200
//frame 19
HS(HITEC_ID_AMP_S1, STR_DEF(STR_SENSOR_CURR_SERVO1), UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S2, STR_DEF(STR_SENSOR_CURR_SERVO2), UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S3, STR_DEF(STR_SENSOR_CURR_SERVO3), UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S4, STR_DEF(STR_SENSOR_CURR_SERVO4), UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S1, STR_SENSOR_CURR_SERVO1, UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S2, STR_SENSOR_CURR_SERVO2, UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S3, STR_SENSOR_CURR_SERVO3, UNIT_AMPS, 1), // Amp sensor
HS(HITEC_ID_AMP_S4, STR_SENSOR_CURR_SERVO4, UNIT_AMPS, 1), // Amp sensor
//frame 1A
HS(HITEC_ID_AIR_SPEED, STR_DEF(STR_SENSOR_ASPD), UNIT_KMH, 0), // Air speed
HS(HITEC_ID_AIR_SPEED, STR_SENSOR_ASPD, UNIT_KMH, 0), // Air speed
//frame 1B
HS(HITEC_ID_VARIO, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 1), // Vario
HS(HITEC_ID_ALT, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 1), // Altitude
HS(HITEC_ID_VARIO, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 1), // Vario
HS(HITEC_ID_ALT, STR_SENSOR_ALT, UNIT_METERS, 1), // Altitude
HS(HITEC_ID_TX_RSSI, STR_DEF(STR_SENSOR_TX_RSSI), UNIT_RAW, 0), // Pseudo id outside 1 byte range of Hitec sensors
HS(HITEC_ID_TX_LQI, STR_DEF(STR_SENSOR_TX_QUALITY), UNIT_RAW, 0), // Pseudo id outside 1 byte range of Hitec sensors// Pseudo sensor for TLQI
HS(HITEC_ID_TX_RSSI, STR_SENSOR_TX_RSSI, UNIT_RAW, 0), // Pseudo id outside 1 byte range of Hitec sensors
HS(HITEC_ID_TX_LQI, STR_SENSOR_TX_QUALITY, UNIT_RAW, 0), // Pseudo id outside 1 byte range of Hitec sensors// Pseudo sensor for TLQI
HS(0x00, NULL, UNIT_RAW, 0), // sentinel
};
// clang-format on
@@ -430,7 +431,7 @@ void hitecSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance)
if (sensor) {
TelemetryUnit unit = sensor->unit;
uint8_t prec = min<uint8_t>(2, sensor->precision);
telemetrySensor.init(STR_VAL(sensor->name), unit, prec);
telemetrySensor.init(sensor->name, unit, prec);
if (unit == UNIT_RPMS) {
telemetrySensor.custom.ratio = 1;
telemetrySensor.custom.offset = 1;