From 7f0cf4f25dabba1c6666b58d33f64ccb819f6aaf Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 12:34:58 -0700
Subject: [PATCH 01/10] Add isJapanMode() frequency detection for ARIB STD-T108

Add getCodingRate() and getFreqMHz() virtual methods to RadioLibWrapper
base class, enabling subclasses to report their operating frequency.
isJapanMode() detects JP 920MHz band (CH25-27) for ARIB STD-T108 compliance.
getMaxTextLen() and getMaxGroupTextLen() enforce 4-second airtime limits
per SF12/BW125 measurements.
---
 src/helpers/radiolib/RadioLibWrappers.h | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index e7fef9104..0498bfbdf 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -53,6 +53,34 @@ public:
   static uint16_t preambleLengthForSF(uint8_t sf) { return sf <= 8 ? 32 : 16; }
   void updatePreamble(uint8_t sf) { _preamble_sf = sf; _radio->setPreambleLength(preambleLengthForSF(sf)); }
   PacketMillis calcMaxPacketMillis(uint8_t sf, float bw, uint8_t cr, uint8_t preambleSymbols);
+  virtual uint8_t getCodingRate() const { return 8; }   // default CR4/8, override in subclass
+  virtual float getFreqMHz() const { return 0.0f; }     // default unknown, override in subclass
+
+  bool isJapanMode() const {
+    float freq = getFreqMHz();
+    return (fabsf(freq - 920.800f) < 0.05f ||
+            fabsf(freq - 921.000f) < 0.05f ||
+            fabsf(freq - 921.200f) < 0.05f);
+  }
+
+  int getMaxTextLen() const {
+    if (!isJapanMode()) return 10 * 16;  // default 160 bytes
+    uint8_t cr = getCodingRate();
+    if (cr <= 5) return 64;  // 3874ms @ SF12/BW125/CR4-5
+    if (cr == 6) return 48;  // 3874ms @ SF12/BW125/CR4-6
+    if (cr == 7) return 32;  // 3678ms @ SF12/BW125/CR4-7
+    return 24;               // 3547ms @ SF12/BW125/CR4-8
+  }
+
+  int getMaxGroupTextLen() const {
+    if (!isJapanMode()) return 10 * 16;  // default 160 bytes
+    uint8_t cr = getCodingRate();
+    if (cr <= 5) return 64;  // 3710ms @ SF12/BW125/CR4-5
+    if (cr == 6) return 48;  // 3678ms @ SF12/BW125/CR4-6
+    if (cr == 7) return 39;  // 3907ms @ SF12/BW125/CR4-7
+    return 29;               // 3809ms @ SF12/BW125/CR4-8
+  }
+
   virtual int16_t performChannelScan();
 
   int getNoiseFloor() const override { return _noise_floor; }

From 17cccc93d698310d67b423f746a7798c3e1fe033 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 12:46:23 -0700
Subject: [PATCH 02/10] Add ARIB STD-T108 LBT path to isChannelActive()

In JP 920MHz band (CH25-27): 5ms continuous RSSI sensing at -80dBm
absolute threshold, exponential backoff (2000-16000ms) on busy, jitter
(0-500ms) on free, then falls through to CAD if enabled.
Non-JP path: existing relative-RSSI threshold + CAD unchanged.
Add YIELD_TASK() macro and _busy_count field for backoff tracking.
---
 src/helpers/radiolib/RadioLibWrappers.cpp | 36 +++++++++++++++++++++--
 src/helpers/radiolib/RadioLibWrappers.h   |  3 +-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index 7146e47b6..879ae787a 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -2,6 +2,12 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include "RadioLibWrappers.h"
 
+#ifdef NRF52_PLATFORM
+  #define YIELD_TASK() vTaskDelay(1)
+#else
+  #define YIELD_TASK() delay(1)
+#endif
+
 #define STATE_IDLE       0
 #define STATE_RX         1
 #define STATE_TX_WAIT    3
