diff --git a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/Commissioning.h b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/Commissioning.h index 07f45097..39b7d5cb 100644 --- a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/Commissioning.h +++ b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/Commissioning.h @@ -60,7 +60,7 @@ extern "C" { #define LORAWAN_PUBLIC_NETWORK true /*root key*/ -#define LORAWAN_APP_KEY {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } +#define LORAWAN_APP_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } /*for ABP================================================================================*/ #define STATIC_DEVICE_ADDRESS 1 //if 0 , using a ramdom address @@ -68,21 +68,21 @@ extern "C" { #define LORAWAN_NETWORK_ID ( uint32_t )0 #define LORAWAN_DEVICE_ADDRESS ( uint32_t )0x0100000a -#define LORAWAN_NWK_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } +#define LORAWAN_NWK_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } /*for 1.1.x*/ -#define LORAWAN_F_NWK_S_INT_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } -#define LORAWAN_S_NWK_S_INT_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } -#define LORAWAN_NWK_S_ENC_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } -#define LORAWAN_APP_S_KEY { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C } +#define LORAWAN_F_NWK_S_INT_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } +#define LORAWAN_S_NWK_S_INT_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } +#define LORAWAN_NWK_S_ENC_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } +#define LORAWAN_APP_S_KEY { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37, 0x1e, 0x29, 0xaa, 0xaa, 0xad, 0x20, 0x4a, 0x72 } /*for OTAA================================================================================*/ #define STATIC_DEVICE_EUI 1 //if 0 , using a ramdom EUI #define IEEE_OUI 0x01, 0x01, 0x01 -#define LORAWAN_DEVICE_EUI { IEEE_OUI, 0x01, 0x01, 0x01, 0x04, 0x02 } -#define LORAWAN_JOIN_EUI /*APP_EUI*/ { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 } +#define LORAWAN_DEVICE_EUI { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37} +#define LORAWAN_JOIN_EUI /*APP_EUI*/ { 0x8c, 0xf9, 0x57, 0x20, 0x00, 0x00, 0xf7, 0x37} diff --git a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_conf.h b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_conf.h index ed79f997..73313c38 100644 --- a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_conf.h +++ b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_conf.h @@ -32,7 +32,7 @@ extern "C" { ******************************************************************************/ /* lw application configuration (Mw is configured by lorawan_conf.h) */ -#define LORAWAN_DEFAULT_ACTIVE_REGION LORAMAC_REGION_CN470ALI +#define LORAWAN_DEFAULT_ACTIVE_REGION LORAMAC_REGION_CN470 diff --git a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_lorawan.c b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_lorawan.c index 05269e7e..1163a4bd 100644 --- a/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_lorawan.c +++ b/board/RHF0M0E5_STM32WLE5xx/KEIL/lorawan/App/app_lorawan.c @@ -83,7 +83,7 @@ void MX_LoRaWAN_Init(void) lw_request_class(CLASS_A); /*channel 8-16*/ - LWChannel_mask_t ch={0xFF00,0,0,0,0,0}; + LWChannel_mask_t ch={0x0000,0,0,0,0,0x00FF}; lw_current_chmask_set(&ch); /*tx dr*/