Fix RX_EN handling during RX power saving

src/helpers/CommonCLI.cpp

@@ -761,6 +761,23 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     } else {
       strcpy(reply, "Error: state must be on or off");
     }
+  } else if (strncmp(config, "radio.rxps.rfrx_disabled ", 25) == 0) {
+    const char* value = &config[25];
+    bool disabled;
+    if (strcmp(value, "on") == 0) {
+      disabled = true;
+    } else if (strcmp(value, "off") == 0) {
+      disabled = false;
+    } else {
+      strcpy(reply, "Error: state must be on or off");
+      return;
+    }
+
+    if (!_callbacks->setRxPowerSavingRfRxDisabled(disabled)) {
+      strcpy(reply, "Error: unsupported");
+    } else {
+      sprintf(reply, "OK - radio.rxps.rfrx_disabled %s", disabled ? "on" : "off");
+    }
   } else if (memcmp(config, "radio.rxps ", 11) == 0) {
     const char* value = &config[11];
     uint8_t enable = _prefs->rx_powersaving_enabled;
@@ -1121,6 +1138,12 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     } else {
       sprintf(reply, "> %s", _board->isLoRaFemLnaEnabled() ? "on" : "off");
     }
+  } else if (strcmp(config, "radio.rxps.rfrx_disabled") == 0) {
+    if (!_callbacks->supportsRxPowerSavingRfRxDisable()) {
+      strcpy(reply, "Error: unsupported");
+    } else {
+      sprintf(reply, "> %s", _callbacks->isRxPowerSavingRfRxDisabled() ? "on" : "off");
+    }
   } else if (memcmp(config, "radio.rxps", 10) == 0) {
     ensureRxPowerSavingDefaults(_prefs);
     sprintf(reply, "> %s,%lu,%lu", _prefs->rx_powersaving_enabled ? "on" : "off",

src/helpers/CommonCLI.h

@@ -137,6 +137,13 @@ public:
     return !enable;
   };
 
+  virtual bool supportsRxPowerSavingRfRxDisable() const { return false; }
+  virtual bool setRxPowerSavingRfRxDisabled(bool disabled) {
+    (void)disabled;
+    return false;
+  }
+  virtual bool isRxPowerSavingRfRxDisabled() const { return false; }
+
   virtual void getRxPsWatchdogCounts(uint32_t* soft, uint32_t* hard) {
     *soft = 0; *hard = 0;
   };

src/helpers/radiolib/CustomSX1262.h

@@ -6,6 +6,8 @@
 #define SX126X_IRQ_PREAMBLE_DETECTED           0x04
 
 class CustomSX1262 : public SX1262 {
+  bool _rx_ps_rf_rx_disabled = false;
+
   public:
     CustomSX1262(Module *mod) : SX1262(mod) { }
 
@@ -86,6 +88,27 @@ class CustomSX1262 : public SX1262 {
       return true;  // success
     }
 
+    int16_t startReceiveDutyCycle(uint32_t rxPeriod, uint32_t sleepPeriod,
+                                  RadioLibIrqFlags_t irqFlags = RADIOLIB_IRQ_RX_DEFAULT_FLAGS,
+                                  RadioLibIrqFlags_t irqMask = RADIOLIB_IRQ_RX_DEFAULT_MASK) {
+      int16_t state = SX1262::startReceiveDutyCycle(rxPeriod, sleepPeriod, irqFlags, irqMask);
+      if (state == RADIOLIB_ERR_NONE && !_rx_ps_rf_rx_disabled) {
+        // RadioLib stages RX duty-cycle through standby, which leaves a
+        // host-controlled RXEN switch in IDLE. Keep the receive path enabled
+        // while the SX1262 alternates between its RX and sleep windows.
+        this->mod->setRfSwitchState(Module::MODE_RX);
+      }
+      return state;
+    }
+
+    void setRxPowerSavingRfRxDisabled(bool disabled) {
+      _rx_ps_rf_rx_disabled = disabled;
+    }
+
+    bool isRxPowerSavingRfRxDisabled() const {
+      return _rx_ps_rf_rx_disabled;
+    }
+
     // BUSY high means the chip is asleep (RX duty-cycle sleep window) or mid
     // command; any SPI access would stall until the chip's next listen window.
     bool isChipBusy() {
@@ -124,4 +147,4 @@ class CustomSX1262 : public SX1262 {
       readRegister(RADIOLIB_SX126X_REG_RX_GAIN, &rxGain, 1);
       return (rxGain == RADIOLIB_SX126X_RX_GAIN_BOOSTED);
     }
-};
+};

src/helpers/radiolib/CustomSX1262Wrapper.h

@@ -41,6 +41,29 @@ public:
 
   bool supportsRxPowerSaving() const override { return true; }
 
+  bool supportsRxPowerSavingRfRxDisable() const override {
+  #if defined(SX126X_RXEN)
+    return SX126X_RXEN != RADIOLIB_NC;
+  #else
+    return false;
+  #endif
+  }
+
+  bool setRxPowerSavingRfRxDisabled(bool disabled) override {
+    if (!supportsRxPowerSavingRfRxDisable()) return false;
+
+    if (_rx_ps_armed) stopReceiveDutyCycle();
+    ((CustomSX1262 *)_radio)->setRxPowerSavingRfRxDisabled(disabled);
+
+    // Re-arm the configured receive mode immediately without disturbing an
+    // unread RX interrupt or an in-flight transmission.
+    return setRxPowerSaving(_rx_ps_enabled, _rx_ps_rx_us, _rx_ps_sleep_us);
+  }
+
+  bool isRxPowerSavingRfRxDisabled() const override {
+    return ((CustomSX1262 *)_radio)->isRxPowerSavingRfRxDisabled();
+  }
+
 protected:
   int startReceiveMode() override {
     if (_rx_ps_armed) {

src/helpers/radiolib/RadioLibWrappers.h

@@ -101,6 +101,9 @@ public:
   void onSendFinished() override;
   bool isInRecvMode() const override;
   bool setRxPowerSaving(bool enabled, uint32_t rx_us, uint32_t sleep_us) override;
+  virtual bool supportsRxPowerSavingRfRxDisable() const { return false; }
+  virtual bool setRxPowerSavingRfRxDisabled(bool) { return false; }
+  virtual bool isRxPowerSavingRfRxDisabled() const { return false; }
   bool isChannelActive();
 
   bool isReceiving() override {