Diff: main.cpp

Revision:

10:5332d0939ebe

Parent:

9:d589fb5e68a4

Child:

12:343229a12653

--- a/main.cpp	Mon Apr 04 22:26:40 2016 +0000
+++ b/main.cpp	Tue Apr 05 02:14:38 2016 +0000
@@ -11,26 +11,26 @@
 
 mDot* dot;
 
+void setupNetwork();
+
 int main() {
     setupNetwork();
     
     std::string data_str = "Hello!";
 
-    // format data for sending to the gateway
     std::vector<uint8_t> data;
     for (std::string::iterator it = data_str.begin(); it != data_str.end(); it++)
         data.push_back((uint8_t) *it);
-
+    
+    int32_t ret;
     while (true) {
-        // send the data to the gateway
-        int32_t ret;
         if ((ret = dot->send(data)) != mDot::MDOT_OK) {
-            logError("failed to send", ret, mDot::getReturnCodeString(ret).c_str());
+            logError("Failed to send", ret, mDot::getReturnCodeString(ret).c_str());
         } else {
-            logInfo("successfully sent data to gateway");
+            logInfo("Successfully sent data");
         }
-
-        osDelay(std::max((uint32_t)5000, (uint32_t)dot->getNextTxMs()));
+        
+        osDelay(std::max((uint32_t)20000, (uint32_t)dot->getNextTxMs()));
     }
 
     return 0;
@@ -43,11 +43,8 @@
     dot = mDot::getInstance();
     
     // print library version information
-    logInfo("version: %s", dot->getId().c_str());
+    logInfo("Version: %s", dot->getId().c_str());
 
-    //*******************************************
-    // configuration
-    //*******************************************
     // reset to default config so we know what state we're in
     dot->resetConfig();
     
@@ -57,11 +54,9 @@
     // these can all be saved in NVM so they don't need to be set every time - see mDot::saveConfig()
     
     // frequency sub band is only applicable in the 915 (US) frequency band
-    // if using a MultiTech Conduit gateway, use the same sub band as your Conduit (1-8) - the mDot will use the 8 channels in that sub band
-    // if using a gateway that supports all 64 channels, use sub band 0 - the mDot will use all 64 channels
-    logInfo("setting frequency sub band");
+    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());
+        logError("Failed to set frequency sub band %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
     
     std::vector<uint8_t> temp;
@@ -71,12 +66,12 @@
     }
     
     if ((ret = dot->setPublicNetwork(true)) != mDot::MDOT_OK) {
-        logError("failed to enable public network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to enable public network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
         
-    logInfo("setting app eui");
+    logInfo("Setting app eui");
     if ((ret = dot->setNetworkId(temp)) != mDot::MDOT_OK) {
-        logError("failed to set app eui %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to set app eui %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
     
     temp.clear();
@@ -84,35 +79,35 @@
         temp.push_back(config_app_key[i]);    
     }
     
-    logInfo("setting app key");
+    logInfo("Setting app key");
     if ((ret = dot->setNetworkKey(temp)) != mDot::MDOT_OK) {
-        logError("failed to set app key %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to set app key %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
     
     // a higher spreading factor allows for longer range but lower throughput
     // in the 915 (US) frequency band, spreading factors 7 - 10 are available
     // in the 868 (EU) frequency band, spreading factors 7 - 12 are available
-    logInfo("setting TX spreading factor");
+    logInfo("Setting TX spreading factor");
     if ((ret = dot->setTxDataRate(mDot::SF_8)) != mDot::MDOT_OK) {
-        logError("failed to set TX datarate %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to set TX datarate %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
     
     // request receive confirmation of packets from the gateway
-    logInfo("enabling ACKs");
+    logInfo("Enabling ACKs");
     if ((ret = dot->setAck(1)) != mDot::MDOT_OK) {
-        logError("failed to enable ACKs %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to enable ACKs %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
     }
     
     // save this configuration to the mDot's NVM
-    logInfo("saving config");
+    logInfo("Saving config");
     if (! dot->saveConfig()) {
-        logError("failed to save configuration");
+        logError("Failed to save configuration");
     }
 
     // attempt to join the network
-    logInfo("joining network");
+    logInfo("Joining network");
     while ((ret = dot->joinNetwork()) != mDot::MDOT_OK) {
-        logError("failed to join network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        logError("Failed to join network %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
         // in the 868 (EU) frequency band, we need to wait until another channel is available before transmitting again
         osDelay(std::max((uint32_t)1000, (uint32_t)dot->getNextTxMs()));
     }