From 09a46d7b25c72cae37a1674f0e3797e4ed0b69b4 Mon Sep 17 00:00:00 2001 From: Ryan Klaassen Date: Mon, 8 Aug 2016 12:11:22 -0500 Subject: Replace main.cpp --- main.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 9166354..48b3552 100644 --- a/main.cpp +++ b/main.cpp @@ -41,6 +41,7 @@ #include "ModeSweep.h" #include "ModeDemo.h" #include "ModeConfig.h" +#include "ModeSemtech.h" // misc heders #include "FileName.h" #include @@ -76,6 +77,7 @@ ModeSingle* modeSingle; ModeSweep* modeSweep; ModeDemo* modeDemo; ModeConfig* modeConfig; +ModeSemtech* modeSemtech; // Serial debug port Serial debug(USBTX, USBRX); @@ -111,6 +113,7 @@ int main() { modeSweep = new ModeSweep(lcd, buttons, dot, lora, gps, sensors); modeDemo = new ModeDemo(lcd, buttons, dot, lora, gps, sensors); modeConfig = new ModeConfig(lcd, buttons, dot, lora, gps, sensors); + modeSemtech = new ModeSemtech(lcd, buttons, dot, lora, gps, sensors); osDelay(1000); logInfo("%sGPS detected", gps->gpsDetected() ? "" : "no "); @@ -136,7 +139,8 @@ void mainMenu() { demo = 1, config, single, - sweep + sweep, + semtech } menu_items; std::string menu_strings[] = { @@ -144,7 +148,8 @@ void mainMenu() { "LoRa Demo", "Configuration", "Survey Single", - "Survey Sweep" + "Survey Sweep", + "Semtech" }; std::vector items; @@ -152,6 +157,7 @@ void mainMenu() { items.push_back(menu_strings[config]); items.push_back(menu_strings[single]); items.push_back(menu_strings[sweep]); + items.push_back(menu_strings[semtech]); while (true) { product = "MTDOT-BOX/EVB "; @@ -195,8 +201,14 @@ void mainMenu() { if (modeJoin->start()) modeSweep->start(); } + else if (selected == menu_strings[semtech]) { + if(dot->getFrequencyBand()==mDot::FB_868)modeJoin->start(); + modeSemtech->start(); + } mode_selected = false; } } + + -- cgit v1.2.3 From 67bfcb079d5ecdd74a17d88831a7cdbb9de0651d Mon Sep 17 00:00:00 2001 From: Ryan Klaassen Date: Wed, 10 Aug 2016 12:55:38 -0500 Subject: Replace main.cpp --- main.cpp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 48b3552..fa91319 100644 --- a/main.cpp +++ b/main.cpp @@ -41,7 +41,7 @@ #include "ModeSweep.h" #include "ModeDemo.h" #include "ModeConfig.h" -#include "ModeSemtech.h" +#include "ModeGps.h" // misc heders #include "FileName.h" #include @@ -77,7 +77,7 @@ ModeSingle* modeSingle; ModeSweep* modeSweep; ModeDemo* modeDemo; ModeConfig* modeConfig; -ModeSemtech* modeSemtech; +ModeGps* modeGps; // Serial debug port Serial debug(USBTX, USBRX); @@ -113,7 +113,7 @@ int main() { modeSweep = new ModeSweep(lcd, buttons, dot, lora, gps, sensors); modeDemo = new ModeDemo(lcd, buttons, dot, lora, gps, sensors); modeConfig = new ModeConfig(lcd, buttons, dot, lora, gps, sensors); - modeSemtech = new ModeSemtech(lcd, buttons, dot, lora, gps, sensors); + modeGps = new ModeGps(lcd, buttons, dot, lora, gps, sensors, modeJoin); osDelay(1000); logInfo("%sGPS detected", gps->gpsDetected() ? "" : "no "); @@ -140,7 +140,7 @@ void mainMenu() { config, single, sweep, - semtech + gps } menu_items; std::string menu_strings[] = { @@ -149,15 +149,14 @@ void mainMenu() { "Configuration", "Survey Single", "Survey Sweep", - "Semtech" + "Survey Gps" }; - std::vector items; items.push_back(menu_strings[demo]); items.push_back(menu_strings[config]); items.push_back(menu_strings[single]); items.push_back(menu_strings[sweep]); - items.push_back(menu_strings[semtech]); + items.push_back(menu_strings[gps]); while (true) { product = "MTDOT-BOX/EVB "; @@ -188,7 +187,6 @@ void mainMenu() { } } } - if (selected == menu_strings[demo]) { if (modeJoin->start()) modeDemo->start(); @@ -201,14 +199,10 @@ void mainMenu() { if (modeJoin->start()) modeSweep->start(); } - else if (selected == menu_strings[semtech]) { + else if (selected == menu_strings[gps]) { if(dot->getFrequencyBand()==mDot::FB_868)modeJoin->start(); - modeSemtech->start(); + modeGps->start(); } - mode_selected = false; } -} - - - +} \ No newline at end of file -- cgit v1.2.3 From 805e501c3d15b32491fd478150cf286dd9834757 Mon Sep 17 00:00:00 2001 From: Ryan Klaassen Date: Thu, 18 Aug 2016 11:44:12 -0500 Subject: Replace main.cpp --- main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index fa91319..63f3a18 100644 --- a/main.cpp +++ b/main.cpp @@ -61,7 +61,7 @@ osThreadId main_id; ButtonHandler* buttons; // LoRa controller -LoRaHandler* lora; +LoRaHandler* lora_handler; mDot* dot; // GPS @@ -100,7 +100,7 @@ int main() { main_id = Thread::gettid(); buttons = new ButtonHandler(main_id); dot = mDot::getInstance(); - lora = new LoRaHandler(main_id); + lora_handler = new LoRaHandler(main_id); gps = new GPSPARSER(&gps_serial, led_cont); sensors = new SensorHandler(); @@ -108,12 +108,12 @@ int main() { MTSLog::setLogLevel(MTSLog::TRACE_LEVEL); - modeJoin = new ModeJoin(lcd, buttons, dot, lora, gps, sensors); - modeSingle = new ModeSingle(lcd, buttons, dot, lora, gps, sensors); - modeSweep = new ModeSweep(lcd, buttons, dot, lora, gps, sensors); - modeDemo = new ModeDemo(lcd, buttons, dot, lora, gps, sensors); - modeConfig = new ModeConfig(lcd, buttons, dot, lora, gps, sensors); - modeGps = new ModeGps(lcd, buttons, dot, lora, gps, sensors, modeJoin); + modeJoin = new ModeJoin(lcd, buttons, dot, lora_handler, gps, sensors); + modeSingle = new ModeSingle(lcd, buttons, dot, lora_handler, gps, sensors); + modeSweep = new ModeSweep(lcd, buttons, dot, lora_handler, gps, sensors); + modeDemo = new ModeDemo(lcd, buttons, dot, lora_handler, gps, sensors); + modeConfig = new ModeConfig(lcd, buttons, dot, lora_handler, gps, sensors); + modeGps = new ModeGps(lcd, buttons, dot, lora_handler, gps, sensors, modeJoin); osDelay(1000); logInfo("%sGPS detected", gps->gpsDetected() ? "" : "no "); @@ -164,7 +164,7 @@ void mainMenu() { // reset session between modes dot->resetNetworkSession(); - lora->resetActivityLed(); + lora_handler->resetActivityLed(); LayoutScrollSelect menu(lcd, items, product, menu_strings[0]); menu.display(); -- cgit v1.2.3