sundp
/
STS_RR_R125
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

PB3/PB5 change for STS_R5_JP

This commit is contained in:
Yunhorn 2024-04-08 17:47:07 +08:00
parent 6aaffe34cc
commit 34c6d95648
10 changed files with 6330 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Core/Inc/main.h
View File

@ -131,70 +131,70 @@ void MX_TOF_Init(void);
/* | | | */ /* | | | */
/* | TOF-2 | TOF-1 | */ /* | TOF-2 | TOF-1 | */
/* -------------------- | ------------------ | */ /* -------------------- | ------------------ | */
/* U4, PA-9 | U3, PB-3 | */ /* U4, PA-9 | U3, PB-5 | */
/* TOF_1, U3 RIGHT CORNER, PB-3 */ /* TOF_1, U3 RIGHT CORNER, PB-5 */
#if defined(TOF_1)&& defined(STM32WLE5xx) #if defined(TOF_1) //&& defined(STM32WLE5xx)
#define TOF_C_INT_Pin GPIO_PIN_5 #define TOF_C_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_C_INT_GPIO_Port GPIOB #define TOF_C_INT_GPIO_Port GPIOB
#define TOF_C_INT_EXTI_IRQn EXTI9_5_IRQn #define TOF_C_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_C_XSHUT_Pin GPIO_PIN_3 #define TOF_C_XSHUT_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3
#define TOF_C_XSHUT_GPIO_Port GPIOB #define TOF_C_XSHUT_GPIO_Port GPIOB
#endif #endif
// Common Shared Int Pin and Port for VL53L0X // Common Shared Int Pin and Port for VL53L0X
#define TOF_INT_EXTI_PIN GPIO_PIN_5 //TOF_C_INT_Pin #define TOF_INT_EXTI_PIN GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5 //TOF_C_INT_Pin
#define TOF_INT_EXTI_PORT GPIOB //TOF_C_INT_GPIO_Port #define TOF_INT_EXTI_PORT GPIOB //TOF_C_INT_GPIO_Port
/* TOF_2, */ /* TOF_2, */
#if defined(TOF_2) && defined(STM32WL55xx) #if defined(TOF_2) && defined(STM32WL55xx)
#define TOF_L_INT_Pin GPIO_PIN_7 #define TOF_L_INT_Pin GPIO_PIN_7
#define TOF_L_INT_GPIO_Port GPIOC #define TOF_L_INT_GPIO_Port GPIOC
#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn #define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_10 #define TOF_L_XSHUT_Pin GPIO_PIN_10
#define TOF_L_XSHUT_GPIO_Port GPIOB #define TOF_L_XSHUT_GPIO_Port GPIOB
#endif #endif
/* TOF_2, U4 LEFT CORNER, PA-9 */ /* TOF_2, U4 LEFT CORNER, PA-9 */
#if defined(TOF_2) && defined(STM32WLE5xx) #if defined(TOF_2) && defined(STM32WLE5xx)
#define TOF_L_INT_Pin GPIO_PIN_5 #define TOF_L_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_L_INT_GPIO_Port GPIOB #define TOF_L_INT_GPIO_Port GPIOB
#define TOF_L_INT_EXTI_IRQn EXTI9_5_IRQn #define TOF_L_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_L_XSHUT_Pin GPIO_PIN_9 #define TOF_L_XSHUT_Pin GPIO_PIN_9
#define TOF_L_XSHUT_GPIO_Port GPIOA #define TOF_L_XSHUT_GPIO_Port GPIOA
#endif #endif
/* TOF_3 */ /* TOF_3 */
#if defined(STM32WL55xx)&& defined(TOF_3) #if defined(STM32WL55xx)&& defined(TOF_3)
#define TOF_R_INT_Pin GPIO_PIN_10 #define TOF_R_INT_Pin GPIO_PIN_10
#define TOF_R_INT_GPIO_Port GPIOA #define TOF_R_INT_GPIO_Port GPIOA
#define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn #define TOF_R_INT_EXTI_IRQn EXTI15_10_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_5 #define TOF_R_XSHUT_Pin GPIO_PIN_5
#define TOF_R_XSHUT_GPIO_Port GPIOB #define TOF_R_XSHUT_GPIO_Port GPIOB
#endif #endif
/* TOF_3 */ /* TOF_3 */
#if defined(STM32WLE5xx)&& defined(TOF_3) #if defined(STM32WLE5xx)&& defined(TOF_3)
#define TOF_R_INT_Pin GPIO_PIN_5 #define TOF_R_INT_Pin GPIO_PIN_3 // 2024-04-08 WAS GPIO_PIN_5
#define TOF_R_INT_GPIO_Port GPIOB #define TOF_R_INT_GPIO_Port GPIOB
#define TOF_R_INT_EXTI_IRQn EXTI9_5_IRQn #define TOF_R_INT_EXTI_IRQn EXTI3_IRQn // 2024-04-08 WAS EXTI9_5_IRQn
#define TOF_R_XSHUT_Pin GPIO_PIN_10 #define TOF_R_XSHUT_Pin GPIO_PIN_10
#define TOF_R_XSHUT_GPIO_Port GPIOA #define TOF_R_XSHUT_GPIO_Port GPIOA
#endif #endif
#if defined(SOAP_LEVEL_SENSOR) #if defined(SOAP_LEVEL_SENSOR)
/* IF_SOAP_IN, MEMS_IF_3, PA10 */ /* IF_SOAP_IN, MEMS_IF_3, PA10 */
#define SOAP_STATUS_Pin GPIO_PIN_10 #define SOAP_STATUS_Pin GPIO_PIN_10
#define SOAP_STATUS_GPIO_Port GPIOA #define SOAP_STATUS_GPIO_Port GPIOA
/* IF_SENSOR_ON_OFF, MEMS_IF_1, PB3 */ /* IF_SENSOR_ON_OFF, MEMS_IF_1, PB3 */
#define SOAP_SWITCH_Pin GPIO_PIN_3 #define SOAP_SWITCH_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3
#define SOAP_SWITCH_GPIO_Port GPIOB #define SOAP_SWITCH_GPIO_Port GPIOB
#define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port,SOAP_STATUS_Pin) #define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port,SOAP_STATUS_Pin)
#endif #endif

