feat: Audio prompt for initial telemetry connect (#4216)

This commit is contained in:
Peter Feerick
2023-10-31 10:50:32 +10:00
committed by GitHub
parent 8fb69b8041
commit 5eb9af3a4e
4 changed files with 22 additions and 18 deletions
+1
View File
@@ -194,6 +194,7 @@ const char * const audioFilenames[] = {
"rssi_org", "rssi_org",
"rssi_red", "rssi_red",
"swr_red", "swr_red",
"telemco",
"telemko", "telemko",
"telemok", "telemok",
"trainco", "trainco",
+1
View File
@@ -597,6 +597,7 @@ void audioTimerCountdown(uint8_t timer, int value);
#define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE) #define AUDIO_RSSI_ORANGE() audioEvent(AU_RSSI_ORANGE)
#define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED) #define AUDIO_RSSI_RED() audioEvent(AU_RSSI_RED)
#define AUDIO_RAS_RED() audioEvent(AU_RAS_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_LOST() audioEvent(AU_TELEMETRY_LOST)
#define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK) #define AUDIO_TELEMETRY_BACK() audioEvent(AU_TELEMETRY_BACK)
#define AUDIO_TRAINER_CONNECTED() audioEvent(AU_TRAINER_CONNECTED) #define AUDIO_TRAINER_CONNECTED() audioEvent(AU_TRAINER_CONNECTED)
+1
View File
@@ -707,6 +707,7 @@ enum AUDIO_SOUNDS {
AU_RSSI_ORANGE, AU_RSSI_ORANGE,
AU_RSSI_RED, AU_RSSI_RED,
AU_RAS_RED, AU_RAS_RED,
AU_TELEMETRY_CONNECTED,
AU_TELEMETRY_LOST, AU_TELEMETRY_LOST,
AU_TELEMETRY_BACK, AU_TELEMETRY_BACK,
AU_TRAINER_CONNECTED, AU_TRAINER_CONNECTED,
+19 -18
View File
@@ -312,8 +312,8 @@ void telemetryWakeup()
} }
_telemetryIsPolling = false; _telemetryIsPolling = false;
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) {
telemetryItems[i].eval(sensor); telemetryItems[i].eval(sensor);
} }
@@ -326,17 +326,17 @@ void telemetryWakeup()
#endif #endif
static tmr10ms_t alarmsCheckTime = 0; static tmr10ms_t alarmsCheckTime = 0;
#define SCHEDULE_NEXT_ALARMS_CHECK(seconds) alarmsCheckTime = get_tmr10ms() + (100*(seconds)) #define SCHEDULE_NEXT_ALARMS_CHECK(seconds) \
alarmsCheckTime = get_tmr10ms() + (100 * (seconds))
if (int32_t(get_tmr10ms() - alarmsCheckTime) > 0) { if (int32_t(get_tmr10ms() - alarmsCheckTime) > 0) {
SCHEDULE_NEXT_ALARMS_CHECK(1 /*second*/);
SCHEDULE_NEXT_ALARMS_CHECK(1/*second*/);
bool sensorLost = false; bool sensorLost = false;
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) { for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) {
if (isTelemetryFieldAvailable(i)) { if (isTelemetryFieldAvailable(i)) {
TelemetryItem & item = telemetryItems[i]; TelemetryItem& item = telemetryItems[i];
if (item.timeout == 0) { if (item.timeout == 0) {
TelemetrySensor * sensor = & g_model.telemetrySensors[i]; TelemetrySensor* sensor = &g_model.telemetrySensors[i];
if (sensor->unit != UNIT_DATETIME) { if (sensor->unit != UNIT_DATETIME) {
item.setOld(); item.setOld();
sensorLost = true; 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); audioEvent(AU_SENSOR_LOST);
} }
@@ -353,24 +354,25 @@ void telemetryWakeup()
if (isBadAntennaDetected()) { if (isBadAntennaDetected()) {
AUDIO_RAS_RED(); AUDIO_RAS_RED();
POPUP_WARNING_ON_UI_TASK(STR_WARNING, STR_ANTENNAPROBLEM); POPUP_WARNING_ON_UI_TASK(STR_WARNING, STR_ANTENNAPROBLEM);
SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/);
} }
#endif #endif
if (!g_model.disableTelemetryWarning) { if (!g_model.disableTelemetryWarning) {
if (TELEMETRY_STREAMING()) { if (TELEMETRY_STREAMING()) {
if (TELEMETRY_RSSI() < g_model.rfAlarms.critical ) { if (TELEMETRY_RSSI() < g_model.rfAlarms.critical) {
AUDIO_RSSI_RED(); AUDIO_RSSI_RED();
SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/);
} } else if (TELEMETRY_RSSI() < g_model.rfAlarms.warning) {
else if (TELEMETRY_RSSI() < g_model.rfAlarms.warning ) {
AUDIO_RSSI_ORANGE(); AUDIO_RSSI_ORANGE();
SCHEDULE_NEXT_ALARMS_CHECK(10/*seconds*/); SCHEDULE_NEXT_ALARMS_CHECK(10 /*seconds*/);
} }
} }
if (TELEMETRY_STREAMING()) { if (TELEMETRY_STREAMING()) {
if (telemetryState == TELEMETRY_KO) { if (telemetryState == TELEMETRY_INIT) {
AUDIO_TELEMETRY_CONNECTED();
} else if (telemetryState == TELEMETRY_KO) {
AUDIO_TELEMETRY_BACK(); AUDIO_TELEMETRY_BACK();
#if defined(CROSSFIRE) #if defined(CROSSFIRE)
@@ -389,8 +391,7 @@ void telemetryWakeup()
#endif #endif
} }
telemetryState = TELEMETRY_OK; telemetryState = TELEMETRY_OK;
} } else if (telemetryState == TELEMETRY_OK) {
else if (telemetryState == TELEMETRY_OK) {
telemetryState = TELEMETRY_KO; telemetryState = TELEMETRY_KO;
if (!isModuleInBeepMode()) { if (!isModuleInBeepMode()) {
AUDIO_TELEMETRY_LOST(); AUDIO_TELEMETRY_LOST();