From 6ed4e894b5599822bb73e822617d34f37adcaf10 Mon Sep 17 00:00:00 2001 From: sundp Date: Sun, 19 Nov 2023 02:21:33 +0800 Subject: [PATCH] revised for AS923-1-JP --- Core/Inc/yunhorn_sts_prd_conf.h | 2 +- LoRaWAN/App/lora_app.c | 2 +- LoRaWAN/Target/lorawan_conf.h | 4 ++-- STM32CubeIDE/.cproject | 4 ++-- STM32CubeIDE/.settings/language.settings.xml | 4 ++-- .../Release/Application/User/Core/subdir.mk | 6 ++--- .../Application/User/LoRaWAN/App/subdir.mk | 6 ++--- .../Application/User/LoRaWAN/Target/subdir.mk | 6 ++--- .../Application/User/Startup/subdir.mk | 6 ++--- .../Application/User/TOF/App/subdir.mk | 6 ++--- .../Application/User/TOF/Target/subdir.mk | 6 ++--- .../Application/User/TOF/vl53l0x/subdir.mk | 6 ++--- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 6 ++--- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 6 ++--- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 6 ++--- .../Release/Middlewares/LoRaWAN/subdir.mk | 6 ++--- .../Release/Middlewares/SubGHz_Phy/subdir.mk | 6 ++--- STM32CubeIDE/Release/Utilities/subdir.mk | 6 ++--- STM32CubeIDE/Release/makefile | 24 +++++++++---------- STM32CubeIDE/Release/objects.mk | 2 +- STM32CubeIDE/Release/sources.mk | 4 ++-- TOF/App/app_tof_vl53l0x_range.c | 2 +- 22 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index 7789c26..8f690ad 100644 --- a/Core/Inc/yunhorn_sts_prd_conf.h +++ b/Core/Inc/yunhorn_sts_prd_conf.h @@ -234,7 +234,7 @@ #define MajorVer 23U #define MinorVer 11U -#define SubMinorVer 10U +#define SubMinorVer 18U #define FirmwareVersion 3U #define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U #define YUNHORN_STS_AC_CODE_SIZE 20U diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 871e3b9..bb22550 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -795,7 +795,7 @@ static void SendTxData(void) #endif UTIL_TIMER_Time_t nextTxIn = 0; - //if (LmHandlerIsBusy() == false) + if (LmHandlerIsBusy() == false) { uint8_t i = 0; //MX_TOF_Process(); diff --git a/LoRaWAN/Target/lorawan_conf.h b/LoRaWAN/Target/lorawan_conf.h index 78fb7f4..9ddccb0 100644 --- a/LoRaWAN/Target/lorawan_conf.h +++ b/LoRaWAN/Target/lorawan_conf.h @@ -58,7 +58,7 @@ extern "C" { * - 0x01000400: Link Layer TS001-1.0.4 + Regional Parameters RP002-1.0.1 * - 0x01010100: soon available ... */ -#define LORAMAC_SPECIFICATION_VERSION 0x01000300 +#define LORAMAC_SPECIFICATION_VERSION 0x01000400 /*! * @brief Enable the additional LoRaWAN packages @@ -109,7 +109,7 @@ extern "C" { * - CHANNEL_PLAN_GROUP_AS923_4 (Freq offset = -5.90 MHz / Freq range = 917-920MHz) * - CHANNEL_PLAN_GROUP_AS923_1_JP (Freq offset = 0.0 MHz / Freq range = 920.6-923.4MHz) */ -#define REGION_AS923_DEFAULT_CHANNEL_PLAN CHANNEL_PLAN_GROUP_AS923_1 +#define REGION_AS923_DEFAULT_CHANNEL_PLAN CHANNEL_PLAN_GROUP_AS923_1_JP /*! * @brief Limits the number usable channels by default for AU915, CN470 and US915 regions diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index cc131c0..a4aac19 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -26,7 +26,7 @@