Merge branch 'Semtech'

Conflicts:
	.gitmodules
	Mode/ModeJoin.cpp
	main.cpp

Add AU915

11 files changed, 199 insertions, 56 deletions

diff --git a/CommandTerminal/CmdDisplayConfig.cpp b/CommandTerminal/CmdDisplayConfig.cpp
index 31fc100..58ba86d 100644
--- a/CommandTerminal/CmdDisplayConfig.cpp
+++ b/CommandTerminal/CmdDisplayConfig.cpp
@@ -38,7 +38,7 @@ uint32_t CmdDisplayConfig::action(std::vector<std::string> args) {
     _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getDeviceId(), ":").c_str());
 
     _serial.writef("Frequency Band:\t\t%s\r\n", mDot::FrequencyBandStr(_dot->getFrequencyBand()).c_str());
-    if (_dot->getFrequencyBand() == mDot::FB_915)
+    if (_dot->getFrequencyBand() == mDot::FB_US915)
 	_serial.writef("Frequency Sub Band:\t%u\r\n", _dot->getFrequencySubBand());
 
     _serial.writef("Public Network:\t\t%s\r\n", _dot->getPublicNetwork() ? "on" : "off");
diff --git a/CommandTerminal/CmdFactoryDefault.cpp b/CommandTerminal/CmdFactoryDefault.cpp
index 955535e..a8554cb 100644
--- a/CommandTerminal/CmdFactoryDefault.cpp
+++ b/CommandTerminal/CmdFactoryDefault.cpp
@@ -29,7 +29,7 @@ uint32_t CmdFactoryDefault::action(std::vector<std::string> args)
     _dot->resetConfig();
 
 //Factory defaults for the DotBox.
-    _dot->setTxDataRate(mDot::SF_7);
+    _dot->setTxDataRate(mDot::DR0);
     _dot->setFrequencySubBand(1);
     _dot->setWakeDelay(242);		//DotBox +MaxSize is stored here. Default is 242.
     _dot->setWakeInterval(11);		//DotBox +MinSize is stored here. Default is 11.
