Revision 1:f2e840f754c8, committed 2015-08-25

Comitter:

mfiore

Date:

Tue Aug 25 21:36:47 2015 +0000

Parent:

0:5ec8b39fcf53

Child:

2:4f4f5307d9e4

Commit message:

clean up code, add more comments about configuration

Changed in this revision

--- a/main.cpp	Wed Aug 19 17:03:30 2015 +0000
+++ b/main.cpp	Tue Aug 25 21:36:47 2015 +0000
@@ -5,9 +5,10 @@
 #include "MTSLog.h"
 
 // these options must match the settings on your Conduit
-static std::string config_network_name = "<lora network id>";
-static std::string config_network_pass = "<lora network key>";
-static uint8_t config_frequency_sub_band = 1;
+// uncomment the following lines and edit their values to match your configuration
+//static std::string config_network_name = "<lora network id>";
+//static std::string config_network_pass = "<lora network key>";
+//static uint8_t config_frequency_sub_band = 1;
 
 int main() {
     int32_t ret;
@@ -17,30 +18,42 @@
 
     // get a mDot handle
     dot = mDot::getInstance();
-
-    // reset to default config so we know what state we're in
-    dot->resetConfig();
-
-    dot->setLogLevel(mts::MTSLog::TRACE_LEVEL);
     
     // print library version information
     logInfo("version: %s", dot->getId().c_str());
 
-    // set up the mDot with our network information
+    //*******************************************
+    // configuration
+    //*******************************************
+    // reset to default config so we know what state we're in
+    dot->resetConfig();
+    
+    dot->setLogLevel(mts::MTSLog::TRACE_LEVEL);
+
+    // set up the mDot with our network information: frequency sub band, network name, and network password
+    // these can all be saved in NVM so they don't need to be set every time - see mDot::saveConfig()
+    logInfo("setting frequency sub band");
     if ((ret = dot->setFrequencySubBand(config_frequency_sub_band)) != mDot::MDOT_OK) {
         logError("failed to set frequency sub band %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
+    logInfo("setting network name");
     if ((ret = dot->setNetworkName(config_network_name)) != mDot::MDOT_OK) {
         logError("failed to set network name %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
+    logInfo("setting network password");
     if ((ret = dot->setNetworkPassphrase(config_network_pass)) != mDot::MDOT_OK) {
         logError("failed to set network password %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
-    if ((ret = dot->setJoinMode(mDot::AUTO_OTA)) != mDot::MDOT_OK) {
-        logError("failed to set network join mode %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+    logInfo("saving config");
+    if (! dot->saveConfig()) {
+        logError("failed to save configuration");
     }
-
+    //*******************************************
+    // end of configuration
+    //*******************************************
+    
     // attempt to join the network
+    logInfo("joining network");
     if ((ret = dot->joinNetwork()) != mDot::MDOT_OK) {
         logError("failed to join network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
@@ -50,6 +63,7 @@
         data.push_back((uint8_t) *it);
 
     if (!dot->getNetworkJoinStatus()) {
+        logInfo("network not joined, joining network");
         if ((ret = dot->joinNetwork()) != mDot::MDOT_OK) {
             logError("failed to join network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
         }