Diff: main.cpp

Revision:

8:4b47a8973f91

Parent:

7:4c9cead936d8

Child:

9:f3629c43fd23

--- a/main.cpp	Fri Mar 04 00:59:45 2016 +0000
+++ b/main.cpp	Fri Mar 04 02:14:24 2016 +0000
@@ -11,15 +11,24 @@
 /* Create AppEUI identifier and Assigned AppKey   */
 /* ********************************************** */
 
+#define USE_OTAA 1 // 1 for OtAA and 0 for Personalized
+
 static const uint8_t DEVKEY[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF }; // Normal
 static const uint8_t APPEUI[8]  = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  }; // SMTC AppEUI - Most Significant Byte First
 
 //DevAddr  01DC266E 
 //NWKSKEY  C7 58 CB 09 BD F2 C7 0E 5F 4C FA 5B 7A 96 68 D8
 //APPSKEY  AC B3 B3 A1 B3 26 25 F7 24 3F B4 39 65 06 38 A7
+//static const uint8_t DEV_ADDR[4] = { 0x01, 0xDC, 0x26, 0x6E };
+//static const uint8_t NETSKEY[16] = { 0xC7, 0x58, 0xCB, 0x09, 0xBD, 0xF2, 0xC7, 0x0E, 0x5F, 0x4C, 0xFA, 0x5B, 0x7A, 0x96, 0x68, 0xD8 }; // Normal
+//static const uint8_t APPSKEY[16] = { 0xAC, 0xB3, 0xB3, 0xA1, 0xB3, 0x26, 0x25, 0xF7, 0x24, 0x3F, 0xB4, 0x39, 0x65, 0x06, 0x38, 0xA7 }; // Normal
+
+//DevAddr  01DC266E 
+//NWKSKEY  2b 7e 15 16 28 ae d2 a6 ab f7 15 88 09 cf 4f 3c 
+//APPSKEY  2b 7e 15 16 28 ae d2 a6 ab f7 15 88 09 cf 4f 3c 
 static const uint8_t DEV_ADDR[4] = { 0x01, 0xDC, 0x26, 0x6E };
-static const uint8_t NETSKEY[16] = { 0xC7, 0x58, 0xCB, 0x09, 0xBD, 0xF2, 0xC7, 0x0E, 0x5F, 0x4C, 0xFA, 0x5B, 0x7A, 0x96, 0x68, 0xD8 }; // Normal
-static const uint8_t APPSKEY[16] = { 0xAC, 0xB3, 0xB3, 0xA1, 0xB3, 0x26, 0x25, 0xF7, 0x24, 0x3F, 0xB4, 0x39, 0x65, 0x06, 0x38, 0xA7 }; // Normal
+static const uint8_t NETSKEY[16] = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }; // Normal
+static const uint8_t APPSKEY[16] = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C }; // Normal
 
 static uint8_t       config_frequency_sub_band = 1; // 0 = Enable all channels, 1 = 1st eight channels
 
@@ -87,12 +96,15 @@
      * @param id a vector of 8 bytes
      * @returns MDOT_OK if success
      */
-//    while ((ret = dot->setNetworkId(AppEUI)) != mDot::MDOT_OK) {
-//        logError("failed to set AppEUI: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
-//    }
-//    while ((ret = dot->setNetworkKey(AppKey)) != mDot::MDOT_OK) {
-//        logError("failed to set AppEUI: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
-//    }
+#if USE_OTAA == 1
+    while ((ret = dot->setNetworkId(AppEUI)) != mDot::MDOT_OK) {
+        logError("failed to set AppEUI: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
+    }
+    while ((ret = dot->setNetworkKey(AppKey)) != mDot::MDOT_OK) {
+        logError("failed to set AppEUI: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
+    }
+    dot->setJoinMode( dot->OTA ); // 0 = Manual and 1 = OTA
+#else
     while ((ret = dot->setNetworkAddress(DevAddr)) != mDot::MDOT_OK) {
         logError("failed to set DevAddr: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
     }
@@ -102,12 +114,13 @@
     while ((ret = dot->setDataSessionKey(AppSKey)) != mDot::MDOT_OK) {
         logError("failed to set App Session Key: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
     }
+    dot->setJoinMode( dot->MANUAL ); // 0 = Manual and 1 = OtAA
+#endif
 
     logInfo("enabling activity LED");
     dot->setActivityLedEnable(true);
 
     logInfo("joining network");
-    dot->setJoinMode( dot->MANUAL ); // 0 = Manual and 1 = OtAA
     while ((ret = dot->joinNetwork()) != mDot::MDOT_OK) {
         logError("failed to join network: [%d][%s]", ret, mDot::getReturnCodeString(ret).c_str());
         wait_ms(dot->getNextTxMs() + 1);