with 36errors
Dependencies: MTS-Serial libxDot-dev-mbed5-deprecated
Fork of Dot-AT-Firmware by
Diff: CommandTerminal/CmdTxDataRate.cpp
- Revision:
- 14:f9a77400b622
- Parent:
- 9:ff62b20f7000
- Child:
- 16:d5cf2af81a6d
--- a/CommandTerminal/CmdTxDataRate.cpp Fri Nov 04 19:10:24 2016 +0000 +++ b/CommandTerminal/CmdTxDataRate.cpp Fri Nov 04 14:25:43 2016 -0500 @@ -2,30 +2,19 @@ #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 all channels"), - _serial(serial) -{ - _help = std::string(text()) + ": " + std::string(desc()); - if (_dot->getFrequencyBand() == mDot::FB_915) - _usage = "(7-10|DR0-DR4|DR8-DR13)"; - else - _usage = "(7-12|DR0-DR7)"; +CmdTxDataRate::CmdTxDataRate() +: Command("Tx Data Rate", "AT+TXDR", "Set the Tx data rate for all channels", "US:(7-10|DR0-DR4|DR8-DR13)) EU:(7-12|DR0-DR7))") { _queryable = true; } uint32_t CmdTxDataRate::action(std::vector<std::string> args) { if (args.size() == 1) { - if (_dot->getVerbose()) - _serial.writef("Tx Data Rate: "); - - _serial.writef("DR%d - %s\r\n", _dot->getTxDataRate(), _dot->getDateRateDetails(_dot->getTxDataRate()).c_str()); + CommandTerminal::Serial()->writef("DR%d - %s\r\n", CommandTerminal::Dot()->getTxDataRate(), CommandTerminal::Dot()->getDateRateDetails(CommandTerminal::Dot()->getTxDataRate()).c_str()); } else if (args.size() == 2) { std::string dr = mts::Text::toUpper(args[1]); - int32_t code; + int datarate = -1; uint8_t i; @@ -41,7 +30,10 @@ } else { if (datarate > 6) { // Convert SF to DR - if (_dot->getFrequencyBand() == mDot::FB_915) { + + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915) { + datarate = 10 - datarate; + } else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) { datarate = 10 - datarate; } else { datarate = 12 - datarate; @@ -49,8 +41,8 @@ } } - if ((code = _dot->setTxDataRate(datarate)) != mDot::MDOT_OK) { - setErrorMessage(_dot->getLastError()); + if (CommandTerminal::Dot()->setTxDataRate(datarate) != mDot::MDOT_OK) { + CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError()); return 1; } } @@ -79,16 +71,17 @@ if (_dr > 15) { _dr = 12 + (mDot::SF_12 - _dr); - if (_dot->getFrequencyBand() == mDot::FB_868) { + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_EU868) { if (_dr == mDot::SF_7H) { - _dr = mDot::DR6; - } else if (_dr == mDot::SF_FSK) { - _dr = mDot::DR7; + _dr = mDot::DR6; + } else if (_dr == mDot::SF_FSK) { + _dr = mDot::DR7; } else { _dr = 12 - _dr; } + } else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) { + _dr = 10 - _dr; } else { - _dr = 10 - _dr; } } @@ -98,13 +91,16 @@ } } } else { - if (_dot->getFrequencyBand() == mDot::FB_915 && datarate > 10) { + + if ((CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915) && datarate > 10) { datarate = -1; - } else if (_dot->getFrequencyBand() == mDot::FB_868 && datarate > 12) { + } else if (datarate > 12) { datarate = -1; } else if (datarate > 6) { // Convert SF to DR - if (_dot->getFrequencyBand() == mDot::FB_915) { + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915) { + datarate = 10 - datarate; + } else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) { datarate = 10 - datarate; } else { datarate = 12 - datarate; @@ -112,15 +108,21 @@ } } - if (_dot->getFrequencyBand() == mDot::FB_915) { + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915) { // 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)"); + CommandTerminal::setErrorMessage("Invalid data rate, expects (7-10|DR0-DR4|DR8-DR13)"); + return false; + } + } else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) { + // DR8-13 used for P2P modes + if (datarate < 0 || datarate > 13 || (datarate >= 5 && datarate <= 7)) { + CommandTerminal::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)"); + CommandTerminal::setErrorMessage("Invalid data rate, expects (7-12|DR0-DR7)"); return false; } } @@ -128,6 +130,6 @@ return true; } - setErrorMessage("Invalid arguments"); + CommandTerminal::setErrorMessage("Invalid arguments"); return false; }