From c297c6933b6768d753c8c5236431860a5c1eb150 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 25 Sep 2024 14:22:35 +0800 Subject: [PATCH 1/3] ---- start of R1D --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 84cb95f..e24d51a 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ 2024 09 20 Overall good of Yunhorn STS AUTO RESPONDER PARSE 2024 09 20 START RR + 2024 09 25 START R1D From bbd62748baea0f07a31706a176d3fb6d8e3206f9 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 25 Sep 2024 15:46:10 +0800 Subject: [PATCH 2/3] ---revised for RM2_R R1D works fine --- Core/Inc/main.h | 3 +- STM32CubeIDE/.cproject | 1 + .../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 | 6 +- .../Application/User/STS/TOF/Target/subdir.mk | 2 +- .../User/STS/TOF/vl53l0x/subdir.mk | 14 ++-- .../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 ++--- STS/TOF/App/X-WL55_WLE5_53L0X.h | 18 +++++ STS/TOF/App/app_tof_vl53l0x_range.c | 4 +- 17 files changed, 132 insertions(+), 112 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index e1e99c2..c8bf8fc 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -133,6 +133,7 @@ void Error_Handler(void); #if defined(VL53LX)||defined(VL53L0) +#ifndef RM2 /* TOF-1 */ /* | U3, PB-5 XSHUT | */ /* INT PIN PB-3 | */ @@ -168,7 +169,7 @@ void Error_Handler(void); /* **** PCB BOARD RM2 **** */ /* **** NO LONG USED ANYMORE FOR TEST ONLY */ -#ifdef RM2 +#elif defined(RM2) /* TOF-1 */ /* | U3, PB-3 XSHUT | */ /* INT PIN PB-5 | */ diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index 9458a06..f826144 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -134,6 +134,7 @@