wayne roberts / lorawan1v1

Dependencies:   sx12xx_hal

Dependents:   LoRaWAN-SanJose_Bootcamp LoRaWAN-grove-cayenne LoRaWAN-classC-demo LoRaWAN-grove-cayenne ... more

Files at this revision

API Documentation at this revision

Comitter:
Wayne Roberts
Date:
Mon Aug 20 14:09:49 2018 -0700
Parent:
11:ce1317758488
Commit message:
add 8 hybrid channel sets for us915 band

Changed in this revision

mac/region_us915.cpp Show annotated file Show diff for this revision Revisions of this file
sx12xx_hal.lib Show annotated file Show diff for this revision Revisions of this file
--- a/mac/region_us915.cpp	Mon Jul 23 17:40:44 2018 -0700
+++ b/mac/region_us915.cpp	Mon Aug 20 14:09:49 2018 -0700
@@ -319,7 +319,23 @@
     /* uint16_t ChannelsMask[6];*/ { 0xffff, 0xffff, 0xffff, 0xffff, 0x00ff, 0x0000},
     /* uint8_t NbEnabledChannels;*/ 72,
 #elif defined( USE_BAND_915_HYBRID )
-    /* uint16_t ChannelsMask[6];*/ { 0x00ff, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000},
+    #if defined(HYBRID_H)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0x0000, 0x0000, 0xff00, 0x0080, 0x0000},
+    #elif defined(HYBRID_G)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0x0000, 0x0000, 0x00ff, 0x0040, 0x0000},
+    #elif defined(HYBRID_F)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0x0000, 0xff00, 0x0000, 0x0020, 0x0000},
+    #elif defined(HYBRID_E)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0x0000, 0x00ff, 0x0000, 0x0010, 0x0000},
+    #elif defined(HYBRID_D)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0xff00, 0x0000, 0x0000, 0x0008, 0x0000},
+    #elif defined(HYBRID_C)
+        /* uint16_t ChannelsMask[6];*/ { 0x0000, 0x00ff, 0x0000, 0x0000, 0x0004, 0x0000},
+    #elif defined(HYBRID_B)
+        /* uint16_t ChannelsMask[6];*/ { 0xff00, 0x0000, 0x0000, 0x0000, 0x0002, 0x0000},
+    #else
+        /* uint16_t ChannelsMask[6];*/ { 0x00ff, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000},
+    #endif
     /* uint8_t NbEnabledChannels;*/ 9,
 #endif
     /* us_timestamp_t MaxListenTime */ 0    /* no LBT in USA */
--- a/sx12xx_hal.lib	Mon Jul 23 17:40:44 2018 -0700
+++ b/sx12xx_hal.lib	Mon Aug 20 14:09:49 2018 -0700
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/dudmuck/code/sx12xx_hal/#122af639cf0b
+https://os.mbed.com/users/dudmuck/code/sx12xx_hal/#57080d572494