Christopher De Bank / LoRaWAN-lib_20171208

20171208

Fork of LoRaWAN-lib by Semtech

Files at this revision

API Documentation at this revision

Revision 11:de2cdd1f253e, committed 2017-12-08

Comitter:
cdebank
Date:
Fri Dec 08 14:22:31 2017 +0000
Parent:
8:26002607de9c
Commit message:
20171208

Changed in this revision

LoRaMac-definitions.h Show annotated file Show diff for this revision Revisions of this file
LoRaMac.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 26002607de9c -r de2cdd1f253e LoRaMac-definitions.h
--- a/LoRaMac-definitions.h	Mon Apr 24 09:42:37 2017 +0000
+++ b/LoRaMac-definitions.h	Fri Dec 08 14:22:31 2017 +0000
@@ -328,6 +328,7 @@
 #define LORA_MAX_NB_BANDS                           1
 
 // Band = { DutyCycle, TxMaxPower, LastTxDoneTime, TimeOff }
+//#define BAND0              { 100, TX_POWER_10_DBM, 0,  0 } //  1.0 %
 #define BAND0              { 100, TX_POWER_10_DBM, 0,  0 } //  1.0 %
 
 /*!
@@ -463,14 +464,19 @@
  * LoRaMac default channels
  */
 // Channel = { Frequency [Hz], { ( ( DrMax << 4 ) | DrMin ) }, Band }
-#define LC1                { 868100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
-#define LC2                { 868300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
-#define LC3                { 868500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
+//Commented out by Chris
+//#define LC1                { 868100000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
+//#define LC2                { 868300000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
+//#define LC3                { 868500000, { ( ( DR_5 << 4 ) | DR_0 ) }, 1 }
+
+#define LC1                { 869400000, { ( ( DR_5 << 4 ) | DR_5 ) }, 3 }
 
 /*!
  * LoRaMac channels which are allowed for the join procedure
  */
-#define JOIN_CHANNELS      ( uint16_t )( LC( 1 ) | LC( 2 ) | LC( 3 ) )
+//Commented out by Chris
+//#define JOIN_CHANNELS      ( uint16_t )( LC( 1 ) | LC( 2 ) | LC( 3 ) )
+#define JOIN_CHANNELS      ( uint16_t )( LC( 1 ))
 
 #elif defined( USE_BAND_915 ) || defined( USE_BAND_915_HYBRID )
 

diff -r 26002607de9c -r de2cdd1f253e LoRaMac.cpp
--- a/LoRaMac.cpp	Mon Apr 24 09:42:37 2017 +0000
+++ b/LoRaMac.cpp	Fri Dec 08 14:22:31 2017 +0000
@@ -405,8 +405,9 @@
 static ChannelParams_t Channels[LORA_MAX_NB_CHANNELS] =
 {
     LC1,
-    LC2,
-    LC3,
+    //Commented out by Chris
+    //LC2,
+    //LC3,
 };
 #elif defined( USE_BAND_915 ) || defined( USE_BAND_915_HYBRID )
 /*!
@@ -3391,7 +3392,9 @@
 #elif defined( USE_BAND_780 )
     DutyCycleOn = true;
 #elif defined( USE_BAND_868 )
-    DutyCycleOn = true;
+    //Edited by Chris
+    //DutyCycleOn = true;
+    DutyCycleOn = false;
 #elif defined( USE_BAND_915 ) || defined( USE_BAND_915_HYBRID )
     DutyCycleOn = false;
 #else