Skip to content

Commit 78c623c

Browse files
committed
fix legacy sensors
1 parent 0ff30db commit 78c623c

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

src/main/fc/settings.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,6 +3119,10 @@ groups:
31193119
description: "Determines if the telemetry protocol default signal inversion is reversed. This should be OFF in most cases unless a custom or hacked RX is used."
31203120
default_value: OFF
31213121
type: bool
3122+
- name: frsky_pitch_roll
3123+
description: "S.Port telemetry: Send pitch and roll degrees*10 instead of raw accelerometer data"
3124+
default_value: OFF
3125+
type: bool
31223126
- name: crsf_telemetry_mode
31233127
description: "Use extended custom or native telemetry sensors for CRSF"
31243128
default_value: NATIVE

src/main/telemetry/crsf.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,9 @@ static void initCrsfNativeSensors(void)
974974
telemetryScheduleInit(crsfNativeTelemetrySensors, ARRAYLEN(crsfNativeTelemetrySensors));
975975

976976
for(size_t i = 0; i < ARRAYLEN(crsfNativeTelemetrySensors); i++) {
977-
telemetryScheduleAdd(&crsfNativeTelemetrySensors[i]);
977+
if(telemetrySensorAllowed(crsfNativeTelemetrySensors[i].sensor_id)) {
978+
telemetryScheduleAdd(&crsfNativeTelemetrySensors[i]);
979+
}
978980
}
979981
}
980982

src/main/telemetry/sensors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ bool telemetrySensorAllowed(sensor_id_e id)
385385
case TELEM_LEGACY_HEADING:
386386
return true;
387387
case TELEM_LEGACY_PITCH:
388-
return telemetryConfig()->frsky_pitch_roll;
388+
FALLTHROUGH;
389389
case TELEM_LEGACY_ROLL:
390390
return telemetryConfig()->frsky_pitch_roll;
391391
case TELEM_LEGACY_ACCX:

src/main/telemetry/smartport_legacy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ void initSmartPortSensorsLegacy(void) {
388388
telemetryScheduleInit(smartportTelemetrySensorsLegacy, ARRAYLEN(smartportTelemetrySensorsLegacy));
389389

390390
for(size_t i = 0; i < ARRAYLEN(smartportTelemetrySensorsLegacy); i++) {
391-
if(telemetrySensorAllowed(smartportTelemetrySensorsLegacy[i].index)) {
391+
if(telemetrySensorAllowed(smartportTelemetrySensorsLegacy[i].sensor_id)) {
392392
telemetryScheduleAdd(&smartportTelemetrySensorsLegacy[i]);
393393
}
394394
}

src/main/telemetry/telemetry.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY
6363
PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
6464
.telemetry_switch = SETTING_TELEMETRY_SWITCH_DEFAULT,
6565
.telemetry_inverted = SETTING_TELEMETRY_INVERTED_DEFAULT,
66+
.frsky_pitch_roll = SETTING_FRSKY_PITCH_ROLL_DEFAULT,
6667
.report_cell_voltage = SETTING_REPORT_CELL_VOLTAGE_DEFAULT,
6768
.hottAlarmSoundInterval = SETTING_HOTT_ALARM_SOUND_INTERVAL_DEFAULT,
6869
.halfDuplex = SETTING_TELEMETRY_HALFDUPLEX_DEFAULT,

0 commit comments

Comments
 (0)