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

another try

This commit is contained in:
Yunhorn 2024-04-17 13:15:03 +08:00
parent dda621e72a
commit da468433a7
7 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/Src/gpio.c
View File

@ -66,9 +66,16 @@ void MX_GPIO_Init(void)
|LED3_Pin, GPIO_PIN_RESET);
#endif
/*Configure GPIO pin Output Level */
#if defined(TOF_2)
HAL_GPIO_WritePin(TOF_L_XSHUT_GPIO_Port, TOF_L_XSHUT_Pin, GPIO_PIN_SET);
#if defined(TOF_1)
HAL_GPIO_WritePin(TOF_C_XSHUT_GPIO_Port, TOF_C_XSHUT_Pin, GPIO_PIN_RESET);
#endif
#if defined(TOF_2)
HAL_GPIO_WritePin(TOF_L_XSHUT_GPIO_Port, TOF_L_XSHUT_Pin, GPIO_PIN_RESET);
#endif
#if defined(TOF_3)
HAL_GPIO_WritePin(TOF_R_XSHUT_GPIO_Port, TOF_R_XSHUT_Pin, GPIO_PIN_RESET);
#endif
#if defined(STM32WL55xx)
/*Configure GPIO pins : PBPin PBPin PBPin */
GPIO_InitStruct.Pin = LED1_Pin|LED2_Pin|LED3_Pin;
@ -131,7 +138,7 @@ void MX_GPIO_Init(void)
#if defined(TOF_1)
GPIO_InitStruct.Pin = TOF_C_XSHUT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(TOF_C_XSHUT_GPIO_Port, &GPIO_InitStruct);
#endif
@ -139,7 +146,7 @@ void MX_GPIO_Init(void)
#if defined(TOF_2)
GPIO_InitStruct.Pin = TOF_L_XSHUT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(TOF_L_XSHUT_GPIO_Port, &GPIO_InitStruct);
#endif
@ -147,7 +154,7 @@ void MX_GPIO_Init(void)
#if defined(TOF_3)
GPIO_InitStruct.Pin = TOF_R_XSHUT_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(TOF_R_XSHUT_GPIO_Port, &GPIO_InitStruct);
#endif

3
Core/Src/stm32_lpm_if.c
View File

@ -97,11 +97,12 @@ void PWR_EnterStopMode(void)
/* USER CODE BEGIN EnterStopMode_1 */
/* USER CODE END EnterStopMode_1 */
#if 0
HAL_UART_DeInit(&huart2);
vcom_DeInit();
HAL_GPIO_WritePin(GPIOA,GPIO_PIN_All, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB,GPIO_PIN_All, GPIO_PIN_RESET);
#endif
HAL_SuspendTick();
/* Clear Status Flag before entering STOP/STANDBY Mode */
LL_PWR_ClearFlag_C1STOP_C1STB();

2
Core/Src/stm32wlxx_it.c
View File

@ -359,7 +359,7 @@ void EXTI3_IRQHandler(void)
//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);
// HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN);
#endif
/* USER CODE BEGIN EXTI3_IRQn 1 */

36
Core/Src/yunhorn_sts_process.c
View File

@ -301,12 +301,6 @@ void STS_YunhornSTSEventP3_Process(void)
*/
void STS_YunhornSTSEventP4_Process(void)
{
STS_SENSOR_Power_ON(0);
#ifdef LED_ONBOARD
LED_ON;
HAL_Delay(10);
LED_OFF;
#endif
#if defined(TOF_1)||defined(TOF_2)
APP_LOG(TS_OFF, VLEVEL_H, "\r\n TOF_1, TOF_2 RANGING Process\r\n");
STS_TOF_VL53L0X_Range_Process();
@ -317,7 +311,7 @@ void STS_YunhornSTSEventP4_Process(void)
STS_TOF250_Range_Process();
#endif
STS_SENSOR_Power_OFF(0);
PME_OFF;
}
@ -515,35 +509,11 @@ void STS_Combined_Status_Processing(void)
void STS_SENSOR_Power_ON(uint8_t cnt)
{
switch (cnt) {
case 0:
case 1:
case 2:
//#if (defined(YUNHORN_STS_M7_ENABLED) || defined(YUNHORN_STS_R0_ENABLED))
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET);
//#endif
break;
default:
break;
}
PME_ON;
}
void STS_SENSOR_Power_OFF(uint8_t cnt)
{
switch (cnt) {
case 0:
case 1:
case 2:
//#if (defined(YUNHORN_STS_M7_ENABLED) || defined(YUNHORN_STS_R0_ENABLED))
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
//#endif
break;
default:
break;
}
PME_OFF;
}
void STS_SENSOR_MEMS_Reset(uint8_t cnt)

2
LoRaWAN/App/lora_app.c
View File

@ -668,7 +668,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStoreContextEvent), CFG_SEQ_Prio_0);
#endif
break;
#if (defined(STS_USE_TOF_VL53L1X) ||defined(STS_USE_TOF_VL53L0X))
#if (defined(STS_USE_TOF_VL53L1X))
case TOF_INT_EXTI_PIN:
ToF_EventDetected = 1;
// APP_LOG(TS_OFF,VLEVEL_L, "##################################### TOF_EVENT DETECTED \r\n");

8
TOF/App/X-WL55_WLE5_53L0X.c
View File

@ -94,10 +94,10 @@ static void _I2cFailRecover(){
HAL_GPIO_WritePin(I2C2_SCL_PORT, I2C2_SCL_PIN, GPIO_PIN_SET);
HAL_Delay(1);
}
// if( HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_9) == 0 ){
// static int RetryRecover;
// RetryRecover++;
// }
if( HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_9) == 0 ){
static int RetryRecover;
RetryRecover++;
}
}while(HAL_GPIO_ReadPin(I2C2_SDA_PORT, I2C2_SDA_PIN) == 0 && nRetry++<7);
if( HAL_GPIO_ReadPin(I2C2_SDA_PORT, I2C2_SDA_PIN) == 0 ){

2
TOF/App/app_tof_vl53l0x_range.c
View File

@ -135,7 +135,7 @@ int sts_tof_vl53l0x_DetectSensors(void)
for (i=0; i < MAX_TOF_COUNT; i++) {
XWL55_WLE5_53L0X_ResetId(i,0);
//XWL55_WLE5_53L0X_SetIntrStateId(0,i);
XWL55_WLE5_53L0X_SetIntrStateId(0,i);
}
/* detect all sensors (even on-board)*/