From 86edfe2c9abd22b7e6e0b060017827614e4241ec Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <wessel@weebl.me>
Date: Thu, 19 Feb 2026 14:44:25 +0100
Subject: [PATCH 1/7] fix agc reset

---
 src/helpers/radiolib/RadioLibWrappers.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index cf3e1266b..a4b4c3bae 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -57,8 +57,11 @@ void RadioLibWrapper::resetAGC() {
   // make sure we're not mid-receive of packet!
   if ((state & STATE_INT_READY) != 0 || isReceivingPacket()) return;
 
-  // NOTE: according to higher powers, just issuing RadioLib's startReceive() will reset the AGC.
-  //      revisit this if a better impl is discovered.
+  // Warm sleep powers down the entire analog frontend (including AGC), forcing a
+  // fresh gain calibration on the next startReceive().  A plain standby->startReceive
+  // cycle does NOT reset the AGC — the analog state can persist across STDBY_RC.
+  // The ~1-2 ms sleep gap is negligible vs the preamble budget (131 ms at SF11/BW250).
+  _radio->sleep();
   state = STATE_IDLE;   // trigger a startReceive()
 }
 

From 551f36fc50ffaa385ebf7238a7db9bd5755354c1 Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <wessel@weebl.me>
Date: Thu, 19 Feb 2026 16:16:21 +0100
Subject: [PATCH 2/7] when doing AGC reset, call Calibrate(0x7F)

1. warm sleep
2. wake to stdby
3. Calibrate(0x7F) to reset all internal blocks
4. re-apply DIO2 RF / boosted gain & register patch to make sure
everything is as it was
---
 src/helpers/radiolib/CustomLLCC68Wrapper.h   | 26 +++++++++++++++++
 src/helpers/radiolib/CustomSTM32WLxWrapper.h | 26 +++++++++++++++++
 src/helpers/radiolib/CustomSX1262Wrapper.h   | 30 ++++++++++++++++++++
 src/helpers/radiolib/CustomSX1268Wrapper.h   | 26 +++++++++++++++++
 src/helpers/radiolib/RadioLibWrappers.cpp    | 10 +++----
 src/helpers/radiolib/RadioLibWrappers.h      |  1 +
 6 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/src/helpers/radiolib/CustomLLCC68Wrapper.h b/src/helpers/radiolib/CustomLLCC68Wrapper.h
