From c195c76980d6d52c00277e9177d1011c36c3ce0f Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 25 Sep 2024 14:17:37 +0800 Subject: [PATCH] revised for R1D --- Core/Inc/main.h | 2 +- LoRaWAN/App/lora_app.c | 7 +- STM32CubeIDE/.cproject | 2 +- STM32CubeIDE/.project | 93 +++++++++++++------ .../Release/Application/User/Core/subdir.mk | 38 ++++---- .../Application/User/LoRaWAN/App/subdir.mk | 8 +- .../Application/User/LoRaWAN/Target/subdir.mk | 2 +- .../Application/User/STS/Core/Src/subdir.mk | 6 +- .../Application/User/STS/TOF/App/subdir.mk | 19 ++-- .../Application/User/STS/TOF/Target/subdir.mk | 2 +- .../User/STS/TOF/vl53l0x/subdir.mk | 16 ++-- .../User/STS/TOF/vl53l1x_uld/subdir.mk | 8 +- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 4 +- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 2 +- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 48 +++++----- .../Release/Middlewares/LoRaWAN/subdir.mk | 66 ++++++------- .../Release/Middlewares/SubGHz_Phy/subdir.mk | 6 +- STM32CubeIDE/Release/Utilities/subdir.mk | 16 ++-- STM32CubeIDE/Release/makefile | 2 +- STM32CubeIDE/Release/sources.mk | 2 +- 20 files changed, 194 insertions(+), 155 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 55a6514..e1e99c2 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -111,7 +111,7 @@ void Error_Handler(void); #define PME_OFF HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET ) #define PME_TOGGLE HAL_GPIO_TogglePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin) -//#define VL53L0 +#define VL53L0 #ifndef VL53L0 #define VL53LX 1 #endif diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 9a3f54e..51b1d45 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1015,9 +1015,10 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n"); } AppData.Port = 1; - AppData.BufferSize = 2; - AppData.Buffer[0]=0x38; - AppData.Buffer[1]=0x38; + AppData.BufferSize = 10; + //AppData.Buffer[0]=0x38; + //AppData.Buffer[1]=0x38; + UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer, "YUNHORN168", 10); LmHandlerParams.IsTxConfirmed = true; LmHandlerErrorStatus_t status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false); if (status ==LORAMAC_HANDLER_SUCCESS ) LmHandlerParams.IsTxConfirmed = false; diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 50f9a80..9458a06 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -133,9 +133,9 @@