sx127x: Enable ValidHeader IRQ for preamble detection

ValidHeader IRQ flag was masked on sx127x, which prevented preamble detection from working. Also process explicit `target_rx_state` states earlier in the receive chain.
embassy-rs · Nov 2, 2023 · cd54188 · cd54188
1 parent 375e5fa
commit cd54188
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/sx1276_7_8_9/mod.rs b/src/sx1276_7_8_9/mod.rs
@@ -496,7 +496,10 @@ where
                 self.write_register(
                     Register::RegIrqFlagsMask,
                     IrqMask::All.value()
-                        ^ (IrqMask::RxDone.value() | IrqMask::RxTimeout.value() | IrqMask::CRCError.value()),
+                        ^ (IrqMask::RxDone.value()
+                            | IrqMask::RxTimeout.value()
+                            | IrqMask::CRCError.value()
+                            | IrqMask::HeaderValid.value()),
                     false,
                 )
                 .await?;
@@ -588,17 +591,17 @@ where
                     return Ok(TargetIrqState::Done);
                 }
             } else if radio_mode == RadioMode::Receive {
+                if target_rx_state == TargetIrqState::PreambleReceived && IrqMask::HeaderValid.is_set_in(irq_flags) {
+                    debug!("HeaderValid in radio mode {}", radio_mode);
+                    return Ok(TargetIrqState::PreambleReceived);
+                }
                 if (irq_flags & IrqMask::CRCError.value()) == IrqMask::CRCError.value() {
                     debug!("CRCError in radio mode {}", radio_mode);
                 }
                 if (irq_flags & IrqMask::RxDone.value()) == IrqMask::RxDone.value() {
                     debug!("RxDone in radio mode {}", radio_mode);
                     return Ok(TargetIrqState::Done);
                 }
-                if target_rx_state == TargetIrqState::PreambleReceived && IrqMask::HeaderValid.is_set_in(irq_flags) {
-                    debug!("HeaderValid in radio mode {}", radio_mode);
-                    return Ok(TargetIrqState::PreambleReceived);
-                }
                 if (irq_flags & IrqMask::RxTimeout.value()) == IrqMask::RxTimeout.value() {
                     debug!("RxTimeout in radio mode {}", radio_mode);
                     return Err(RadioError::ReceiveTimeout);