dev
Dependencies: MTS-Serial libmDot-mbed5
Fork of Dot-AT-Firmware by
Diff: CommandTerminal/CmdTxChannel.cpp
- Revision:
- 14:f9a77400b622
- Parent:
- 9:ff62b20f7000
- Child:
- 16:d5cf2af81a6d
diff -r b0f5ae12dc05 -r f9a77400b622 CommandTerminal/CmdTxChannel.cpp --- a/CommandTerminal/CmdTxChannel.cpp Fri Nov 04 19:10:24 2016 +0000 +++ b/CommandTerminal/CmdTxChannel.cpp Fri Nov 04 14:25:43 2016 -0500 @@ -1,32 +1,53 @@ #include "CmdTxChannel.h" -CmdTxChannel::CmdTxChannel(mDot* dot, mts::MTSSerial& serial) -: - Command(dot, "Tx Channels", "AT+TXCH", "List Tx channel frequencies for sub-band"), - _serial(serial) { - _help = std::string(text()) + ": " + std::string(desc()); - _usage = "<INDEX>,<FREQUENCY>,<DR_RANGE>"; +CmdTxChannel::CmdTxChannel() +: Command("Tx Channels", "AT+TXCH", "List Tx channel frequencies for sub-band", "<INDEX>,<FREQUENCY>,<DR_RANGE>") { _queryable = true; } uint32_t CmdTxChannel::action(std::vector<std::string> args) { if (args.size() == 1) { - std::vector<uint32_t> channels = _dot->getChannels(); + + std::vector<uint32_t> channels = CommandTerminal::Dot()->getChannels(); + std::vector<uint8_t> ranges = CommandTerminal::Dot()->getChannelRanges(); + std::vector<uint16_t> mask = CommandTerminal::Dot()->getChannelMask(); + + CommandTerminal::Serial()->writef("Index\tFrequency DR Max Min On\r\n"); - if (_dot->getFrequencyBand() == mDot::FB_868) { - for (int i = 0; i < 16; i++) { - _serial.writef("%d: %d 125k\r\n", i, channels[i]); + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_EU868) { + for (int8_t i = 0; i < 16; i++) { + if (channels[i] != 0) + CommandTerminal::Serial()->writef(" %d\t%d %X %X %d\r\n", i, channels[i], ranges[i] >> 4, ranges[i] & 0xF, (mask[0] & (0x1 << i)) ? 1 : 0); + else + CommandTerminal::Serial()->writef(" %d\t %d %X %X 0\r\n", i, channels[i], ranges[i] >> 4, ranges[i] & 0xF); } - _serial.writef("D: %d 125k\r\n", channels[8]); + + if (channels[16] != 0) + CommandTerminal::Serial()->writef(" R2\t%d %X %X\r\n", channels[16], ranges[16] >> 4, ranges[16] & 0xF); + else + CommandTerminal::Serial()->writef(" R2\t %d %X %X\r\n", channels[16], ranges[16], ranges[168]); } else { + if (CommandTerminal::Dot()->getFrequencySubBand() > 0) { + uint8_t offset = (CommandTerminal::Dot()->getFrequencySubBand() - 1) * 8; - for (int i = 0; i < 8; i++) { - _serial.writef("%d: %d 125k\r\n", i, channels[i]); + for (int i = 0; i < 8; i++) { + if ((CommandTerminal::Dot()->getFrequencySubBand() % 2) == 1) { + CommandTerminal::Serial()->writef(" %d\t%d %X %X %d\r\n", i, channels[i], ranges[i] >> 4, ranges[i] & 0xF, (mask[(offset + i)/16] & (0x0001 << i)) ? 1 : 0); + } else { + CommandTerminal::Serial()->writef(" %d\t%d %X %X %d\r\n", i, channels[i], ranges[i] >> 4, ranges[i] & 0xF, (mask[(offset + i)/16] & (0x0001 << (i + 8))) ? 1 : 0); + } + } + + CommandTerminal::Serial()->writef(" U\t%d %X %X %d\r\n", channels[8], ranges[8] >> 4, ranges[8] & 0xF, (mask[4] & (0x0001 << (CommandTerminal::Dot()->getFrequencySubBand() - 1))) ? 1 : 0); + CommandTerminal::Serial()->writef(" R2\t%d %X %X\r\n", channels[9], ranges[9], ranges[9]); + } else { + for (size_t i = 0; i < channels.size() - 1; i++) { + CommandTerminal::Serial()->writef(" %d\t%d %X %X %d\r\n", i, channels[i], ranges[i] >> 4, ranges[i] & 0xF, (mask[i/16] & (0x0001 << (i%16))) ? 1 : 0); + } + uint8_t last = channels.size() - 1; + CommandTerminal::Serial()->writef(" R2\t%d %X %X\r\n", channels[last], ranges[last], ranges[last]); } - - _serial.writef("U: %d 500k\r\n", channels[8]); - _serial.writef("D: %d 500k\r\n", channels[9]); } } @@ -39,7 +60,7 @@ sscanf(args[2].c_str(), "%d", &frequency); sscanf(args[3].c_str(), "%02x", &datarateRange); - _dot->addChannel(index, frequency, datarateRange); + CommandTerminal::Dot()->addChannel(index, frequency, datarateRange); } return 0; @@ -59,24 +80,24 @@ sscanf(args[2].c_str(), "%d", &frequency); sscanf(args[3].c_str(), "%02x", &datarateRange); - if (_dot->getFrequencyBand() == mDot::FB_868) { + if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_EU868) { if (index < 3 || index > 15) { - setErrorMessage("Invalid index, expects (3-15)"); + CommandTerminal::setErrorMessage("Invalid index, expects (3-15)"); return false; } if (frequency != 0 && (frequency < 863000000 || frequency > 870000000)) { - setErrorMessage("Invalid frequency, expects (863000000-870000000)"); + CommandTerminal::setErrorMessage("Invalid frequency, expects (863000000-870000000)"); return false; } } else { - setErrorMessage("US915 Channels cannot be changed, use AT+FSB to limit"); + CommandTerminal::setErrorMessage("US915|AU915 Channels cannot be changed, use AT+FSB or AT+CHM to limit"); return false; } return true; } else { - setErrorMessage("Invalid arguments"); + CommandTerminal::setErrorMessage("Invalid arguments"); return false; }