Added Russia RU864 region support.

mluis1 · mluis1 · commit c9d4f25960f1 · 2018-07-02T11:33:53.000+02:00
#496
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -62,6 +62,7 @@
         "REGION_AS923":"OFF",
         "REGION_CN470":"OFF",
         "REGION_KR920":"OFF",
-        "REGION_IN865":"OFF"
+        "REGION_IN865":"OFF",
+        "REGION_RU864":"OFF"
     }
 }
diff --git a/Doc/development-environment.md b/Doc/development-environment.md
@@ -101,6 +101,7 @@ Alternatively one can use a graphical interface to configure CMake, drop down me
      * LORAMAC_REGION_CN470
      * LORAMAC_REGION_KR920
      * LORAMAC_REGION_IN865
+     * LORAMAC_REGION_RU864
 * `MODULATION` - Type of modulation choice.  
    **Note**: Only applicable to ping-pong or rx-sensi `APPLICATION` choice.  
    The possible choices are:
@@ -122,6 +123,7 @@ Alternatively one can use a graphical interface to configure CMake, drop down me
 * `REGION_CN470` - Enables support for the Region CN470 (Default OFF)
 * `REGION_KR920` - Enables support for the Region IN865 (Default OFF)
 * `REGION_IN865` - Enables support for the Region AS923 (Default OFF)
+* `REGION_RU864` - Enables support for the Region RU864 (Default OFF)
 
 ### Options that are automatically set
 
diff --git a/src/apps/LoRaMac/CMakeLists.txt b/src/apps/LoRaMac/CMakeLists.txt
@@ -30,7 +30,7 @@ set_property(CACHE CLASS PROPERTY STRINGS ${CLASS_LIST})
 # Allow switching of active region
 set(ACTIVE_REGION_LIST   LORAMAC_REGION_EU868 LORAMAC_REGION_US915 LORAMAC_REGION_CN779
     LORAMAC_REGION_EU433 LORAMAC_REGION_AU915 LORAMAC_REGION_AS923 LORAMAC_REGION_CN470
-    LORAMAC_REGION_KR920 LORAMAC_REGION_IN865
+    LORAMAC_REGION_KR920 LORAMAC_REGION_IN865 LORAMAC_REGION_RU864
 )
 set(ACTIVE_REGION LORAMAC_REGION_EU868 CACHE STRING "Default active region is EU868")
 set_property(CACHE ACTIVE_REGION PROPERTY STRINGS ${ACTIVE_REGION_LIST})
diff --git a/src/apps/LoRaMac/classA/NAMote72/main.c b/src/apps/LoRaMac/classA/NAMote72/main.c
@@ -633,7 +633,7 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 )
+    defined( REGION_KR920 ) || defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classA/NucleoL073/main.c b/src/apps/LoRaMac/classA/NucleoL073/main.c
@@ -541,7 +541,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classA/NucleoL152/main.c b/src/apps/LoRaMac/classA/NucleoL152/main.c
@@ -541,7 +541,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classA/SAML21/main.c b/src/apps/LoRaMac/classA/SAML21/main.c
@@ -547,7 +547,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classB/NAMote72/main.c b/src/apps/LoRaMac/classB/NAMote72/main.c
@@ -667,7 +667,7 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 )
+    defined( REGION_KR920 ) || defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classB/NucleoL073/main.c b/src/apps/LoRaMac/classB/NucleoL073/main.c
@@ -575,7 +575,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classB/SAML21/main.c b/src/apps/LoRaMac/classB/SAML21/main.c
@@ -581,7 +581,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classC/NAMote72/main.c b/src/apps/LoRaMac/classC/NAMote72/main.c
@@ -633,7 +633,7 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 )
+    defined( REGION_KR920 ) || defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classC/NucleoL073/main.c b/src/apps/LoRaMac/classC/NucleoL073/main.c
@@ -541,7 +541,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classC/NucleoL152/main.c b/src/apps/LoRaMac/classC/NucleoL152/main.c
@@ -541,7 +541,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/LoRaMac/classC/SAML21/main.c b/src/apps/LoRaMac/classC/SAML21/main.c
@@ -547,7 +547,8 @@ static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
         printf("CHANNEL MASK: ");
 #if defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
     defined( REGION_EU868 ) || defined( REGION_IN865 ) || \
-    defined( REGION_KR920 ) || defined( REGION_EU433 )
+    defined( REGION_KR920 ) || defined( REGION_EU433 ) || \
+    defined( REGION_RU864 )
 
         for( uint8_t i = 0; i < 1; i++)
 
