diff --git a/radio/src/audio.cpp b/radio/src/audio.cpp index 79f0bfaac..48dbc0859 100644 --- a/radio/src/audio.cpp +++ b/radio/src/audio.cpp @@ -194,6 +194,7 @@ const char * const audioFilenames[] = { "rssi_org", "rssi_red", "swr_red", + "telemco", "telemko", "telemok", "trainco", diff --git a/radio/src/audio.h b/radio/src/audio.h index ecc7a9a53..160162882 100644 --- a/radio/src/audio.h +++ b/radio/src/audio.h @@ -597,6 +597,7 @@ void audioTimerCountdown(uint8_t timer, int value); #define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE) #define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED) #define AUDIO_RAS_RED() audioEvent(AU_RAS_RED) +#define AUDIO_TELEMETRY_CONNECTED() audioEvent(AU_TELEMETRY_CONNECTED) #define AUDIO_TELEMETRY_LOST() audioEvent(AU_TELEMETRY_LOST) #define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK) #define AUDIO_TRAINER_CONNECTED() audioEvent(AU_TRAINER_CONNECTED) diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 8798a3875..411bdda13 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -707,6 +707,7 @@ enum AUDIO_SOUNDS { AU_RSSI_ORANGE, AU_RSSI_RED, AU_RAS_RED, + AU_TELEMETRY_CONNECTED, AU_TELEMETRY_LOST, AU_TELEMETRY_BACK, AU_TRAINER_CONNECTED, diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 6183220c2..94a4ed3fc 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -312,8 +312,8 @@ void telemetryWakeup() } _telemetryIsPolling = false; - for (int i=0; i 0) { - - SCHEDULE_NEXT_ALARMS_CHECK(1/*second*/); + SCHEDULE_NEXT_ALARMS_CHECK(1 /*second*/); bool sensorLost = false; - for (int i=0; iunit != UNIT_DATETIME) { item.setOld(); sensorLost = true; @@ -345,7 +345,8 @@ void telemetryWakeup() } } - if (sensorLost && TELEMETRY_STREAMING() && !g_model.disableTelemetryWarning) { + if (sensorLost && TELEMETRY_STREAMING() && + !g_model.disableTelemetryWarning) { audioEvent(AU_SENSOR_LOST); } @@ -353,24 +354,25 @@ void telemetryWakeup() if (isBadAntennaDetected()) { AUDIO_RAS_RED(); POPUP_WARNING_ON_UI_TASK(STR_WARNING, STR_ANTENNAPROBLEM); - SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); + SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/); } #endif if (!g_model.disableTelemetryWarning) { if (TELEMETRY_STREAMING()) { - if (TELEMETRY_RSSI() < g_model.rfAlarms.critical ) { + if (TELEMETRY_RSSI() < g_model.rfAlarms.critical) { AUDIO_RSSI_RED(); - SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); - } - else if (TELEMETRY_RSSI() < g_model.rfAlarms.warning ) { + SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/); + } else if (TELEMETRY_RSSI() < g_model.rfAlarms.warning) { AUDIO_RSSI_ORANGE(); - SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); + SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/); } } if (TELEMETRY_STREAMING()) { - if (telemetryState == TELEMETRY_KO) { + if (telemetryState == TELEMETRY_INIT) { + AUDIO_TELEMETRY_CONNECTED(); + } else if (telemetryState == TELEMETRY_KO) { AUDIO_TELEMETRY_BACK(); #if defined(CROSSFIRE) @@ -389,8 +391,7 @@ void telemetryWakeup() #endif } telemetryState = TELEMETRY_OK; - } - else if (telemetryState == TELEMETRY_OK) { + } else if (telemetryState == TELEMETRY_OK) { telemetryState = TELEMETRY_KO; if (!isModuleInBeepMode()) { AUDIO_TELEMETRY_LOST();