Zheng Ping / LoRaMacLib

this is avaiable project

Dependents:   LoRaWAN_MBED

Fork of LoRaMacLib by LoRa All

Files at this revision

API Documentation at this revision

Revision 11:29686c1ac910, committed 2016-04-19

Comitter:
pzheng
Date:
Tue Apr 19 00:07:13 2016 +0000
Parent:
10:66e623be7f8a
Commit message:
print all the keys in the format of string

Changed in this revision

LoRaMac-board.h Show annotated file Show diff for this revision Revisions of this file
mac/LoRaMac.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 66e623be7f8a -r 29686c1ac910 LoRaMac-board.h
--- a/LoRaMac-board.h	Thu Dec 03 09:03:28 2015 +0000
+++ b/LoRaMac-board.h	Tue Apr 19 00:07:13 2016 +0000
@@ -122,13 +122,13 @@
 #define LC1                { 868100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
 #define LC2                { 868300000, { ( ( DR_6 << 4 ) | DR_0 ) }, 1 }
 #define LC3                { 868500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
-#define LC4                { 868850000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC5                { 869050000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC6                { 869525000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-/*#define LC7                { 867700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC4                { 867100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC5                { 867300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC6                { 867500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC7                { 867700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
 #define LC8                { 867900000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC9                { 868800000, { ( ( DR_7 << 4 ) | DR_7 ) }, 2 }
-*/
+#define LC9                { 868900000, { ( ( DR_7 << 4 ) | DR_7 ) }, 2 }
+
 #elif defined( USE_BAND_915 )
 
 /*!
@@ -149,15 +149,15 @@
  * LoRaMac default channels
  */
 // Channel = { Frequency [Hz], { ( ( DrMax << 4 ) | DrMin ) }, Band }
-#define LC1                { 921500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC2                { 921700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC3                { 921900000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC1                { 920600000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC2                { 920800000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC3                { 921000000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
 //Added by pzheng 20151203
-#define LC4                { 922100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC5                { 922300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC6                { 922500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC7                { 922700000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
-#define LC8                { 922900000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC4                { 921200000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC5                { 921400000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC6                { 921600000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC7                { 921800000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
+#define LC8                { 922000000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
 #define LC9                { 000000000, { ( ( DR_5 << 4 ) | DR_0 ) }, 0 }
 
 #elif defined( USE_BAND_433 )

diff -r 66e623be7f8a -r 29686c1ac910 mac/LoRaMac.cpp
--- a/mac/LoRaMac.cpp	Thu Dec 03 09:03:28 2015 +0000
+++ b/mac/LoRaMac.cpp	Tue Apr 19 00:07:13 2016 +0000
@@ -209,9 +209,9 @@
     LC4,
     LC5,
     LC6,
- /*   LC7,
+    LC7,
     LC8,
-    LC9,*/
+    LC9,
 };
 #else
 /*!