index f7dd7a9f1..826c8ed2d 100644
--- a/src/helpers/radiolib/CustomLLCC68Wrapper.h
+++ b/src/helpers/radiolib/CustomLLCC68Wrapper.h
@@ -19,4 +19,30 @@ class CustomLLCC68Wrapper : public RadioLibWrapper {
     int sf = ((CustomLLCC68 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+
+  void doResetAGC() override {
+    auto* radio = (CustomLLCC68 *)_radio;
+    radio->sleep(true);
+    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
+    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
+    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
+    radio->mod->hal->delay(5);
+    uint32_t start = millis();
+    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
+      if (millis() - start > 50) break;
+      radio->mod->hal->yield();
+    }
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+#ifdef SX126X_REGISTER_PATCH
+    uint8_t r_data = 0;
+    radio->readRegister(0x8B5, &r_data, 1);
+    r_data |= 0x01;
+    radio->writeRegister(0x8B5, &r_data, 1);
+#endif
+  }
 };
diff --git a/src/helpers/radiolib/CustomSTM32WLxWrapper.h b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
index 9e2d0441d..ed65b1888 100644
--- a/src/helpers/radiolib/CustomSTM32WLxWrapper.h
+++ b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
@@ -20,4 +20,30 @@ class CustomSTM32WLxWrapper : public RadioLibWrapper {
     int sf = ((CustomSTM32WLx *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+
+  void doResetAGC() override {
+    auto* radio = (CustomSTM32WLx *)_radio;
+    radio->sleep(true);
+    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
+    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
+    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
+    radio->mod->hal->delay(5);
+    uint32_t start = millis();
+    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
+      if (millis() - start > 50) break;
+      radio->mod->hal->yield();
+    }
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+#ifdef SX126X_REGISTER_PATCH
+    uint8_t r_data = 0;
+    radio->readRegister(0x8B5, &r_data, 1);
+    r_data |= 0x01;
+    radio->writeRegister(0x8B5, &r_data, 1);
+#endif
+  }
 };
diff --git a/src/helpers/radiolib/CustomSX1262Wrapper.h b/src/helpers/radiolib/CustomSX1262Wrapper.h
index 1afee5e8b..505b4996c 100644
--- a/src/helpers/radiolib/CustomSX1262Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1262Wrapper.h
@@ -22,4 +22,34 @@ class CustomSX1262Wrapper : public RadioLibWrapper {
   virtual void powerOff() override {
     ((CustomSX1262 *)_radio)->sleep(false);
   }
+
+  void doResetAGC() override {
+    auto* radio = (CustomSX1262 *)_radio;
+    // Warm sleep powers down analog frontend (resets AGC gain state)
+    radio->sleep(true);
+    // Wake to STDBY_RC for calibration
+    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
+    // Recalibrate all blocks (ADC, PLL, image, oscillators)
+    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
+    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
+    radio->mod->hal->delay(5);
+    uint32_t start = millis();
+    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
+      if (millis() - start > 50) break;
+      radio->mod->hal->yield();
+    }
+    // Re-apply RX settings that calibration may reset
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+#ifdef SX126X_REGISTER_PATCH
+    uint8_t r_data = 0;
+    radio->readRegister(0x8B5, &r_data, 1);
+    r_data |= 0x01;
+    radio->writeRegister(0x8B5, &r_data, 1);
+#endif
+  }
 };
diff --git a/src/helpers/radiolib/CustomSX1268Wrapper.h b/src/helpers/radiolib/CustomSX1268Wrapper.h
index 5d7106b40..c87ee9770 100644
--- a/src/helpers/radiolib/CustomSX1268Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1268Wrapper.h
@@ -19,4 +19,30 @@ class CustomSX1268Wrapper : public RadioLibWrapper {
     int sf = ((CustomSX1268 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+
+  void doResetAGC() override {
+    auto* radio = (CustomSX1268 *)_radio;
+    radio->sleep(true);
+    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
+    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
+    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
+    radio->mod->hal->delay(5);
+    uint32_t start = millis();
+    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
+      if (millis() - start > 50) break;
+      radio->mod->hal->yield();
+    }
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+#ifdef SX126X_REGISTER_PATCH
+    uint8_t r_data = 0;
+    radio->readRegister(0x8B5, &r_data, 1);
+    r_data |= 0x01;
+    radio->writeRegister(0x8B5, &r_data, 1);
+#endif
+  }
 };
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index a4b4c3bae..53a4b0a2a 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -53,15 +53,15 @@ void RadioLibWrapper::triggerNoiseFloorCalibrate(int threshold) {
   }
 }
 
+void RadioLibWrapper::doResetAGC() {
+  _radio->sleep();  // warm sleep to reset analog frontend
+}
+
 void RadioLibWrapper::resetAGC() {
   // make sure we're not mid-receive of packet!
   if ((state & STATE_INT_READY) != 0 || isReceivingPacket()) return;
 
-  // Warm sleep powers down the entire analog frontend (including AGC), forcing a
-  // fresh gain calibration on the next startReceive().  A plain standby->startReceive
-  // cycle does NOT reset the AGC — the analog state can persist across STDBY_RC.
-  // The ~1-2 ms sleep gap is negligible vs the preamble budget (131 ms at SF11/BW250).
-  _radio->sleep();
+  doResetAGC();
   state = STATE_IDLE;   // trigger a startReceive()
 }
 
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 9ac1bbaeb..b338b03a4 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -16,6 +16,7 @@ class RadioLibWrapper : public mesh::Radio {
   void startRecv();
   float packetScoreInt(float snr, int sf, int packet_len);
   virtual bool isReceivingPacket() =0;
+  virtual void doResetAGC();
 
 public:
   RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board) { n_recv = n_sent = 0; }

From 5ada7cf820655e47905b08f197bdf6778ac94cf0 Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <wessel@weebl.me>
Date: Thu, 19 Feb 2026 16:52:57 +0100
Subject: [PATCH 3/7] reset noise_floor sampling after agc reset

---
 src/helpers/radiolib/RadioLibWrappers.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index 53a4b0a2a..2216ca8f3 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -63,6 +63,14 @@ void RadioLibWrapper::resetAGC() {
 
   doResetAGC();
   state = STATE_IDLE;   // trigger a startReceive()
+
+  // Reset noise floor sampling so it reconverges from scratch.
+  // Without this, a stuck _noise_floor of -120 makes the sampling threshold
+  // too low (-106) to accept normal samples (~-105), self-reinforcing the
+  // stuck value even after the receiver has recovered.
+  _noise_floor = 0;
+  _num_floor_samples = 0;
+  _floor_sample_sum = 0;
 }
 
 void RadioLibWrapper::loop() {

From 5d25126abf5800c24854d2e8be7b71728564a128 Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <wessel@weebl.me>
Date: Thu, 19 Feb 2026 17:34:48 +0100
Subject: [PATCH 4/7] make it more dry

---
 src/helpers/radiolib/CustomLLCC68Wrapper.h   | 27 ++--------------
 src/helpers/radiolib/CustomSTM32WLxWrapper.h | 27 ++--------------
 src/helpers/radiolib/CustomSX1262Wrapper.h   | 31 ++----------------
 src/helpers/radiolib/CustomSX1268Wrapper.h   | 27 ++--------------
 src/helpers/radiolib/SX126xReset.h           | 33 ++++++++++++++++++++
 5 files changed, 41 insertions(+), 104 deletions(-)
 create mode 100644 src/helpers/radiolib/SX126xReset.h

diff --git a/src/helpers/radiolib/CustomLLCC68Wrapper.h b/src/helpers/radiolib/CustomLLCC68Wrapper.h
index 826c8ed2d..9e783a955 100644
--- a/src/helpers/radiolib/CustomLLCC68Wrapper.h
+++ b/src/helpers/radiolib/CustomLLCC68Wrapper.h
@@ -2,6 +2,7 @@
 
 #include "CustomLLCC68.h"
 #include "RadioLibWrappers.h"
+#include "SX126xReset.h"
 
 class CustomLLCC68Wrapper : public RadioLibWrapper {
 public:
@@ -20,29 +21,5 @@ class CustomLLCC68Wrapper : public RadioLibWrapper {
     return packetScoreInt(snr, sf, packet_len);
   }
 
-  void doResetAGC() override {
-    auto* radio = (CustomLLCC68 *)_radio;
-    radio->sleep(true);
-    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
-    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
-    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
-    radio->mod->hal->delay(5);
-    uint32_t start = millis();
-    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
-      if (millis() - start > 50) break;
-      radio->mod->hal->yield();
-    }
-#ifdef SX126X_DIO2_AS_RF_SWITCH
-    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
-#endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
-#endif
-#ifdef SX126X_REGISTER_PATCH
-    uint8_t r_data = 0;
-    radio->readRegister(0x8B5, &r_data, 1);
-    r_data |= 0x01;
-    radio->writeRegister(0x8B5, &r_data, 1);
-#endif
-  }
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 };
diff --git a/src/helpers/radiolib/CustomSTM32WLxWrapper.h b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
index ed65b1888..e3e520294 100644
--- a/src/helpers/radiolib/CustomSTM32WLxWrapper.h
+++ b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
@@ -2,6 +2,7 @@
 
 #include "CustomSTM32WLx.h"
 #include "RadioLibWrappers.h"
+#include "SX126xReset.h"
 #include <math.h>
 
 class CustomSTM32WLxWrapper : public RadioLibWrapper {
@@ -21,29 +22,5 @@ class CustomSTM32WLxWrapper : public RadioLibWrapper {
     return packetScoreInt(snr, sf, packet_len);
   }
 
-  void doResetAGC() override {
-    auto* radio = (CustomSTM32WLx *)_radio;
-    radio->sleep(true);
-    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
-    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
-    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
-    radio->mod->hal->delay(5);
-    uint32_t start = millis();
-    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
-      if (millis() - start > 50) break;
-      radio->mod->hal->yield();
-    }
-#ifdef SX126X_DIO2_AS_RF_SWITCH
-    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
-#endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
-#endif
-#ifdef SX126X_REGISTER_PATCH
-    uint8_t r_data = 0;
-    radio->readRegister(0x8B5, &r_data, 1);
-    r_data |= 0x01;
-    radio->writeRegister(0x8B5, &r_data, 1);
-#endif
-  }
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 };
diff --git a/src/helpers/radiolib/CustomSX1262Wrapper.h b/src/helpers/radiolib/CustomSX1262Wrapper.h
index 505b4996c..5856720b9 100644
--- a/src/helpers/radiolib/CustomSX1262Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1262Wrapper.h
@@ -2,6 +2,7 @@
 
 #include "CustomSX1262.h"
 #include "RadioLibWrappers.h"
