Diff: main.cpp

Revision:

6:ebaf55285f73

Parent:

5:1ad91719506b

Child:

7:30602a4a9902

diff -r 1ad91719506b -r ebaf55285f73 main.cpp
--- a/main.cpp	Thu Jul 07 18:49:44 2016 +0000
+++ b/main.cpp	Fri Jul 15 13:55:27 2016 +0000
@@ -6,21 +6,19 @@
 #include <vector>
 #include <algorithm>
 
-// This example will setup a class C node, the node must be configured at the network server for class c operation as well
-// Uplink packets will be sent every 15 seconds
+// This example will setup a peer to peer node, copy program to two dots
+// Uplink packets will be sent every 5 seconds
 // Received packets will be sent to the Serial port on pins 2 and 3
 // baud rate for serial ports is set to 115200
 
 
-// these options must match the settings on your Conduit
-// uncomment the following lines and edit their values to match your configuration
-// static std::string config_network_name = "<NETWORK_NAME>";
-// static std::string config_network_pass = "<NETWORK_PASS>";
-// static uint8_t config_frequency_sub_band = 1;
-
 Serial _serial(XBEE_DOUT, XBEE_DIN);
 Serial debug(USBTX, USBRX);
 
+static uint8_t config_network_addr[] = { 0x01, 0x02, 0x03, 0x04 };
+static uint8_t config_network_nskey[] = { 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04 };
+static uint8_t config_network_dskey[] = { 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04 };
+
 // Custom event handler for receiving Class C packets
 
 class RadioEvent : public mDotEvent
@@ -80,15 +78,15 @@
         }
 
         if (flags->Bits.Rx) {
-            
+
             logDebug("Rx %d bytes", info->RxBufferSize);
             if (info->RxBufferSize > 0) {
-                
+
                 for (int i = 0; i < info->RxBufferSize; i++) {
                     _serial.putc(info->RxBuffer[i]);
                 }
             }
-            
+
             delete[] info->RxBuffer;
         }
     }
@@ -116,70 +114,71 @@
     // print library version information
     logInfo("version: %s", dot->getId().c_str());
 
+    //*******************************************
+    // configuration
+    //*******************************************
+    // reset to default config so we know what state we're in
+    dot->resetConfig();
 
-    // if device is not configured for AUTO_OTA or not joined
-    if (dot->getJoinMode() != mDot::AUTO_OTA || !dot->getNetworkJoinStatus()) {
-        //*******************************************
-        // configuration
-        //*******************************************
-        // reset to default config so we know what state we're in
-        dot->resetConfig();
+    dot->setLogLevel(mts::MTSLog::TRACE_LEVEL);
 
-        dot->setLogLevel(mts::MTSLog::INFO_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()
+    // set up the mDot with our network information: Network Address and Session Keys must match on each device
+    // these can all be saved in NVM so they don't need to be set every time - see mDot::saveConfig()
+    std::vector<uint8_t> temp;
 
-        // 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");
-        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());
-        }
+    for (int i = 0; i < 4; i++) {
+        temp.push_back(config_network_addr[i]);
+    }
+
+    logInfo("setting network addr");
+    if ((ret = dot->setNetworkAddress(temp)) != mDot::MDOT_OK) {
+        logError("failed to set network name %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());
-        }
+    temp.clear();
+    for (int i = 0; i < 16; i++) {
+        temp.push_back(config_network_nskey[i]);
+    }
 
-        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());
-        }
+    logInfo("setting network password");
+    if ((ret = dot->setNetworkSessionKey(temp)) != mDot::MDOT_OK) {
+        logError("failed to set network password %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");
-        if ((ret = dot->setTxDataRate(mDot::SF_10)) != mDot::MDOT_OK) {
-            logError("failed to set TX datarate %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
-        }
+    temp.clear();
+    for (int i = 0; i < 16; i++) {
+        temp.push_back(config_network_dskey[i]);
+    }
 
-        // request receive confirmation of packets from the gateway
-        logInfo("enabling ACKs");
-        if ((ret = dot->setAck(1)) != mDot::MDOT_OK) {
-            logError("failed to enable ACKs %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
-        }
+    logInfo("setting network password");
+    if ((ret = dot->setDataSessionKey(temp)) != mDot::MDOT_OK) {
+        logError("failed to set network password %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+    }
+
+    logInfo("setting TX frequency");
+    if ((ret = dot->setTxFrequency(915500000)) != mDot::MDOT_OK) {
+        logError("failed to set TX frequency %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+    }
 
-        // set join mode to AUTO_OTA so the mDot doesn't have to rejoin after sleeping
-        logInfo("setting join mode to AUTO_OTA");
-        if ((ret = dot->setJoinMode(mDot::AUTO_OTA)) != mDot::MDOT_OK) {
-            logError("failed to set join mode %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, DR8-DR13
+    logInfo("setting TX spreading factor");
+    if ((ret = dot->setTxDataRate(mDot::DR13)) != mDot::MDOT_OK) {
+        logError("failed to set TX datarate %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+    }
 
-        logInfo("setting class C");
-        if ((ret = dot->setClass("C")) != mDot::MDOT_OK) {
-            logError("failed to set class C mode %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
-        }
+    // set join mode to AUTO_OTA so the mDot doesn't have to rejoin after sleeping
+    logInfo("setting join mode to AUTO_OTA");
+    if ((ret = dot->setJoinMode(mDot::PEER_TO_PEER)) != mDot::MDOT_OK) {
+        logError("failed to set join mode %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+    }
 
-        // save this configuration to the mDot's NVM
-        logInfo("saving config");
-        if (! dot->saveConfig()) {
-            logError("failed to save configuration");
-        }
+    // save this configuration to the mDot's NVM
+    logInfo("saving config");
+    if (! dot->saveConfig()) {
+        logError("failed to save configuration");
+    }
 
-    }
     //*******************************************
     // end of configuration
     //*******************************************
@@ -189,25 +188,14 @@
         data.push_back((uint8_t) *it);
 
     while(true) {
-        // join the network if not joined
-        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());
-            }
-        }
-    
-        if (dot->getNetworkJoinStatus()) {
-            // send the data
-            // ACKs are enabled by default, so we're expecting to get one back
-            if ((ret = dot->send(data)) != mDot::MDOT_OK) {
-                logError("failed to send %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
-            } else {
-                logInfo("successfully sent data to gateway");
-            }
+        // send the data
+        if ((ret = dot->send(data)) != mDot::MDOT_OK) {
+            logError("failed to send %d:%s", ret, mDot::getReturnCodeString(ret).c_str());
+        } else {
+            logInfo("successfully sent data to peer");
         }
 
-        wait(15.0);
+        wait(5.0);
     }
 
     return 0;