@@ -184,10 +190,34 @@ int16_t RadioLibWrapper::performChannelScan() {
 }
 
 bool RadioLibWrapper::isChannelActive() {
-  // int.thresh: RSSI-based interference detection (relative to noise floor)
-  if (_threshold != 0 && getCurrentRSSI() > _noise_floor + _threshold) return true;
+  if (isJapanMode()) {
+    // ARIB STD-T108: 5ms continuous RSSI sensing, -80dBm absolute threshold
+    uint32_t sense_start = millis();
+    while (millis() - sense_start < 5) {
+      if (getCurrentRSSI() > -80.0f) {
+        _busy_count++;
+        uint32_t base_ms = 2000;
+        uint32_t max_backoff = min(base_ms * (1u << _busy_count), (uint32_t)16000);
+        uint32_t backoff_until = millis() + random(max_backoff / 2, max_backoff);
+        while (millis() < backoff_until) {
+          YIELD_TASK();
+        }
+        return true;
+      }
+      YIELD_TASK();
+    }
+    _busy_count = 0;
+    uint32_t jitter_until = millis() + random(0, 500);
+    while (millis() < jitter_until) {
+      YIELD_TASK();
+    }
+    // JP RSSI sensing passed; fall through to CAD if enabled
+  } else {
+    // Non-JP: RSSI-based interference detection (relative to noise floor)
+    if (_threshold != 0 && getCurrentRSSI() > _noise_floor + _threshold) return true;
+  }
 
-  // cad: hardware channel activity detection
+  // hardware channel activity detection (JP and non-JP)
   if (_cad_enabled) {
     int16_t result = performChannelScan();
     // scanChannel() triggers DIO interrupt (CAD done) which sets STATE_INT_READY
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 0498bfbdf..3330ccb08 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -15,6 +15,7 @@ protected:
   uint32_t n_recv, n_sent, n_recv_errors;
   int16_t _noise_floor, _threshold;
   bool _cad_enabled;
+  uint8_t _busy_count;
   uint16_t _num_floor_samples;
   int32_t _floor_sample_sum;
   uint8_t _preamble_sf;
@@ -26,7 +27,7 @@ protected:
   virtual void doResetAGC();
 
 public:
-  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board), _preamble_sf(0) { n_recv = n_sent = 0; }
+  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board), _busy_count(0), _preamble_sf(0) { n_recv = n_sent = 0; }
 
   void begin() override;
   virtual void powerOff() { _radio->sleep(); }

From ce1575754cecf92ec83f30236a1abed5844ae274 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 12:58:44 -0700
Subject: [PATCH 03/10] Prevent forced TX during JP LBT backoff via
 getCADFailMaxDuration()

Add isJapanMode() virtual to mesh::Radio (default false) so Dispatcher
can query frequency context without depending on RadioLibWrapper.
Dispatcher::getCADFailMaxDuration() returns UINT32_MAX for JP nodes,
eliminating the 4-second forced-TX that would violate ARIB STD-T108.
Non-JP nodes retain the original 4-second safety timeout unchanged.
---
 src/Dispatcher.cpp                      | 1 +
 src/Dispatcher.h                        | 2 ++
 src/helpers/radiolib/RadioLibWrappers.h | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Dispatcher.cpp b/src/Dispatcher.cpp
index c0610b7f8..d0cfc3966 100644
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -60,6 +60,7 @@ uint32_t Dispatcher::getCADFailRetryDelay() const {
   return 200;
 }
 uint32_t Dispatcher::getCADFailMaxDuration() const {
+  if (_radio->isJapanMode()) return UINT32_MAX;  // ARIB STD-T108: never force TX during LBT
   return 4000;   // 4 seconds
 }
 
diff --git a/src/Dispatcher.h b/src/Dispatcher.h
index aad6cba3e..e53b75aa0 100644
--- a/src/Dispatcher.h
+++ b/src/Dispatcher.h
@@ -78,6 +78,8 @@ public:
 
   virtual float getLastRSSI() const { return 0; }
   virtual float getLastSNR() const { return 0; }
