diff options
| author | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
| commit | 04b6e95c2931eadee93a6c1fe982f1658a60e1b7 (patch) | |
| tree | 84406fd9a31a44d78422003249572f2b104be850 /CommandTerminal/CmdFrequencyBand.cpp | |
| parent | be0d56b806ce76cef1d5bd5b6795391c2049b8b4 (diff) | |
| parent | 692b74778f6b95cf0c668dfdb85f39035e113baa (diff) | |
| download | mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.gz mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.bz2 mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.zip | |
Merge branch 'Semtech'
Conflicts:
.gitmodules
Mode/ModeJoin.cpp
main.cpp
Add AU915
Diffstat (limited to 'CommandTerminal/CmdFrequencyBand.cpp')
| -rw-r--r-- | CommandTerminal/CmdFrequencyBand.cpp | 31 |
1 files changed, 23 insertions, 8 deletions
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; } |