chore: cleanup strings (#7590)

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
+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;
}
+49 -48
View File
@@ -20,6 +20,7 @@
*/
#include "edgetx.h"
#include "sensor_names.h"
/*
* TXID + RXID are already skipped in MULTI module to save memory+transmission time, format from Multi is:
@@ -39,7 +40,7 @@ struct FlySkySensor
const uint16_t type;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
// telemetry sensors type
@@ -149,54 +150,54 @@ enum
const FlySkySensor flySkySensors[] = {
// flysky start
FS( SENSOR_TYPE_RX_VOL, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 2 ), // RX Voltage (remapped, really 0x0)
FS( SENSOR_TYPE_TEMPERATURE, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 1 ), // Temperature
FS( SENSOR_TYPE_MOT, STR_DEF(STR_SENSOR_RPM), UNIT_RAW, 0 ), // RPM
FS( SENSOR_TYPE_EXT_VOL, STR_DEF(STR_SENSOR_A3), UNIT_VOLTS, 2 ), // External voltage
FS( SENSOR_TYPE_BVD, STR_DEF(STR_BVD), UNIT_VOLTS, 2 ), // BVD
FS( SENSOR_TYPE_GYROSCOPE_1_AXIS, STR_DEF(STR_SENSOR_CELLS), UNIT_DEGREE, 1 ), //
FS( SENSOR_TYPE_PRES, STR_DEF(STR_SENSOR_PRES), UNIT_RAW, 2 ), // 4 bytes In fact Temperature + Pressure -> Altitude
FS( SENSOR_TYPE_ALT, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 2 ),
FS( SENSOR_TYPE_RF_MODULE_TEMP, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 0 ), // 1 bytes temperature
FS( SENSOR_TYPE_RF_MODULE_VOL, STR_DEF(STR_SENSOR_TXV), UNIT_VOLTS, 2 ), // 2 bytes voltage
FS( SENSOR_TYPE_RF_MODULE_POWER, STR_DEF(STR_SENSOR_TX_POWER), UNIT_DBM, 0 ), // 2 bytes DBM
// FS( SENSOR_TYPE_RF_MODULE_RAW, STR_DEF(STR_SENSOR_TX_POWER), UNIT_RAW, 0 ), // 2 bytes DBM
FS( SENSOR_TYPE_TX_V, STR_DEF(STR_SENSOR_TXV), UNIT_VOLTS, 2 ), // TX Voltage
FS( SENSOR_TYPE_RX_SNR, STR_DEF(STR_SENSOR_RX_SNR), UNIT_DB, 0 ), // RX SNR
FS( SENSOR_TYPE_RX_NOISE, STR_DEF(STR_SENSOR_RX_NOISE), UNIT_DBM, 0 ), // RX Noise
FS( SENSOR_TYPE_RX_RSSI, STR_DEF(STR_SENSOR_RSSI), UNIT_DBM, 0 ), // RX RSSI (0xfc)
FS( SENSOR_TYPE_RX_ERR_RATE, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0 ), // RX error rate
FS( SENSOR_TYPE_RX_VOL, STR_SENSOR_A1, UNIT_VOLTS, 2 ), // RX Voltage (remapped, really 0x0)
FS( SENSOR_TYPE_TEMPERATURE, STR_SENSOR_TEMP1, UNIT_CELSIUS, 1 ), // Temperature
FS( SENSOR_TYPE_MOT, STR_SENSOR_RPM, UNIT_RAW, 0 ), // RPM
FS( SENSOR_TYPE_EXT_VOL, STR_SENSOR_A3, UNIT_VOLTS, 2 ), // External voltage
FS( SENSOR_TYPE_BVD, STR_SENSOR_BVD, UNIT_VOLTS, 2 ), // BVD
FS( SENSOR_TYPE_GYROSCOPE_1_AXIS, STR_SENSOR_CELLS, UNIT_DEGREE, 1 ), //
FS( SENSOR_TYPE_PRES, STR_SENSOR_PRES, UNIT_RAW, 2 ), // 4 bytes In fact Temperature + Pressure -> Altitude
FS( SENSOR_TYPE_ALT, STR_SENSOR_ALT, UNIT_METERS, 2 ),
FS( SENSOR_TYPE_RF_MODULE_TEMP, STR_SENSOR_TEMP2, UNIT_CELSIUS, 0 ), // 1 bytes temperature
FS( SENSOR_TYPE_RF_MODULE_VOL, STR_SENSOR_TXV, UNIT_VOLTS, 2 ), // 2 bytes voltage
FS( SENSOR_TYPE_RF_MODULE_POWER, STR_SENSOR_TX_POWER, UNIT_DBM, 0 ), // 2 bytes DBM
// FS( SENSOR_TYPE_RF_MODULE_RAW, STR_SENSOR_TX_POWER, UNIT_RAW, 0 ), // 2 bytes DBM
FS( SENSOR_TYPE_TX_V, STR_SENSOR_TXV, UNIT_VOLTS, 2 ), // TX Voltage
FS( SENSOR_TYPE_RX_SNR, STR_SENSOR_RX_SNR, UNIT_DB, 0 ), // RX SNR
FS( SENSOR_TYPE_RX_NOISE, STR_SENSOR_RX_NOISE, UNIT_DBM, 0 ), // RX Noise
FS( SENSOR_TYPE_RX_RSSI, STR_SENSOR_RSSI, UNIT_DBM, 0 ), // RX RSSI (0xfc)
FS( SENSOR_TYPE_RX_ERR_RATE, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0 ), // RX error rate
////////////////////////////////////////////////////////////////
FS( AFHDS2A_ID_BAT_CURR, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 2 ), // battery current A * 100
FS( AFHDS2A_ID_FUEL, STR_DEF(STR_SENSOR_CAPACITY), UNIT_RAW, 0 ), // remaining battery percentage / mah drawn otherwise or fuel level no unit!
FS( AFHDS2A_ID_RPM, STR_DEF(STR_SENSOR_RPM), UNIT_RAW, 0 ), // throttle value / battery capacity
FS( AFHDS2A_ID_CMP_HEAD, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 0 ), // Heading 0..360 deg, 0=north 2bytes
FS( AFHDS2A_ID_CLIMB_RATE, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100
FS( AFHDS2A_ID_COG, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 2 ), // 2 bytes Course over ground(NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. unknown max uint
FS( AFHDS2A_ID_GPS_STATUS, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0 ), // 2 bytes
FS( AFHDS2A_ID_ACC_X, STR_DEF(STR_SENSOR_ACCX), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ACC_Y, STR_DEF(STR_SENSOR_ACCY), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ACC_Z, STR_DEF(STR_SENSOR_ACCZ), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ROLL, STR_DEF(STR_SENSOR_ROLL), UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_PITCH, STR_DEF(STR_SENSOR_PITCH), UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_YAW, STR_DEF(STR_SENSOR_YAW), UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_VERTICAL_SPEED, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100
FS( AFHDS2A_ID_GROUND_SPEED, STR_DEF(STR_SENSOR_GSPD), UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 different unit than build-in sensor
FS( AFHDS2A_ID_GPS_DIST, STR_DEF(STR_SENSOR_DIST), UNIT_METERS, 0 ), // 2 bytes dist from home m unsigned
FS( AFHDS2A_ID_ARMED, STR_DEF(STR_SENSOR_ARM), UNIT_RAW, 0 ), // 2 bytes
FS( AFHDS2A_ID_FLIGHT_MODE, STR_DEF(STR_SENSOR_FLIGHT_MODE), UNIT_RAW, 0 ), // 2 bytes index
FS( SENSOR_TYPE_PRES | 0x100, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 1 ), // 2 bytes Temperature
FS( AFHDS2A_ID_ODO1, STR_DEF(STR_SENSOR_ODO1), UNIT_METERS, 2 ), // 2 bytes Odometer1 -- some magic with 330 needed
FS( AFHDS2A_ID_ODO2, STR_DEF(STR_SENSOR_ODO2), UNIT_METERS, 2 ), // 2 bytes Odometer2 -- some magic with 330 needed
FS( AFHDS2A_ID_SPE, STR_DEF(STR_SENSOR_ASPD), UNIT_KMH, 2 ), // 2 bytes Speed km/h -- some magic with 330 needed
FS( AFHDS2A_ID_GPS_LAT, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0 ), // 4 bytes signed WGS84 in degrees * 1E7
//FS( AFHDS2A_ID_GPS_LON, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0 ), // 4 bytes signed WGS84 in degrees * 1E7
FS( AFHDS2A_ID_GPS_ALT, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 2 ), // 4 bytes signed GPS alt m*100
FS( AFHDS2A_ID_ALT, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 2 ), // 4 bytes signed Alt m*100
FS( AFHDS2A_ID_RX_SIG_AFHDS3, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0 ), // RX error rate
FS( AFHDS2A_ID_RX_SNR_AFHDS3, STR_DEF(STR_SENSOR_RX_SNR), UNIT_DB, 1 ), // RX SNR
FS( AFHDS2A_ID_TX_RSSI, STR_DEF(STR_SENSOR_TX_RSSI), UNIT_DBM, 0 ), // Pseudo sensor for TRSSI
FS( AFHDS2A_ID_BAT_CURR, STR_SENSOR_CURR, UNIT_AMPS, 2 ), // battery current A * 100
FS( AFHDS2A_ID_FUEL, STR_SENSOR_CAPACITY, UNIT_RAW, 0 ), // remaining battery percentage / mah drawn otherwise or fuel level no unit!
FS( AFHDS2A_ID_RPM, STR_SENSOR_RPM, UNIT_RAW, 0 ), // throttle value / battery capacity
FS( AFHDS2A_ID_CMP_HEAD, STR_SENSOR_HDG, UNIT_DEGREE, 0 ), // Heading 0..360 deg, 0=north 2bytes
FS( AFHDS2A_ID_CLIMB_RATE, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100
FS( AFHDS2A_ID_COG, STR_SENSOR_HDG, UNIT_DEGREE, 2 ), // 2 bytes Course over ground(NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. unknown max uint
FS( AFHDS2A_ID_GPS_STATUS, STR_SENSOR_SATELLITES, UNIT_RAW, 0 ), // 2 bytes
FS( AFHDS2A_ID_ACC_X, STR_SENSOR_ACCX, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ACC_Y, STR_SENSOR_ACCY, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ACC_Z, STR_SENSOR_ACCZ, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 signed
FS( AFHDS2A_ID_ROLL, STR_SENSOR_ROLL, UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_PITCH, STR_SENSOR_PITCH, UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_YAW, STR_SENSOR_YAW, UNIT_DEGREE, 2 ), // 2 bytes deg *100 signed
FS( AFHDS2A_ID_VERTICAL_SPEED, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100
FS( AFHDS2A_ID_GROUND_SPEED, STR_SENSOR_GSPD, UNIT_METERS_PER_SECOND, 2 ), // 2 bytes m/s *100 different unit than build-in sensor
FS( AFHDS2A_ID_GPS_DIST, STR_SENSOR_DIST, UNIT_METERS, 0 ), // 2 bytes dist from home m unsigned
FS( AFHDS2A_ID_ARMED, STR_SENSOR_ARM, UNIT_RAW, 0 ), // 2 bytes
FS( AFHDS2A_ID_FLIGHT_MODE, STR_SENSOR_FLIGHT_MODE, UNIT_RAW, 0 ), // 2 bytes index
FS( SENSOR_TYPE_PRES | 0x100, STR_SENSOR_TEMP2, UNIT_CELSIUS, 1 ), // 2 bytes Temperature
FS( AFHDS2A_ID_ODO1, STR_SENSOR_ODO1, UNIT_METERS, 2 ), // 2 bytes Odometer1 -- some magic with 330 needed
FS( AFHDS2A_ID_ODO2, STR_SENSOR_ODO2, UNIT_METERS, 2 ), // 2 bytes Odometer2 -- some magic with 330 needed
FS( AFHDS2A_ID_SPE, STR_SENSOR_ASPD, UNIT_KMH, 2 ), // 2 bytes Speed km/h -- some magic with 330 needed
FS( AFHDS2A_ID_GPS_LAT, STR_SENSOR_GPS, UNIT_GPS, 0 ), // 4 bytes signed WGS84 in degrees * 1E7
//FS( AFHDS2A_ID_GPS_LON, STR_SENSOR_GPS, UNIT_GPS, 0 ), // 4 bytes signed WGS84 in degrees * 1E7
FS( AFHDS2A_ID_GPS_ALT, STR_SENSOR_GPSALT, UNIT_METERS, 2 ), // 4 bytes signed GPS alt m*100
FS( AFHDS2A_ID_ALT, STR_SENSOR_ALT, UNIT_METERS, 2 ), // 4 bytes signed Alt m*100
FS( AFHDS2A_ID_RX_SIG_AFHDS3, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0 ), // RX error rate
FS( AFHDS2A_ID_RX_SNR_AFHDS3, STR_SENSOR_RX_SNR, UNIT_DB, 1 ), // RX SNR
FS( AFHDS2A_ID_TX_RSSI, STR_SENSOR_TX_RSSI, UNIT_DBM, 0 ), // Pseudo sensor for TRSSI
FS( 0x00, NULL, UNIT_RAW, 0 ), // sentinel
};
@@ -496,7 +497,7 @@ void flySkySetDefault(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;
+1
View File
@@ -24,6 +24,7 @@
#include "edgetx.h"
#include "pulses/afhds3_config.h"
#include "pulses/afhds3_transport.h"
#include "sensor_names.h"
#define FLYSKY_TELEMETRY_LENGTH (2 + 7 * 4)
#define ALT_PRECISION 15
+23 -24
View File
@@ -24,8 +24,7 @@
#include "flysky_ibus.h"
#include "pulses/afhds2.h"
#include "dataconstants.h"
#include "sensor_names.h"
#define FLYSKY_FIXED_RX_VOLTAGE (uint8_t)(FLYSKY_SENSOR_RX_VOLTAGE + (uint8_t)0xA0)
@@ -43,7 +42,7 @@
struct FlyskyNv14Sensor {
const uint16_t id;
const uint8_t subId;
STR_TYP name;
const char* name;
const TelemetryUnit unit;
const uint8_t precision;
const uint8_t offset;
@@ -58,30 +57,30 @@ union nv14SensorData {
uint32_t UINT32;
};
FlyskyNv14Sensor defaultNv14Sensor = {0, 0, STR_DEF(STR_UNKNOWN), UNIT_RAW, 0, 0, 2, false};
FlyskyNv14Sensor defaultNv14Sensor = {0, 0, STR_SENSOR_UNKNOWN, UNIT_RAW, 0, 0, 2, false};
// clang-format off
const FlyskyNv14Sensor Nv14Sensor[]=
{
{FLYSKY_FIXED_RX_VOLTAGE, 0, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 2, 0, 2, false},
{FLYSKY_SENSOR_RX_SIGNAL, 0, STR_DEF(STR_SENSOR_RX_SIGNAL), UNIT_RAW, 0, 0, 2, false},
{FLYSKY_SENSOR_RX_RSSI, 0, STR_DEF(STR_SENSOR_RSSI), UNIT_DB, 0, 0, 2, true,},
{FLYSKY_SENSOR_RX_NOISE, 0, STR_DEF(STR_SENSOR_RX_NOISE), UNIT_DB, 0, 0, 2, true},
{FLYSKY_SENSOR_RX_SNR, 0, STR_DEF(STR_SENSOR_RX_SNR), UNIT_DB, 0, 0, 2, false},
{FLYSKY_SENSOR_RX_SNR, 1, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0, 0, 2, false},
{FLYSKY_SENSOR_TEMP, 0, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 1, 0, 2, true},
{FLYSKY_SENSOR_EXT_VOLTAGE,0, STR_DEF(STR_SENSOR_A3), UNIT_VOLTS, 2, 0, 2, false},
{FLYSKY_SENSOR_MOTO_RPM, 0, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0, 0, 2, false},
{FLYSKY_SENSOR_PRESSURE, 0, STR_DEF(STR_SENSOR_PRES), UNIT_RAW, 1, 0, 2, false},
{FLYSKY_SENSOR_PRESSURE, 1, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 2, 0, 2, true},
// {FLYSKY_SENSOR_PRESSURE, 2, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 1, 0, 4, true},
{FLYSKY_SENSOR_PRESSURE, 3, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 2, 0, 2, true},
{FLYSKY_SENSOR_GPS, 1, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0, 0, 1, false},
{FLYSKY_SENSOR_GPS, 2, STR_DEF(STR_SENSOR_GPS), UNIT_GPS_LATITUDE, 0, 1, 4, true},
{FLYSKY_SENSOR_GPS, 3, STR_DEF(STR_SENSOR_GPS), UNIT_GPS_LONGITUDE, 0, 5, 4, true},
{FLYSKY_SENSOR_GPS, 4, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 0, 8, 2, true},
{FLYSKY_SENSOR_GPS, 5, STR_DEF(STR_SENSOR_GSPD), UNIT_KMH, 1, 10, 2, false},
{FLYSKY_SENSOR_GPS, 6, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 3, 12, 2, false},
{FLYSKY_FIXED_RX_VOLTAGE, 0, STR_SENSOR_A1, UNIT_VOLTS, 2, 0, 2, false},
{FLYSKY_SENSOR_RX_SIGNAL, 0, STR_SENSOR_RX_SIGNAL, UNIT_RAW, 0, 0, 2, false},
{FLYSKY_SENSOR_RX_RSSI, 0, STR_SENSOR_RSSI, UNIT_DB, 0, 0, 2, true,},
{FLYSKY_SENSOR_RX_NOISE, 0, STR_SENSOR_RX_NOISE, UNIT_DB, 0, 0, 2, true},
{FLYSKY_SENSOR_RX_SNR, 0, STR_SENSOR_RX_SNR, UNIT_DB, 0, 0, 2, false},
{FLYSKY_SENSOR_RX_SNR, 1, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0, 0, 2, false},
{FLYSKY_SENSOR_TEMP, 0, STR_SENSOR_TEMP1, UNIT_CELSIUS, 1, 0, 2, true},
{FLYSKY_SENSOR_EXT_VOLTAGE,0, STR_SENSOR_A3, UNIT_VOLTS, 2, 0, 2, false},
{FLYSKY_SENSOR_MOTO_RPM, 0, STR_SENSOR_RPM, UNIT_RPMS, 0, 0, 2, false},
{FLYSKY_SENSOR_PRESSURE, 0, STR_SENSOR_PRES, UNIT_RAW, 1, 0, 2, false},
{FLYSKY_SENSOR_PRESSURE, 1, STR_SENSOR_ALT, UNIT_METERS, 2, 0, 2, true},
// {FLYSKY_SENSOR_PRESSURE, 2, STR_SENSOR_TEMP2, UNIT_CELSIUS, 1, 0, 4, true},
{FLYSKY_SENSOR_PRESSURE, 3, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2, 0, 2, true},
{FLYSKY_SENSOR_GPS, 1, STR_SENSOR_SATELLITES, UNIT_RAW, 0, 0, 1, false},
{FLYSKY_SENSOR_GPS, 2, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0, 1, 4, true},
{FLYSKY_SENSOR_GPS, 3, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0, 5, 4, true},
{FLYSKY_SENSOR_GPS, 4, STR_SENSOR_ALT, UNIT_METERS, 0, 8, 2, true},
{FLYSKY_SENSOR_GPS, 5, STR_SENSOR_GSPD, UNIT_KMH, 1, 10, 2, false},
{FLYSKY_SENSOR_GPS, 6, STR_SENSOR_HDG, UNIT_DEGREE, 3, 12, 2, false},
// {FLYSKY_SENSOR_SYNC, 0, "Sync", UNIT_RAW, 0, 0, 2, false},
defaultNv14Sensor
};
@@ -115,7 +114,7 @@ void flySkyNv14SetDefault(int index, uint8_t id, uint8_t subId,
telemetrySensor.subId = subId;
telemetrySensor.instance = instance;
const FlyskyNv14Sensor* sensor = getFlyskyNv14Sensor(id, subId);
telemetrySensor.init(STR_VAL(sensor->name), sensor->unit, sensor->precision);
telemetrySensor.init(sensor->name, sensor->unit, sensor->precision);
if (sensor->unit == UNIT_RPMS) {
telemetrySensor.custom.ratio = 1;
telemetrySensor.custom.offset = 1;
+24 -23
View File
@@ -20,6 +20,7 @@
*/
#include "edgetx.h"
#include "sensor_names.h"
void parseTelemHubByte(uint8_t byte)
{
@@ -103,33 +104,33 @@ PACK_NOT_SIMU(struct FrSkyDSensor {
const uint8_t id;
const TelemetryUnit unit:6;
const uint8_t prec:2;
STR_TYP name;
const char* name;
});
#define FS(id,name,unit,prec) {id,unit,prec,name}
const FrSkyDSensor frskyDSensors[] = {
FS( D_RSSI_ID, STR_DEF(STR_SENSOR_RSSI), UNIT_RAW, 0 ),
FS( D_A1_ID, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 1 ),
FS( D_A2_ID, STR_DEF(STR_SENSOR_A2), UNIT_VOLTS, 1 ),
FS( RPM_ID, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0 ),
FS( FUEL_ID, STR_DEF(STR_SENSOR_FUEL), UNIT_PERCENT, 0 ),
FS( TEMP1_ID, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 0 ),
FS( TEMP2_ID, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 0 ),
FS( CURRENT_ID, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 1 ),
FS( ACCEL_X_ID, STR_DEF(STR_SENSOR_ACCX), UNIT_G, 3 ),
FS( ACCEL_Y_ID, STR_DEF(STR_SENSOR_ACCY), UNIT_G, 3 ),
FS( ACCEL_Z_ID, STR_DEF(STR_SENSOR_ACCZ), UNIT_G, 3 ),
FS( VARIO_ID, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 2 ),
FS( VFAS_ID, STR_DEF(STR_SENSOR_VFAS), UNIT_VOLTS, 2 ),
FS( BARO_ALT_AP_ID, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 1 ), // we map hi precision vario into PREC1!
FS( VOLTS_AP_ID, STR_DEF(STR_SENSOR_VFAS), UNIT_VOLTS, 2 ),
FS( GPS_SPEED_BP_ID, STR_DEF(STR_SENSOR_GSPD), UNIT_KTS, 0 ),
FS( GPS_COURS_BP_ID, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 0 ),
FS( VOLTS_ID, STR_DEF(STR_SENSOR_CELLS), UNIT_CELLS, 2 ),
FS( GPS_ALT_BP_ID, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 0 ),
FS( GPS_HOUR_MIN_ID, STR_DEF(STR_SENSOR_GPSDATETIME), UNIT_DATETIME, 0 ),
FS( GPS_LAT_AP_ID, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0 ),
FS( D_RSSI_ID, STR_SENSOR_RSSI, UNIT_RAW, 0 ),
FS( D_A1_ID, STR_SENSOR_A1, UNIT_VOLTS, 1 ),
FS( D_A2_ID, STR_SENSOR_A2, UNIT_VOLTS, 1 ),
FS( RPM_ID, STR_SENSOR_RPM, UNIT_RPMS, 0 ),
FS( FUEL_ID, STR_SENSOR_FUEL, UNIT_PERCENT, 0 ),
FS( TEMP1_ID, STR_SENSOR_TEMP1, UNIT_CELSIUS, 0 ),
FS( TEMP2_ID, STR_SENSOR_TEMP2, UNIT_CELSIUS, 0 ),
FS( CURRENT_ID, STR_SENSOR_CURR, UNIT_AMPS, 1 ),
FS( ACCEL_X_ID, STR_SENSOR_ACCX, UNIT_G, 3 ),
FS( ACCEL_Y_ID, STR_SENSOR_ACCY, UNIT_G, 3 ),
FS( ACCEL_Z_ID, STR_SENSOR_ACCZ, UNIT_G, 3 ),
FS( VARIO_ID, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2 ),
FS( VFAS_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 ),
FS( BARO_ALT_AP_ID, STR_SENSOR_ALT, UNIT_METERS, 1 ), // we map hi precision vario into PREC1!
FS( VOLTS_AP_ID, STR_SENSOR_VFAS, UNIT_VOLTS, 2 ),
FS( GPS_SPEED_BP_ID, STR_SENSOR_GSPD, UNIT_KTS, 0 ),
FS( GPS_COURS_BP_ID, STR_SENSOR_HDG, UNIT_DEGREE, 0 ),
FS( VOLTS_ID, STR_SENSOR_CELLS, UNIT_CELLS, 2 ),
FS( GPS_ALT_BP_ID, STR_SENSOR_GPSALT, UNIT_METERS, 0 ),
FS( GPS_HOUR_MIN_ID, STR_SENSOR_GPSDATETIME, UNIT_DATETIME, 0 ),
FS( GPS_LAT_AP_ID, STR_SENSOR_GPS, UNIT_GPS, 0 ),
FS( 0, NULL, UNIT_RAW, 0 ) // sentinel
};
@@ -306,7 +307,7 @@ void frskyDSetDefault(int index, uint16_t id)
if (sensor) {
TelemetryUnit unit = sensor->unit;
uint8_t prec = min<uint8_t>(2, sensor->prec);
telemetrySensor.init(STR_VAL(sensor->name), unit, prec);
telemetrySensor.init(sensor->name, unit, prec);
if (id == D_RSSI_ID) {
telemetrySensor.filter = 1;
telemetrySensor.logs = true;
+1
View File
@@ -20,6 +20,7 @@
*/
#include "edgetx.h"
#include "sensor_names.h"
struct FrSkySportSensor {
const uint16_t firstId;
+23 -22
View File
@@ -23,6 +23,7 @@
#include "ghost_menu.h"
#include "edgetx.h"
#include "sensor_names.h"
const char * const ghstRfProfileValue[GHST_RF_PROFILE_COUNT] = { "Auto", "Norm", "Race", "Pure", "Long", "Unused", "Race2", "Pure2" };
const char * const ghstVtxBandName[GHST_VTX_BAND_COUNT] = { "- - -" , "IRC", "Race", "BandE", "BandB", "BandA" };
@@ -32,7 +33,7 @@ struct GhostSensor
const uint16_t id;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
// clang-format off
@@ -66,30 +67,30 @@ enum
};
const GhostSensor ghostSensors[] = {
GS(GHOST_ID_RX_RSSI, STR_DEF(STR_SENSOR_RSSI), UNIT_DB, 0),
GS(GHOST_ID_RX_LQ, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0),
GS(GHOST_ID_RX_SNR, STR_DEF(STR_SENSOR_RX_SNR), UNIT_DB, 0),
GS(GHOST_ID_RX_RSSI, STR_SENSOR_RSSI, UNIT_DB, 0),
GS(GHOST_ID_RX_LQ, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0),
GS(GHOST_ID_RX_SNR, STR_SENSOR_RX_SNR, UNIT_DB, 0),
GS(GHOST_ID_FRAME_RATE, STR_DEF(STR_SENSOR_FRAME_RATE), UNIT_RAW, 0),
GS(GHOST_ID_TX_POWER, STR_DEF(STR_SENSOR_TX_POWER), UNIT_MILLIWATTS, 0),
GS(GHOST_ID_RF_MODE, STR_DEF(STR_SENSOR_RF_MODE), UNIT_TEXT, 0),
GS(GHOST_ID_TOTAL_LATENCY, STR_DEF(STR_SENSOR_TOTAL_LATENCY), UNIT_RAW, 0),
GS(GHOST_ID_FRAME_RATE, STR_SENSOR_FRAME_RATE, UNIT_RAW, 0),
GS(GHOST_ID_TX_POWER, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0),
GS(GHOST_ID_RF_MODE, STR_SENSOR_RF_MODE, UNIT_TEXT, 0),
GS(GHOST_ID_TOTAL_LATENCY, STR_SENSOR_TOTAL_LATENCY, UNIT_RAW, 0),
GS(GHOST_ID_VTX_FREQ, STR_DEF(STR_SENSOR_VTX_FREQ), UNIT_RAW, 0),
GS(GHOST_ID_VTX_POWER, STR_DEF(STR_SENSOR_VTX_PWR), UNIT_RAW, 0),
GS(GHOST_ID_VTX_CHAN, STR_DEF(STR_SENSOR_VTX_CHAN), UNIT_RAW, 0),
GS(GHOST_ID_VTX_BAND, STR_DEF(STR_SENSOR_VTX_BAND), UNIT_TEXT, 0),
GS(GHOST_ID_VTX_FREQ, STR_SENSOR_VTX_FREQ, UNIT_RAW, 0),
GS(GHOST_ID_VTX_POWER, STR_SENSOR_VTX_PWR, UNIT_RAW, 0),
GS(GHOST_ID_VTX_CHAN, STR_SENSOR_VTX_CHAN, UNIT_RAW, 0),
GS(GHOST_ID_VTX_BAND, STR_SENSOR_VTX_BAND, UNIT_TEXT, 0),
GS(GHOST_ID_PACK_VOLTS, STR_DEF(STR_SENSOR_BATT), UNIT_VOLTS, 2),
GS(GHOST_ID_PACK_AMPS, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 2),
GS(GHOST_ID_PACK_MAH, STR_DEF(STR_SENSOR_CAPACITY), UNIT_MAH, 0),
GS(GHOST_ID_PACK_VOLTS, STR_SENSOR_BATT, UNIT_VOLTS, 2),
GS(GHOST_ID_PACK_AMPS, STR_SENSOR_CURR, UNIT_AMPS, 2),
GS(GHOST_ID_PACK_MAH, STR_SENSOR_CAPACITY, UNIT_MAH, 0),
GS(GHOST_ID_GPS_LAT, STR_DEF(STR_GPS), UNIT_GPS_LATITUDE, 0),
GS(GHOST_ID_GPS_LONG, STR_DEF(STR_GPS), UNIT_GPS_LONGITUDE, 0),
GS(GHOST_ID_GPS_GSPD, STR_DEF(STR_SENSOR_GSPD), UNIT_KMH, 1),
GS(GHOST_ID_GPS_HDG, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 3),
GS(GHOST_ID_GPS_ALT, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 0),
GS(GHOST_ID_GPS_SATS, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0),
GS(GHOST_ID_GPS_LAT, STR_GPS, UNIT_GPS_LATITUDE, 0),
GS(GHOST_ID_GPS_LONG, STR_GPS, UNIT_GPS_LONGITUDE, 0),
GS(GHOST_ID_GPS_GSPD, STR_SENSOR_GSPD, UNIT_KMH, 1),
GS(GHOST_ID_GPS_HDG, STR_SENSOR_HDG, UNIT_DEGREE, 3),
GS(GHOST_ID_GPS_ALT, STR_SENSOR_GPSALT, UNIT_METERS, 0),
GS(GHOST_ID_GPS_SATS, STR_SENSOR_SATELLITES, UNIT_RAW, 0),
GS(0x00, NULL, UNIT_RAW, 0),
};
@@ -335,7 +336,7 @@ void ghostSetDefault(int index, uint8_t id, uint8_t subId)
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);
}
else
telemetrySensor.init(id);
+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;
+58 -57
View File
@@ -20,6 +20,7 @@
*/
#include "edgetx.h"
#include "sensor_names.h"
/* HoTT Telemetry
@@ -214,7 +215,7 @@ struct HottSensor
const uint16_t id;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
// clang-format off
@@ -222,73 +223,73 @@ struct HottSensor
const HottSensor hottSensors[] = {
// TX
HS( HOTT_ID_TX_RSSI_DL, STR_DEF(STR_SENSOR_HOTT_ID_TX_RSSI_DL), UNIT_DB, 0), // downlink signal strength (rx --> tx as seen by tx)
HS( HOTT_ID_TX_LQI_DL, STR_DEF(STR_SENSOR_HOTT_ID_TX_LQI_DL), UNIT_RAW, 0), // downlink signal quality (rx --> tx s seen by tx)
HS( HOTT_ID_TX_RSSI_DL, STR_SENSOR_HOTT_ID_TX_RSSI_DL, UNIT_DB, 0), // downlink signal strength (rx --> tx as seen by tx)
HS( HOTT_ID_TX_LQI_DL, STR_SENSOR_HOTT_ID_TX_LQI_DL, UNIT_RAW, 0), // downlink signal quality (rx --> tx s seen by tx)
// RX
HS( HOTT_ID_RX_RSSI_UL, STR_DEF(STR_SENSOR_HOTT_ID_RX_RSSI_UL), UNIT_DB, 0 ), // uplink signal strength (tx --> rx as seen by rx)
HS( HOTT_ID_RX_LQI_UL, STR_DEF(STR_SENSOR_HOTT_ID_RX_LQI_UL), UNIT_RAW, 0 ), // uplink signal quality (tx --> rx as seen by rx)
HS( HOTT_ID_RX_VLT, STR_DEF(STR_SENSOR_HOTT_ID_RX_VLT), UNIT_VOLTS, 1 ), // RX battery voltage
HS( HOTT_ID_RX_TMP, STR_DEF(STR_SENSOR_HOTT_ID_RX_TMP), UNIT_CELSIUS, 0 ), // RX temperature
HS( HOTT_ID_RX_BAT_MIN, STR_DEF(STR_SENSOR_HOTT_ID_RX_BAT_MIN), UNIT_VOLTS, 1 ), // RX lowest rx voltage
HS( HOTT_ID_RX_VPCK, STR_DEF(STR_SENSOR_HOTT_ID_RX_VPCK), UNIT_MS, 0 ), // RX VPack
HS( HOTT_ID_RX_EVENT, STR_DEF(STR_SENSOR_HOTT_ID_RX_EVENT), UNIT_RAW, 0 ), // RX event and other devices warnings
HS( HOTT_ID_RX_RSSI_UL, STR_SENSOR_HOTT_ID_RX_RSSI_UL, UNIT_DB, 0 ), // uplink signal strength (tx --> rx as seen by rx)
HS( HOTT_ID_RX_LQI_UL, STR_SENSOR_HOTT_ID_RX_LQI_UL, UNIT_RAW, 0 ), // uplink signal quality (tx --> rx as seen by rx)
HS( HOTT_ID_RX_VLT, STR_SENSOR_HOTT_ID_RX_VLT, UNIT_VOLTS, 1 ), // RX battery voltage
HS( HOTT_ID_RX_TMP, STR_SENSOR_HOTT_ID_RX_TMP, UNIT_CELSIUS, 0 ), // RX temperature
HS( HOTT_ID_RX_BAT_MIN, STR_SENSOR_HOTT_ID_RX_BAT_MIN, UNIT_VOLTS, 1 ), // RX lowest rx voltage
HS( HOTT_ID_RX_VPCK, STR_SENSOR_HOTT_ID_RX_VPCK, UNIT_MS, 0 ), // RX VPack
HS( HOTT_ID_RX_EVENT, STR_SENSOR_HOTT_ID_RX_EVENT, UNIT_RAW, 0 ), // RX event and other devices warnings
// Vario
HS( HOTT_ID_VARIO_ALT, STR_DEF(STR_SENSOR_HOTT_ID_VARIO_ALT), UNIT_METERS, 0 ), // Vario altitude
HS( HOTT_ID_VARIO_VV, STR_DEF(STR_SENSOR_HOTT_ID_VARIO_VV), UNIT_METERS_PER_SECOND, 2 ), // Vario vertical velocity
HS( HOTT_ID_VARIO_HDG, STR_DEF(STR_SENSOR_HOTT_ID_VARIO_HDG), UNIT_DEGREE, 0 ), // Vario heading
HS( HOTT_ID_VARIO_ALT, STR_SENSOR_HOTT_ID_VARIO_ALT, UNIT_METERS, 0 ), // Vario altitude
HS( HOTT_ID_VARIO_VV, STR_SENSOR_HOTT_ID_VARIO_VV, UNIT_METERS_PER_SECOND, 2 ), // Vario vertical velocity
HS( HOTT_ID_VARIO_HDG, STR_SENSOR_HOTT_ID_VARIO_HDG, UNIT_DEGREE, 0 ), // Vario heading
// GPS
HS( HOTT_ID_GPS_HDG, STR_DEF(STR_SENSOR_HOTT_ID_GPS_HDG), UNIT_DEGREE, 0 ), // GPS heading
HS( HOTT_ID_GPS_SPEED, STR_DEF(STR_SENSOR_HOTT_ID_GPS_SPEED), UNIT_KMH, 0 ) , // GPS ground speed
HS( HOTT_ID_GPS_LL, STR_DEF(STR_SENSOR_HOTT_ID_GPS_LL), UNIT_GPS, 0 ), // GPS lat/long
HS( HOTT_ID_GPS_DST, STR_DEF(STR_SENSOR_HOTT_ID_GPS_DST), UNIT_METERS, 0 ), // GPS distance
HS( HOTT_ID_GPS_ALT, STR_DEF(STR_SENSOR_HOTT_ID_GPS_ALT), UNIT_METERS, 0 ), // GPS altitude
HS( HOTT_ID_GPS_VV, STR_DEF(STR_SENSOR_HOTT_ID_GPS_VV), UNIT_METERS_PER_SECOND, 2), // GPS vertical velocity
HS( HOTT_ID_GPS_NSATS, STR_DEF(STR_SENSOR_HOTT_ID_GPS_NSATS), UNIT_RAW, 0 ), // GPS number of satellites
HS( HOTT_ID_GPS_HDG, STR_SENSOR_HOTT_ID_GPS_HDG, UNIT_DEGREE, 0 ), // GPS heading
HS( HOTT_ID_GPS_SPEED, STR_SENSOR_HOTT_ID_GPS_SPEED, UNIT_KMH, 0 ) , // GPS ground speed
HS( HOTT_ID_GPS_LL, STR_SENSOR_HOTT_ID_GPS_LL, UNIT_GPS, 0 ), // GPS lat/long
HS( HOTT_ID_GPS_DST, STR_SENSOR_HOTT_ID_GPS_DST, UNIT_METERS, 0 ), // GPS distance
HS( HOTT_ID_GPS_ALT, STR_SENSOR_HOTT_ID_GPS_ALT, UNIT_METERS, 0 ), // GPS altitude
HS( HOTT_ID_GPS_VV, STR_SENSOR_HOTT_ID_GPS_VV, UNIT_METERS_PER_SECOND, 2), // GPS vertical velocity
HS( HOTT_ID_GPS_NSATS, STR_SENSOR_HOTT_ID_GPS_NSATS, UNIT_RAW, 0 ), // GPS number of satellites
// ESC
HS( HOTT_ID_ESC_VLT, STR_DEF(STR_SENSOR_HOTT_ID_ESC_VLT), UNIT_VOLTS, 1 ), // ESC battery voltage
HS( HOTT_ID_ESC_CAP, STR_DEF(STR_SENSOR_HOTT_ID_ESC_CAP), UNIT_MAH, 0 ), // ESC battery capacity consumed
HS( HOTT_ID_ESC_TMP, STR_DEF(STR_SENSOR_HOTT_ID_ESC_TMP), UNIT_CELSIUS, 0 ), // ESC temperature
HS( HOTT_ID_ESC_CUR, STR_DEF(STR_SENSOR_HOTT_ID_ESC_CUR), UNIT_AMPS, 1 ), // ESC current
HS( HOTT_ID_ESC_RPM, STR_DEF(STR_SENSOR_HOTT_ID_ESC_RPM), UNIT_RPMS, 0 ), // ESC motor rpm
HS( HOTT_ID_ESC_BEC_VLT, STR_DEF(STR_SENSOR_HOTT_ID_ESC_BEC_VLT), UNIT_VOLTS, 1 ), // ESC BEC voltage
HS( HOTT_ID_ESC_BEC_CUR, STR_DEF(STR_SENSOR_HOTT_ID_ESC_BEC_CUR), UNIT_AMPS, 1 ), // ESC BEC current
HS( HOTT_ID_ESC_BEC_TMP, STR_DEF(STR_SENSOR_HOTT_ID_ESC_BEC_TMP), UNIT_CELSIUS, 0 ), // BEC BEC temperature
HS( HOTT_ID_ESC_MOT_TMP, STR_DEF(STR_SENSOR_HOTT_ID_ESC_MOT_TMP), UNIT_CELSIUS, 0 ), // ESC motor or external temperature
HS( HOTT_ID_ESC_VLT, STR_SENSOR_HOTT_ID_ESC_VLT, UNIT_VOLTS, 1 ), // ESC battery voltage
HS( HOTT_ID_ESC_CAP, STR_SENSOR_HOTT_ID_ESC_CAP, UNIT_MAH, 0 ), // ESC battery capacity consumed
HS( HOTT_ID_ESC_TMP, STR_SENSOR_HOTT_ID_ESC_TMP, UNIT_CELSIUS, 0 ), // ESC temperature
HS( HOTT_ID_ESC_CUR, STR_SENSOR_HOTT_ID_ESC_CUR, UNIT_AMPS, 1 ), // ESC current
HS( HOTT_ID_ESC_RPM, STR_SENSOR_HOTT_ID_ESC_RPM, UNIT_RPMS, 0 ), // ESC motor rpm
HS( HOTT_ID_ESC_BEC_VLT, STR_SENSOR_HOTT_ID_ESC_BEC_VLT, UNIT_VOLTS, 1 ), // ESC BEC voltage
HS( HOTT_ID_ESC_BEC_CUR, STR_SENSOR_HOTT_ID_ESC_BEC_CUR, UNIT_AMPS, 1 ), // ESC BEC current
HS( HOTT_ID_ESC_BEC_TMP, STR_SENSOR_HOTT_ID_ESC_BEC_TMP, UNIT_CELSIUS, 0 ), // BEC BEC temperature
HS( HOTT_ID_ESC_MOT_TMP, STR_SENSOR_HOTT_ID_ESC_MOT_TMP, UNIT_CELSIUS, 0 ), // ESC motor or external temperature
// GAM
HS( HOTT_ID_GAM_CELS, STR_DEF(STR_SENSOR_HOTT_ID_GAM_CELS), UNIT_CELLS, 2), // GAM Cels L
HS( HOTT_ID_GAM_VLT1, STR_DEF(STR_SENSOR_HOTT_ID_GAM_VLT1), UNIT_VOLTS, 1 ), // GAM voltage battery 1
HS( HOTT_ID_GAM_VLT2, STR_DEF(STR_SENSOR_HOTT_ID_GAM_VLT2), UNIT_VOLTS, 1 ), // GAM volatge battery 2
HS( HOTT_ID_GAM_TMP1, STR_DEF(STR_SENSOR_HOTT_ID_GAM_TMP1), UNIT_CELSIUS, 0 ), // GAM temperature 1
HS( HOTT_ID_GAM_TMP2, STR_DEF(STR_SENSOR_HOTT_ID_GAM_TMP2), UNIT_CELSIUS, 0 ), // GAM temperature 2
HS( HOTT_ID_GAM_FUEL, STR_DEF(STR_SENSOR_HOTT_ID_GAM_FUEL), UNIT_PERCENT, 0), // GAM fuel percentage
HS( HOTT_ID_GAM_RPM1, STR_DEF(STR_SENSOR_HOTT_ID_GAM_RPM1), UNIT_RPMS, 0 ), // GAM rpm 1
HS( HOTT_ID_GAM_ALT, STR_DEF(STR_SENSOR_HOTT_ID_GAM_ALT), UNIT_METERS, 0 ), // GAM altitude
HS( HOTT_ID_GAM_VV, STR_DEF(STR_SENSOR_HOTT_ID_GAM_VV), UNIT_METERS_PER_SECOND, 2 ), // GAM vertical velocity
HS( HOTT_ID_GAM_CUR, STR_DEF(STR_SENSOR_HOTT_ID_GAM_CUR), UNIT_AMPS, 1 ), // GAM current
HS( HOTT_ID_GAM_VLT3, STR_DEF(STR_SENSOR_HOTT_ID_GAM_VLT3), UNIT_VOLTS, 1 ), // GAM voltage battery 3
HS( HOTT_ID_GAM_CAP, STR_DEF(STR_SENSOR_HOTT_ID_GAM_CAP), UNIT_MAH, 0 ), // GAM battery capacity
HS( HOTT_ID_GAM_SPEED, STR_DEF(STR_SENSOR_HOTT_ID_GAM_SPEED), UNIT_KMH, 0 ) , // GAM speed
HS( HOTT_ID_GAM_RPM2, STR_DEF(STR_SENSOR_HOTT_ID_GAM_RPM2), UNIT_RPMS, 0 ), // GAM rmp 2
HS( HOTT_ID_GAM_CELS, STR_SENSOR_HOTT_ID_GAM_CELS, UNIT_CELLS, 2), // GAM Cels L
HS( HOTT_ID_GAM_VLT1, STR_SENSOR_HOTT_ID_GAM_VLT1, UNIT_VOLTS, 1 ), // GAM voltage battery 1
HS( HOTT_ID_GAM_VLT2, STR_SENSOR_HOTT_ID_GAM_VLT2, UNIT_VOLTS, 1 ), // GAM volatge battery 2
HS( HOTT_ID_GAM_TMP1, STR_SENSOR_HOTT_ID_GAM_TMP1, UNIT_CELSIUS, 0 ), // GAM temperature 1
HS( HOTT_ID_GAM_TMP2, STR_SENSOR_HOTT_ID_GAM_TMP2, UNIT_CELSIUS, 0 ), // GAM temperature 2
HS( HOTT_ID_GAM_FUEL, STR_SENSOR_HOTT_ID_GAM_FUEL, UNIT_PERCENT, 0), // GAM fuel percentage
HS( HOTT_ID_GAM_RPM1, STR_SENSOR_HOTT_ID_GAM_RPM1, UNIT_RPMS, 0 ), // GAM rpm 1
HS( HOTT_ID_GAM_ALT, STR_SENSOR_HOTT_ID_GAM_ALT, UNIT_METERS, 0 ), // GAM altitude
HS( HOTT_ID_GAM_VV, STR_SENSOR_HOTT_ID_GAM_VV, UNIT_METERS_PER_SECOND, 2 ), // GAM vertical velocity
HS( HOTT_ID_GAM_CUR, STR_SENSOR_HOTT_ID_GAM_CUR, UNIT_AMPS, 1 ), // GAM current
HS( HOTT_ID_GAM_VLT3, STR_SENSOR_HOTT_ID_GAM_VLT3, UNIT_VOLTS, 1 ), // GAM voltage battery 3
HS( HOTT_ID_GAM_CAP, STR_SENSOR_HOTT_ID_GAM_CAP, UNIT_MAH, 0 ), // GAM battery capacity
HS( HOTT_ID_GAM_SPEED, STR_SENSOR_HOTT_ID_GAM_SPEED, UNIT_KMH, 0 ) , // GAM speed
HS( HOTT_ID_GAM_RPM2, STR_SENSOR_HOTT_ID_GAM_RPM2, UNIT_RPMS, 0 ), // GAM rmp 2
//EAM
HS( HOTT_ID_EAM_CELS_L, STR_DEF(STR_SENSOR_HOTT_ID_EAM_CELS_L), UNIT_CELLS, 2), // EAM Cells L voltage
HS( HOTT_ID_EAM_CELS_H, STR_DEF(STR_SENSOR_HOTT_ID_EAM_CELS_H), UNIT_CELLS, 2), // EAM Cells H voltage
HS( HOTT_ID_EAM_VLT1, STR_DEF(STR_SENSOR_HOTT_ID_EAM_VLT1), UNIT_VOLTS, 1 ), // EAM Voltage battery 1
HS( HOTT_ID_EAM_VLT2, STR_DEF(STR_SENSOR_HOTT_ID_EAM_VLT2), UNIT_VOLTS, 1 ), // EAM Voltage battery 2
HS( HOTT_ID_EAM_TMP1, STR_DEF(STR_SENSOR_HOTT_ID_EAM_TMP1), UNIT_CELSIUS, 0 ), // EAM temperature 1
HS( HOTT_ID_EAM_TMP2, STR_DEF(STR_SENSOR_HOTT_ID_EAM_TMP2), UNIT_CELSIUS, 0 ), // EAM temperature 2
HS( HOTT_ID_EAM_ALT, STR_DEF(STR_SENSOR_HOTT_ID_EAM_ALT), UNIT_METERS, 0 ), // EAM altitude
HS( HOTT_ID_EAM_CUR, STR_DEF(STR_SENSOR_HOTT_ID_EAM_CUR), UNIT_AMPS, 1 ), // EAM current
HS( HOTT_ID_EAM_VLT3, STR_DEF(STR_SENSOR_HOTT_ID_EAM_VLT3), UNIT_VOLTS, 1 ), // EAM battery voltage 3
HS( HOTT_ID_EAM_CAP, STR_DEF(STR_SENSOR_HOTT_ID_EAM_CAP), UNIT_MAH, 0 ), // EAM Batt capacity
HS( HOTT_ID_EAM_VV, STR_DEF(STR_SENSOR_HOTT_ID_EAM_VV), UNIT_METERS_PER_SECOND, 2 ), // EAM vertical velcocity
HS( HOTT_ID_EAM_RPM, STR_DEF(STR_SENSOR_HOTT_ID_EAM_RPM), UNIT_RPMS, 0 ), // EAM rpm
HS( HOTT_ID_EAM_SPEED, STR_DEF(STR_SENSOR_HOTT_ID_EAM_SPEED), UNIT_KMH, 0 ) , // EAM speed
HS( HOTT_ID_EAM_CELS_L, STR_SENSOR_HOTT_ID_EAM_CELS_L, UNIT_CELLS, 2), // EAM Cells L voltage
HS( HOTT_ID_EAM_CELS_H, STR_SENSOR_HOTT_ID_EAM_CELS_H, UNIT_CELLS, 2), // EAM Cells H voltage
HS( HOTT_ID_EAM_VLT1, STR_SENSOR_HOTT_ID_EAM_VLT1, UNIT_VOLTS, 1 ), // EAM Voltage battery 1
HS( HOTT_ID_EAM_VLT2, STR_SENSOR_HOTT_ID_EAM_VLT2, UNIT_VOLTS, 1 ), // EAM Voltage battery 2
HS( HOTT_ID_EAM_TMP1, STR_SENSOR_HOTT_ID_EAM_TMP1, UNIT_CELSIUS, 0 ), // EAM temperature 1
HS( HOTT_ID_EAM_TMP2, STR_SENSOR_HOTT_ID_EAM_TMP2, UNIT_CELSIUS, 0 ), // EAM temperature 2
HS( HOTT_ID_EAM_ALT, STR_SENSOR_HOTT_ID_EAM_ALT, UNIT_METERS, 0 ), // EAM altitude
HS( HOTT_ID_EAM_CUR, STR_SENSOR_HOTT_ID_EAM_CUR, UNIT_AMPS, 1 ), // EAM current
HS( HOTT_ID_EAM_VLT3, STR_SENSOR_HOTT_ID_EAM_VLT3, UNIT_VOLTS, 1 ), // EAM battery voltage 3
HS( HOTT_ID_EAM_CAP, STR_SENSOR_HOTT_ID_EAM_CAP, UNIT_MAH, 0 ), // EAM Batt capacity
HS( HOTT_ID_EAM_VV, STR_SENSOR_HOTT_ID_EAM_VV, UNIT_METERS_PER_SECOND, 2 ), // EAM vertical velcocity
HS( HOTT_ID_EAM_RPM, STR_SENSOR_HOTT_ID_EAM_RPM, UNIT_RPMS, 0 ), // EAM rpm
HS( HOTT_ID_EAM_SPEED, STR_SENSOR_HOTT_ID_EAM_SPEED, UNIT_KMH, 0 ) , // EAM speed
// sentinel
HS(0x00, NULL, UNIT_RAW, 0) // sentinel
@@ -931,7 +932,7 @@ void hottSetDefault(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;
+22 -21
View File
@@ -21,38 +21,39 @@
#include "edgetx.h"
#include "mlink.h"
#include "sensor_names.h"
struct MLinkSensor
{
const uint16_t id;
const TelemetryUnit unit;
const uint8_t precision;
STR_TYP name;
const char* name;
};
// clang-format off
#define MS(id,name,unit,precision) {id,unit,precision,name}
const MLinkSensor mlinkSensors[] = {
MS(MLINK_SPECIAL, STR_DEF(STR_SENSOR_SPECIAL), UNIT_RAW, 0),
MS(MLINK_RX_VOLTAGE, STR_DEF(STR_SENSOR_BATT), UNIT_VOLTS, 1),
MS(MLINK_VOLTAGE, STR_DEF(STR_SENSOR_VFAS), UNIT_VOLTS, 1),
MS(MLINK_CURRENT, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 1),
MS(MLINK_VARIO, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 1),
MS(MLINK_SPEED, STR_DEF(STR_SENSOR_SPEED), UNIT_KMH, 1),
MS(MLINK_RPM, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0),
MS(MLINK_TEMP, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 1),
MS(MLINK_HEADING, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 1),
MS(MLINK_ALT, STR_DEF(STR_SENSOR_ALT ), UNIT_METERS, 0),
MS(MLINK_FUEL, STR_DEF(STR_SENSOR_FUEL), UNIT_PERCENT, 0),
MS(MLINK_CAPACITY, STR_DEF(STR_SENSOR_CAPACITY), UNIT_MAH, 0),
MS(MLINK_FLOW, STR_DEF(STR_SENSOR_FLOW), UNIT_MILLILITERS, 0),
MS(MLINK_DISTANCE, STR_DEF(STR_SENSOR_DIST), UNIT_KM, 1),
MS(MLINK_GRATE, STR_DEF(STR_SENSOR_ACC), UNIT_G, 1),
MS(MLINK_LQI, STR_DEF(STR_SENSOR_RX_QUALITY), UNIT_PERCENT, 0),
MS(MLINK_LOSS, STR_DEF(STR_SENSOR_LOSS), UNIT_RAW, 0),
MS(MLINK_TX_RSSI, STR_DEF(STR_SENSOR_TX_RSSI), UNIT_RAW, 0),
MS(MLINK_TX_LQI, STR_DEF(STR_SENSOR_TX_QUALITY), UNIT_RAW, 0),
MS(MLINK_SPECIAL, STR_SENSOR_SPECIAL, UNIT_RAW, 0),
MS(MLINK_RX_VOLTAGE, STR_SENSOR_BATT, UNIT_VOLTS, 1),
MS(MLINK_VOLTAGE, STR_SENSOR_VFAS, UNIT_VOLTS, 1),
MS(MLINK_CURRENT, STR_SENSOR_CURR, UNIT_AMPS, 1),
MS(MLINK_VARIO, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 1),
MS(MLINK_SPEED, STR_SENSOR_SPEED, UNIT_KMH, 1),
MS(MLINK_RPM, STR_SENSOR_RPM, UNIT_RPMS, 0),
MS(MLINK_TEMP, STR_SENSOR_TEMP1, UNIT_CELSIUS, 1),
MS(MLINK_HEADING, STR_SENSOR_HDG, UNIT_DEGREE, 1),
MS(MLINK_ALT, STR_SENSOR_ALT , UNIT_METERS, 0),
MS(MLINK_FUEL, STR_SENSOR_FUEL, UNIT_PERCENT, 0),
MS(MLINK_CAPACITY, STR_SENSOR_CAPACITY, UNIT_MAH, 0),
MS(MLINK_FLOW, STR_SENSOR_FLOW, UNIT_MILLILITERS, 0),
MS(MLINK_DISTANCE, STR_SENSOR_DIST, UNIT_KM, 1),
MS(MLINK_GRATE, STR_SENSOR_ACC, UNIT_G, 1),
MS(MLINK_LQI, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0),
MS(MLINK_LOSS, STR_SENSOR_LOSS, UNIT_RAW, 0),
MS(MLINK_TX_RSSI, STR_SENSOR_TX_RSSI, UNIT_RAW, 0),
MS(MLINK_TX_LQI, STR_SENSOR_TX_QUALITY, UNIT_RAW, 0),
};
// clang-format on
@@ -170,7 +171,7 @@ void mlinkSetDefault(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;
+301
View File
@@ -0,0 +1,301 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#pragma once
// RX stat labeling for settings/telemetry, range
// check and internal/external module setup screens
#define STR_RXSTAT_LABEL_RSSI "RSSI "
#define STR_RXSTAT_LABEL_RQLY "Rqly "
#define STR_RXSTAT_LABEL_SIGNAL "Sgnl "
#define STR_RXSTAT_UNIT_PERCENT " %"
#define STR_RXSTAT_UNIT_DBM " db"
#define STR_RXSTAT_UNIT_NOUNIT ""
#define STR_SENSOR_UNKNOWN "UNKNOWN"
// Telemetry sensor name definitions
#define STR_SENSOR_RSSI "RSSI"
#define STR_SENSOR_R9PW "R9PW"
#define STR_SENSOR_RAS "SWR"
#define STR_SENSOR_A1 "A1"
#define STR_SENSOR_A2 "A2"
#define STR_SENSOR_A3 "A3"
#define STR_SENSOR_A4 "A4"
#define STR_SENSOR_BVD "BVD"
#define STR_SENSOR_VOLT "Volt"
#define STR_SENSOR_BATT "RxBt"
#define STR_SENSOR_ALT "Alt"
#define STR_SENSOR_TEMP "Temp"
#define STR_SENSOR_TEMP1 "Tmp1"
#define STR_SENSOR_TEMP2 "Tmp2"
#define STR_SENSOR_TEMP3 "Tmp3"
#define STR_SENSOR_TEMP4 "Tmp4"
#define STR_SENSOR_RPM2 "RPM2"
#define STR_SENSOR_PRES "Pres"
#define STR_SENSOR_ODO1 "Odo1"
#define STR_SENSOR_ODO2 "Odo2"
#define STR_SENSOR_TXV "TX_V"
#define STR_SENSOR_CURR_SERVO1 "CSv1"
#define STR_SENSOR_CURR_SERVO2 "CSv2"
#define STR_SENSOR_CURR_SERVO3 "CSv3"
#define STR_SENSOR_CURR_SERVO4 "CSv4"
#define STR_SENSOR_DIST "Dist"
#define STR_SENSOR_ARM "Arm"
#define STR_SENSOR_C50 "C50"
#define STR_SENSOR_C200 "C200"
#define STR_SENSOR_RPM "RPM"
#define STR_SENSOR_FUEL "Fuel"
#define STR_SENSOR_VSPD "VSpd"
#define STR_SENSOR_ACCX "AccX"
#define STR_SENSOR_ACCY "AccY"
#define STR_SENSOR_ACCZ "AccZ"
#define STR_SENSOR_ACC "Acc"
#define STR_SENSOR_GYROX "GYRX"
#define STR_SENSOR_GYROY "GYRY"
#define STR_SENSOR_GYROZ "GYRZ"
#define STR_SENSOR_CURR "Curr"
#define STR_SENSOR_CAPACITY "Capa"
#define STR_SENSOR_VFAS "VFAS"
#define STR_SENSOR_ASPD "ASpd"
#define STR_SENSOR_GSPD "GSpd"
#define STR_SENSOR_HDG "Hdg"
#define STR_SENSOR_SATELLITES "Sats"
#define STR_SENSOR_CELLS "Cels"
#define STR_SENSOR_GPSALT "GAlt"
#define STR_SENSOR_GPSDATETIME "Date"
#define STR_SENSOR_GPS "GPS"
#define STR_SENSOR_BATT1_VOLTAGE "RB1V"
#define STR_SENSOR_BATT2_VOLTAGE "RB2V"
#define STR_SENSOR_BATT1_CURRENT "RB1A"
#define STR_SENSOR_BATT2_CURRENT "RB2A"
#define STR_SENSOR_BATT1_CONSUMPTION "RB1C"
#define STR_SENSOR_BATT2_CONSUMPTION "RB2C"
#define STR_SENSOR_BATT1_TEMP "RB1T"
#define STR_SENSOR_BATT2_TEMP "RB2T"
#define STR_SENSOR_RB_STATE "RBS"
#define STR_SENSOR_CHANS_STATE "RBCS"
#define STR_SENSOR_RX_RSSI1 "1RSS"
#define STR_SENSOR_RX_RSSI2 "2RSS"
#define STR_SENSOR_RX_QUALITY "RQly"
#define STR_SENSOR_RX_SNR "RSNR"
#define STR_SENSOR_RX_SIGNAL "Sgnl"
#define STR_SENSOR_RX_NOISE "RNse"
#define STR_SENSOR_ANTENNA "ANT"
#define STR_SENSOR_RF_MODE "RFMD"
#define STR_SENSOR_TX_POWER "TPWR"
#define STR_SENSOR_TX_RSSI "TRSS"
#define STR_SENSOR_TX_QUALITY "TQly"
#define STR_SENSOR_RX_RSSI_PERC "RRSP"
#define STR_SENSOR_RX_RF_POWER "RPWR"
#define STR_SENSOR_TX_RSSI_PERC "TRSP"
#define STR_SENSOR_TX_FPS "TFPS"
#define STR_SENSOR_TX_SNR "TSNR"
#define STR_SENSOR_TX_NOISE "TNse"
#define STR_SENSOR_PITCH "Ptch"
#define STR_SENSOR_ROLL "Roll"
#define STR_SENSOR_YAW "Yaw"
#define STR_SENSOR_FLIGHT_MODE "FM"
#define STR_SENSOR_THROTTLE "Thr"
#define STR_SENSOR_QOS_A "FdeA"
#define STR_SENSOR_QOS_B "FdeB"
#define STR_SENSOR_QOS_L "FdeL"
#define STR_SENSOR_QOS_R "FdeR"
#define STR_SENSOR_QOS_F "FLss"
#define STR_SENSOR_QOS_H "Hold"
#define STR_SENSOR_BIND "BIND"
#define STR_SENSOR_LAP_NUMBER "Lap "
#define STR_SENSOR_GATE_NUMBER "Gate"
#define STR_SENSOR_LAP_TIME "LapT"
#define STR_SENSOR_GATE_TIME "GteT"
#define STR_SENSOR_ESC_VOLTAGE "EscV"
#define STR_SENSOR_ESC_CURRENT "EscA"
#define STR_SENSOR_ESC_RPM "EscR" //FrSky name
#define STR_SENSOR_ESC_RPM2 "Erpm" //Spektrum name
#define STR_SENSOR_ESC_CONSUMPTION "EscC"
#define STR_SENSOR_ESC_TEMP "EscT"
#define STR_SENSOR_SD1_CHANNEL "Chan"
#define STR_SENSOR_GASSUIT_TEMP1 "GTp1"
#define STR_SENSOR_GASSUIT_TEMP2 "GTp2"
#define STR_SENSOR_GASSUIT_RPM "GRPM"
#define STR_SENSOR_GASSUIT_FLOW "GFlo"
#define STR_SENSOR_GASSUIT_CONS "GFue"
#define STR_SENSOR_GASSUIT_RES_VOL "GRVl"
#define STR_SENSOR_GASSUIT_RES_PERC "GRPc"
#define STR_SENSOR_GASSUIT_MAX_FLOW "GMFl"
#define STR_SENSOR_GASSUIT_AVG_FLOW "GAFl"
#define STR_SENSOR_SBEC_VOLTAGE "BecV"
#define STR_SENSOR_SBEC_CURRENT "BecA"
#define STR_SENSOR_LOSS "Loss"
#define STR_SENSOR_FLOW "Flow"
#define STR_SENSOR_SPEED "Spd"
#define STR_SENSOR_FRAME_RATE "FRat"
#define STR_SENSOR_TOTAL_LATENCY "TLat"
#define STR_SENSOR_VTX_FREQ "VFrq"
#define STR_SENSOR_VTX_PWR "VPwr"
#define STR_SENSOR_VTX_CHAN "VChn"
#define STR_SENSOR_VTX_BAND "VBan"
#define STR_SENSOR_BATT_PERCENT "Bat%"
#define STR_SENSOR_ESC_VIN "EVIN"
#define STR_SENSOR_ESC_TFET "TFET"
#define STR_SENSOR_ESC_CUR "ECUR"
#define STR_SENSOR_ESC_TBEC "TBEC"
#define STR_SENSOR_ESC_BCUR "CBEC"
#define STR_SENSOR_ESC_VBEC "VBEC"
#define STR_SENSOR_ESC_THR "ETHR"
#define STR_SENSOR_ESC_POUT "EOUT"
#define STR_SENSOR_SMART_BAT_BTMP "BTmp"
#define STR_SENSOR_SMART_BAT_BCUR "BCur"
#define STR_SENSOR_SMART_BAT_BCAP "BUse"
#define STR_SENSOR_SMART_BAT_MIN_CEL "CLMi"
#define STR_SENSOR_SMART_BAT_MAX_CEL "CLMa"
#define STR_SENSOR_SMART_BAT_CYCLES "Cycl"
#define STR_SENSOR_SMART_BAT_CAPACITY "BCpT"
#define STR_SENSOR_CL01 "Cel1"
#define STR_SENSOR_CL02 "Cel2"
#define STR_SENSOR_CL03 "Cel3"
#define STR_SENSOR_CL04 "Cel4"
#define STR_SENSOR_CL05 "Cel5"
#define STR_SENSOR_CL06 "Cel6"
#define STR_SENSOR_CL07 "Cel7"
#define STR_SENSOR_CL08 "Cel8"
#define STR_SENSOR_CL09 "Cel9"
#define STR_SENSOR_CL10 "Cl10"
#define STR_SENSOR_CL11 "Cl11"
#define STR_SENSOR_CL12 "Cl12"
#define STR_SENSOR_CL13 "Cl13"
#define STR_SENSOR_CL14 "Cl14"
#define STR_SENSOR_CL15 "Cl15"
#define STR_SENSOR_CL16 "Cl16"
#define STR_SENSOR_CL17 "Cl17"
#define STR_SENSOR_CL18 "Cl18"
#define STR_SENSOR_VFR "VFR"
#define STR_SENSOR_RB3040_EXTRA_STATE "RBES"
#define STR_SENSOR_RB3040_CHANNEL1 "CH1A"
#define STR_SENSOR_RB3040_CHANNEL2 "CH2A"
#define STR_SENSOR_RB3040_CHANNEL3 "CH3A"
#define STR_SENSOR_RB3040_CHANNEL4 "CH4A"
#define STR_SENSOR_RB3040_CHANNEL5 "CH5A"
#define STR_SENSOR_RB3040_CHANNEL6 "CH6A"
#define STR_SENSOR_RB3040_CHANNEL7 "CH7A"
#define STR_SENSOR_RB3040_CHANNEL8 "CH8A"
#define STR_SENSOR_SERVO_CURRENT "SrvA"
#define STR_SENSOR_SERVO_VOLTAGE "SrvV"
#define STR_SENSOR_SERVO_TEMPERATURE "SrvT"
#define STR_SENSOR_SERVO_STATUS "SrvS"
#define STR_SENSOR_SPECIAL "Spcl"
//
// HoTT Telemetry sensor names by Hott device
//
// naming convention: Name of device in capital letters (1 or 2) followed by sensor name in lower case letters
//
// example: GPal = GPS altitude, GAal = GAM altitude, Valt = Vario altitude, GAt2 = GAM temperature sensor 2
//
// T = transmitter
// R = receiver
// V = Vario
// G = GPS
// ES = ESC
// EA = EAM
//
// ssi = signal strength indicator
// qly = quality
// bt = battery
// evt = HoTT warnings
// btm = battery lowest voltage
// vpk = VPack
// al or alt = altitude
// vv = vertical velocity (climb rate)
// hd = heading
// sp = speed
// PS = GPS coordinates
// di = direction
// ns = number of satellites
// cp = capacity
// u = voltage (may be followed by number if device offers more voltage sensors)
// i = current (may be followed by number if device offers more current sensors)
// tmp or t = temperature (single t may be followed by number if device offers more temperature sensors)
// rp or r = RPM (single r may be followed by number if device offers more RPM sensors)
// fl = fuel
//
// TX
#define STR_SENSOR_HOTT_ID_TX_RSSI_DL "Tssi"
#define STR_SENSOR_HOTT_ID_TX_LQI_DL "Tqly"
// RX
#define STR_SENSOR_HOTT_ID_RX_RSSI_UL "Rssi"
#define STR_SENSOR_HOTT_ID_RX_LQI_UL "Rqly"
#define STR_SENSOR_HOTT_ID_RX_VLT "Rbt"
#define STR_SENSOR_HOTT_ID_RX_TMP "Rtmp"
#define STR_SENSOR_HOTT_ID_RX_BAT_MIN "Rbtm"
#define STR_SENSOR_HOTT_ID_RX_VPCK "Rvpk"
#define STR_SENSOR_HOTT_ID_RX_EVENT "Revt"
// Vario
#define STR_SENSOR_HOTT_ID_VARIO_ALT "Valt"
#define STR_SENSOR_HOTT_ID_VARIO_VV "Vvv"
#define STR_SENSOR_HOTT_ID_VARIO_HDG "Vhdg"
// GPS
#define STR_SENSOR_HOTT_ID_GPS_HDG "GPhd"
#define STR_SENSOR_HOTT_ID_GPS_SPEED "GPsp"
#define STR_SENSOR_HOTT_ID_GPS_LL "GPS"
#define STR_SENSOR_HOTT_ID_GPS_DST "GPdi"
#define STR_SENSOR_HOTT_ID_GPS_ALT "GPal"
#define STR_SENSOR_HOTT_ID_GPS_VV "GPvv"
#define STR_SENSOR_HOTT_ID_GPS_NSATS "GPns"
// ESC
#define STR_SENSOR_HOTT_ID_ESC_VLT "ESu1"
#define STR_SENSOR_HOTT_ID_ESC_CAP "EScp"
#define STR_SENSOR_HOTT_ID_ESC_TMP "ESt1"
#define STR_SENSOR_HOTT_ID_ESC_CUR "ESi1"
#define STR_SENSOR_HOTT_ID_ESC_RPM "ESrp"
#define STR_SENSOR_HOTT_ID_ESC_BEC_VLT "ESu2"
#define STR_SENSOR_HOTT_ID_ESC_BEC_CUR "ESi2"
#define STR_SENSOR_HOTT_ID_ESC_BEC_TMP "ESt2"
#define STR_SENSOR_HOTT_ID_ESC_MOT_TMP "ESt3"
// GAM
#define STR_SENSOR_HOTT_ID_GAM_CELS "GAcl"
#define STR_SENSOR_HOTT_ID_GAM_VLT1 "GAu1"
#define STR_SENSOR_HOTT_ID_GAM_VLT2 "GAu2"
#define STR_SENSOR_HOTT_ID_GAM_TMP1 "GAt1"
#define STR_SENSOR_HOTT_ID_GAM_TMP2 "GAt2"
#define STR_SENSOR_HOTT_ID_GAM_FUEL "GAfl"
#define STR_SENSOR_HOTT_ID_GAM_RPM1 "GAr1"
#define STR_SENSOR_HOTT_ID_GAM_ALT "GAal"
#define STR_SENSOR_HOTT_ID_GAM_VV "GAvv"
#define STR_SENSOR_HOTT_ID_GAM_CUR "GAi"
#define STR_SENSOR_HOTT_ID_GAM_VLT3 "GAu3"
#define STR_SENSOR_HOTT_ID_GAM_CAP "GAcp"
#define STR_SENSOR_HOTT_ID_GAM_SPEED "GAsp"
#define STR_SENSOR_HOTT_ID_GAM_RPM2 "GAr2"
// EAM
#define STR_SENSOR_HOTT_ID_EAM_CELS_L "EAc1"
#define STR_SENSOR_HOTT_ID_EAM_CELS_H "EAc2"
#define STR_SENSOR_HOTT_ID_EAM_VLT1 "EAu1"
#define STR_SENSOR_HOTT_ID_EAM_VLT2 "EAu2"
#define STR_SENSOR_HOTT_ID_EAM_TMP1 "EAt1"
#define STR_SENSOR_HOTT_ID_EAM_TMP2 "EAt2"
#define STR_SENSOR_HOTT_ID_EAM_ALT "EAal"
#define STR_SENSOR_HOTT_ID_EAM_CUR "EAi"
#define STR_SENSOR_HOTT_ID_EAM_VLT3 "EAu3"
#define STR_SENSOR_HOTT_ID_EAM_CAP "EAcp"
#define STR_SENSOR_HOTT_ID_EAM_VV "EAvv"
#define STR_SENSOR_HOTT_ID_EAM_RPM "EArp"
#define STR_SENSOR_HOTT_ID_EAM_SPEED "EAsp"
+133 -132
View File
@@ -23,6 +23,7 @@
#include "spektrum.h"
#include "hal/module_port.h"
#include "tasks/mixer_task.h"
#include "sensor_names.h"
/*
* Documentation of the Spektrum protocol is available under
@@ -139,7 +140,7 @@ struct SpektrumSensor {
const SpektrumDataType dataType:4;
const uint8_t precision;
const TelemetryUnit unit;
STR_TYP name;
const char* name;
};
// clang-format off
@@ -148,182 +149,182 @@ struct SpektrumSensor {
// IMPORTANT: Keep the sensor table incremtally sorted by i2caddress
const SpektrumSensor spektrumSensors[] = {
// 0x01 High voltage internal sensor
SS(I2C_VOLTAGE, 0, int16, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 2), // 0.01V increments
SS(I2C_VOLTAGE, 0, int16, STR_SENSOR_A1, UNIT_VOLTS, 2), // 0.01V increments
// 0x02 Temperature internal sensor
SS(I2C_TEMPERATURE, 0, int16, STR_DEF(STR_SENSOR_TEMP1), UNIT_FAHRENHEIT, 1), // Temperature in degrees Fahrenheit
SS(I2C_TEMPERATURE, 0, int16, STR_SENSOR_TEMP1, UNIT_FAHRENHEIT, 1), // Temperature in degrees Fahrenheit
// 0x03 High current internal sensor (0x03), Resolution: 300A / 2048 = 0.196791 A/count
SS(I2C_HIGH_CURRENT, 0, int16, STR_DEF(STR_SENSOR_CURR), UNIT_AMPS, 1), // Range: +/- 150A
SS(I2C_HIGH_CURRENT, 0, int16, STR_SENSOR_CURR, UNIT_AMPS, 1), // Range: +/- 150A
// 0x0A Powerbox (also mentioned as 0x7D but that is also transmitter frame data)
SS(I2C_PBOX, 0, uint16, STR_DEF(STR_SENSOR_BATT1_VOLTAGE), UNIT_VOLTS, 2), // Volts, 0.01v
SS(I2C_PBOX, 2, uint16, STR_DEF(STR_SENSOR_BATT2_VOLTAGE), UNIT_VOLTS, 2),
SS(I2C_PBOX, 4, uint16, STR_DEF(STR_SENSOR_BATT1_CONSUMPTION), UNIT_MAH, 0), // mAh, 1mAh
SS(I2C_PBOX, 6, uint16, STR_DEF(STR_SENSOR_BATT2_CONSUMPTION), UNIT_MAH, 0),
SS(I2C_PBOX, 0, uint16, STR_SENSOR_BATT1_VOLTAGE, UNIT_VOLTS, 2), // Volts, 0.01v
SS(I2C_PBOX, 2, uint16, STR_SENSOR_BATT2_VOLTAGE, UNIT_VOLTS, 2),
SS(I2C_PBOX, 4, uint16, STR_SENSOR_BATT1_CONSUMPTION, UNIT_MAH, 0), // mAh, 1mAh
SS(I2C_PBOX, 6, uint16, STR_SENSOR_BATT2_CONSUMPTION, UNIT_MAH, 0),
// 0x0B Lap Timer
SS(I2C_LAPTIMER, 0, uint8, STR_DEF(STR_SENSOR_LAP_NUMBER), UNIT_RAW, 0), // Lap last finished
SS(I2C_LAPTIMER, 0, uint8, STR_DEF(STR_SENSOR_GATE_NUMBER), UNIT_RAW, 0), // Last gate passed
SS(I2C_LAPTIMER, 0, uint32, STR_DEF(STR_SENSOR_LAP_TIME), UNIT_SECONDS, 3), // Time of lap in 1ms increments
SS(I2C_LAPTIMER, 0, uint32, STR_DEF(STR_SENSOR_GATE_TIME), UNIT_SECONDS, 3), // Duration between last 2 gates
SS(I2C_LAPTIMER, 0, uint8, STR_SENSOR_LAP_NUMBER, UNIT_RAW, 0), // Lap last finished
SS(I2C_LAPTIMER, 0, uint8, STR_SENSOR_GATE_NUMBER, UNIT_RAW, 0), // Last gate passed
SS(I2C_LAPTIMER, 0, uint32, STR_SENSOR_LAP_TIME, UNIT_SECONDS, 3), // Time of lap in 1ms increments
SS(I2C_LAPTIMER, 0, uint32, STR_SENSOR_GATE_TIME, UNIT_SECONDS, 3), // Duration between last 2 gates
// Text Generator
//SS(I2C_TEXTGEN, 0, uint32, STR_DEF(STR_SENSOR_FLIGHT_MODE), UNIT_TEXT, 0),
//SS(I2C_TEXTGEN, 0, uint32, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0),
// 0x11 AirSpeed
SS(I2C_AIRSPEED, 0, int16, STR_DEF(STR_SENSOR_ASPD), UNIT_KMH, 0), // 1 km/h increments
//SS(I2C_AIRSPEED, 2, int16, STR_DEF(STR_SENSOR_MAX_ASPD ?), UNIT_KMH, 0), // 1 km/h increments
SS(I2C_AIRSPEED, 0, int16, STR_SENSOR_ASPD, UNIT_KMH, 0), // 1 km/h increments
//SS(I2C_AIRSPEED, 2, int16, STR_SENSOR_MAX_ASPD ?, UNIT_KMH, 0), // 1 km/h increments
// 0x012 Altitude
SS(I2C_ALTITUDE, 0, int16, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 1), // .1m increments
//SS(I2C_ALTITUDE, 2, int16, STR_DEF(STR_SENSOR_MAX_ALT ?), UNIT_METERS, 1), // .1m increments
SS(I2C_ALTITUDE, 0, int16, STR_SENSOR_ALT, UNIT_METERS, 1), // .1m increments
//SS(I2C_ALTITUDE, 2, int16, STR_SENSOR_MAX_ALT ?, UNIT_METERS, 1), // .1m increments
// 0x14 G-Force
SS(I2C_GMETER, 0, int16, STR_DEF(STR_SENSOR_ACCX), UNIT_G, 2), // force is reported as .01G increments
SS(I2C_GMETER, 2, int16, STR_DEF(STR_SENSOR_ACCY), UNIT_G, 2), // Range = +/-4000 (+/- 40G) in Pro model
SS(I2C_GMETER, 4, int16, STR_DEF(STR_SENSOR_ACCZ), UNIT_G, 2), // Range = +/-800 (+/- 8G) in Standard model
//SS(I2C_GMETER, 6, int16, STR_DEF(STR_SENSOR_MAX_ACCX ?), UNIT_G, 2), // abs(max G X-axis) FORE/AFT
//SS(I2C_GMETER, 8, int16, STR_DEF(STR_SENSOR_MAX_ACCY ?), UNIT_G, 2), // abs (max G Y-axis) LEFT/RIGHT
//SS(I2C_GMETER, 10, int16, STR_DEF(STR_SENSOR_MAX_ACCZ ?), UNIT_G, 2), // max G Z-axis WING SPAR LOAD
//SS(I2C_GMETER, 12, int16, STR_DEF(STR_SENSOR_MIN_ACCZ ?), UNIT_G, 2), // min G Z-axis WING SPAR LOAD
SS(I2C_GMETER, 0, int16, STR_SENSOR_ACCX, UNIT_G, 2), // force is reported as .01G increments
SS(I2C_GMETER, 2, int16, STR_SENSOR_ACCY, UNIT_G, 2), // Range = +/-4000 (+/- 40G) in Pro model
SS(I2C_GMETER, 4, int16, STR_SENSOR_ACCZ, UNIT_G, 2), // Range = +/-800 (+/- 8G) in Standard model
//SS(I2C_GMETER, 6, int16, STR_SENSOR_MAX_ACCX ?, UNIT_G, 2), // abs(max G X-axis) FORE/AFT
//SS(I2C_GMETER, 8, int16, STR_SENSOR_MAX_ACCY ?, UNIT_G, 2), // abs (max G Y-axis) LEFT/RIGHT
//SS(I2C_GMETER, 10, int16, STR_SENSOR_MAX_ACCZ ?, UNIT_G, 2), // max G Z-axis WING SPAR LOAD
//SS(I2C_GMETER, 12, int16, STR_SENSOR_MIN_ACCZ ?, UNIT_G, 2), // min G Z-axis WING SPAR LOAD
// 0x15, JETCAT/TURBINE, BCD Encoded values
// TODO: Add decoding of status information
//SS(I2C_JETCAT, 0, uint8, STR_DEF(STR_SENSOR_STATUS), UNIT_BITFIELD, 0),
SS(I2C_JETCAT, 1, uint8bcd, STR_DEF(STR_SENSOR_THROTTLE), UNIT_PERCENT, 0),
SS(I2C_JETCAT, 2, uint16bcd, STR_DEF(STR_SENSOR_A1), UNIT_VOLTS, 2),
SS(I2C_JETCAT, 4, uint16bcd, STR_DEF(STR_SENSOR_A2), UNIT_VOLTS, 2),
SS(I2C_JETCAT, 6, uint32bcd, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0),
SS(I2C_JETCAT, 10, uint16bcd, STR_DEF(STR_SENSOR_TEMP1), UNIT_CELSIUS, 0),
//SS(I2C_JETCAT, 0, uint8, STR_SENSOR_STATUS, UNIT_BITFIELD, 0),
SS(I2C_JETCAT, 1, uint8bcd, STR_SENSOR_THROTTLE, UNIT_PERCENT, 0),
SS(I2C_JETCAT, 2, uint16bcd, STR_SENSOR_A1, UNIT_VOLTS, 2),
SS(I2C_JETCAT, 4, uint16bcd, STR_SENSOR_A2, UNIT_VOLTS, 2),
SS(I2C_JETCAT, 6, uint32bcd, STR_SENSOR_RPM, UNIT_RPMS, 0),
SS(I2C_JETCAT, 10, uint16bcd, STR_SENSOR_TEMP1, UNIT_CELSIUS, 0),
// 0x16 GPS LOG
SS(I2C_GPS_LOC, 0, uint16bcd, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 1), // Atl-Low BCD 3.1
SS(I2C_GPS_LOC, 2, uint32bcd, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0), // LAT and LON
SS(I2C_GPS_LOC, 10, uint16bcd, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 1), // Course BCD 3.1
//SS(I2C_GPS_LOC, 12, uint8bcd, STR_DEF(STR_SENSOR_HDOP ?), UNIT_RAW, 1), // HDOP BCD 1.1
SS(I2C_GPS_LOC, 0, uint16bcd, STR_SENSOR_GPSALT, UNIT_METERS, 1), // Atl-Low BCD 3.1
SS(I2C_GPS_LOC, 2, uint32bcd, STR_SENSOR_GPS, UNIT_GPS, 0), // LAT and LON
SS(I2C_GPS_LOC, 10, uint16bcd, STR_SENSOR_HDG, UNIT_DEGREE, 1), // Course BCD 3.1
//SS(I2C_GPS_LOC, 12, uint8bcd, STR_SENSOR_HDOP ?, UNIT_RAW, 1), // HDOP BCD 1.1
// 0x17 GPS STAT
SS(I2C_GPS_STAT, 0, uint16bcd, STR_DEF(STR_SENSOR_GSPD), UNIT_KTS, 1), // BCD 3.1
SS(I2C_GPS_STAT, 2, uint32bcd, STR_DEF(STR_SENSOR_GPSDATETIME), UNIT_DATETIME, 1), // BCD 6.1 HH:MM:SS.S
SS(I2C_GPS_STAT, 6, uint8bcd, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0), // BCD 2.0
SS(I2C_GPS_STAT, 0, uint16bcd, STR_SENSOR_GSPD, UNIT_KTS, 1), // BCD 3.1
SS(I2C_GPS_STAT, 2, uint32bcd, STR_SENSOR_GPSDATETIME, UNIT_DATETIME, 1), // BCD 6.1 HH:MM:SS.S
SS(I2C_GPS_STAT, 6, uint8bcd, STR_SENSOR_SATELLITES, UNIT_RAW, 0), // BCD 2.0
// 0x18 Dual Batt Capacity monitor - Receiver
SS(I2C_RX_BATT, 0, int16, STR_DEF(STR_SENSOR_BATT1_CURRENT), UNIT_AMPS, 2), // Instantaneous current, 0.01A (0-327.66A)
SS(I2C_RX_BATT, 2, uint16, STR_DEF(STR_SENSOR_BATT1_CONSUMPTION), UNIT_MAH, 1), // Integrated mAh used, 0.1mAh (0-3276.6mAh)
SS(I2C_RX_BATT, 4, uint16, STR_DEF(STR_SENSOR_BATT1_VOLTAGE), UNIT_VOLTS, 2), // Volts, 0.01V increments (0-16.00V)
SS(I2C_RX_BATT, 6, int16, STR_DEF(STR_SENSOR_BATT1_CURRENT), UNIT_AMPS, 2), // Instantaneous current, 0.01A (0-327.66A)
SS(I2C_RX_BATT, 8, uint16, STR_DEF(STR_SENSOR_BATT1_CONSUMPTION), UNIT_MAH, 1), // Integrated mAh used, 0.1mAh (0-3276.6mAh)
SS(I2C_RX_BATT, 10, uint16, STR_DEF(STR_SENSOR_BATT1_VOLTAGE), UNIT_VOLTS, 2), // Volts, 0.01V increments (0-16.00V)
SS(I2C_RX_BATT, 0, int16, STR_SENSOR_BATT1_CURRENT, UNIT_AMPS, 2), // Instantaneous current, 0.01A (0-327.66A)
SS(I2C_RX_BATT, 2, uint16, STR_SENSOR_BATT1_CONSUMPTION, UNIT_MAH, 1), // Integrated mAh used, 0.1mAh (0-3276.6mAh)
SS(I2C_RX_BATT, 4, uint16, STR_SENSOR_BATT1_VOLTAGE, UNIT_VOLTS, 2), // Volts, 0.01V increments (0-16.00V)
SS(I2C_RX_BATT, 6, int16, STR_SENSOR_BATT1_CURRENT, UNIT_AMPS, 2), // Instantaneous current, 0.01A (0-327.66A)
SS(I2C_RX_BATT, 8, uint16, STR_SENSOR_BATT1_CONSUMPTION, UNIT_MAH, 1), // Integrated mAh used, 0.1mAh (0-3276.6mAh)
SS(I2C_RX_BATT, 10, uint16, STR_SENSOR_BATT1_VOLTAGE, UNIT_VOLTS, 2), // Volts, 0.01V increments (0-16.00V)
// 0x19 Jetcat flow rate
//SS(I2C_JETCAT_2, 0, uint16bcd, STR_DEF(STR_SENSOR_FUEL_CONSUMPTION), UNIT_MILLILITERS_PER_MINUTE, 1), missing ml/min
SS(I2C_JETCAT_2, 2, uint32bcd, STR_DEF(STR_SENSOR_FUEL), UNIT_MILLILITERS, 1),
//SS(I2C_JETCAT_2, 0, uint16bcd, STR_SENSOR_FUEL_CONSUMPTION, UNIT_MILLILITERS_PER_MINUTE, 1), missing ml/min
SS(I2C_JETCAT_2, 2, uint32bcd, STR_SENSOR_FUEL, UNIT_MILLILITERS, 1),
// 0x1a Gyro
SS(I2C_GYRO, 0, int16, STR_DEF(STR_SENSOR_GYROX), UNIT_DEGREE, 1), // Units are 0.1 deg/sec
SS(I2C_GYRO, 2, int16, STR_DEF(STR_SENSOR_GYROY), UNIT_DEGREE, 1),
SS(I2C_GYRO, 4, int16, STR_DEF(STR_SENSOR_GYROZ), UNIT_DEGREE, 1),
//SS(I2C_GYRO, 6, int16, STR_DEF(STR_SENSOR_MAX_GYROX ?), UNIT_DEGREE, 1), // abs (max)
//SS(I2C_GYRO, 8, int16, STR_DEF(STR_SENSOR_MAX_GYROY ?), UNIT_DEGREE, 1),
//SS(I2C_GYRO, 10, int16, STR_DEF(STR_SENSOR_MAX_GYROZ ?), UNIT_DEGREE, 1),
SS(I2C_GYRO, 0, int16, STR_SENSOR_GYROX, UNIT_DEGREE, 1), // Units are 0.1 deg/sec
SS(I2C_GYRO, 2, int16, STR_SENSOR_GYROY, UNIT_DEGREE, 1),
SS(I2C_GYRO, 4, int16, STR_SENSOR_GYROZ, UNIT_DEGREE, 1),
//SS(I2C_GYRO, 6, int16, STR_SENSOR_MAX_GYROX ?, UNIT_DEGREE, 1), // abs (max)
//SS(I2C_GYRO, 8, int16, STR_SENSOR_MAX_GYROY ?, UNIT_DEGREE, 1),
//SS(I2C_GYRO, 10, int16, STR_SENSOR_MAX_GYROZ ?, UNIT_DEGREE, 1),
// 0x1b Attitude & Mag Compass
// mag Units are tbd so probably no sensor in existance, ignore them for now
SS(I2C_ATTMAG, 0, int16, STR_DEF(STR_SENSOR_ROLL), UNIT_DEGREE, 1), // Attitude, 3 axes.
SS(I2C_ATTMAG, 2, int16, STR_DEF(STR_SENSOR_PITCH), UNIT_DEGREE, 1), // Units are 0.1 deg
SS(I2C_ATTMAG, 4, int16, STR_DEF(STR_SENSOR_YAW), UNIT_DEGREE, 1),
//SS(I2C_ATTMAG, 6, int16, STR_DEF(STR_SENSOR_MAGX ?), ??, 1), // Magnetic Compass, 3 axes
//SS(I2C_ATTMAG, 8, int16, STR_DEF(STR_SENSOR_MAGY ?), ??, 1), // Units are 0.1mG
//SS(I2C_ATTMAG, 10, int16, STR_DEF(STR_SENSOR_MAXZ ?), ??, 1),
//SS(I2C_ATTMAG, 12, int16, STR_DEF(STR_SENSOR_HDG ?), UNIT_DEGREE, 1), // Heading, 0.1deg
SS(I2C_ATTMAG, 0, int16, STR_SENSOR_ROLL, UNIT_DEGREE, 1), // Attitude, 3 axes.
SS(I2C_ATTMAG, 2, int16, STR_SENSOR_PITCH, UNIT_DEGREE, 1), // Units are 0.1 deg
SS(I2C_ATTMAG, 4, int16, STR_SENSOR_YAW, UNIT_DEGREE, 1),
//SS(I2C_ATTMAG, 6, int16, STR_SENSOR_MAGX ?, ??, 1), // Magnetic Compass, 3 axes
//SS(I2C_ATTMAG, 8, int16, STR_SENSOR_MAGY ?, ??, 1), // Units are 0.1mG
//SS(I2C_ATTMAG, 10, int16, STR_SENSOR_MAXZ ?, ??, 1),
//SS(I2C_ATTMAG, 12, int16, STR_SENSOR_HDG ?, UNIT_DEGREE, 1), // Heading, 0.1deg
// 0x20 Smart ESC telemetry
SS(I2C_ESC, 0, uint16, STR_DEF(STR_SENSOR_ESC_RPM2), UNIT_RPMS, 0), // Electrical RPM, 10RPM (0-655340 RPM)
SS(I2C_ESC, 2, uint16, STR_DEF(STR_SENSOR_ESC_VIN), UNIT_VOLTS, 2), // Volts, 0.01v (0-655.34V)
SS(I2C_ESC, 4, uint16, STR_DEF(STR_SENSOR_ESC_TFET), UNIT_CELSIUS, 1), // Temperature, 0.1C (0-6553.4C)
SS(I2C_ESC, 6, uint16, STR_DEF(STR_SENSOR_ESC_CUR), UNIT_AMPS, 2), // Current, 10mA (0-655.34A)
SS(I2C_ESC, 8, uint16, STR_DEF(STR_SENSOR_ESC_TBEC), UNIT_CELSIUS, 1), // Temperature, 0.1C (0-6553.4C)
SS(I2C_ESC, 10, uint8, STR_DEF(STR_SENSOR_ESC_BCUR), UNIT_AMPS, 1), // BEC Current, 100mA (0-25.4A)
SS(I2C_ESC, 11, uint8, STR_DEF(STR_SENSOR_ESC_VBEC), UNIT_VOLTS, 2), // BEC Volts, 0.05V (0-12.70V)
SS(I2C_ESC, 12, uint8, STR_DEF(STR_SENSOR_ESC_THR), UNIT_PERCENT, 0), // 0.5% (0-100%)
SS(I2C_ESC, 13, uint8, STR_DEF(STR_SENSOR_ESC_POUT), UNIT_PERCENT, 0), // Power Output, 0.5% (0-127%)
SS(I2C_ESC, 0, uint16, STR_SENSOR_ESC_RPM2, UNIT_RPMS, 0), // Electrical RPM, 10RPM (0-655340 RPM)
SS(I2C_ESC, 2, uint16, STR_SENSOR_ESC_VIN, UNIT_VOLTS, 2), // Volts, 0.01v (0-655.34V)
SS(I2C_ESC, 4, uint16, STR_SENSOR_ESC_TFET, UNIT_CELSIUS, 1), // Temperature, 0.1C (0-6553.4C)
SS(I2C_ESC, 6, uint16, STR_SENSOR_ESC_CUR, UNIT_AMPS, 2), // Current, 10mA (0-655.34A)
SS(I2C_ESC, 8, uint16, STR_SENSOR_ESC_TBEC, UNIT_CELSIUS, 1), // Temperature, 0.1C (0-6553.4C)
SS(I2C_ESC, 10, uint8, STR_SENSOR_ESC_BCUR, UNIT_AMPS, 1), // BEC Current, 100mA (0-25.4A)
SS(I2C_ESC, 11, uint8, STR_SENSOR_ESC_VBEC, UNIT_VOLTS, 2), // BEC Volts, 0.05V (0-12.70V)
SS(I2C_ESC, 12, uint8, STR_SENSOR_ESC_THR, UNIT_PERCENT, 0), // 0.5% (0-100%)
SS(I2C_ESC, 13, uint8, STR_SENSOR_ESC_POUT, UNIT_PERCENT, 0), // Power Output, 0.5% (0-127%)
// 0x26 GPS Binary
SS(I2C_GPS_BIN, 0, uint16, STR_DEF(STR_SENSOR_GPSALT), UNIT_METERS, 0), // altitude m, 1000m offset
SS(I2C_GPS_BIN, 2, int32, STR_DEF(STR_SENSOR_GPS), UNIT_GPS, 0), // latitude+long degree / 10,000,000
SS(I2C_GPS_BIN, 10, uint16, STR_DEF(STR_SENSOR_HDG), UNIT_DEGREE, 1), // heading/course degree / 10
SS(I2C_GPS_BIN, 12, uint8, STR_DEF(STR_SENSOR_GSPD), UNIT_KMH, 0), // ground speed Km/h
SS(I2C_GPS_BIN, 13, uint8, STR_DEF(STR_SENSOR_SATELLITES), UNIT_RAW, 0), // count
SS(I2C_GPS_BIN, 0, uint16, STR_SENSOR_GPSALT, UNIT_METERS, 0), // altitude m, 1000m offset
SS(I2C_GPS_BIN, 2, int32, STR_SENSOR_GPS, UNIT_GPS, 0), // latitude+long degree / 10,000,000
SS(I2C_GPS_BIN, 10, uint16, STR_SENSOR_HDG, UNIT_DEGREE, 1), // heading/course degree / 10
SS(I2C_GPS_BIN, 12, uint8, STR_SENSOR_GSPD, UNIT_KMH, 0), // ground speed Km/h
SS(I2C_GPS_BIN, 13, uint8, STR_SENSOR_SATELLITES, UNIT_RAW, 0), // count
// 0x34 Dual Batt Capacity monitor - Flight Pack
// The difference with sensor 0x18 (RX capacity monitor) is the consumption magnitude.
// RX (0x18) is up to 3.2A, and flight pack is up to 32A (x 10 or 1 decimal place)
// Right now they have the same sensor name... could this sensors (0x18 and 0x34) be used at the same time?
SS(I2C_FP_BATT, 0, int16le, STR_DEF(STR_SENSOR_BATT1_CURRENT), UNIT_AMPS, 1), // Instantaneous current, 0.1A (0-3276.6A)
SS(I2C_FP_BATT, 2, int16le, STR_DEF(STR_SENSOR_BATT1_CONSUMPTION), UNIT_MAH, 0), // Integrated mAh used, 1mAh (0-32.766Ah)
SS(I2C_FP_BATT, 4, int16le, STR_DEF(STR_SENSOR_BATT1_TEMP), UNIT_CELSIUS, 1), // Temperature, 0.1C (0-150C)
SS(I2C_FP_BATT, 6, int16le, STR_DEF(STR_SENSOR_BATT2_CURRENT), UNIT_AMPS, 1), // Instantaneous current, 0.1A (0-3276.6A)
SS(I2C_FP_BATT, 8, int16le, STR_DEF(STR_SENSOR_BATT2_CONSUMPTION), UNIT_MAH, 0), // Integrated mAh used, 1mAh (0-32.766Ah)
SS(I2C_FP_BATT, 10, int16le, STR_DEF(STR_SENSOR_BATT2_TEMP), UNIT_CELSIUS, 1), // Temperature, 0.1C (0-150C)
SS(I2C_FP_BATT, 0, int16le, STR_SENSOR_BATT1_CURRENT, UNIT_AMPS, 1), // Instantaneous current, 0.1A (0-3276.6A)
SS(I2C_FP_BATT, 2, int16le, STR_SENSOR_BATT1_CONSUMPTION, UNIT_MAH, 0), // Integrated mAh used, 1mAh (0-32.766Ah)
SS(I2C_FP_BATT, 4, int16le, STR_SENSOR_BATT1_TEMP, UNIT_CELSIUS, 1), // Temperature, 0.1C (0-150C)
SS(I2C_FP_BATT, 6, int16le, STR_SENSOR_BATT2_CURRENT, UNIT_AMPS, 1), // Instantaneous current, 0.1A (0-3276.6A)
SS(I2C_FP_BATT, 8, int16le, STR_SENSOR_BATT2_CONSUMPTION, UNIT_MAH, 0), // Integrated mAh used, 1mAh (0-32.766Ah)
SS(I2C_FP_BATT, 10, int16le, STR_SENSOR_BATT2_TEMP, UNIT_CELSIUS, 1), // Temperature, 0.1C (0-150C)
// Tank pressure + custom input bits (ignore for now)
//SS(0x38, 0, uint16, STR_DEF(STR_SENSOR_STATUS_BITS), UNIT_BITFIELD, 0),
//SS(0x38, 0, uint16, STR_DEF(STR_SENSOR_PRESSSURE), UNIT_PSI, 1),
//SS(0x38, 0, uint16, STR_SENSOR_STATUS_BITS, UNIT_BITFIELD, 0),
//SS(0x38, 0, uint16, STR_SENSOR_PRESSSURE, UNIT_PSI, 1),
// 0x3A Lipo 6s Monitor Cells
SS(I2C_CELLS, 0, uint16le, STR_DEF(STR_SENSOR_CL01), UNIT_VOLTS, 2), // Voltage across cell 1, .01V steps
SS(I2C_CELLS, 2, uint16le, STR_DEF(STR_SENSOR_CL02), UNIT_VOLTS, 2),
SS(I2C_CELLS, 4, uint16le, STR_DEF(STR_SENSOR_CL03), UNIT_VOLTS, 2),
SS(I2C_CELLS, 6, uint16le, STR_DEF(STR_SENSOR_CL04), UNIT_VOLTS, 2),
SS(I2C_CELLS, 8, uint16le, STR_DEF(STR_SENSOR_CL05), UNIT_VOLTS, 2),
SS(I2C_CELLS, 10, uint16le, STR_DEF(STR_SENSOR_CL06), UNIT_VOLTS, 2),
SS(I2C_CELLS, 12, uint16le, STR_DEF(STR_SENSOR_TEMP2), UNIT_CELSIUS, 1), // Temperature, 0.1C (0-655.34C)
SS(I2C_CELLS, 0, uint16le, STR_SENSOR_CL01, UNIT_VOLTS, 2), // Voltage across cell 1, .01V steps
SS(I2C_CELLS, 2, uint16le, STR_SENSOR_CL02, UNIT_VOLTS, 2),
SS(I2C_CELLS, 4, uint16le, STR_SENSOR_CL03, UNIT_VOLTS, 2),
SS(I2C_CELLS, 6, uint16le, STR_SENSOR_CL04, UNIT_VOLTS, 2),
SS(I2C_CELLS, 8, uint16le, STR_SENSOR_CL05, UNIT_VOLTS, 2),
SS(I2C_CELLS, 10, uint16le, STR_SENSOR_CL06, UNIT_VOLTS, 2),
SS(I2C_CELLS, 12, uint16le, STR_SENSOR_TEMP2, UNIT_CELSIUS, 1), // Temperature, 0.1C (0-655.34C)
// 0x40 Vario-S
SS(I2C_VARIO, 0, int16, STR_DEF(STR_SENSOR_ALT), UNIT_METERS, 1),
SS(I2C_VARIO, 2, int16, STR_DEF(STR_SENSOR_VSPD), UNIT_METERS_PER_SECOND, 1),
SS(I2C_VARIO, 0, int16, STR_SENSOR_ALT, UNIT_METERS, 1),
SS(I2C_VARIO, 2, int16, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 1),
// 0x42 Smartbat
//SS(I2C_SMART_BAT_REALTIME, 1, int8, STR_DEF(STR_SMART_BAT_BTMP), UNIT_CELSIUS, 0), // disabled because sensor is a duplicate of cells sensors ones
SS(I2C_SMART_BAT_REALTIME, 2, uint32le, STR_DEF(STR_SENSOR_SMART_BAT_BCUR), UNIT_MAH, 0),
//SS(I2C_SMART_BAT_REALTIME, 6, uint16le, STR_DEF(STR_SENSOR_SMART_BAT_BCAP), UNIT_MAH, 0),
//SS(I2C_SMART_BAT_REALTIME, 8, uint16le, STR_DEF(STR_SENSOR_SMART_BAT_MIN_CEL), UNIT_VOLTS, 2),
//SS(I2C_SMART_BAT_REALTIME, 10, uint16le, STR_DEF(STR_SENSOR_SMART_BAT_MAX_CEL), UNIT_VOLTS, 2),
//SS(I2C_SMART_BAT_REALTIME, 1, int8, STR_SMART_BAT_BTMP, UNIT_CELSIUS, 0), // disabled because sensor is a duplicate of cells sensors ones
SS(I2C_SMART_BAT_REALTIME, 2, uint32le, STR_SENSOR_SMART_BAT_BCUR, UNIT_MAH, 0),
//SS(I2C_SMART_BAT_REALTIME, 6, uint16le, STR_SENSOR_SMART_BAT_BCAP, UNIT_MAH, 0),
//SS(I2C_SMART_BAT_REALTIME, 8, uint16le, STR_SENSOR_SMART_BAT_MIN_CEL, UNIT_VOLTS, 2),
//SS(I2C_SMART_BAT_REALTIME, 10, uint16le, STR_SENSOR_SMART_BAT_MAX_CEL, UNIT_VOLTS, 2),
//SS(I2C_SMART_BAT_REALTIME, 12, uint16le, "RFU[2]", UNIT_RAW, 0), // disabled to save sensors slots
SS(I2C_SMART_BAT_CELLS_1_6, 1, int8, STR_DEF(STR_SENSOR_SMART_BAT_BTMP), UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_1_6, 2, uint16le, STR_DEF(STR_SENSOR_CL01), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 4, uint16le, STR_DEF(STR_SENSOR_CL02), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 6, uint16le, STR_DEF(STR_SENSOR_CL03), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 8, uint16le, STR_DEF(STR_SENSOR_CL04), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 10, uint16le, STR_DEF(STR_SENSOR_CL05), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 12, uint16le, STR_DEF(STR_SENSOR_CL06), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 1, int8, STR_SENSOR_SMART_BAT_BTMP, UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_1_6, 2, uint16le, STR_SENSOR_CL01, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 4, uint16le, STR_SENSOR_CL02, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 6, uint16le, STR_SENSOR_CL03, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 8, uint16le, STR_SENSOR_CL04, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 10, uint16le, STR_SENSOR_CL05, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_1_6, 12, uint16le, STR_SENSOR_CL06, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 1, int8, STR_DEF(STR_SENSOR_SMART_BAT_BTMP), UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_7_12, 2, uint16le, STR_DEF(STR_SENSOR_CL07), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 4, uint16le, STR_DEF(STR_SENSOR_CL08), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 6, uint16le, STR_DEF(STR_SENSOR_CL09), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 8, uint16le, STR_DEF(STR_SENSOR_CL10), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 10, uint16le, STR_DEF(STR_SENSOR_CL11), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 12, uint16le, STR_DEF(STR_SENSOR_CL12), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 1, int8, STR_SENSOR_SMART_BAT_BTMP, UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_7_12, 2, uint16le, STR_SENSOR_CL07, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 4, uint16le, STR_SENSOR_CL08, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 6, uint16le, STR_SENSOR_CL09, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 8, uint16le, STR_SENSOR_CL10, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 10, uint16le, STR_SENSOR_CL11, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_7_12, 12, uint16le, STR_SENSOR_CL12, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 1, int8, STR_DEF(STR_SENSOR_SMART_BAT_BTMP), UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_13_18, 2, uint16le, STR_DEF(STR_SENSOR_CL13), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 4, uint16le, STR_DEF(STR_SENSOR_CL14), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 6, uint16le, STR_DEF(STR_SENSOR_CL15), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 8, uint16le, STR_DEF(STR_SENSOR_CL16), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 10, uint16le, STR_DEF(STR_SENSOR_CL17), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 12, uint16le, STR_DEF(STR_SENSOR_CL18), UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 1, int8, STR_SENSOR_SMART_BAT_BTMP, UNIT_CELSIUS, 0),
SS(I2C_SMART_BAT_CELLS_13_18, 2, uint16le, STR_SENSOR_CL13, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 4, uint16le, STR_SENSOR_CL14, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 6, uint16le, STR_SENSOR_CL15, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 8, uint16le, STR_SENSOR_CL16, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 10, uint16le, STR_SENSOR_CL17, UNIT_VOLTS, 2),
SS(I2C_SMART_BAT_CELLS_13_18, 12, uint16le, STR_SENSOR_CL18, UNIT_VOLTS, 2),
//SS(I2C_SMART_BAT_ID, 1, uint8, "chemistery", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_ID, 2, uint8, "number of cells", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_ID, 3, uint8, "manufacturer code", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_ID, 4, uint16le, STR_DEF(STR_SENSOR_SMART_BAT_CYCLES), UNIT_RAW, 0),
//SS(I2C_SMART_BAT_ID, 4, uint16le, STR_SENSOR_SMART_BAT_CYCLES, UNIT_RAW, 0),
//SS(I2C_SMART_BAT_ID, 6, uint8, "uniqueID[8]", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_LIMITS, 1, uint8, "rfu", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_LIMITS, 2, uint16le, STR_DEF(STR_SENSOR_SMART_BAT_CAPACITY),UNIT_MAH, 0),
//SS(I2C_SMART_BAT_LIMITS, 2, uint16le, STR_SENSOR_SMART_BAT_CAPACITY,UNIT_MAH, 0),
//SS(I2C_SMART_BAT_LIMITS, 4, uint16le, "dischargeCurrentRating", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_LIMITS, 6, uint16le, "overDischarge_mV", UNIT_RAW, 0), // disabled to save sensors slots
//SS(I2C_SMART_BAT_LIMITS, 8, uint16le, "zeroCapacity_mV", UNIT_RAW, 0), // disabled to save sensors slots
@@ -338,23 +339,23 @@ const SpektrumSensor spektrumSensors[] = {
// telemetry bus on the model itself
// 0x7E RPM/Volts/Temperature
SS(I2C_RPM, 0, uint16, STR_DEF(STR_SENSOR_RPM), UNIT_RPMS, 0), // microseconds between pulse leading edges
SS(I2C_RPM, 2, uint16, STR_DEF(STR_SENSOR_A3), UNIT_VOLTS, 2), // 0.01V increments (typically flight pack voltage)
SS(I2C_RPM, 4, int16, STR_DEF(STR_SENSOR_TEMP2), UNIT_FAHRENHEIT, 0), // Temperature in degrees F.
SS(I2C_RPM, 0, uint16, STR_SENSOR_RPM, UNIT_RPMS, 0), // microseconds between pulse leading edges
SS(I2C_RPM, 2, uint16, STR_SENSOR_A3, UNIT_VOLTS, 2), // 0.01V increments (typically flight pack voltage)
SS(I2C_RPM, 4, int16, STR_SENSOR_TEMP2, UNIT_FAHRENHEIT, 0), // Temperature in degrees F.
// 0x7f, QoS DATA, also called Flight Log
SS(I2C_QOS, 0, uint16, STR_DEF(STR_SENSOR_QOS_A), UNIT_RAW, 0), // A - Antenna Fades on Receiver A
SS(I2C_QOS, 2, uint16, STR_DEF(STR_SENSOR_QOS_B), UNIT_RAW, 0), // B - Antenna Fades on Receiver B
SS(I2C_QOS, 4, uint16, STR_DEF(STR_SENSOR_QOS_L), UNIT_RAW, 0), // L - Antenna Fades on left Receiver
SS(I2C_QOS, 6, uint16, STR_DEF(STR_SENSOR_QOS_R), UNIT_RAW, 0), // R - Antenna Fades on right Receiver
SS(I2C_QOS, 8, uint16, STR_DEF(STR_SENSOR_QOS_F), UNIT_RAW, 0), // F - Frame losses.
SS(I2C_QOS, 10, uint16, STR_DEF(STR_SENSOR_QOS_H), UNIT_RAW, 0), // H - Holds
SS(I2C_QOS, 12, uint16, STR_DEF(STR_SENSOR_A2), UNIT_VOLTS, 2), // Volts, .01V increment.
SS(I2C_QOS, 0, uint16, STR_SENSOR_QOS_A, UNIT_RAW, 0), // A - Antenna Fades on Receiver A
SS(I2C_QOS, 2, uint16, STR_SENSOR_QOS_B, UNIT_RAW, 0), // B - Antenna Fades on Receiver B
SS(I2C_QOS, 4, uint16, STR_SENSOR_QOS_L, UNIT_RAW, 0), // L - Antenna Fades on left Receiver
SS(I2C_QOS, 6, uint16, STR_SENSOR_QOS_R, UNIT_RAW, 0), // R - Antenna Fades on right Receiver
SS(I2C_QOS, 8, uint16, STR_SENSOR_QOS_F, UNIT_RAW, 0), // F - Frame losses.
SS(I2C_QOS, 10, uint16, STR_SENSOR_QOS_H, UNIT_RAW, 0), // H - Holds
SS(I2C_QOS, 12, uint16, STR_SENSOR_A2, UNIT_VOLTS, 2), // Volts, .01V increment.
SS(I2C_PSEUDO_TX, 0, uint8, STR_DEF(STR_SENSOR_TX_RSSI), UNIT_RAW, 0),
SS(I2C_PSEUDO_TX, 4, uint32, STR_DEF(STR_SENSOR_BIND), UNIT_RAW, 0),
SS(I2C_PSEUDO_TX, 8, uint32, STR_DEF(STR_SENSOR_FLIGHT_MODE), UNIT_TEXT, 0),
SS(I2C_PSEUDO_TX, 10, uint32, STR_DEF(STR_SENSOR_CELLS), UNIT_CELLS, 2),
SS(I2C_PSEUDO_TX, 0, uint8, STR_SENSOR_TX_RSSI, UNIT_RAW, 0),
SS(I2C_PSEUDO_TX, 4, uint32, STR_SENSOR_BIND, UNIT_RAW, 0),
SS(I2C_PSEUDO_TX, 8, uint32, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0),
SS(I2C_PSEUDO_TX, 10, uint32, STR_SENSOR_CELLS, UNIT_CELLS, 2),
SS(0, 0, int16, NULL, UNIT_RAW, 0) //sentinel
};
// clang-format on
@@ -884,7 +885,7 @@ void spektrumSetDefault(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;
+1
View File
@@ -28,6 +28,7 @@
#include "mixer_scheduler.h"
#include "io/multi_protolist.h"
#include "hal/module_port.h"
#include "sensor_names.h"
#include <list>