diff --git a/CommandTerminal/CmdFrequencyBand.cpp b/CommandTerminal/CmdFrequencyBand.cpp
index 4057f7a..c3116c9 100644
--- a/CommandTerminal/CmdFrequencyBand.cpp
+++ b/CommandTerminal/CmdFrequencyBand.cpp
@@ -19,10 +19,10 @@
 #include "CmdFrequencyBand.h"
 
 CmdFrequencyBand::CmdFrequencyBand(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Frequency Band", "AT+FREQ", "Configured Frequency Band '868' or '915'"), _serial(serial)
+        Command(dot, "Frequency Band", "AT+FREQ", "Configured Frequency Band 'EU868', 'AU915' or 'US915'"), _serial(serial)
 {
     _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(868,915)";
+    _usage = "(EU868,AU915,US915)";
     _queryable = true;
 }
 
@@ -40,10 +40,22 @@ uint32_t CmdFrequencyBand::action(std::vector<std::string> args)
     else if (args.size() == 2)
     {
         int32_t code;
-        uint8_t band = mDot::FB_915;
 
-        if (mDot::FrequencyBandStr(mDot::FB_868).find(args[1]) != std::string::npos) {
-            band = mDot::FB_868;
+        std::string text = mts::Text::toUpper(args[1]);
+
+        uint8_t band = mDot::FB_US915;
+
+
+        if (mDot::FrequencyBandStr(mDot::FB_EU868).find(text) != std::string::npos) {
+            band = mDot::FB_EU868;
+        }
+
+        if (mDot::FrequencyBandStr(mDot::FB_AU915).find(text) != std::string::npos) {
+            band = mDot::FB_AU915;
+        }
+
+        if (mDot::FrequencyBandStr(mDot::FB_US915).find(text) != std::string::npos) {
+            band = mDot::FB_US915;
         }
 
         if ((code = _dot->setFrequencyBand(band)) != mDot::MDOT_OK) {
@@ -65,10 +77,13 @@ bool CmdFrequencyBand::verify(std::vector<std::string> args)
 #ifdef DEBUG_MAC
     if (args.size() == 2)
     {
-        if (mDot::FrequencyBandStr(mDot::FB_868).find(args[1]) == std::string::npos &&
-            mDot::FrequencyBandStr(mDot::FB_915).find(args[1]) == std::string::npos)
+        std::string band = mts::Text::toUpper(args[1]);
+
+        if (mDot::FrequencyBandStr(mDot::FB_EU868).find(band) == std::string::npos &&
+            mDot::FrequencyBandStr(mDot::FB_US915).find(band) == std::string::npos &&
+            mDot::FrequencyBandStr(mDot::FB_AU915).find(band) == std::string::npos)
         {
-            setErrorMessage("Invalid parameter, expects (868,915)");
+            setErrorMessage("Invalid parameter, expects (EU868,AU915,US915)");
             return false;
         }
 
diff --git a/CommandTerminal/CmdSendContinuous.cpp b/CommandTerminal/CmdSendContinuous.cpp
new file mode 100644
index 0000000..843d5bf
--- /dev/null
+++ b/CommandTerminal/CmdSendContinuous.cpp
@@ -0,0 +1,13 @@
+#include "CmdSendContinuous.h"
+
+CmdSendContinuous::CmdSendContinuous(mDot* dot)
+: Command(dot, "Send Continuous", "AT+SENDC", "Send un-modulated data continuously") {
+}
+
+uint32_t CmdSendContinuous::action(std::vector<std::string> args) {
+
+    _dot->sendContinuous(true);
+
+    return 0;
+}
+
diff --git a/CommandTerminal/CmdSendContinuous.h b/CommandTerminal/CmdSendContinuous.h
new file mode 100644
index 0000000..403ab54
--- /dev/null
+++ b/CommandTerminal/CmdSendContinuous.h
@@ -0,0 +1,18 @@
+
+#ifndef __CMDSENDCONTINUOUS_H__
+#define __CMDSENDCONTINUOUS_H__
+
+#include "Command.h"
+
+class CmdSendContinuous : public Command {
+
+public:
+
+    CmdSendContinuous(mDot* dot);
+    uint32_t action(std::vector<std::string> args);
+    
+private:
+    
+};
+
+#endif // __CMDSENDCONTINUOUS_H__
diff --git a/CommandTerminal/CmdTxDataRate.cpp b/CommandTerminal/CmdTxDataRate.cpp
index 846562b..fefbd69 100644
--- a/CommandTerminal/CmdTxDataRate.cpp
+++ b/CommandTerminal/CmdTxDataRate.cpp
@@ -15,49 +15,60 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
 #include "CmdTxDataRate.h"
+#include "MTSText.h"
+#include "MTSLog.h"
 
-CmdTxDataRate::CmdTxDataRate(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Tx Data Rate", "AT+TXDR", "Set the Tx data rate for LoRa demo mode"), _serial(serial)
+CmdTxDataRate::CmdTxDataRate(mDot* dot, mts::MTSSerial& serial)
+:
+  Command(dot, "Tx Data Rate", "AT+TXDR", "Set the Tx data rate for all channels"),
+  _serial(serial)
 {
     _help = std::string(text()) + ": " + std::string(desc());
 
-    if (_dot->getFrequencyBand() == mDot::FB_915)
-        _usage = "(7-10)";
+    if (_dot->getFrequencyBand() == mDot::FB_EU868)
+        _usage = "(7-12|DR0-DR7)";
     else
-        _usage = "(7-12)";
+        _usage = "(7-10|DR0-DR4|DR8-DR13)";
+
     _queryable = true;
 }
 
-uint32_t CmdTxDataRate::action(std::vector<std::string> args)
-{
+uint32_t CmdTxDataRate::action(std::vector<std::string> args) {
     if (args.size() == 1)
-    {
+        {
         if (_dot->getVerbose())
             _serial.writef("Tx Data Rate: ");
 
-        _serial.writef("%s\r\n", mDot::DataRateStr(_dot->getTxDataRate()).c_str());
-    }
-    else if (args.size() == 2)
-    {
+        _serial.writef("DR%d - %s\r\n", _dot->getTxDataRate(), _dot->getDateRateDetails(_dot->getTxDataRate()).c_str());
+    } else if (args.size() == 2) {
+        std::string dr = mts::Text::toUpper(args[1]);
         int32_t code;
-        uint8_t datarate = 0;
+        int datarate = -1;
         uint8_t i;
 
-        for (i = 0; i < 8; i++)
-        {
-            if (mDot::DataRateStr(i).find(args[1].c_str()) != std::string::npos)
-            {
-                datarate = i;
-                break;
+        int res = sscanf(dr.c_str(), "%d", &datarate);
+
+        if (res == 0) {
+            for (i = 0; i < 24; i++) {
+                if (mDot::DataRateStr(i).find(dr) != std::string::npos) {
+                    datarate = i;
+                    break;
+                }
+            }
+        } else {
+            if (datarate > 6) {
+                // Convert SF to DR
+                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
+                    datarate = 10 - datarate;
+                } else {
+                    datarate = 12 - datarate;
+                }
             }
         }
 
-        if ((code = _dot->setTxDataRate(datarate)) != mDot::MDOT_OK)
-        {
-            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-            setErrorMessage(error);
+        if ((code = _dot->setTxDataRate(datarate)) != mDot::MDOT_OK) {
+            setErrorMessage(_dot->getLastError());
             return 1;
         }
     }
@@ -65,36 +76,69 @@ uint32_t CmdTxDataRate::action(std::vector<std::string> args)
     return 0;
 }
 
-bool CmdTxDataRate::verify(std::vector<std::string> args)
-{
+bool CmdTxDataRate::verify(std::vector<std::string> args) {
     if (args.size() == 1)
         return true;
 
-    if (args.size() == 2)
-    {
+    if (args.size() == 2) {
+        std::string dr = mts::Text::toUpper(args[1]);
+
         uint8_t i;
         int datarate = -1;
-        for (i = 0; i < 8; i++)
-        {
-            if (mDot::DataRateStr(i).find(args[1].c_str()) != std::string::npos)
-            {
-                datarate = i;
-                break;
+
+        int res = sscanf(dr.c_str(), "%d", &datarate);
+
+        if (res == 0) {
+            for (i = 0; i < 24; i++) {
+
+                if (mDot::DataRateStr(i).find(dr) != std::string::npos) {
+                    uint8_t _dr = i;
+
+                    if (_dr > 15) {
+                        _dr = 12 + (mDot::SF_12 - _dr);
+
+                        if (_dot->getFrequencyBand() == mDot::FB_EU868) {
+                            if (_dr == mDot::SF_7H) {
+                                _dr =  mDot::DR6;
+                            } else if (_dr ==  mDot::SF_FSK) {
+                                _dr =  mDot::DR7;
+                            } else {
+                                _dr = 12 - _dr;
+                            }
+                        } else {
+
+                            _dr = 10 - _dr;
+                        }
+                    }
+
+                    datarate = _dr;
+                    break;
+                }
+            }
+        } else {
+            if ((_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915) && datarate > 10) {
+                datarate = -1;
+            } else if (_dot->getFrequencyBand() == mDot::FB_EU868 && datarate > 12) {
+                datarate = -1;
+            } else if (datarate > 6) {
+                // Convert SF to DR
+                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
+                    datarate = 10 - datarate;
+                } else {
+                    datarate = 12 - datarate;
+                }
             }
         }
 
-        if (datarate < 0)
-        {       
-            if (_dot->getFrequencyBand() == mDot::FB_915)
-                setErrorMessage("Invalid data rate, expects (7-10)");
-            else
-                setErrorMessage("Invalid data rate, expects (7-12)");
-            return false;
-        }   
-
-        if (_dot->getFrequencyBand() == mDot::FB_915) {
-            if (datarate < 2) {
-                setErrorMessage("Invalid data rate, expects (7-10)");
+        if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
+            // DR8-13 used for P2P modes
+            if (datarate < 0 || datarate > 13 || (datarate >= 5 && datarate <= 7)) {
+                setErrorMessage("Invalid data rate, expects (7-10|DR0-DR4|DR8-DR13)");
+                return false;
+            }
+        } else {
+            if (datarate < 0 || datarate > 7) {
+                setErrorMessage("Invalid data rate, expects (7-12|DR0-DR7)");
                 return false;
             }
         }
diff --git a/CommandTerminal/CmdTxFrequency.cpp b/CommandTerminal/CmdTxFrequency.cpp
new file mode 100644
index 0000000..35e7f8d
--- /dev/null
+++ b/CommandTerminal/CmdTxFrequency.cpp
@@ -0,0 +1,26 @@
+#include "CmdTxFrequency.h"
+#include <climits>
+
+
+CmdTxFrequency::CmdTxFrequency(mDot* dot) :
+    Command(dot, "Tx Frequency", "AT+TXF", "Set Tx frequency") {
+}
+
+uint32_t CmdTxFrequency::action(std::vector<std::string> args)
+{
+    if (args.size() == 2)
+    {
+        int frequency = 0;
+
+        sscanf(args[1].c_str(), "%d", &frequency);
+        _dot->setTxFrequency(frequency);
+    }
+
+    return 0;
+}
+
+bool CmdTxFrequency::verify(std::vector<std::string> args)
+{
+    return true;
+}
+
diff --git a/CommandTerminal/CmdTxFrequency.h b/CommandTerminal/CmdTxFrequency.h
new file mode 100644
index 0000000..22eb777
--- /dev/null
+++ b/CommandTerminal/CmdTxFrequency.h
@@ -0,0 +1,20 @@
+#ifndef __CMDTXFREQUENCY_H__
+#define __CMDTXFREQUENCY_H__
+
+#include "Command.h"
+
+class CommandTerminal;
+
+class CmdTxFrequency : public Command {
+
+public:
+
+    CmdTxFrequency(mDot* dot);
+    uint32_t action(std::vector<std::string> args);
+    bool verify(std::vector<std::string> args);
+    
+private:   
+    
+};
+
+#endif // __CMDTXFREQUENCY_H__
diff --git a/CommandTerminal/CmdWriteProtectedConfig.cpp b/CommandTerminal/CmdWriteProtectedConfig.cpp
index 6c2d6ce..db22562 100644
--- a/CommandTerminal/CmdWriteProtectedConfig.cpp
+++ b/CommandTerminal/CmdWriteProtectedConfig.cpp
@@ -24,6 +24,10 @@ CmdWriteProtectedConfig::CmdWriteProtectedConfig(mDot* dot) :
     _help = std::string(text()) + ": " + std::string(desc());
 }
 
+CmdWriteProtectedConfig::~CmdWriteProtectedConfig() {
+
+}
+
 uint32_t CmdWriteProtectedConfig::action(std::vector<std::string> args)
 {
     if (!_dot->saveProtectedConfig()) {
diff --git a/CommandTerminal/CmdWriteProtectedConfig.h b/CommandTerminal/CmdWriteProtectedConfig.h
index e5ad3c7..51315fe 100644
--- a/CommandTerminal/CmdWriteProtectedConfig.h
+++ b/CommandTerminal/CmdWriteProtectedConfig.h
@@ -27,6 +27,7 @@ class CmdWriteProtectedConfig : public Command {
 public:
 
     CmdWriteProtectedConfig(mDot* dot);
+    virtual ~CmdWriteProtectedConfig();
     virtual uint32_t action(std::vector<std::string> args);
 
 private:
diff --git a/CommandTerminal/Commands.h b/CommandTerminal/Commands.h
index 9a06835..b041b19 100644
--- a/CommandTerminal/Commands.h
+++ b/CommandTerminal/Commands.h
@@ -49,4 +49,6 @@
 
 #ifdef MTS_RADIO_DEBUG_COMMANDS
 #include "CmdWriteProtectedConfig.h"
+#include "CmdSendContinuous.h"
+#include "CmdTxFrequency.h"
 #endif