fix(telemetry): sensor processing with legacy polling disabled (#2653)
Fixes #2546 Fixes #2591
This commit is contained in:
@@ -265,30 +265,33 @@ void telemetryWakeup()
|
|||||||
if (int_drv) pollTelemetry(INTERNAL_MODULE, int_drv, getIntModuleCtx());
|
if (int_drv) pollTelemetry(INTERNAL_MODULE, int_drv, getIntModuleCtx());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
bool disable_legacy_polling = false;
|
||||||
#if defined(HARDWARE_EXTERNAL_MODULE)
|
#if defined(HARDWARE_EXTERNAL_MODULE)
|
||||||
auto ext_drv = getExtModuleDriver();
|
auto ext_drv = getExtModuleDriver();
|
||||||
if (ext_drv) {
|
if (ext_drv) {
|
||||||
if (pollTelemetry(EXTERNAL_MODULE, ext_drv, getExtModuleCtx())) {
|
if (pollTelemetry(EXTERNAL_MODULE, ext_drv, getExtModuleCtx())) {
|
||||||
// skip legacy telemetry polling in case external module
|
// skip legacy telemetry polling in case external module
|
||||||
// driver defines telemetry methods (getByte & processData)
|
// driver defines telemetry methods (getByte & processData)
|
||||||
return;
|
disable_legacy_polling = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// TODO: needs to be moved to protocol/module init
|
if (!disable_legacy_polling) {
|
||||||
// as-is, it implies only ONE telemetry protocol
|
// TODO: needs to be moved to protocol/module init
|
||||||
// enabled at the same time
|
// as-is, it implies only ONE telemetry protocol
|
||||||
uint8_t requiredTelemetryProtocol = modelTelemetryProtocol();
|
// enabled at the same time
|
||||||
|
uint8_t requiredTelemetryProtocol = modelTelemetryProtocol();
|
||||||
|
|
||||||
if (telemetryProtocol != requiredTelemetryProtocol) {
|
if (telemetryProtocol != requiredTelemetryProtocol) {
|
||||||
telemetryInit(requiredTelemetryProtocol);
|
telemetryInit(requiredTelemetryProtocol);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Poll external / S.PORT telemetry
|
||||||
|
// TODO: how to switch this OFF ???
|
||||||
|
pollExtTelemetryLegacy();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Poll external / S.PORT telemetry
|
|
||||||
// TODO: how to switch this OFF ???
|
|
||||||
pollExtTelemetryLegacy();
|
|
||||||
|
|
||||||
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
|
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
|
||||||
const TelemetrySensor & sensor = g_model.telemetrySensors[i];
|
const TelemetrySensor & sensor = g_model.telemetrySensors[i];
|
||||||
if (sensor.type == TELEM_TYPE_CALCULATED) {
|
if (sensor.type == TELEM_TYPE_CALCULATED) {
|
||||||
|
|||||||
Reference in New Issue
Block a user