From 8e802eba86078ed11c7c843b58927ac424ac19ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Daleck=C3=BD?= Date: Fri, 17 Jun 2022 19:50:52 +0200 Subject: [PATCH] Remove unused rxRefreshRate --- src/main/rx/crsf.c | 2 -- src/main/rx/fport.c | 2 -- src/main/rx/ghst.c | 2 -- src/main/rx/ibus.c | 2 -- src/main/rx/jetiexbus.c | 2 -- src/main/rx/msp.c | 2 -- src/main/rx/pwm.c | 2 -- src/main/rx/rx.c | 5 ----- src/main/rx/rx.h | 3 --- src/main/rx/rx_spi.c | 1 - src/main/rx/sbus.c | 2 -- src/main/rx/spektrum.c | 2 -- src/main/rx/srxl2.c | 2 -- src/main/rx/sumd.c | 2 -- src/main/rx/sumh.c | 2 -- src/main/rx/xbus.c | 2 -- src/test/unit/rx_ibus_unittest.cc | 2 -- src/test/unit/rx_sumd_unittest.cc | 2 -- 18 files changed, 39 deletions(-) diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c index d8d9236e5b..353023e65e 100644 --- a/src/main/rx/crsf.c +++ b/src/main/rx/crsf.c @@ -626,8 +626,6 @@ bool crsfRxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) } rxRuntimeState->channelCount = CRSF_MAX_CHANNEL; - rxRuntimeState->rxRefreshRate = CRSF_TIME_BETWEEN_FRAMES_US; //!!TODO this needs checking - rxRuntimeState->rcReadRawFn = crsfReadRawRC; rxRuntimeState->rcFrameStatusFn = crsfFrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/fport.c b/src/main/rx/fport.c index 4bd0e8e472..448c52a6b7 100644 --- a/src/main/rx/fport.c +++ b/src/main/rx/fport.c @@ -391,8 +391,6 @@ bool fportRxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) sbusChannelsInit(rxConfig, rxRuntimeState); rxRuntimeState->channelCount = SBUS_MAX_CHANNEL; - rxRuntimeState->rxRefreshRate = 11000; - rxRuntimeState->rcFrameStatusFn = fportFrameStatus; rxRuntimeState->rcProcessFrameFn = fportProcessFrame; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/ghst.c b/src/main/rx/ghst.c index a9942f20b2..26b0034934 100644 --- a/src/main/rx/ghst.c +++ b/src/main/rx/ghst.c @@ -318,8 +318,6 @@ bool ghstRxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) } rxRuntimeState->channelCount = GHST_MAX_NUM_CHANNELS; - rxRuntimeState->rxRefreshRate = GHST_TIME_BETWEEN_FRAMES_US; - rxRuntimeState->rcReadRawFn = ghstReadRawRC; rxRuntimeState->rcFrameStatusFn = ghstFrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/ibus.c b/src/main/rx/ibus.c index 753e25b8d5..c2f296cee7 100644 --- a/src/main/rx/ibus.c +++ b/src/main/rx/ibus.c @@ -207,8 +207,6 @@ bool ibusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) ibusSyncByte = 0; rxRuntimeState->channelCount = IBUS_MAX_CHANNEL; - rxRuntimeState->rxRefreshRate = 20000; // TODO - Verify speed - rxRuntimeState->rcReadRawFn = ibusReadRawRC; rxRuntimeState->rcFrameStatusFn = ibusFrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c index c477deed7d..0d0e7a9000 100644 --- a/src/main/rx/jetiexbus.c +++ b/src/main/rx/jetiexbus.c @@ -249,8 +249,6 @@ bool jetiExBusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) UNUSED(rxConfig); rxRuntimeState->channelCount = JETIEXBUS_CHANNEL_COUNT; - rxRuntimeState->rxRefreshRate = 5500; - rxRuntimeState->rcReadRawFn = jetiExBusReadRawRC; rxRuntimeState->rcFrameStatusFn = jetiExBusFrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/msp.c b/src/main/rx/msp.c index 91177de899..adf3ad5537 100644 --- a/src/main/rx/msp.c +++ b/src/main/rx/msp.c @@ -76,8 +76,6 @@ void rxMspInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) UNUSED(rxConfig); rxRuntimeState->channelCount = MAX_SUPPORTED_RC_CHANNEL_COUNT; - rxRuntimeState->rxRefreshRate = 20000; - rxRuntimeState->rcReadRawFn = rxMspReadRawRC; rxRuntimeState->rcFrameStatusFn = rxMspFrameStatus; } diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c index 49f16f92e7..27b4cd9ade 100644 --- a/src/main/rx/pwm.c +++ b/src/main/rx/pwm.c @@ -57,8 +57,6 @@ void rxPwmInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) { UNUSED(rxConfig); - rxRuntimeState->rxRefreshRate = 20000; - // configure PWM/CPPM read function and max number of channels. serial rx below will override both of these, if enabled switch (rxRuntimeState->rxProvider) { default: diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index e04443d44f..bb31377ae1 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -930,11 +930,6 @@ uint16_t rxGetUplinkTxPwrMw(void) } #endif -uint16_t rxGetRefreshRate(void) -{ - return rxRuntimeState.rxRefreshRate; -} - bool isRssiConfigured(void) { return rssiSource != RSSI_SOURCE_NONE; diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h index 4227399b10..3efdd9bf55 100644 --- a/src/main/rx/rx.h +++ b/src/main/rx/rx.h @@ -142,7 +142,6 @@ typedef struct rxRuntimeState_s { rxProvider_t rxProvider; SerialRXType serialrxProvider; uint8_t channelCount; // number of RC channels as reported by current input driver - uint16_t rxRefreshRate; rcReadRawDataFnPtr rcReadRawFn; rcFrameStatusFnPtr rcFrameStatusFn; rcProcessFrameFnPtr rcProcessFrameFn; @@ -217,8 +216,6 @@ void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *rxChannelRange void suspendRxSignal(void); void resumeRxSignal(void); -uint16_t rxGetRefreshRate(void); - timeDelta_t rxGetFrameDelta(timeDelta_t *frameAgeUs); timeUs_t rxFrameTimeUs(void); diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c index 5080d428a1..bed15e317c 100644 --- a/src/main/rx/rx_spi.c +++ b/src/main/rx/rx_spi.c @@ -269,7 +269,6 @@ bool rxSpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeState_t *rxRuntimeStat } rxSpiNewPacketAvailable = false; - rxRuntimeState->rxRefreshRate = 20000; rxRuntimeState->rcReadRawFn = rxSpiReadRawRC; rxRuntimeState->rcFrameStatusFn = rxSpiFrameStatus; diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c index a63889376f..03e4abc346 100644 --- a/src/main/rx/sbus.c +++ b/src/main/rx/sbus.c @@ -171,10 +171,8 @@ bool sbusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) rxRuntimeState->channelCount = SBUS_MAX_CHANNEL; if (rxConfig->sbus_baud_fast) { - rxRuntimeState->rxRefreshRate = SBUS_FAST_RX_REFRESH_RATE; sbusBaudRate = SBUS_FAST_BAUDRATE; } else { - rxRuntimeState->rxRefreshRate = SBUS_RX_REFRESH_RATE; sbusBaudRate = SBUS_BAUDRATE; } diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c index 8333b2ecce..a1ece1c100 100644 --- a/src/main/rx/spektrum.c +++ b/src/main/rx/spektrum.c @@ -374,7 +374,6 @@ bool spektrumInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) spekHiRes = true; resolution = 2048; rxRuntimeState->channelCount = SPEKTRUM_2048_CHANNEL_COUNT; - rxRuntimeState->rxRefreshRate = 11000; break; case SERIALRX_SPEKTRUM1024: // 10 bit frames @@ -383,7 +382,6 @@ bool spektrumInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) spekHiRes = false; resolution = 1024; rxRuntimeState->channelCount = SPEKTRUM_1024_CHANNEL_COUNT; - rxRuntimeState->rxRefreshRate = 22000; break; } diff --git a/src/main/rx/srxl2.c b/src/main/rx/srxl2.c index 9406e1e2c3..ab5573ce9a 100644 --- a/src/main/rx/srxl2.c +++ b/src/main/rx/srxl2.c @@ -488,8 +488,6 @@ bool srxl2RxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) rxRuntimeState->channelData = channelData; rxRuntimeState->channelCount = SRXL2_MAX_CHANNELS; - rxRuntimeState->rxRefreshRate = SRXL2_FRAME_PERIOD_US; - rxRuntimeState->rcReadRawFn = srxl2ReadRawRC; rxRuntimeState->rcFrameStatusFn = srxl2FrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c index 76a60b4496..9a5fb0b988 100644 --- a/src/main/rx/sumd.c +++ b/src/main/rx/sumd.c @@ -172,8 +172,6 @@ bool sumdInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) UNUSED(rxConfig); rxRuntimeState->channelCount = MIN(SUMD_MAX_CHANNEL, MAX_SUPPORTED_RC_CHANNEL_COUNT); - rxRuntimeState->rxRefreshRate = 11000; - rxRuntimeState->rcReadRawFn = sumdReadRawRC; rxRuntimeState->rcFrameStatusFn = sumdFrameStatus; rxRuntimeState->rcFrameTimeUsFn = rxFrameTimeUs; diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c index 9dc7d82896..89aa5c07b1 100644 --- a/src/main/rx/sumh.c +++ b/src/main/rx/sumh.c @@ -124,8 +124,6 @@ bool sumhInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) UNUSED(rxConfig); rxRuntimeState->channelCount = SUMH_MAX_CHANNEL_COUNT; - rxRuntimeState->rxRefreshRate = 11000; - rxRuntimeState->rcReadRawFn = sumhReadRawRC; rxRuntimeState->rcFrameStatusFn = sumhFrameStatus; diff --git a/src/main/rx/xbus.c b/src/main/rx/xbus.c index 3981bd4c4a..9fc85eff6d 100644 --- a/src/main/rx/xbus.c +++ b/src/main/rx/xbus.c @@ -292,8 +292,6 @@ bool xBusInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) break; } - rxRuntimeState->rxRefreshRate = 11000; - rxRuntimeState->rcReadRawFn = xBusReadRawRC; rxRuntimeState->rcFrameStatusFn = xBusFrameStatus; diff --git a/src/test/unit/rx_ibus_unittest.cc b/src/test/unit/rx_ibus_unittest.cc index 6cc2fbb40e..b9d6391cf2 100644 --- a/src/test/unit/rx_ibus_unittest.cc +++ b/src/test/unit/rx_ibus_unittest.cc @@ -218,7 +218,6 @@ TEST_F(IbusRxInitUnitTest, Test_IbusRxNotEnabled) // EXPECT_EQ(NULL, rxRuntimeState.rcFrameStatusFn); EXPECT_EQ(18, rxRuntimeState.channelCount); - EXPECT_EQ(20000, rxRuntimeState.rxRefreshRate); EXPECT_FALSE(NULL == rxRuntimeState.rcReadRawFn); EXPECT_FALSE(NULL == rxRuntimeState.rcFrameStatusFn); } @@ -233,7 +232,6 @@ TEST_F(IbusRxInitUnitTest, Test_IbusRxEnabled) EXPECT_TRUE(ibusInit(&initialRxConfig, &rxRuntimeState)); EXPECT_EQ(18, rxRuntimeState.channelCount); - EXPECT_EQ(20000, rxRuntimeState.rxRefreshRate); EXPECT_FALSE(NULL == rxRuntimeState.rcReadRawFn); EXPECT_FALSE(NULL == rxRuntimeState.rcFrameStatusFn); diff --git a/src/test/unit/rx_sumd_unittest.cc b/src/test/unit/rx_sumd_unittest.cc index 49f7a58e74..37fc58f470 100644 --- a/src/test/unit/rx_sumd_unittest.cc +++ b/src/test/unit/rx_sumd_unittest.cc @@ -163,7 +163,6 @@ TEST_F(SumdRxInitUnitTest, Test_SumdRxNotEnabled) EXPECT_FALSE(sumdInit(&initialRxConfig, &rxRuntimeState)); EXPECT_EQ(18, rxRuntimeState.channelCount); - EXPECT_EQ(11000, rxRuntimeState.rxRefreshRate); EXPECT_FALSE(NULL == rxRuntimeState.rcReadRawFn); EXPECT_FALSE(NULL == rxRuntimeState.rcFrameStatusFn); } @@ -178,7 +177,6 @@ TEST_F(SumdRxInitUnitTest, Test_SumdRxEnabled) EXPECT_TRUE(sumdInit(&initialRxConfig, &rxRuntimeState)); EXPECT_EQ(18, rxRuntimeState.channelCount); - EXPECT_EQ(11000, rxRuntimeState.rxRefreshRate); EXPECT_FALSE(NULL == rxRuntimeState.rcReadRawFn); EXPECT_FALSE(NULL == rxRuntimeState.rcFrameStatusFn);