Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 03:19:53 +03:00
Code Issues Wiki Activity

Rationalize

Browse source
This commit is contained in:
3djc 2021-02-02 16:12:49 +01:00
parent 0652fa609b
commit 7a0a566238
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
radio/src/telemetry/telemetry.cpp
View file

@ -244,11 +244,14 @@ void telemetryInterrupt10ms()
if (sensor.type == TELEM_TYPE_CALCULATED) { if (sensor.type == TELEM_TYPE_CALCULATED) {
telemetryItems[i].per10ms(sensor); telemetryItems[i].per10ms(sensor);
} }
if (tick160ms && telemetryItems[i].timeout > 0) { if (tick160ms) {
telemetryItems[i].timeout--; auto & timeout = telemetryItems[i].timeout;
} if (!MODEL_TELEMETRY_STREAMING() && timeout < TELEMETRY_SENSOR_TIMEOUT_NO_MODEL_TELEM) {
if (!MODEL_TELEMETRY_STREAMING() && tick160ms && telemetryItems[i].timeout < TELEMETRY_SENSOR_TIMEOUT_NO_MODEL_TELEM) { timeout = TELEMETRY_SENSOR_TIMEOUT_OLD;
telemetryItems[i].timeout = TELEMETRY_SENSOR_TIMEOUT_OLD; }
else if (timeout > 0) {
timeout--;
}
} }
} }
telemetryStreaming--; telemetryStreaming--;

5
radio/src/telemetry/telemetry.h
View file

@ -40,11 +40,6 @@
extern uint8_t telemetryStreaming; // >0 (true) == data is streaming in. 0 = no data detected for some time extern uint8_t telemetryStreaming; // >0 (true) == data is streaming in. 0 = no data detected for some time
extern uint8_t modelTelemetryStreaming; // allows to differentiate between module telem and model telem extern uint8_t modelTelemetryStreaming; // allows to differentiate between module telem and model telem
inline bool TELEMETRY_STREAMING()
{
return telemetryStreaming > 0;
}
inline bool MODEL_TELEMETRY_STREAMING() inline bool MODEL_TELEMETRY_STREAMING()
{ {
return modelTelemetryStreaming > 0; return modelTelemetryStreaming > 0;