Revision 7:3ccfc47b8e0b, committed 2016-08-04

Comitter:

dkjendal

Date:

Thu Aug 04 20:35:15 2016 +0000

Parent:

6:b22dfacacae1

Commit message:

New mdot lib 1.0.11

Changed in this revision

diff -r b22dfacacae1 -r 3ccfc47b8e0b libmDot.lib
--- a/libmDot.lib	Tue Jul 05 20:58:46 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/teams/MultiTech/code/libmDot/#121e4c454964

diff -r b22dfacacae1 -r 3ccfc47b8e0b libmDot_1012-hotifx.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmDot_1012-hotifx.lib	Thu Aug 04 20:35:15 2016 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/shaunkrnelson/code/libmDot_1012-hotifx/#5f84bdd949b8

diff -r b22dfacacae1 -r 3ccfc47b8e0b main.cpp
--- a/main.cpp	Tue Jul 05 20:58:46 2016 +0000
+++ b/main.cpp	Thu Aug 04 20:35:15 2016 +0000
@@ -107,9 +107,9 @@
 /*  config_app_id and config_app_key are for public networks. */
 static uint8_t app_id[8] = {0x00,0x25,0x0C,0x00,0x00,0x01,0x00,0x01};
 std::vector<uint8_t> config_app_id(app_id,app_id+sizeof(app_id)/sizeof(uint8_t));
-static uint8_t app_key[16] = //9C49 - {0xB4,0xAD,0x1A,0x25,0x69,0x7F,0xF6,0x8E,0xD3,0x4B,0x83,0xC4,0xB6,0xC0,0xF2,0x3C};
-							 //{0xA0,0xC8,0x3D,0xD1,0x7B,0x32,0x97,0x1B,0x71,0xDC,0x53,0xB5,0x4D,0x89,0xC6,0x19};
-							  {0xFC,0xD1,0x8B,0x22,0x9E,0xA0,0xDA,0x4F,0x6B,0x8F,0x39,0x26,0xAF,0x07,0x8A,0x05}; //9CFF
+static uint8_t app_key[16] = {0xB4,0xAD,0x1A,0x25,0x69,0x7F,0xF6,0x8E,0xD3,0x4B,0x83,0xC4,0xB6,0xC0,0xF2,0x3C}; // 9C49
+							  //{0xA0,0xC8,0x3D,0xD1,0x7B,0x32,0x97,0x1B,0x71,0xDC,0x53,0xB5,0x4D,0x89,0xC6,0x19};
+							  //{0xFC,0xD1,0x8B,0x22,0x9E,0xA0,0xDA,0x4F,0x6B,0x8F,0x39,0x26,0xAF,0x07,0x8A,0x05}; //9CFF
 							  //{0xB3,0x53,0x00,0xDA,0xF6,0x0A,0x6C,0xF9,0x54,0x57,0x79,0x50,0x6F,0x19,0xE1,0x3A}; //9C35
 std::vector<uint8_t> config_app_key(app_key,app_key+sizeof(app_key)/sizeof(uint8_t));
 
@@ -235,6 +235,8 @@
     if (mdot_radio) {
         // reset to default config so we know what state we're in
         mdot_radio->resetConfig();
+        mdot_radio->setLogLevel(6);
+        mdot_radio->setAntennaGain(-3);
 
         // Setting up LED1 as activity LED
         mdot_radio->setActivityLedPin(PB_0);
@@ -260,6 +262,10 @@
        if ((mdot_ret = mdot_radio->setPublicNetwork(true)) != mDot::MDOT_OK) {
            log_error(mdot_radio, "failed to set Public Network Mode", mdot_ret);
        }
+       mdot_radio->setTxDataRate(mDot::DR0);
+       mdot_radio->setTxPower(14);
+       mdot_radio->setJoinRetries(1);
+       mdot_radio->setJoinMode(mDot::OTA);
 
 /*
  * Frequency sub-band is valid for NAM only and for Private networks should be set to a value
@@ -313,7 +319,7 @@
          	}
         		
             printf("delay = %lu\n\r",mdot_ret);
-            osDelay(mdot_ret + 1);
+            osDelay(mdot_ret + 10000);
         }
 
         /*