+#include "SX126xReset.h"
 
 class CustomSX1262Wrapper : public RadioLibWrapper {
 public:
@@ -23,33 +24,5 @@ class CustomSX1262Wrapper : public RadioLibWrapper {
     ((CustomSX1262 *)_radio)->sleep(false);
   }
 
-  void doResetAGC() override {
-    auto* radio = (CustomSX1262 *)_radio;
-    // Warm sleep powers down analog frontend (resets AGC gain state)
-    radio->sleep(true);
-    // Wake to STDBY_RC for calibration
-    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
-    // Recalibrate all blocks (ADC, PLL, image, oscillators)
-    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
-    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
-    radio->mod->hal->delay(5);
-    uint32_t start = millis();
-    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
-      if (millis() - start > 50) break;
-      radio->mod->hal->yield();
-    }
-    // Re-apply RX settings that calibration may reset
-#ifdef SX126X_DIO2_AS_RF_SWITCH
-    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
-#endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
-#endif
-#ifdef SX126X_REGISTER_PATCH
-    uint8_t r_data = 0;
-    radio->readRegister(0x8B5, &r_data, 1);
-    r_data |= 0x01;
-    radio->writeRegister(0x8B5, &r_data, 1);
-#endif
-  }
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 };
diff --git a/src/helpers/radiolib/CustomSX1268Wrapper.h b/src/helpers/radiolib/CustomSX1268Wrapper.h
index c87ee9770..5149fc431 100644
--- a/src/helpers/radiolib/CustomSX1268Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1268Wrapper.h
@@ -2,6 +2,7 @@
 
 #include "CustomSX1268.h"
 #include "RadioLibWrappers.h"
