Skip to content

Commit 7471212

Browse files
committed
add profile to extended telemetry
1 parent 942226b commit 7471212

File tree

4 files changed

+37
-29
lines changed

4 files changed

+37
-29
lines changed

src/main/telemetry/crsf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ static telemetrySensor_t crsfCustomTelemetrySensors[] =
460460
TLM_SENSOR(CPU_LOAD, 0x1150, 500, 3000, 10, U8),
461461
TLM_SENSOR(FLIGHT_MODE, 0x1251, 200, 3000, 0, U16),
462462
TLM_SENSOR(ARMING_FLAGS, 0x1252, 200, 3000, 0, U8),
463+
TLM_SENSOR(PROFILES, 0x1253, 200, 3000, 0, U24),
463464
};
464465

465466
telemetrySensor_t * crsfGetCustomSensor(sensor_id_e id)

src/main/telemetry/sensors.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ int telemetrySensorValue(sensor_id_e id)
166166
////// SYSTEM //////////////////////////
167167
case TELEM_FLIGHT_MODE:
168168
return (int)flightModeFlags;
169+
case TELEM_PROFILES:
170+
return ((getConfigBatteryProfile() & 0xFF) << 16) |
171+
((getConfigMixerProfile() & 0xFF) << 8) |
172+
((getConfigProfile() & 0xFF));
169173
case TELEM_ARMING_FLAGS:
170174
return (int)armingFlags;
171175
case TELEM_CPU_LOAD:
@@ -376,11 +380,12 @@ bool telemetrySensorAllowed(sensor_id_e id)
376380
////// SYSTEM //////////////////////////
377381
case TELEM_CPU_LOAD:
378382
return true;
379-
380383
case TELEM_FLIGHT_MODE:
381384
return true;
382385
case TELEM_ARMING_FLAGS:
383386
return true;
387+
case TELEM_PROFILES:
388+
return true;
384389

385390
////////////////////////////////////////
386391
////// LEGACY SMARTPORT ////////////////

src/main/telemetry/sensors.h

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -92,34 +92,35 @@ typedef enum
9292
////// SYSTEM //////////////////////////
9393
TELEM_CPU_LOAD = 42,
9494
TELEM_FLIGHT_MODE = 43,
95-
TELEM_ARMING_FLAGS = 44,
96-
97-
/////////////////////////////////////////
98-
////// LEGACY SMARTPORT ////////////////
99-
TELEM_LEGACY_VFAS = 45,
100-
TELEM_LEGACY_CURRENT = 46,
101-
TELEM_LEGACY_ALTITUDE = 47,
102-
TELEM_LEGACY_FUEL = 48,
103-
TELEM_LEGACY_VARIO = 49,
104-
TELEM_LEGACY_HEADING = 50,
105-
TELEM_LEGACY_PITCH = 51,
106-
TELEM_LEGACY_ROLL = 52,
107-
TELEM_LEGACY_ACCX = 53,
108-
TELEM_LEGACY_ACCY = 54,
109-
TELEM_LEGACY_ACCZ = 55,
110-
TELEM_LEGACY_MODES = 56,
111-
112-
TELEM_LEGACY_GNSS = 57,
113-
TELEM_LEGACY_SPEED = 58,
114-
TELEM_LEGACY_LAT = 59,
115-
TELEM_LEGACY_LON = 60,
116-
TELEM_LEGACY_HOME_DIST = 61,
117-
TELEM_LEGACY_GPS_ALT = 62,
118-
TELEM_LEGACY_FPV = 63,
119-
TELEM_LEGACY_AZIMUTH = 64,
120-
121-
TELEM_LEGACY_A4 = 65,
122-
TELEM_LEGACY_ASPD = 66,
95+
TELEM_PROFILES = 44,
96+
TELEM_ARMING_FLAGS = 45,
97+
98+
/////////////////////////////////////////
99+
////// LEGACY SMARTPORT ////////////////
100+
TELEM_LEGACY_VFAS = 46,
101+
TELEM_LEGACY_CURRENT = 47,
102+
TELEM_LEGACY_ALTITUDE = 48,
103+
TELEM_LEGACY_FUEL = 49,
104+
TELEM_LEGACY_VARIO = 50,
105+
TELEM_LEGACY_HEADING = 51,
106+
TELEM_LEGACY_PITCH = 52,
107+
TELEM_LEGACY_ROLL = 53,
108+
TELEM_LEGACY_ACCX = 54,
109+
TELEM_LEGACY_ACCY = 55,
110+
TELEM_LEGACY_ACCZ = 56,
111+
TELEM_LEGACY_MODES = 57,
112+
113+
TELEM_LEGACY_GNSS = 58,
114+
TELEM_LEGACY_SPEED = 59,
115+
TELEM_LEGACY_LAT = 60,
116+
TELEM_LEGACY_LON = 61,
117+
TELEM_LEGACY_HOME_DIST = 62,
118+
TELEM_LEGACY_GPS_ALT = 63,
119+
TELEM_LEGACY_FPV = 64,
120+
TELEM_LEGACY_AZIMUTH = 65,
121+
122+
TELEM_LEGACY_A4 = 66,
123+
TELEM_LEGACY_ASPD = 67,
123124

124125
TELEM_SENSOR_COUNT
125126

src/main/telemetry/smartport.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ static telemetrySensor_t smartportTelemetrySensors[] =
240240
TLM_SENSOR(CPU_LOAD, 0x51D0, 200, 3000, 1, 10, 10, INT),
241241
TLM_SENSOR(FLIGHT_MODE, 0x5121, 100, 3000, 1, 1, 0, INT),
242242
TLM_SENSOR(ARMING_FLAGS, 0x5122, 100, 3000, 1, 1, 0, INT),
243+
TLM_SENSOR(PROFILES, 0x5123, 100, 3000, 1, 1, 0, INT),
243244

244245
#ifdef USE_ESC_SENSOR
245246
TLM_SENSOR(ESC1_RPM, 0x5130, 100, 3000, 1, 10, 0, INT),

0 commit comments

Comments
 (0)