From bca5f50214f103a2c8605778a6311f8e9a5902fe Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Tue, 19 Jul 2016 10:14:13 -0500 Subject: mts-lora datarate changes --- CommandTerminal/CmdDisplayConfig.cpp | 2 +- CommandTerminal/CmdFactoryDefault.cpp | 2 +- CommandTerminal/CmdFrequencyBand.cpp | 10 +-- CommandTerminal/CmdTxDataRate.cpp | 131 ++++++++++++++++++++++------------ 4 files changed, 94 insertions(+), 51 deletions(-) (limited to 'CommandTerminal') 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 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 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..26b7831 100644 --- a/CommandTerminal/CmdFrequencyBand.cpp +++ b/CommandTerminal/CmdFrequencyBand.cpp @@ -40,10 +40,10 @@ uint32_t CmdFrequencyBand::action(std::vector args) else if (args.size() == 2) { int32_t code; - uint8_t band = mDot::FB_915; + uint8_t band = mDot::FB_US915; - if (mDot::FrequencyBandStr(mDot::FB_868).find(args[1]) != std::string::npos) { - band = mDot::FB_868; + if (mDot::FrequencyBandStr(mDot::FB_EU868).find(args[1]) != std::string::npos) { + band = mDot::FB_EU868; } if ((code = _dot->setFrequencyBand(band)) != mDot::MDOT_OK) { @@ -65,8 +65,8 @@ bool CmdFrequencyBand::verify(std::vector 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) + if (mDot::FrequencyBandStr(mDot::FB_EU868).find(args[1]) == std::string::npos && + mDot::FrequencyBandStr(mDot::FB_US915).find(args[1]) == std::string::npos) { setErrorMessage("Invalid parameter, expects (868,915)"); return false; diff --git a/CommandTerminal/CmdTxDataRate.cpp b/CommandTerminal/CmdTxDataRate.cpp index 846562b..004ee8e 100644 --- a/CommandTerminal/CmdTxDataRate.cpp +++ b/CommandTerminal/CmdTxDataRate.cpp @@ -15,49 +15,59 @@ * 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)"; + _usage = "(7-10|DR0-DR4|DR8-DR13)"; else - _usage = "(7-12)"; + _usage = "(7-12|DR0-DR7)"; _queryable = true; } -uint32_t CmdTxDataRate::action(std::vector args) -{ +uint32_t CmdTxDataRate::action(std::vector 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_915) { + 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 +75,69 @@ uint32_t CmdTxDataRate::action(std::vector args) return 0; } -bool CmdTxDataRate::verify(std::vector args) -{ +bool CmdTxDataRate::verify(std::vector 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_868) { + 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_915 && datarate > 10) { + datarate = -1; + } else if (_dot->getFrequencyBand() == mDot::FB_868 && datarate > 12) { + datarate = -1; + } else if (datarate > 6) { + // Convert SF to DR + if (_dot->getFrequencyBand() == mDot::FB_915) { + 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)"); + // 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; } } -- cgit v1.2.3