From 3a8725997b9a448e8dd8db03cc586856a63120f3 Mon Sep 17 00:00:00 2001 From: Pierre-A Date: Thu, 5 Mar 2015 20:07:48 +0100 Subject: [PATCH] update of the corrections --- src/main/telemetry/hott.c | 2 +- src/main/telemetry/telemetry.c | 5 ----- src/main/telemetry/telemetry.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c index a61fd567d..b7eac4903 100644 --- a/src/main/telemetry/hott.c +++ b/src/main/telemetry/hott.c @@ -213,7 +213,7 @@ void hottPrepareGPSResponse(HOTT_GPS_MSG_t *hottGPSMessage) static bool shouldTriggerVoiceAlarmNow(void) { - return ((millis() - lastHottAlarmSoundTime) >= (useHottAlarmSoundInterval() * MILLISECONDS_IN_A_SECOND)); + return ((millis() - lastHottAlarmSoundTime) >= (telemetryConfig->hottAlarmSoundInterval * MILLISECONDS_IN_A_SECOND)); } static inline void updateAlarmBatteryStatus(HOTT_EAM_MSG_t *hottEAMMessage) diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index 3b99731c8..8d840aca2 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -48,11 +48,6 @@ static bool telemetryPortIsShared; static telemetryConfig_t *telemetryConfig; - -uint8_t useHottAlarmSoundInterval(void) -{ - return telemetryConfig->hottAlarmSoundInterval; -} void useTelemetryConfig(telemetryConfig_t *telemetryConfigToUse) { telemetryConfig = telemetryConfigToUse; diff --git a/src/main/telemetry/telemetry.h b/src/main/telemetry/telemetry.h index 17954162c..c36e53f76 100644 --- a/src/main/telemetry/telemetry.h +++ b/src/main/telemetry/telemetry.h @@ -60,6 +60,5 @@ uint32_t getTelemetryProviderBaudRate(void); void useTelemetryConfig(telemetryConfig_t *telemetryConfig); bool telemetryAllowsOtherSerial(int serialPortFunction); bool isTelemetryPortShared(void); -uint8_t useHottAlarmSoundInterval (void); #endif /* TELEMETRY_COMMON_H_ */