diff options
author | Mike Fiore <mfiore@multitech.com> | 2015-12-04 09:53:21 -0600 |
---|---|---|
committer | Mike Fiore <mfiore@multitech.com> | 2015-12-04 09:53:21 -0600 |
commit | 41a5c0de1343c4a4163c7096ea33bbfd6c3e84cb (patch) | |
tree | aa964ee70557217d409a2fb44546785a543aaeb0 /main.cpp | |
parent | c52f29331e76857b4bbab72829479a04e19318cf (diff) | |
download | mtdot-box-evb-factory-firmware-41a5c0de1343c4a4163c7096ea33bbfd6c3e84cb.tar.gz mtdot-box-evb-factory-firmware-41a5c0de1343c4a4163c7096ea33bbfd6c3e84cb.tar.bz2 mtdot-box-evb-factory-firmware-41a5c0de1343c4a4163c7096ea33bbfd6c3e84cb.zip |
implement demo mode logic - still need to add sensor data
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 38 |
1 files changed, 4 insertions, 34 deletions
@@ -19,6 +19,7 @@ #include "ModeJoin.h" #include "ModeSingle.h" #include "ModeSweep.h" +#include "ModeDemo.h" #include "ModeConfig.h" // misc heders #include "FileName.h" @@ -50,6 +51,7 @@ MTSSerial gps_serial(XBEE_DOUT, XBEE_DIN, 256, 2048); ModeJoin* modeJoin; ModeSingle* modeSingle; ModeSweep* modeSweep; +ModeDemo* modeDemo; ModeConfig* modeConfig; // Serial debug port @@ -88,6 +90,7 @@ int main() { modeJoin = new ModeJoin(lcd, buttons, dot, lora, gps); modeSingle = new ModeSingle(lcd, buttons, dot, lora, gps); modeSweep = new ModeSweep(lcd, buttons, dot, lora, gps); + modeDemo = new ModeDemo(lcd, buttons, dot, lora, gps); modeConfig = new ModeConfig(lcd, buttons, dot, lora, gps); logInfo("GPS %sdetected", gps->gpsDetected() ? "" : "not "); @@ -157,7 +160,7 @@ void mainMenu() { if (selected == menu_strings[demo]) { if (modeJoin->start()) - loraDemo(); + modeDemo->start(); } else if (selected == menu_strings[config]) { modeConfig->start(); } else if (selected == menu_strings[single]) { @@ -172,36 +175,3 @@ void mainMenu() { } } -void loraDemo() { - LayoutHelp lh(lcd); - lh.display(); - lh.updateMode("LoRa Demo"); - lh.updateDescription("Select TX Method"); - lh.updateSw1(" Trigger"); - lh.updateSw2("Interval"); - - // clear any stale signals - osSignalClear(main_id, buttonSignal | loraSignal); - - logInfo("demo mode"); - - while (true) { - osEvent e = Thread::signal_wait(buttonSignal); - if (e.status == osEventSignal) { - ButtonHandler::ButtonEvent ev = buttons->getButtonEvent(); - switch (ev) { - case ButtonHandler::sw1_press: - logInfo("trigger TX mode"); - break; - case ButtonHandler::sw2_press: - logInfo("interval TX mode"); - break; - case ButtonHandler::sw1_hold: - return; - default: - break; - } - } - } -} - |