RM2_1 #2

Merged
sundp merged 208 commits from RM2_1 into master 2024-09-13 09:16:14 +08:00
1 changed files with 31 additions and 25 deletions
Showing only changes of commit 7463d52e48 - Show all commits

View File

@ -690,8 +690,10 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
case HALL1_Pin:
if (sts_reed_hall_1_changed)
{
HAL_Delay(50); //de-bouncing
HAL_Delay(30); //de-bouncing
sts_hall1_read = HALL1_STATE;
if (sts_hall1_read == HALL1_STATE)
{
SysTime_t current_event_time = SysTimeGetMcuTime();
if ((last_sts_hall1_read !=sts_hall1_read) && ((current_event_time.Seconds - sts_o7_sensorData.event_sensor1_start_time)>5)&&((current_event_time.Seconds - sts_o7_sensorData.event_sensor1_stop_time)>5))
{
@ -712,13 +714,16 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
}
}
}
}
break;
case HALL2_Pin:
if (sts_reed_hall_2_changed)
{
HAL_Delay(50); //de-bouncing
sts_hall2_read = HALL2_STATE;
HAL_Delay(30); //de-bouncing
if (sts_hall2_read == HALL2_STATE)
{
SysTime_t current_event_time = SysTimeGetMcuTime();
if (last_sts_hall2_read != sts_hall2_read)
{
@ -734,6 +739,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
last_sts_hall2_read = sts_hall2_read;
}
}
}
break;
#else