6
Core/Inc/sys_conf.h
View File

@ -47,12 +47,12 @@ extern "C" {
/** /**
* @brief Verbose level for all trace logs * @brief Verbose level for all trace logs
*/ */
#define VERBOSE_LEVEL VLEVEL_M #define VERBOSE_LEVEL VLEVEL_OFF
/** /**
* @brief Enable trace logs * @brief Enable trace logs
*/ */
#define APP_LOG_ENABLED 1 #define APP_LOG_ENABLED 0
/** /**
* @brief Activate monitoring (probes) of some internal RF signals for debug purpose * @brief Activate monitoring (probes) of some internal RF signals for debug purpose
@ -75,7 +75,7 @@ extern "C" {
* @brief Enable/Disable MCU Debugger pins (dbg serial wires) * @brief Enable/Disable MCU Debugger pins (dbg serial wires)
* @note by HW serial wires are ON by default, need to put them OFF to save power * @note by HW serial wires are ON by default, need to put them OFF to save power
*/ */
#define DEBUGGER_ENABLED 1 #define DEBUGGER_ENABLED 0
/** /**
* @brief Disable Low Power mode * @brief Disable Low Power mode

4
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -241,8 +241,8 @@
#define MajorVer 24U #define MajorVer 24U
#define MinorVer 03U #define MinorVer 04U
#define SubMinorVer 7U #define SubMinorVer 8U
#define FirmwareVersion 3U #define FirmwareVersion 3U
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U #define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
#define YUNHORN_STS_AC_CODE_SIZE 20U #define YUNHORN_STS_AC_CODE_SIZE 20U

17
Core/Src/stm32wlxx_it.c
View File

@ -351,6 +351,21 @@ void DMA1_Channel7_IRQHandler(void)
/* USER CODE END DMA1_Channel7_IRQn 1 */ /* USER CODE END DMA1_Channel7_IRQn 1 */
} }
void EXTI3_IRQHandler(void)
{
/* USER CODE BEGIN EXTI3_IRQn 0 */
/* USER CODE END EXTI3_IRQn 0 */
//HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#if defined(STM32WLE5xx)
//HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
/* USER CODE BEGIN EXTI3_IRQn 1 */
/* USER CODE END EXTI3_IRQn 1 */
}
/** /**
* @brief This function handles EXTI Lines [4] Interrupt. * @brief This function handles EXTI Lines [4] Interrupt.
*/ */
@ -377,9 +392,11 @@ void EXTI9_5_IRQHandler(void)
#if defined(STM32WL55xx) #if defined(STM32WL55xx)
HAL_GPIO_EXTI_IRQHandler(BUT3_Pin); HAL_GPIO_EXTI_IRQHandler(BUT3_Pin);
#endif #endif
#if 0
#if defined(STM32WLE5xx) #if defined(STM32WLE5xx)
//HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN); //HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN); HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
#endif #endif
/* USER CODE BEGIN EXTI9_5_IRQn 1 */ /* USER CODE BEGIN EXTI9_5_IRQn 1 */

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-752586124573436390" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="188690963369024153" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-752586124573436390" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="188690963369024153" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

