Diff: CommandTerminal/CommandTerminal.cpp

Revision:

16:d5cf2af81a6d

Parent:

14:f9a77400b622

diff -r e20116281a78 -r d5cf2af81a6d CommandTerminal/CommandTerminal.cpp
--- a/CommandTerminal/CommandTerminal.cpp	Fri Nov 04 17:04:54 2016 -0500
+++ b/CommandTerminal/CommandTerminal.cpp	Mon Jun 19 14:33:21 2017 -0500
@@ -2,6 +2,7 @@
 #include "CommandTerminal.h"
 #include "Command.h"
 #include "MTSLog.h"
+#include "ChannelPlan.h"
 #include <cstdarg>
 #include <deque>
 #if defined(TARGET_XDOT_L151CC)
@@ -66,11 +67,13 @@
     CmdDebugBaudRate(),
     CmdStartUpMode(),
 
+    CmdDefaultFrequencyBand(),
     CmdFrequencyBand(),
     CmdFrequencySubBand(),
     CmdPublicNetwork(),
     CmdDeviceId(),
     CmdDeviceClass(),
+    CmdLbt(),
 
     CmdAppPort(),
     CmdNetworkAddress(),
@@ -156,6 +159,7 @@
     CmdDumpRegisters(),
     CmdEraseFlash(),
     CmdDisableDutyCycle(),
+    CmdLBTRSSI(),
 #endif
 
 };
@@ -177,11 +181,13 @@
     CmdDebugBaudRate::verify,
     CmdStartUpMode::verify,
 
+    CmdDefaultFrequencyBand::verify,
     CmdFrequencyBand::verify,
     CmdFrequencySubBand::verify,
     CmdPublicNetwork::verify,
     CmdDeviceId::verify,
     CmdDeviceClass::verify,
+    CmdLbt::verify,
 
     CmdAppPort::verify,
     CmdNetworkAddress::verify,
@@ -267,6 +273,7 @@
     CmdDummy::verify,
     CmdEraseFlash::verify,
     CmdDisableDutyCycle::verify,
+    CmdLBTRSSI::verify,
 #endif
 
 };
@@ -288,11 +295,13 @@
     CmdDebugBaudRate::action,
     CmdStartUpMode::action,
 
+    CmdDefaultFrequencyBand::action,
     CmdFrequencyBand::action,
     CmdFrequencySubBand::action,
     CmdPublicNetwork::action,
     CmdDeviceId::action,
     CmdDeviceClass::action,
+    CmdLbt::action,
 
     CmdAppPort::action,
     CmdNetworkAddress::action,
@@ -378,6 +387,7 @@
     CmdDumpRegisters::action,
     CmdEraseFlash::action,
     CmdDisableDutyCycle::action,
+    CmdLBTRSSI::action,
 #endif
 
 };
@@ -636,7 +646,7 @@
         if (!_serial.escaped() && _dot->getFrequencySubBand() != 0 && _dot->getJoinRetries() > 0 && cnt++ > _dot->getJoinRetries()) {
             cnt = 0;
 
-            if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
+            if (lora::ChannelPlan::IsPlanFixed(_dot->getFrequencyBand())) {
                 uint8_t band = ((_dot->getFrequencySubBand()) % 8) + 1;
                 logWarning("Join retries exhausted, switching to sub band %u", band);
                 _dot->setFrequencySubBand(band);