From 710f0e8a1ae1074d046254a145994b849744917b Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 30 Oct 2024 19:40:56 +0800 Subject: [PATCH] refine for STS_R1D_JP with workable elf --- Core/Src/main.c | 2 - LoRaWAN/App/lora_app.c | 4 -- STM32CubeIDE/.cproject | 2 +- .../Release/Application/User/Core/subdir.mk | 40 +++++------ .../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 | 6 +- .../Application/User/STS/TOF/Target/subdir.mk | 2 +- .../User/STS/TOF/vl53l0x/subdir.mk | 14 ++-- 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 ++--- .../WLE5CC_NODE_STS_R1D_JP_20241030.elf | Bin 0 -> 168324 bytes STS/TOF/App/app_tof_vl53l0x_range.c | 2 +- 17 files changed, 110 insertions(+), 116 deletions(-) create mode 100644 STM32CubeIDE/Release/WLE5CC_NODE_STS_R1D_JP_20241030.elf diff --git a/Core/Src/main.c b/Core/Src/main.c index a0ab3d1..bc1a023 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -126,8 +126,6 @@ int main(void) /* USER CODE END WHILE */ MX_LoRaWAN_Process(); - //MX_TOF_Process(); - // MX_TOF_Ranging_Process(); /* USER CODE BEGIN 3 */ } diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 957c9af..63c3b8c 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1111,10 +1111,6 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) } AppData.Port = 1; AppData.BufferSize = 16; - //AppData.Buffer[0]=0x38; - //AppData.Buffer[1]=0x38; - //UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer, (uint8_t *)"YUNHORN " + (uint8_t*)YUNHORN_STS_PRD_STRING, 16); - //UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer, (uint8_t *)"YUNHORN ", 8); UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer, (uint8_t *)"YUNHORN168", 10); UTIL_MEM_cpy_8((uint8_t*)AppData.Buffer+10, (uint8_t *)(uint8_t*)YUNHORN_STS_PRD_STRING, sizeof(YUNHORN_STS_PRD_STRING)); AppData.BufferSize = sizeof(YUNHORN_STS_PRD_STRING)+10; diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 43ffa57..dd6dddc 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -133,7 +133,7 @@