Browse Source

Rename isJapanMode() to isAS923_1_JP() for clarity

pull/2218/head
me 1 month ago
parent
commit
8cf27b9fd9
  1. 2
      src/Dispatcher.cpp
  2. 2
      src/Dispatcher.h
  3. 4
      src/helpers/radiolib/RadioLibWrappers.cpp
  4. 6
      src/helpers/radiolib/RadioLibWrappers.h

2
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
}

2
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; }
};
/**

4
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) {

6
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

Loading…
Cancel
Save