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

---- WIP sts_p2 TESTING

This commit is contained in:
Yunhorn 2024-09-09 12:44:46 +08:00
parent 77729eb0c6
commit 726cba118d
6 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Inc/main.h
View File

@ -146,7 +146,6 @@ void Error_Handler(void);
#endif
#ifdef STS_P2
#define TOF_C_INT_Pin GPIO_PIN_3
#define TOF_C_INT_GPIO_Port GPIOB
#define TOF_C_INT_EXTI_IRQn EXTI3_IRQn
@ -200,7 +199,7 @@ void Error_Handler(void);
#define A111_SENSOR_INTERRUPT_GPIO_Port GPIOA
#define A111_SENSOR_INTERRUPT_EXTI_IRQn EXTI9_5_IRQn
*/
//#ifdef USE_ACCONEER_A111
#define A111_SPI_SCK_Pin GPIO_PIN_5 //GPIO_PIN_3
#define A111_SPI_SCK_GPIO_Port GPIOA //GPIOB
#define A111_SPI_MISO_Pin GPIO_PIN_6 //GPIO_PIN_11
@ -209,6 +208,8 @@ void Error_Handler(void);
#define A111_SPI_MOSI_GPIO_Port GPIOA //GPIOA
#define A111_CS_N_Pin GPIO_PIN_4 //GPIO_PIN_15
#define A111_CS_N_GPIO_Port GPIOA //GPIOA
#ifdef STM32WL55
#define A111_SENSOR_INTERRUPT_Pin GPIO_PIN_8
#define A111_SENSOR_INTERRUPT_GPIO_Port GPIOA
@ -238,7 +239,7 @@ void Error_Handler(void);
#ifndef A111_USE_SPI_DMA
#define A111_USE_SPI_DMA
#endif
//#endif
/* USER CODE END Private defines */

21
Core/Src/gpio.c
View File

@ -53,8 +53,9 @@ void MX_GPIO_Init(void)
//HAL_GPIO_WritePin(GPIOB, LED1_Pin|LED2_Pin|PROB2_Pin|PROB1_Pin|LED3_Pin, GPIO_PIN_RESET);
HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_RESET);
#ifdef USE_ACCONEER_A111
HAL_GPIO_WritePin(A111_CS_N_GPIO_Port, A111_CS_N_Pin, GPIO_PIN_RESET);
#endif
/*Configure GPIO pins : PBPin PBPin PBPin */
GPIO_InitStruct.Pin = LED1_Pin; //|LED2_Pin|LED3_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@ -68,6 +69,7 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(MEMS_POWER_GPIO_Port, &GPIO_InitStruct);
#ifdef USE_ACCONEER_A111
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = A111_ENABLE_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@ -87,6 +89,23 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(A111_SENSOR_INTERRUPT_GPIO_Port, &GPIO_InitStruct);
#endif
// CONFLIC SETTING FOR A111 and VL53LX
#ifdef STS_P2
//VL53L1X GPIO1 INTR PIN
GPIO_InitStruct.Pin = TOF_C_INT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(TOF_C_INT_GPIO_Port, &GPIO_InitStruct);
//VL53L1X XSHUT PIN
GPIO_InitStruct.Pin = TOF_C_XSHUT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(TOF_C_XSHUT_GPIO_Port, &GPIO_InitStruct);
#endif
#if defined(STS_O7)||defined(STS_O6)||defined(STS_O2)
GPIO_InitStruct.Pin = HALL1_Pin|HALL2_Pin|HALL3_Pin|HALL4_Pin;

1
Core/Src/main.c
View File

@ -31,6 +31,7 @@
#include "tim.h"
#include "sys_app.h"
/* USER CODE END Includes */
#include "i2c.h"
#include "app_tof_peoplecount.h"
/* Private typedef -----------------------------------------------------------*/
/* USER CODE BEGIN PTD */

5
Core/Src/stm32wlxx_it.c
View File

@ -276,7 +276,7 @@ void EXTI3_IRQHandler(void)
/* USER CODE BEGIN EXTI3_IRQn 0 */
/* USER CODE END EXTI3_IRQn 0 */
#ifdef RM2_1
#if defined(RM2_1) && defined(USE_ACCONEER_A111)
//HAL_GPIO_EXTI_IRQHandler(A111_SENSOR_INTERRUPT_Pin);
#endif
#ifdef STS_P2
@ -307,7 +307,7 @@ void DMA1_Channel1_IRQHandler(void)
/* USER CODE END DMA1_Channel1_IRQn 1 */
}
#ifdef USE_ACCONEER_A111
/**
* @brief This function handles DMA1 Channel 2 Interrupt.
*/
@ -335,6 +335,7 @@ void DMA1_Channel3_IRQHandler(void)
/* USER CODE END DMA1_Channel3_IRQn 1 */
}
#endif
/**
* @brief This function handles DMA1 Channel 4 Interrupt.

BIN
STM32CubeIDE/Release/STS_O7.bin
View File

Binary file not shown.

3
TOF/App/app_tof_peoplecount.c
View File

@ -345,9 +345,10 @@ int sts_tof_vl53lx_peoplecount_init(void)
status = XNUCLEO53L1A1_ResetId(XNUCLEO53L1A1_DEV_CENTER, 0); // Reset ToF sensor
APP_LOG(TS_OFF, VLEVEL_L,"XNUCLEO53L1A1_ResetId Status : %X\n", status);
HAL_Delay(2);
status = XNUCLEO53L1A1_ResetId(XNUCLEO53L1A1_DEV_CENTER, 1); // Reset ToF sensor
APP_LOG(TS_OFF, VLEVEL_L,"XNUCLEO53L1A1_ResetId Status : %X\n", status);
// Those basic I2C read functions can be used to check your own I2C functions */
status = VL53L1_RdByte(dev, 0x010F, &byteData);