Fix rx spi processing required (betaflight#13454)

* fix RX_SPI_PROCESSING_REQUIRED - fix typo - remove unreachable 'return false;' in rxSpiProcessFrame * Simplify auxiliaryProcessingRequired rxRuntimeState.rcProcessFrameFn never returns false * fixup! fix RX_SPI_PROCESSING_REQUIRED --------- Co-authored-by: Petr Ledvina <[email protected]>
HThuren · Mar 15, 2024 · 3aabaf3 · 3aabaf3
1 parent d22ea47
commit 3aabaf3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/main/rx/cc2500_frsky_x.c b/src/main/rx/cc2500_frsky_x.c
@@ -480,7 +480,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro
 
 #if defined(USE_TELEMETRY_SMARTPORT)
             if (telemetryEnabled) {
-                ret |= RX_SPI_ROCESSING_REQUIRED;
+                ret |= RX_SPI_PROCESSING_REQUIRED;
             }
 #endif
             *protocolState = STATE_RESUME;

diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
@@ -769,7 +769,8 @@ void detectAndApplySignalLossBehaviour(void)
 bool calculateRxChannelsAndUpdateFailsafe(timeUs_t currentTimeUs)
 {
     if (auxiliaryProcessingRequired) {
-        auxiliaryProcessingRequired = !rxRuntimeState.rcProcessFrameFn(&rxRuntimeState);
+        rxRuntimeState.rcProcessFrameFn(&rxRuntimeState);
+        auxiliaryProcessingRequired = false;
     }
 
     if (!rxDataProcessingRequired) {

diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c
@@ -216,7 +216,7 @@ static uint8_t rxSpiFrameStatus(rxRuntimeState_t *rxRuntimeState)
         status = RX_FRAME_COMPLETE;
     }
 
-    if (result & RX_SPI_ROCESSING_REQUIRED) {
+    if (result & RX_SPI_PROCESSING_REQUIRED) {
         status |= RX_FRAME_PROCESSING_REQUIRED;
     }
 
@@ -236,10 +236,6 @@ static bool rxSpiProcessFrame(const rxRuntimeState_t *rxRuntimeState)
         if (result & RX_SPI_RECEIVED_DATA) {
             rxSpiNewPacketAvailable = true;
         }
-
-        if (result & RX_SPI_ROCESSING_REQUIRED) {
-            return false;
-        }
     }
 
     return true;

diff --git a/src/main/rx/rx_spi.h b/src/main/rx/rx_spi.h
@@ -56,7 +56,7 @@ typedef enum {
     RX_SPI_RECEIVED_NONE = 0,
     RX_SPI_RECEIVED_BIND = (1 << 0),
     RX_SPI_RECEIVED_DATA = (1 << 1),
-    RX_SPI_ROCESSING_REQUIRED = (1 << 2),
+    RX_SPI_PROCESSING_REQUIRED = (1 << 2),
 } rx_spi_received_e;
 
 // RC channels in AETR order