Revision 22:467445cc66f6, committed 2017-06-23

Comitter:

macpijan

Date:

Fri Jun 23 20:00:44 2017 +0000

Parent:

21:09d05faf0e13

Commit message:

mdot-examples triage

Changed in this revision

diff -r 09d05faf0e13 -r 467445cc66f6 examples/example_config.h
--- a/examples/example_config.h	Fri Jun 09 08:31:21 2017 -0500
+++ b/examples/example_config.h	Fri Jun 23 20:00:44 2017 +0000
@@ -9,7 +9,7 @@
 
 // the active example is the one that will be compiled
 #if !defined(ACTIVE_EXAMPLE)
-#define ACTIVE_EXAMPLE  OTA_EXAMPLE
+#define ACTIVE_EXAMPLE  MANUAL_EXAMPLE
 #endif
 
 // the active channel plan is the one that will be compiled
@@ -21,7 +21,7 @@
 //      CP_AS923
 //      CP_AS923_JAPAN
 #if !defined(CHANNEL_PLAN)
-#define CHANNEL_PLAN CP_US915
+#define CHANNEL_PLAN CP_EU868
 #endif
 
 #endif

diff -r 09d05faf0e13 -r 467445cc66f6 examples/inc/dot_util.h
--- a/examples/inc/dot_util.h	Fri Jun 09 08:31:21 2017 -0500
+++ b/examples/inc/dot_util.h	Fri Jun 23 20:00:44 2017 +0000
@@ -3,7 +3,7 @@
 
 #include "mbed.h"
 #include "mDot.h"
-#include "ChannelPlans.h"
+#include "ChannelPlan.h"
 #include "MTSLog.h"
 #include "MTSText.h"
 #include "ISL29011.h"

diff -r 09d05faf0e13 -r 467445cc66f6 examples/src/manual_example.cpp
--- a/examples/src/manual_example.cpp	Fri Jun 09 08:31:21 2017 -0500
+++ b/examples/src/manual_example.cpp	Fri Jun 23 20:00:44 2017 +0000
@@ -2,6 +2,7 @@
 #include "RadioEvent.h"
  
 #if ACTIVE_EXAMPLE == MANUAL_EXAMPLE
+#define CHANNEL_PLAN CP_EU868
 
 /////////////////////////////////////////////////////////////////////////////
 // -------------------- DOT LIBRARY REQUIRED ------------------------------//
@@ -20,9 +21,9 @@
 // * edit their values to match your configuration         //
 // * frequency sub band is only relevant for the 915 bands //
 /////////////////////////////////////////////////////////////
-static uint8_t network_address[] = { 0x01, 0x02, 0x03, 0x04 };
-static uint8_t network_session_key[] = { 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04 };
-static uint8_t data_session_key[] = { 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04 };
+static uint8_t network_address[] = { 0x26, 0x01, 0x16, 0xE5 };
+static uint8_t network_session_key[] = { 0x60, 0xB0, 0xD0, 0x88, 0x7F, 0xB7, 0xB8, 0x33, 0xD1, 0xE9, 0x64, 0x2C, 0xF2, 0xEE, 0xEE, 0x63 };
+static uint8_t data_session_key[] = { 0x68, 0x08, 0x51, 0x18, 0xB1, 0x64, 0x17, 0xC2, 0x5B, 0x9C, 0xDA, 0x2F, 0xF6, 0xC5, 0xFC, 0x18 };
 static uint8_t frequency_sub_band = 6;
 static bool public_network = false;
 static uint8_t ack = 1;
@@ -53,13 +54,16 @@
     pc.baud(115200);
 
     mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-    
+/*   
 #if CHANNEL_PLAN == CP_US915
     plan = new lora::ChannelPlan_US915();
 #elif CHANNEL_PLAN == CP_AU915
     plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
+    */
+#if CHANNEL_PLAN == CP_EU868
     plan = new lora::ChannelPlan_EU868();
+#endif
+    /*
 #elif CHANNEL_PLAN == CP_KR920
     plan = new lora::ChannelPlan_KR920();
 #elif CHANNEL_PLAN == CP_AS923
@@ -67,6 +71,7 @@
 #elif CHANNEL_PLAN == CP_AS923_JAPAN
     plan = new lora::ChannelPlan_AS923_Japan();
 #endif
+*/
     assert(plan);
 
     dot = mDot::getInstance(plan);

diff -r 09d05faf0e13 -r 467445cc66f6 libmDot-dev-mbed5.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmDot-dev-mbed5.lib	Fri Jun 23 20:00:44 2017 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/teams/MultiTech/code/libmDot-dev-mbed5/#0f5a742a08cd

diff -r 09d05faf0e13 -r 467445cc66f6 mbed-os.lib
--- a/mbed-os.lib	Fri Jun 09 08:31:21 2017 -0500
+++ b/mbed-os.lib	Fri Jun 23 20:00:44 2017 +0000
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#50b3418e45484ebf442b88cd935a2d5355402d7d
+https://github.com/ARMmbed/mbed-os/#fc1836545dcc2fc86f03b01292b62bf2089f67c3