+#include "SX126xReset.h"
 
 class CustomSX1268Wrapper : public RadioLibWrapper {
 public:
@@ -20,29 +21,5 @@ class CustomSX1268Wrapper : public RadioLibWrapper {
     return packetScoreInt(snr, sf, packet_len);
   }
 
-  void doResetAGC() override {
-    auto* radio = (CustomSX1268 *)_radio;
-    radio->sleep(true);
-    radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
-    uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
-    radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
-    radio->mod->hal->delay(5);
-    uint32_t start = millis();
-    while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
-      if (millis() - start > 50) break;
-      radio->mod->hal->yield();
-    }
-#ifdef SX126X_DIO2_AS_RF_SWITCH
-    radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
-#endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-    radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
-#endif
-#ifdef SX126X_REGISTER_PATCH
-    uint8_t r_data = 0;
-    radio->readRegister(0x8B5, &r_data, 1);
-    r_data |= 0x01;
-    radio->writeRegister(0x8B5, &r_data, 1);
-#endif
-  }
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 };
diff --git a/src/helpers/radiolib/SX126xReset.h b/src/helpers/radiolib/SX126xReset.h
new file mode 100644
index 000000000..ba08ef8db
--- /dev/null
+++ b/src/helpers/radiolib/SX126xReset.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <RadioLib.h>
+
+// Full receiver reset for all SX126x-family chips (SX1262, SX1268, LLCC68, STM32WLx).
+// Warm sleep powers down analog, Calibrate(0x7F) refreshes ADC/PLL/image calibration,
+// then re-applies RX settings that calibration may reset.
+inline void sx126xResetAGC(SX126x* radio) {
+  radio->sleep(true);
+  radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
+
+  uint8_t calData = RADIOLIB_SX126X_CALIBRATE_ALL;
+  radio->mod->SPIwriteStream(RADIOLIB_SX126X_CMD_CALIBRATE, &calData, 1, true, false);
+  radio->mod->hal->delay(5);
+  uint32_t start = millis();
+  while (radio->mod->hal->digitalRead(radio->mod->getGpio())) {
+    if (millis() - start > 50) break;
+    radio->mod->hal->yield();
+  }
+
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+  radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
+#endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+  radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif
+#ifdef SX126X_REGISTER_PATCH
+  uint8_t r_data = 0;
+  radio->readRegister(0x8B5, &r_data, 1);
+  r_data |= 0x01;
+  radio->writeRegister(0x8B5, &r_data, 1);
+#endif
+}

