Revision 43:231de26f0302, committed 2020-08-25

Comitter:

aidanwynn

Date:

Tue Aug 25 02:48:32 2020 +0000

Parent:

42:b9d591a58118

Child:

44:89b8ed62c32c

Commit message:

test2;

Changed in this revision

--- a/examples/example_config.h	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/example_config.h	Tue Aug 25 02:48:32 2020 +0000
@@ -24,7 +24,7 @@
 //      CP_AS923_JAPAN
 //      CP_IN865
 #if !defined(CHANNEL_PLAN)
-#define CHANNEL_PLAN CP_AU915
+#define CHANNEL_PLAN CP_AS923
 #endif
 
 #endif

--- a/examples/src/auto_ota_example.cpp	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/src/auto_ota_example.cpp	Tue Aug 25 02:48:32 2020 +0000
@@ -24,8 +24,8 @@
 /////////////////////////////////////////////////////////////
 static std::string network_name = "MultiTech";
 static std::string network_passphrase = "MultiTech";
-static uint8_t network_id[] = { 0x6C, 0x4E, 0xEF, 0x66, 0xF4, 0x79, 0x86, 0xA6 };
-static uint8_t network_key[] = { 0x1F, 0x33, 0xA1, 0x70, 0xA5, 0xF1, 0xFD, 0xA0, 0xAB, 0x69, 0x7A, 0xAE, 0x2B, 0x95, 0x91, 0x6B };
+static uint8_t network_id[] = { 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x03, 0x3B, 0xB9 };
+static uint8_t network_key[] = { 0x12, 0x1A, 0x81, 0x8F, 0x10, 0x6B, 0x18, 0x67, 0x54, 0xE6, 0x9E, 0x70, 0x53, 0x7C, 0xAD, 0xCF };
 static uint8_t frequency_sub_band = 0;
 static lora::NetworkType network_type = lora::PUBLIC_LORAWAN;
 static uint8_t join_delay = 5;

--- a/examples/src/class_b_example.cpp	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/src/class_b_example.cpp	Tue Aug 25 02:48:32 2020 +0000
@@ -24,8 +24,8 @@
 /////////////////////////////////////////////////////////////
 static std::string network_name = "MultiTech";
 static std::string network_passphrase = "MultiTech";
-static uint8_t network_id[] = { 0x6C, 0x4E, 0xEF, 0x66, 0xF4, 0x79, 0x86, 0xA6 };
-static uint8_t network_key[] = { 0x1F, 0x33, 0xA1, 0x70, 0xA5, 0xF1, 0xFD, 0xA0, 0xAB, 0x69, 0x7A, 0xAE, 0x2B, 0x95, 0x91, 0x6B };
+static uint8_t network_id[] = { 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x03, 0x3B, 0xB9 };
+static uint8_t network_key[] = { 0x12, 0x1A, 0x81, 0x8F, 0x10, 0x6B, 0x18, 0x67, 0x54, 0xE6, 0x9E, 0x70, 0x53, 0x7C, 0xAD, 0xCF };
 static uint8_t frequency_sub_band = 1;
 static lora::NetworkType public_network = lora::PUBLIC_LORAWAN;
 static uint8_t join_delay = 5;

--- a/examples/src/class_c_example.cpp	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/src/class_c_example.cpp	Tue Aug 25 02:48:32 2020 +0000
@@ -24,8 +24,8 @@
 /////////////////////////////////////////////////////////////
 static std::string network_name = "MultiTech";
 static std::string network_passphrase = "MultiTech";
-static uint8_t network_id[] = { 0x6C, 0x4E, 0xEF, 0x66, 0xF4, 0x79, 0x86, 0xA6 };
-static uint8_t network_key[] = { 0x1F, 0x33, 0xA1, 0x70, 0xA5, 0xF1, 0xFD, 0xA0, 0xAB, 0x69, 0x7A, 0xAE, 0x2B, 0x95, 0x91, 0x6B };
+static uint8_t network_id[] = { 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x03, 0x3B, 0xB9 };
+static uint8_t network_key[] = { 0x12, 0x1A, 0x81, 0x8F, 0x10, 0x6B, 0x18, 0x67, 0x54, 0xE6, 0x9E, 0x70, 0x53, 0x7C, 0xAD, 0xCF };
 static uint8_t frequency_sub_band = 0;
 static lora::NetworkType network_type = lora::PUBLIC_LORAWAN;
 static uint8_t join_delay = 5;

--- a/examples/src/fota_example.cpp	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/src/fota_example.cpp	Tue Aug 25 02:48:32 2020 +0000
@@ -44,8 +44,8 @@
 
 static std::string network_name = "MultiTech";
 static std::string network_passphrase = "MultiTech";
-static uint8_t network_id[] = { 0x6C, 0x4E, 0xEF, 0x66, 0xF4, 0x79, 0x86, 0xA6 };
-static uint8_t network_key[] = { 0x1F, 0x33, 0xA1, 0x70, 0xA5, 0xF1, 0xFD, 0xA0, 0xAB, 0x69, 0x7A, 0xAE, 0x2B, 0x95, 0x91, 0x6B };
+static uint8_t network_id[] = { 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x03, 0x3B, 0xB9 };
+static uint8_t network_key[] = { 0x12, 0x1A, 0x81, 0x8F, 0x10, 0x6B, 0x18, 0x67, 0x54, 0xE6, 0x9E, 0x70, 0x53, 0x7C, 0xAD, 0xCF };
 static uint8_t frequency_sub_band = 0;
 static lora::NetworkType network_type = lora::PUBLIC_LORAWAN;
 static uint8_t join_delay = 5;

--- a/examples/src/ota_example.cpp	Mon Aug 24 23:23:30 2020 +0000
+++ b/examples/src/ota_example.cpp	Tue Aug 25 02:48:32 2020 +0000
@@ -28,7 +28,7 @@
 static uint8_t network_key[] = { 0x12, 0x1A, 0x81, 0x8F, 0x10, 0x6B, 0x18, 0x67, 0x54, 0xE6, 0x9E, 0x70, 0x53, 0x7C, 0xAD, 0xCF };
 static uint8_t frequency_sub_band = 0;
 static lora::NetworkType network_type = lora::PUBLIC_LORAWAN;
-static uint8_t join_delay = 5;
+static uint8_t join_delay = 5000;
 static uint8_t ack = 0;
 static bool adr = true;
 
@@ -62,20 +62,10 @@
 
     mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
 
-#if CHANNEL_PLAN == CP_US915
-    plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
+#if CHANNEL_PLAN == CP_AU915
     plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
-    plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
-    plan = new lora::ChannelPlan_KR920();
 #elif CHANNEL_PLAN == CP_AS923
     plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
-    plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
-    plan = new lora::ChannelPlan_IN865();
 #endif
     assert(plan);
 

--- a/libmDot-dev-mbed5.lib	Mon Aug 24 23:23:30 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://github.com/MultiTechSystems/libmDot-dev-mbed5/#e1613111777eb843e1b96bf8254c7fca56f6ba71