summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CommandTerminal/CmdFactoryDefault.cpp16
-rw-r--r--Mode/ModeConfig.cpp67
-rw-r--r--Mode/ModeConfig.h19
-rw-r--r--main.cpp20
4 files changed, 42 insertions, 80 deletions
diff --git a/CommandTerminal/CmdFactoryDefault.cpp b/CommandTerminal/CmdFactoryDefault.cpp
index c310083..e2645cd 100644
--- a/CommandTerminal/CmdFactoryDefault.cpp
+++ b/CommandTerminal/CmdFactoryDefault.cpp
@@ -11,13 +11,15 @@ uint32_t CmdFactoryDefault::action(std::vector<std::string> args)
_dot->resetConfig();
//Factory defaults for the DotBox.
- _dot->setWakeDelay(242); //DotBox +MaxSize is stored here. Default is 242.
- _dot->setWakeInterval(11); //DotBox +MinSize is stored here. Default is 11.
- _dot->setWakeMode(20); //DotBox +MaxPwr is stored here. Default is 20.
- _dot->setWakeTimeout(2); //DotBox +MinPwr is stored here. Default is 2.
- _dot->setStartUpMode(0); //DotBox +Data is stored here. Default is 0.
- _dot->setVerbose(1);
- _dot->setEcho(1);
+ _dot->setTxDataRate(mDot::SF_7);
+ _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.
+ _dot->setWakeMode(20); //DotBox +MaxPwr is stored here. Default is 20.
+ _dot->setWakeTimeout(2); //DotBox +MinPwr is stored here. Default is 2.
+ _dot->setStartUpMode(0); //DotBox +Data is stored here. Default is 0.
+ _dot->setVerbose(1);
+ _dot->setEcho(1);
_dot->resetNetworkSession();
return 0;
diff --git a/Mode/ModeConfig.cpp b/Mode/ModeConfig.cpp
index 2d24716..6075897 100644
--- a/Mode/ModeConfig.cpp
+++ b/Mode/ModeConfig.cpp
@@ -15,53 +15,44 @@ const char ModeConfig::command_error[] = "Command not found!\r\n";
const char ModeConfig::done[] = "\r\nOK\r\n";
const char ModeConfig::error[] = "\r\nERROR\r\n";
-mts::MTSSerial* ModeConfig::_serialp = NULL;
-
void ModeConfig::addCommand(Command* cmd) {
_commands.push_back(cmd);
}
-ModeConfig::ModeConfig(DOGS102* lcd, mts::MTSSerial& serial, mDot* dot, ButtonHandler* buttons)
-: Mode(lcd, buttons),
+ModeConfig::ModeConfig(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora)
+: Mode(lcd, buttons, dot, lora),
_lc(lcd),
- _serial(serial),
- _dot(dot),
- _mode(mDot::COMMAND_MODE),
- _idle_thread(idle, NULL, osPriorityLow),
- _serial_up(false),
- _buttons(buttons) {
-
- _serialp = &serial;
+ _serial(USBTX, USBRX, 512, 512)
+{
addCommand(new CmdAttention(_dot));
- addCommand(new CmdIdentification(_dot, serial));
+ addCommand(new CmdIdentification(_dot, _serial));
addCommand(new CmdFactoryDefault(_dot));
addCommand(new CmdSaveConfig(_dot));
- addCommand(new CmdDisplayConfig(_dot, serial));
-
- addCommand(new CmdFrequencyBand(_dot, serial));
- addCommand(new CmdFrequencySubBand(_dot, serial));
- addCommand(new CmdPublicNetwork(_dot, serial));
- addCommand(new CmdDeviceId(_dot, serial));
-
- addCommand(new CmdNetworkAddress(_dot, serial));
- addCommand(new CmdNetworkSessionKey(_dot, serial));
- addCommand(new CmdDataSessionKey(_dot, serial));
- addCommand(new CmdNetworkKey(_dot, serial));
- addCommand(new CmdNetworkId(_dot, serial));
-
- addCommand(new CmdNetworkJoinMode(_dot, serial));
- addCommand(new CmdTxDataRate(_dot, serial));
- addCommand(new CmdTxPower(_dot, serial));
-
- addCommand(new CmdMinimumSize(_dot, serial));
- addCommand(new CmdMaximumSize(_dot, serial));
- addCommand(new CmdMinimumPower(_dot, serial));
- addCommand(new CmdMaximumPower(_dot, serial));
- addCommand(new CmdData(_dot, serial));
- addCommand(new CmdGetSurveyDataFile(_dot, serial));
- addCommand(new CmdDeleteSurveyDataFile(_dot, serial));
-
+ addCommand(new CmdDisplayConfig(_dot, _serial));
+
+ addCommand(new CmdFrequencyBand(_dot, _serial));
+ addCommand(new CmdFrequencySubBand(_dot, _serial));
+ addCommand(new CmdPublicNetwork(_dot, _serial));
+ addCommand(new CmdDeviceId(_dot, _serial));
+
+ addCommand(new CmdNetworkAddress(_dot, _serial));
+ addCommand(new CmdNetworkSessionKey(_dot, _serial));
+ addCommand(new CmdDataSessionKey(_dot, _serial));
+ addCommand(new CmdNetworkKey(_dot, _serial));
+ addCommand(new CmdNetworkId(_dot, _serial));
+
+ addCommand(new CmdNetworkJoinMode(_dot, _serial));
+ addCommand(new CmdTxDataRate(_dot, _serial));
+ addCommand(new CmdTxPower(_dot, _serial));
+
+ addCommand(new CmdMinimumSize(_dot, _serial));
+ addCommand(new CmdMaximumSize(_dot, _serial));
+ addCommand(new CmdMinimumPower(_dot, _serial));
+ addCommand(new CmdMaximumPower(_dot, _serial));
+ addCommand(new CmdData(_dot, _serial));
+ addCommand(new CmdGetSurveyDataFile(_dot, _serial));
+ addCommand(new CmdDeleteSurveyDataFile(_dot, _serial));
}
void ModeConfig::printHelp() {
diff --git a/Mode/ModeConfig.h b/Mode/ModeConfig.h
index ade3093..1192a8c 100644
--- a/Mode/ModeConfig.h
+++ b/Mode/ModeConfig.h
@@ -13,7 +13,7 @@ class ModeConfig : public Mode {
public:
- ModeConfig(DOGS102* lcd, mts::MTSSerial& serial, mDot* dot, ButtonHandler* buttons);
+ ModeConfig(DOGS102* lcd, ButtonHandler* buttons, mDot* dot, LoRaHandler* lora);
// Command error text...
static const char command_error[];
@@ -27,22 +27,9 @@ public:
private:
- static void idle(void const* args) {
- while (1)
- __WFI();
- }
-
- mts::MTSSerial& _serial;
- static mts::MTSSerial* _serialp;
-
- LayoutConfig _lc;
- ButtonHandler::ButtonEvent _be;
- ButtonHandler* _buttons;
- mDot* _dot;
- mDot::Mode _mode;
+ mts::MTSSerial _serial;
+ LayoutConfig _lc;
std::vector<Command*> _commands;
- Thread _idle_thread;
- bool _serial_up;
void addCommand(Command* cmd);
diff --git a/main.cpp b/main.cpp
index 6bc459f..c1c7f6d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,13 +52,10 @@ ModeConfig* modeConfig;
// Serial debug port
Serial debug(USBTX, USBRX);
-// Config mode serial port.
-mts::MTSSerial serial(USBTX, USBRX, 512, 512);
// Prototypes
void mainMenu();
void join();
-void configuration();
void loraDemo();
void surveySingle();
void surveySweep();
@@ -74,24 +71,9 @@ int main() {
dot = mDot::getInstance();
lora = new LoRaHandler(main_id);
- // display startup screen for 3 seconds
- LayoutStartup ls(lcd);
- ls.display();
- osDelay(3000);
-
- // start of temporary stuff!
- //dot->setFrequencyBand(mDot::FB_868);
- if (dot->getFrequencyBand() == mDot::FB_915)
- dot->setFrequencySubBand(mDot::FSB_7);
- dot->setJoinMode(mDot::OTA);
- dot->setNetworkName("mikes_lora_network");
- dot->setNetworkPassphrase("password_123");
- dot->setAck(1);
- // end of temporary stuff!
-
modeJoin = new ModeJoin(lcd, buttons, dot, lora);
modeSingle = new ModeSingle(lcd, buttons, dot, lora);
- modeConfig = new ModeConfig(lcd, serial, dot, buttons);
+ modeConfig = new ModeConfig(lcd, buttons, dot, lora);
// display startup screen for 3 seconds
LayoutStartup ls(lcd);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 22:16:37 +0000