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

GPIO PB3/PB5 CHANGE, IRQ CHANGE

This commit is contained in:
Yunhorn 2024-04-08 16:17:44 +08:00
parent 3c548dcd75
commit 81ef0eb81c
5 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Core/Inc/main.h
View File

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

6
Core/Inc/sys_conf.h
View File

@ -47,12 +47,12 @@ extern "C" {
/**
* @brief Verbose level for all trace logs
*/
#define VERBOSE_LEVEL VLEVEL_M
#define VERBOSE_LEVEL VLEVEL_OFF
/**
* @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
@ -75,7 +75,7 @@ extern "C" {
* @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
*/
#define DEBUGGER_ENABLED 1
#define DEBUGGER_ENABLED 0
/**
* @brief Disable Low Power mode

19
Core/Src/stm32wlxx_it.c
View File

@ -383,10 +383,29 @@ void EXTI9_5_IRQHandler(void)
#if defined(STM32WL55xx)
HAL_GPIO_EXTI_IRQHandler(BUT3_Pin);
#endif
#if 0
#if defined(STM32WLE5xx)
//HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
#endif
/* USER CODE BEGIN EXTI9_5_IRQn 1 */
/* USER CODE END EXTI9_5_IRQn 1 */
}
void EXTI3_IRQHandler(void)
{
/* USER CODE BEGIN EXTI9_5_IRQn 0 */
/* USER CODE END EXTI9_5_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 EXTI9_5_IRQn 1 */
/* USER CODE END EXTI9_5_IRQn 1 */

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

@ -1,4 +1,4 @@
2F62501ED4689FB349E356AB974DBE57=1E8F1D9EDF5EB0F4ACFD485842648E9C
8DF89ED150041C4CBC7CB9A9CAA90856=1E8F1D9EDF5EB0F4ACFD485842648E9C
2F62501ED4689FB349E356AB974DBE57=A6EBE0E84BEC4DB205A3B0632707E4E0
8DF89ED150041C4CBC7CB9A9CAA90856=A6EBE0E84BEC4DB205A3B0632707E4E0
DC22A860405A8BF2F2C095E5B6529F12=74CD6EB106FB50B767E4FE71225C7638
eclipse.preferences.version=1

10
STM32CubeIDE/STM32WLE5CCUX_FLASH.ld
View File

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