From bca5f50214f103a2c8605778a6311f8e9a5902fe Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Tue, 19 Jul 2016 10:14:13 -0500
Subject: mts-lora datarate changes

---
 main.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 9166354..464b00a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -45,6 +45,9 @@
 #include "FileName.h"
 #include <string>
 
+#define DISABLE_DUTY_CYCLE true
+
+
 // LCD and LED controllers
 SPI lcd_spi(SPI1_MOSI, SPI1_MISO, SPI1_SCK);
 I2C led_i2c(I2C_SDA, I2C_SCL);
@@ -60,7 +63,7 @@ osThreadId main_id;
 ButtonHandler* buttons;
 
 // LoRa controller
-LoRaHandler* lora;
+LoRaHandler* loraHandler;
 mDot* dot;
 
 // GPS
@@ -81,14 +84,13 @@ ModeConfig* modeConfig;
 Serial debug(USBTX, USBRX);
 
 // Survey Data File
-char* file_name;
+char file_name[] = "SurveyData.txt";
 
 // Prototypes
 void mainMenu();
 
 int main() {
     debug.baud(115200);
-    file_name = "SurveyData.txt";
 
     lcd = new DOGS102(lcd_spi, lcd_spi_cs, lcd_cd);
     // NCP5623B::LEDs 1 & 2 are the screen backlight - not used on default build
@@ -98,7 +100,13 @@ int main() {
     main_id = Thread::gettid();
     buttons = new ButtonHandler(main_id);
     dot = mDot::getInstance();
-    lora = new LoRaHandler(main_id);
+
+    dot->setDisableDutyCycle(DISABLE_DUTY_CYCLE);
+
+    // Seed the RNG
+    srand(dot->getRadioRandom());
+
+    loraHandler = new LoRaHandler(main_id);
     gps = new GPSPARSER(&gps_serial, led_cont);
     sensors = new SensorHandler();
 
@@ -106,11 +114,11 @@ 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);
+    modeJoin = new ModeJoin(lcd, buttons, dot, loraHandler, gps, sensors);
+    modeSingle = new ModeSingle(lcd, buttons, dot, loraHandler, gps, sensors);
+    modeSweep = new ModeSweep(lcd, buttons, dot, loraHandler, gps, sensors);
+    modeDemo = new ModeDemo(lcd, buttons, dot, loraHandler, gps, sensors);
+    modeConfig = new ModeConfig(lcd, buttons, dot, loraHandler, gps, sensors);
 
     osDelay(1000);
     logInfo("%sGPS detected", gps->gpsDetected() ? "" : "no ");
@@ -159,7 +167,7 @@ void mainMenu() {
 
         // reset session between modes
         dot->resetNetworkSession();
-        lora->resetActivityLed();
+        loraHandler->resetActivityLed();
         LayoutScrollSelect menu(lcd, items, product, menu_strings[0]);
         menu.display();
 
-- 
cgit v1.2.3


From 54270b95f3fe169948ef551c49204defcda4033b Mon Sep 17 00:00:00 2001
From: Ryan Klaassen <ryan.klaassen@multitech.com>
Date: Mon, 8 Aug 2016 10:11:08 -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 <string>
@@ -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<std::string> 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