From ce05fed2075838bd1790ab6ec6a52553453f69dd Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <github@weebl.me>
Date: Sat, 21 Feb 2026 15:33:38 +0100
Subject: [PATCH 5/7] Also implement LR11x10 AGC reset

Similar to SX126x but simpler.
---
 src/helpers/radiolib/CustomLR1110Wrapper.h |  4 +++-
 src/helpers/radiolib/LR11x0Reset.h         | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/helpers/radiolib/LR11x0Reset.h

diff --git a/src/helpers/radiolib/CustomLR1110Wrapper.h b/src/helpers/radiolib/CustomLR1110Wrapper.h
index 947bb51dd..be4a6cde6 100644
--- a/src/helpers/radiolib/CustomLR1110Wrapper.h
+++ b/src/helpers/radiolib/CustomLR1110Wrapper.h
@@ -2,11 +2,13 @@
 
 #include "CustomLR1110.h"
 #include "RadioLibWrappers.h"
+#include "LR11x0Reset.h"
 
 class CustomLR1110Wrapper : public RadioLibWrapper {
 public:
   CustomLR1110Wrapper(CustomLR1110& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
-  bool isReceivingPacket() override { 
+  void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio); }
+  bool isReceivingPacket() override {
     return ((CustomLR1110 *)_radio)->isReceiving();
   }
   float getCurrentRSSI() override {
diff --git a/src/helpers/radiolib/LR11x0Reset.h b/src/helpers/radiolib/LR11x0Reset.h
new file mode 100644
index 000000000..539ed44e8
--- /dev/null
+++ b/src/helpers/radiolib/LR11x0Reset.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <RadioLib.h>
+
+// Full receiver reset for LR11x0-family chips (LR1110, LR1120, LR1121).
+// Warm sleep powers down analog, calibrate(0x3F) refreshes all calibration blocks,
+// then re-applies RX settings that calibration may reset.
+inline void lr11x0ResetAGC(LR11x0* radio) {
+  radio->sleep(true, 0);
+  radio->standby(RADIOLIB_LR11X0_STANDBY_RC, true);
+
+  radio->calibrate(RADIOLIB_LR11X0_CALIBRATE_ALL);
+
+#ifdef RX_BOOSTED_GAIN
+  radio->setRxBoostedGainMode(RX_BOOSTED_GAIN);
+#endif
+}

From 5b73fb97099c365e2fd67d07c881a09907addd32 Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <github@weebl.me>
Date: Sat, 21 Feb 2026 17:34:28 +0100
Subject: [PATCH 6/7] Calibrate configured frequency for AGC reset

---
 src/helpers/radiolib/CustomLR1110.h        | 2 ++
 src/helpers/radiolib/CustomLR1110Wrapper.h | 2 +-
 src/helpers/radiolib/LR11x0Reset.h         | 6 +++++-
 src/helpers/radiolib/SX126xReset.h         | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/helpers/radiolib/CustomLR1110.h b/src/helpers/radiolib/CustomLR1110.h
index e4332013a..b1f68080b 100644
--- a/src/helpers/radiolib/CustomLR1110.h
+++ b/src/helpers/radiolib/CustomLR1110.h
@@ -20,6 +20,8 @@ class CustomLR1110 : public LR1110 {
       return len;
     }
     
+    float getFreqMHz() const { return freqMHz; }
+
     bool isReceiving() {
       uint16_t irq = getIrqStatus();
       bool detected = ((irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID) || (irq & RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
diff --git a/src/helpers/radiolib/CustomLR1110Wrapper.h b/src/helpers/radiolib/CustomLR1110Wrapper.h
index be4a6cde6..a1e0a4937 100644
--- a/src/helpers/radiolib/CustomLR1110Wrapper.h
+++ b/src/helpers/radiolib/CustomLR1110Wrapper.h
@@ -7,7 +7,7 @@
 class CustomLR1110Wrapper : public RadioLibWrapper {
 public:
   CustomLR1110Wrapper(CustomLR1110& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
-  void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio); }
+  void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio, ((CustomLR1110 *)_radio)->getFreqMHz()); }
   bool isReceivingPacket() override {
     return ((CustomLR1110 *)_radio)->isReceiving();
   }
diff --git a/src/helpers/radiolib/LR11x0Reset.h b/src/helpers/radiolib/LR11x0Reset.h
index 539ed44e8..47cca627a 100644
--- a/src/helpers/radiolib/LR11x0Reset.h
+++ b/src/helpers/radiolib/LR11x0Reset.h
@@ -5,12 +5,16 @@
 // Full receiver reset for LR11x0-family chips (LR1110, LR1120, LR1121).
 // Warm sleep powers down analog, calibrate(0x3F) refreshes all calibration blocks,
 // then re-applies RX settings that calibration may reset.
-inline void lr11x0ResetAGC(LR11x0* radio) {
+inline void lr11x0ResetAGC(LR11x0* radio, float freqMHz) {
   radio->sleep(true, 0);
   radio->standby(RADIOLIB_LR11X0_STANDBY_RC, true);
 
   radio->calibrate(RADIOLIB_LR11X0_CALIBRATE_ALL);
 
+  // calibrate(0x3F) defaults image calibration to an unknown band.
+  // Re-calibrate for the actual operating frequency (band=4MHz matches RadioLib default).
+  radio->calibrateImageRejection(freqMHz - 4.0f, freqMHz + 4.0f);
+
 #ifdef RX_BOOSTED_GAIN
   radio->setRxBoostedGainMode(RX_BOOSTED_GAIN);
 #endif
diff --git a/src/helpers/radiolib/SX126xReset.h b/src/helpers/radiolib/SX126xReset.h
index ba08ef8db..39ddb73ee 100644
--- a/src/helpers/radiolib/SX126xReset.h
+++ b/src/helpers/radiolib/SX126xReset.h
@@ -18,6 +18,10 @@ inline void sx126xResetAGC(SX126x* radio) {
     radio->mod->hal->yield();
   }
 
+  // Calibrate(0x7F) defaults image calibration to 902-928MHz band.
+  // Re-calibrate for the actual operating frequency.
+  radio->calibrateImage(radio->freqMHz);
+
 #ifdef SX126X_DIO2_AS_RF_SWITCH
   radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif

From 80710c91c185b2e886135e5a0a1add3073c01d95 Mon Sep 17 00:00:00 2001
From: Wessel Nieboer <github@weebl.me>
Date: Sat, 21 Feb 2026 17:42:33 +0100
Subject: [PATCH 7/7] fix comment, we know the band now after checking LR1110
 user manual

---
 src/helpers/radiolib/LR11x0Reset.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers/radiolib/LR11x0Reset.h b/src/helpers/radiolib/LR11x0Reset.h
index 47cca627a..d06ffc538 100644
--- a/src/helpers/radiolib/LR11x0Reset.h
+++ b/src/helpers/radiolib/LR11x0Reset.h
@@ -11,7 +11,7 @@ inline void lr11x0ResetAGC(LR11x0* radio, float freqMHz) {
 
   radio->calibrate(RADIOLIB_LR11X0_CALIBRATE_ALL);
 
-  // calibrate(0x3F) defaults image calibration to an unknown band.
+  // calibrate(0x3F) defaults image calibration to 902-928MHz band.
   // Re-calibrate for the actual operating frequency (band=4MHz matches RadioLib default).
   radio->calibrateImageRejection(freqMHz - 4.0f, freqMHz + 4.0f);