diff --git a/src/apps/ping-pong/NAMote72/main.c b/src/apps/ping-pong/NAMote72/main.c
@@ -56,6 +56,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/ping-pong/NucleoL073/main.c b/src/apps/ping-pong/NucleoL073/main.c
@@ -63,6 +63,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/ping-pong/NucleoL152/main.c b/src/apps/ping-pong/NucleoL152/main.c
@@ -63,6 +63,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/ping-pong/SAML21/main.c b/src/apps/ping-pong/SAML21/main.c
@@ -57,6 +57,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/rx-sensi/NAMote72/main.c b/src/apps/rx-sensi/NAMote72/main.c
@@ -59,6 +59,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/rx-sensi/NucleoL073/main.c b/src/apps/rx-sensi/NucleoL073/main.c
@@ -66,6 +66,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/rx-sensi/NucleoL152/main.c b/src/apps/rx-sensi/NucleoL152/main.c
@@ -66,6 +66,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/rx-sensi/SAML21/main.c b/src/apps/rx-sensi/SAML21/main.c
@@ -60,6 +60,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
     #error "Please define a frequency band in the compiler options."
 #endif
diff --git a/src/apps/tx-cw/NAMote72/main.c b/src/apps/tx-cw/NAMote72/main.c
@@ -54,6 +54,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
 
     #error "Please define a frequency band in the compiler options."
diff --git a/src/apps/tx-cw/NucleoL073/main.c b/src/apps/tx-cw/NucleoL073/main.c
@@ -70,6 +70,11 @@
 #define RF_FREQUENCY                                915000000 // Hz
 #define TX_OUTPUT_POWER                             14        // 14 dBm
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+#define TX_OUTPUT_POWER                             14        // 14 dBm
+
 #else
 
     #error "Please define a frequency band in the compiler options."
diff --git a/src/apps/tx-cw/NucleoL152/main.c b/src/apps/tx-cw/NucleoL152/main.c
@@ -70,6 +70,11 @@
 #define RF_FREQUENCY                                915000000 // Hz
 #define TX_OUTPUT_POWER                             14        // 14 dBm
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+#define TX_OUTPUT_POWER                             14        // 14 dBm
+
 #else
 
     #error "Please define a frequency band in the compiler options."
diff --git a/src/apps/tx-cw/SAML21/main.c b/src/apps/tx-cw/SAML21/main.c
@@ -55,6 +55,10 @@
 
 #define RF_FREQUENCY                                915000000 // Hz
 
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 // Hz
+
 #else
 
     #error "Please define a frequency band in the compiler options."
diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt
@@ -32,7 +32,8 @@ option(REGION_AS923 "Region AS923" OFF)
 option(REGION_CN470 "Region CN470" OFF)
 option(REGION_KR920 "Region KR920" OFF)
 option(REGION_IN865 "Region IN865" OFF)
-set(REGION_LIST REGION_EU868 REGION_US915 REGION_CN779 REGION_EU433 REGION_AU915 REGION_AS923 REGION_CN470 REGION_KR920 REGION_IN865)
+option(REGION_RU864 "Region RU864" OFF)
+set(REGION_LIST REGION_EU868 REGION_US915 REGION_CN779 REGION_EU433 REGION_AU915 REGION_AS923 REGION_CN470 REGION_KR920 REGION_IN865 REGION_RU864)
 
 #---------------------------------------------------------------------------------------
 # Target
diff --git a/src/mac/LoRaMac.h b/src/mac/LoRaMac.h
@@ -2213,6 +2213,10 @@ typedef enum eLoRaMacRegion_t
      * North american band on 915MHz
      */
     LORAMAC_REGION_US915,
+    /*!
+     * Russia band on 864MHz
+     */
+    LORAMAC_REGION_RU864,
 }LoRaMacRegion_t;
 
 /*!
diff --git a/src/mac/region/Region.c b/src/mac/region/Region.c
diff --git a/src/mac/region/Region.h b/src/mac/region/Region.h
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
diff --git a/src/mac/region/RegionRU864.h b/src/mac/region/RegionRU864.h

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`"REGION_AS923":"OFF",`
`63`	`63`	`"REGION_CN470":"OFF",`
`64`	`64`	`"REGION_KR920":"OFF",`
`65`		`- "REGION_IN865":"OFF"`
	`65`	`+ "REGION_IN865":"OFF",`
	`66`	`+ "REGION_RU864":"OFF"`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ set_property(CACHE CLASS PROPERTY STRINGS ${CLASS_LIST})`
`30`	`30`	`# Allow switching of active region`
`31`	`31`	`set(ACTIVE_REGION_LIST LORAMAC_REGION_EU868 LORAMAC_REGION_US915 LORAMAC_REGION_CN779`
`32`	`32`	`LORAMAC_REGION_EU433 LORAMAC_REGION_AU915 LORAMAC_REGION_AS923 LORAMAC_REGION_CN470`
`33`		`- LORAMAC_REGION_KR920 LORAMAC_REGION_IN865`
	`33`	`+ LORAMAC_REGION_KR920 LORAMAC_REGION_IN865 LORAMAC_REGION_RU864`
`34`	`34`	`)`
`35`	`35`	`set(ACTIVE_REGION LORAMAC_REGION_EU868 CACHE STRING "Default active region is EU868")`
`36`	`36`	`set_property(CACHE ACTIVE_REGION PROPERTY STRINGS ${ACTIVE_REGION_LIST})`