+
+  virtual bool isJapanMode() const { return false; }
 };
 
 /**
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 3330ccb08..051bec7ef 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -57,7 +57,7 @@ public:
   virtual uint8_t getCodingRate() const { return 8; }   // default CR4/8, override in subclass
   virtual float getFreqMHz() const { return 0.0f; }     // default unknown, override in subclass
 
-  bool isJapanMode() const {
+  bool isJapanMode() const override {
     float freq = getFreqMHz();
     return (fabsf(freq - 920.800f) < 0.05f ||
             fabsf(freq - 921.000f) < 0.05f ||

From 2645c2c2c304f0eec82f56b41c161df36defa209 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 13:07:18 -0700
Subject: [PATCH 04/10] Add getCodingRate() and getFreqMHz() to
 CustomLR1110/Wrapper

getCodingRate() returns codingRate+4 (RadioLib stores 1-4 internally,
expose as CR4/5-8 matching the rest of the codebase).
CustomLR1110Wrapper overrides both getCodingRate() and getFreqMHz() so
isJapanMode() and getMaxTextLen() work correctly on T1000-E.
---
 src/helpers/radiolib/CustomLR1110.h        | 1 +
 src/helpers/radiolib/CustomLR1110Wrapper.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/helpers/radiolib/CustomLR1110.h b/src/helpers/radiolib/CustomLR1110.h
index 0470e48f2..33c20cca2 100644
--- a/src/helpers/radiolib/CustomLR1110.h
+++ b/src/helpers/radiolib/CustomLR1110.h
@@ -82,4 +82,5 @@ class CustomLR1110 : public LR1110 {
     }
 
     uint8_t getSpreadingFactor() const { return spreadingFactor; }
+    uint8_t getCodingRate() const { return this->codingRate + 4; }  // RadioLib stores 1-4, return 5-8
 };
\ No newline at end of file
diff --git a/src/helpers/radiolib/CustomLR1110Wrapper.h b/src/helpers/radiolib/CustomLR1110Wrapper.h
index 44230c61c..ca86bc95f 100644
--- a/src/helpers/radiolib/CustomLR1110Wrapper.h
+++ b/src/helpers/radiolib/CustomLR1110Wrapper.h
@@ -43,6 +43,8 @@ public:
   float getLastSNR() const override { return ((CustomLR1110 *)_radio)->getSNR(); }
 
   uint8_t getSpreadingFactor() const override { return ((CustomLR1110 *)_radio)->getSpreadingFactor(); }
+  uint8_t getCodingRate() const override { return ((CustomLR1110 *)_radio)->getCodingRate(); }
+  float getFreqMHz() const override { return ((CustomLR1110 *)_radio)->getFreqMHz(); }
   
   bool setRxBoostedGainMode(bool en) override {
     return ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;

From 0dda84bee3ffe9d0fc27b2acec6273582d2fdce0 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 13:12:55 -0700
Subject: [PATCH 05/10] Add getCodingRate() and getFreqMHz() to
 CustomSX1262Wrapper

Enables isJapanMode() and getMaxTextLen() to work on SX1262-based targets
(WisMesh Tag, T-Echo Lite, T114, XIAO nRF52, etc.).
codingRate accessed as SX1262 base class member +4 (same pattern as LR1110).
---
 src/helpers/radiolib/CustomSX1262Wrapper.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/helpers/radiolib/CustomSX1262Wrapper.h b/src/helpers/radiolib/CustomSX1262Wrapper.h
index bfea50ec9..4d29e5f7e 100644
--- a/src/helpers/radiolib/CustomSX1262Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1262Wrapper.h
@@ -37,6 +37,8 @@ public:
     return packetScoreInt(snr, sf, packet_len);
   }
   uint8_t getSpreadingFactor() const override { return ((CustomSX1262 *)_radio)->spreadingFactor; }
+  uint8_t getCodingRate() const override { return ((CustomSX1262 *)_radio)->codingRate + 4; }  // RadioLib stores 1-4, return 5-8
+  float getFreqMHz() const override { return ((CustomSX1262 *)_radio)->freqMHz; }
   virtual void powerOff() override {
     ((CustomSX1262 *)_radio)->sleep(false);
   }

From 2835a2192ce332fe64a3ea2afec0f5dc29796063 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 13:17:59 -0700
Subject: [PATCH 06/10] =?UTF-8?q?Add=20ARIB=20STD-T108=20=C2=A73.4.1=20pos?=
 =?UTF-8?q?t-TX=2050ms=20wait=20to=20onSendFinished()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index 879ae787a..0b54e314e 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -182,6 +182,9 @@ bool RadioLibWrapper::isSendComplete() {
 void RadioLibWrapper::onSendFinished() {
   _radio->finishTransmit();
   _board->onAfterTransmit();
+  if (isJapanMode()) {
+    delay(50);  // ARIB STD-T108 §3.4.1: >= 50ms between transmissions
+  }
   state = STATE_IDLE;
 }
 

From 8cf27b9fd930e79a9fcf540a31fde0ae778c08e3 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 13:33:04 -0700
Subject: [PATCH 07/10] Rename isJapanMode() to isAS923_1_JP() for clarity

---
 src/Dispatcher.cpp                        | 2 +-
 src/Dispatcher.h                          | 2 +-
 src/helpers/radiolib/RadioLibWrappers.cpp | 4 ++--
 src/helpers/radiolib/RadioLibWrappers.h   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Dispatcher.cpp b/src/Dispatcher.cpp
index d0cfc3966..4ac78a1f5 100644
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -60,7 +60,7 @@ uint32_t Dispatcher::getCADFailRetryDelay() const {
   return 200;
 }
 uint32_t Dispatcher::getCADFailMaxDuration() const {
-  if (_radio->isJapanMode()) return UINT32_MAX;  // ARIB STD-T108: never force TX during LBT
+  if (_radio->isAS923_1_JP()) return UINT32_MAX;  // ARIB STD-T108: never force TX during LBT
   return 4000;   // 4 seconds
 }
 
diff --git a/src/Dispatcher.h b/src/Dispatcher.h
index e53b75aa0..b64909fb1 100644
--- a/src/Dispatcher.h
+++ b/src/Dispatcher.h
@@ -79,7 +79,7 @@ public:
   virtual float getLastRSSI() const { return 0; }
   virtual float getLastSNR() const { return 0; }
 
-  virtual bool isJapanMode() const { return false; }
+  virtual bool isAS923_1_JP() const { return false; }
 };
 
 /**
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index 0b54e314e..f640a8469 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -182,7 +182,7 @@ bool RadioLibWrapper::isSendComplete() {
 void RadioLibWrapper::onSendFinished() {
   _radio->finishTransmit();
   _board->onAfterTransmit();
-  if (isJapanMode()) {
+  if (isAS923_1_JP()) {
     delay(50);  // ARIB STD-T108 §3.4.1: >= 50ms between transmissions
   }
   state = STATE_IDLE;
@@ -193,7 +193,7 @@ int16_t RadioLibWrapper::performChannelScan() {
 }
 
 bool RadioLibWrapper::isChannelActive() {
-  if (isJapanMode()) {
+  if (isAS923_1_JP()) {
     // ARIB STD-T108: 5ms continuous RSSI sensing, -80dBm absolute threshold
     uint32_t sense_start = millis();
     while (millis() - sense_start < 5) {
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 051bec7ef..84b12f34c 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -57,7 +57,7 @@ public:
   virtual uint8_t getCodingRate() const { return 8; }   // default CR4/8, override in subclass
   virtual float getFreqMHz() const { return 0.0f; }     // default unknown, override in subclass
 
-  bool isJapanMode() const override {
+  bool isAS923_1_JP() const override {
     float freq = getFreqMHz();
     return (fabsf(freq - 920.800f) < 0.05f ||
             fabsf(freq - 921.000f) < 0.05f ||
@@ -65,7 +65,7 @@ public:
   }
 
   int getMaxTextLen() const {
-    if (!isJapanMode()) return 10 * 16;  // default 160 bytes
+    if (!isAS923_1_JP()) return 10 * 16;  // default 160 bytes
     uint8_t cr = getCodingRate();
     if (cr <= 5) return 64;  // 3874ms @ SF12/BW125/CR4-5
     if (cr == 6) return 48;  // 3874ms @ SF12/BW125/CR4-6
@@ -74,7 +74,7 @@ public:
   }
 
   int getMaxGroupTextLen() const {
-    if (!isJapanMode()) return 10 * 16;  // default 160 bytes
+    if (!isAS923_1_JP()) return 10 * 16;  // default 160 bytes
     uint8_t cr = getCodingRate();
     if (cr <= 5) return 64;  // 3710ms @ SF12/BW125/CR4-5
     if (cr == 6) return 48;  // 3678ms @ SF12/BW125/CR4-6

From 62067d19de23b9ade9e43f31ede884d1bcbcbe46 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Mon, 22 Jun 2026 14:11:40 -0700
Subject: [PATCH 08/10] Enforce JP airtime limits via
 getMaxTextLen()/getMaxGroupTextLen()

Add getMaxTextLen() and getMaxGroupTextLen() virtual to mesh::Radio
(default 160 bytes). BaseChatMesh uses these instead of the hardcoded
MAX_TEXT_LEN macro for limit checks in composeMsgPacket(),
sendCommandData(), and sendGroupMessage(). Stack buffers remain sized
to MAX_TEXT_LEN as a safe upper bound.
---
 src/Dispatcher.h                        |  3 +++
 src/helpers/BaseChatMesh.cpp            | 11 +++++++----
 src/helpers/radiolib/RadioLibWrappers.h |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Dispatcher.h b/src/Dispatcher.h
index b64909fb1..e4f2d4a53 100644
--- a/src/Dispatcher.h
+++ b/src/Dispatcher.h
@@ -80,6 +80,9 @@ public:
   virtual float getLastSNR() const { return 0; }
 
   virtual bool isAS923_1_JP() const { return false; }
+
+  virtual int getMaxTextLen() const { return 10 * 16; }       // default 160 bytes
+  virtual int getMaxGroupTextLen() const { return 10 * 16; }  // default 160 bytes
 };
 
 /**
diff --git a/src/helpers/BaseChatMesh.cpp b/src/helpers/BaseChatMesh.cpp
index 972a97e9e..75d27464b 100644
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -419,8 +419,9 @@ void BaseChatMesh::onGroupDataRecv(mesh::Packet* packet, uint8_t type, const mes
 
 mesh::Packet* BaseChatMesh::composeMsgPacket(const ContactInfo& recipient, uint32_t timestamp, uint8_t attempt, const char *text, uint32_t& expected_ack) {
   int text_len = strlen(text);
-  if (text_len > MAX_TEXT_LEN) return NULL;
-  if (attempt > 3 && text_len > MAX_TEXT_LEN-2) return NULL;
+  int max_len = _radio->getMaxTextLen();
+  if (text_len > max_len) return NULL;
+  if (attempt > 3 && text_len > max_len - 2) return NULL;
 
   uint8_t temp[5+MAX_TEXT_LEN+1];
   memcpy(temp, &timestamp, 4);   // mostly an extra blob to help make packet_hash unique
@@ -460,7 +461,8 @@ int  BaseChatMesh::sendMessage(const ContactInfo& recipient, uint32_t timestamp,
 
 int  BaseChatMesh::sendCommandData(const ContactInfo& recipient, uint32_t timestamp, uint8_t attempt, const char* text, uint32_t& est_timeout) {
   int text_len = strlen(text);
-  if (text_len > MAX_TEXT_LEN) return MSG_SEND_FAILED;
+  int max_len = _radio->getMaxTextLen();
+  if (text_len > max_len) return MSG_SEND_FAILED;
 
   uint8_t temp[5+MAX_TEXT_LEN+1];
   memcpy(temp, &timestamp, 4);   // mostly an extra blob to help make packet_hash unique
@@ -493,7 +495,8 @@ bool BaseChatMesh::sendGroupMessage(uint32_t timestamp, mesh::GroupChannel& chan
   char *ep = strchr((char *) &temp[5], 0);
   int prefix_len = ep - (char *) &temp[5];
 
-  if (text_len + prefix_len > MAX_TEXT_LEN) text_len = MAX_TEXT_LEN - prefix_len;
+  int max_len = _radio->getMaxGroupTextLen();
+  if (text_len + prefix_len > max_len) text_len = max_len - prefix_len;
   memcpy(ep, text, text_len);
   ep[text_len] = 0;  // null terminator
 
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 84b12f34c..ef04e158e 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -64,7 +64,7 @@ public:
             fabsf(freq - 921.200f) < 0.05f);
   }
 
-  int getMaxTextLen() const {
+  int getMaxTextLen() const override {
     if (!isAS923_1_JP()) return 10 * 16;  // default 160 bytes
     uint8_t cr = getCodingRate();
     if (cr <= 5) return 64;  // 3874ms @ SF12/BW125/CR4-5
@@ -73,7 +73,7 @@ public:
     return 24;               // 3547ms @ SF12/BW125/CR4-8
   }
 
-  int getMaxGroupTextLen() const {
+  int getMaxGroupTextLen() const override {
     if (!isAS923_1_JP()) return 10 * 16;  // default 160 bytes
     uint8_t cr = getCodingRate();
     if (cr <= 5) return 64;  // 3710ms @ SF12/BW125/CR4-5

From 2d961b6a5f464a4320f7271506c8121007c5a7f3 Mon Sep 17 00:00:00 2001
From: me <jiroiset@gmail.com>
Date: Tue, 23 Jun 2026 00:17:45 -0700
Subject: [PATCH 09/10] JP LBT: suppress txdelay to jitter-scale at SF12/BW125

---
 examples/simple_repeater/MyMesh.cpp       | 12 ++++++++++++
 examples/simple_room_server/MyMesh.cpp    | 12 ++++++++++++
 examples/simple_sensor/SensorMesh.cpp     | 16 ++++++++++++++--
 src/helpers/radiolib/RadioLibWrappers.cpp |  8 +++++++-
 src/helpers/radiolib/RadioLibWrappers.h   |  2 ++
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index b66e19522..73a5bf32e 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -541,10 +541,22 @@ int MyMesh::calcRxDelay(float score, uint32_t air_time) const {
 }
 
 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
+  if (_radio->isAS923_1_JP()) {
+    // JP LBT: suppress txdelay to jitter-scale to avoid adding unnecessary
+    // latency on top of LBT backoff. A window equal to jitter_max gives
+    // ~33% collision reduction vs zero, scales naturally with airtime as
+    // CR changes, and keeps average added delay to ~56ms at SF12/BW125.
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.tx_delay_factor);
   return getRNG()->nextInt(0, 5*t + 1);
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
+  if (_radio->isAS923_1_JP()) {
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
   return getRNG()->nextInt(0, 5*t + 1);
 }
diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index 36978e808..4c272d312 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -272,10 +272,22 @@ const char *MyMesh::getLogDateTime() {
 }
 
 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
+  if (_radio->isAS923_1_JP()) {
+    // JP LBT: suppress txdelay to jitter-scale to avoid adding unnecessary
+    // latency on top of LBT backoff. A window equal to jitter_max gives
+    // ~33% collision reduction vs zero, scales naturally with airtime as
+    // CR changes, and keeps average added delay to ~56ms at SF12/BW125.
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.tx_delay_factor);
   return getRNG()->nextInt(0, 5*t + 1);
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
+  if (_radio->isAS923_1_JP()) {
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
   return getRNG()->nextInt(0, 5*t + 1);
 }
diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index 59c9aa090..066b2e054 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -313,12 +313,24 @@ int SensorMesh::calcRxDelay(float score, uint32_t air_time) const {
 }
 
 uint32_t SensorMesh::getRetransmitDelay(const mesh::Packet* packet) {
+  if (_radio->isAS923_1_JP()) {
+    // JP LBT: suppress txdelay to jitter-scale to avoid adding unnecessary
+    // latency on top of LBT backoff. A window equal to jitter_max gives
+    // ~33% collision reduction vs zero, scales naturally with airtime as
+    // CR changes, and keeps average added delay to ~56ms at SF12/BW125.
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.tx_delay_factor);
-  return getRNG()->nextInt(0, 6)*t;
+  return getRNG()->nextInt(0, 5*t + 1);
 }
 uint32_t SensorMesh::getDirectRetransmitDelay(const mesh::Packet* packet) {
+  if (_radio->isAS923_1_JP()) {
+    uint32_t jitter_max = _radio->getEstAirtimeFor(MAX_TRANS_UNIT) / RadioLibWrapper::JP_LBT_JITTER_DIVISOR;
+    return getRNG()->nextInt(0, jitter_max + 1);
+  }
   uint32_t t = (_radio->getEstAirtimeFor(packet->getPathByteLen() + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
-  return getRNG()->nextInt(0, 6)*t;
+  return getRNG()->nextInt(0, 5*t + 1);
 }
 int SensorMesh::getInterferenceThreshold() const {
   return _prefs.interference_threshold;
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index f640a8469..f6afbaaff 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -209,8 +209,14 @@ bool RadioLibWrapper::isChannelActive() {
       }
       YIELD_TASK();
     }
+    // Channel free: reset busy counter and add airtime-scaled jitter.
+    // JP_LBT_JITTER_DIVISOR controls jitter upper bound:
+    //   /8  -> SF12/BW125 ~975ms, SF7/BW62.5 ~50ms
+    //   /16 -> SF12/BW125 ~490ms, SF7/BW62.5 ~25ms
+    //   /32 -> SF12/BW125 ~245ms, SF7/BW62.5 ~12ms  (default)
     _busy_count = 0;
-    uint32_t jitter_until = millis() + random(0, 500);
+    uint32_t airtime_ms = getEstAirtimeFor(MAX_TRANS_UNIT);
+    uint32_t jitter_until = millis() + random(0, airtime_ms / JP_LBT_JITTER_DIVISOR);
     while (millis() < jitter_until) {
       YIELD_TASK();
     }
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index ef04e158e..699b31223 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -57,6 +57,8 @@ public:
   virtual uint8_t getCodingRate() const { return 8; }   // default CR4/8, override in subclass
   virtual float getFreqMHz() const { return 0.0f; }     // default unknown, override in subclass
 
+  static constexpr uint8_t JP_LBT_JITTER_DIVISOR = 32;
+
   bool isAS923_1_JP() const override {
     float freq = getFreqMHz();
     return (fabsf(freq - 920.800f) < 0.05f ||

From 25f65735dfb45ac97feedf538a5ded4908ab527c Mon Sep 17 00:00:00 2001
From: jirogit <jiroiset@gmail.com>
Date: Fri, 17 Jul 2026 21:35:29 -0700
Subject: [PATCH 10/10] JP LBT: make busy-channel backoff non-blocking

isChannelActive() previously spin-waited (with YIELD_TASK()) for up to
16s after detecting RSSI busy, blocking Dispatcher::loop() from
servicing incoming packets for the duration of the backoff.

Replace the blocking wait with a state machine (_lbt_backoff_active /
_lbt_deadline): on busy detection, arm a deadline and return true
(busy) immediately. Dispatcher::checkSend()'s existing retry mechanism
(getCADFailRetryDelay()) re-polls isChannelActive() on the next
loop() pass; once the deadline has elapsed, re-sense (bounded,
single-level recursion) instead of assuming still-busy.

The initial 5ms RSSI sense and the post-clear jitter wait remain
blocking, as both are short (<=5ms and <=~1s respectively) relative
to the up-to-16s backoff this change targets.

Hardware-tested (LilyGo T3S3 sx1262 / Wio Tracker L1 Pro) in both quiet and
electrically noisy environments; confirmed both bidirectional and
unidirectional message delivery under legitimate busy-channel
conditions.
---
 src/helpers/radiolib/RadioLibWrappers.cpp | 18 ++++++++++++++----
 src/helpers/radiolib/RadioLibWrappers.h   |  5 ++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index f6afbaaff..7e5e1acfb 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -194,6 +194,18 @@ int16_t RadioLibWrapper::performChannelScan() {
 
 bool RadioLibWrapper::isChannelActive() {
   if (isAS923_1_JP()) {
+    // Non-blocking backoff: if a prior busy detection armed a backoff wait,
+    // report busy and let Dispatcher::checkSend() re-poll on the next loop()
+    // pass instead of spin-waiting here (which used to block the Dispatcher
+    // loop for up to 16s).
+    if (_lbt_backoff_active) {
+      if ((int32_t)(millis() - _lbt_deadline) < 0) {
+        return true;  // still waiting; re-checked next call
+      }
+      _lbt_backoff_active = false;
+      return isChannelActive();  // backoff elapsed -- re-sense (bounded, single-level recursion)
+    }
+
     // ARIB STD-T108: 5ms continuous RSSI sensing, -80dBm absolute threshold
     uint32_t sense_start = millis();
     while (millis() - sense_start < 5) {
@@ -201,10 +213,8 @@ bool RadioLibWrapper::isChannelActive() {
         _busy_count++;
         uint32_t base_ms = 2000;
         uint32_t max_backoff = min(base_ms * (1u << _busy_count), (uint32_t)16000);
-        uint32_t backoff_until = millis() + random(max_backoff / 2, max_backoff);
-        while (millis() < backoff_until) {
-          YIELD_TASK();
-        }
+        _lbt_deadline = millis() + random(max_backoff / 2, max_backoff);
+        _lbt_backoff_active = true;
         return true;
       }
       YIELD_TASK();
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 699b31223..b58ac8ab0 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -20,6 +20,9 @@ protected:
   int32_t _floor_sample_sum;
   uint8_t _preamble_sf;
 
+  bool _lbt_backoff_active;   // non-blocking wait after RSSI busy detection (up to 16s)
+  uint32_t _lbt_deadline;
+
   void idle();
   void startRecv();
   float packetScoreInt(float snr, int sf, int packet_len);
@@ -27,7 +30,7 @@ protected:
   virtual void doResetAGC();
 
 public:
-  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board), _busy_count(0), _preamble_sf(0) { n_recv = n_sent = 0; }
+  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board), _busy_count(0), _preamble_sf(0), _lbt_backoff_active(false), _lbt_deadline(0) { n_recv = n_sent = 0; }
 
   void begin() override;
   virtual void powerOff() { _radio->sleep(); }