diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index 2743046d48..dceef40d83 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -73,7 +73,7 @@ static timeUs_t lastMspRssiUpdateUs = 0; #define MSP_RSSI_TIMEOUT_US 1500000 // 1.5 sec -rssiSource_t rssiSource; +rssiSource_e rssiSource; static bool rxDataProcessingRequired = false; static bool auxiliaryProcessingRequired = false; @@ -652,7 +652,7 @@ void parseRcChannels(const char *input, rxConfig_t *rxConfig) } } -void setRssiFiltered(uint16_t newRssi, rssiSource_t source) +void setRssiFiltered(uint16_t newRssi, rssiSource_e source) { if (source != rssiSource) { return; @@ -664,7 +664,7 @@ void setRssiFiltered(uint16_t newRssi, rssiSource_t source) #define RSSI_SAMPLE_COUNT 16 #define RSSI_MAX_VALUE 1023 -void setRssiUnfiltered(uint16_t rssiValue, rssiSource_t source) +void setRssiUnfiltered(uint16_t rssiValue, rssiSource_e source) { if (source != rssiSource) { return; @@ -740,17 +740,14 @@ void updateRSSI(timeUs_t currentTimeUs) switch (rssiSource) { case RSSI_SOURCE_RX_CHANNEL: updateRSSIPWM(); - break; case RSSI_SOURCE_ADC: updateRSSIADC(currentTimeUs); - break; case RSSI_SOURCE_MSP: if (cmpTimeUs(micros(), lastMspRssiUpdateUs) > MSP_RSSI_TIMEOUT_US) { rssi = 0; } - break; default: break; diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h index b170f27f4c..99c7d71a37 100644 --- a/src/main/rx/rx.h +++ b/src/main/rx/rx.h @@ -163,15 +163,15 @@ typedef struct rxRuntimeConfig_s { void *frameData; } rxRuntimeConfig_t; -typedef enum rssiSource_e { +typedef enum { RSSI_SOURCE_NONE = 0, RSSI_SOURCE_ADC, RSSI_SOURCE_RX_CHANNEL, RSSI_SOURCE_RX_PROTOCOL, RSSI_SOURCE_MSP, -} rssiSource_t; +} rssiSource_e; -extern rssiSource_t rssiSource; +extern rssiSource_e rssiSource; extern rxRuntimeConfig_t rxRuntimeConfig; //!!TODO remove this extern, only needed once for channelCount @@ -183,10 +183,10 @@ bool calculateRxChannelsAndUpdateFailsafe(timeUs_t currentTimeUs); void parseRcChannels(const char *input, rxConfig_t *rxConfig); -void setRssiFiltered(const uint16_t newRssi, const rssiSource_t source); -void setRssiUnfiltered(const uint16_t rssiValue, const rssiSource_t source); -void setRssiMsp(const uint8_t newMspRssi); -void updateRSSI(const timeUs_t currentTimeUs); +void setRssiFiltered(uint16_t newRssi, rssiSource_e source); +void setRssiUnfiltered(uint16_t rssiValue, rssiSource_e source); +void setRssiMsp(uint8_t newMspRssi); +void updateRSSI(timeUs_t currentTimeUs); uint16_t getRssi(void); void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *rxChannelRangeConfig);