5
STM32CubeIDE/.settings/stm32cubeide.project.prefs
View File

@ -1,3 +1,4 @@
8DF89ED150041C4CBC7CB9A9CAA90856=1E8F1D9EDF5EB0F4ACFD485842648E9C 2F62501ED4689FB349E356AB974DBE57=5FDF04BA58421D24173F6858CB619980
DC22A860405A8BF2F2C095E5B6529F12=EAC6FC6468FD9889D03DF8A29B68CCA9 8DF89ED150041C4CBC7CB9A9CAA90856=5FDF04BA58421D24173F6858CB619980
DC22A860405A8BF2F2C095E5B6529F12=74CD6EB106FB50B767E4FE71225C7638
eclipse.preferences.version=1 eclipse.preferences.version=1

BIN
STM32CubeIDE/Release/STS_R5_JP_0408.bin Normal file
View File

Binary file not shown.

6261
STM32CubeIDE/Release/STS_R5_JP_0408.hex Normal file
View File

File diff suppressed because it is too large Load Diff

10
STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
View File

@ -86,13 +86,13 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.ARM.extab : { .ARM.extab (READONLY) : {
. = ALIGN(4); . = ALIGN(4);
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.ARM : { .ARM (READONLY): {
. = ALIGN(4); . = ALIGN(4);
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) *(.ARM.exidx*)
@ -100,7 +100,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.preinit_array : .preinit_array (READONLY) :
{ {
. = ALIGN(4); . = ALIGN(4);
PROVIDE_HIDDEN (__preinit_array_start = .); PROVIDE_HIDDEN (__preinit_array_start = .);
@ -109,7 +109,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.init_array : .init_array (READONLY):
{ {
. = ALIGN(4); . = ALIGN(4);
PROVIDE_HIDDEN (__init_array_start = .); PROVIDE_HIDDEN (__init_array_start = .);
@ -119,7 +119,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >FLASH } >FLASH
.fini_array : .fini_array (READONLY):
{ {
. = ALIGN(4); . = ALIGN(4);
PROVIDE_HIDDEN (__fini_array_start = .); PROVIDE_HIDDEN (__fini_array_start = .);

3
readme.txt
View File

@ -42,5 +42,8 @@ Pre-defines
Jumbo Roll, Tissue Paper, Waste Bin sensor Jumbo Roll, Tissue Paper, Waste Bin sensor
change log
2024 04 08 PB3 PB5 exchange
****************************************************************************** ******************************************************************************