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

minor change logic

This commit is contained in:
Yunhorn 2024-03-27 13:50:40 +08:00
parent 7f3e94cfaf
commit 68684a6e1c
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
LoRaWAN/App/lora_app.c
View File

@ -449,7 +449,8 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
case BUT1_Pin: case BUT1_Pin:
/* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */ /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
door_changed_flag = 1; door_changed_flag = 1;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSP1CheckingEvent), CFG_SEQ_Prio_0); //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
//UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSP1CheckingEvent), CFG_SEQ_Prio_0);
if (EventType == TX_ON_EVENT) if (EventType == TX_ON_EVENT)
{ {
@ -474,14 +475,17 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
static void OnYunhornSTSP1CheckingEvent(void) static void OnYunhornSTSP1CheckingEvent(void)
{ {
if (door_changed_flag==1)
door_status = HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0);
if (door_status != door_previous_status)
{ {
door_previous_status = door_status; door_status = HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0);
door_changed_flag = 1;
APP_LOG(TS_OFF,VLEVEL_M,"\r\n----- Door Status Changed-------------\r\n"); if (door_status != door_previous_status)
{
door_previous_status = door_status;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
}
door_changed_flag = 0;
} }
//UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
@ -685,13 +689,19 @@ static void SendTxData(void)
static void OnTxTimerEvent(void *context) static void OnTxTimerEvent(void *context)
{ {
/* USER CODE BEGIN OnTxTimerEvent_1 */ /* USER CODE BEGIN OnTxTimerEvent_1 */
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSP1CheckingEvent), CFG_SEQ_Prio_0); //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSP1CheckingEvent), CFG_SEQ_Prio_0);
if (door_changed_flag ==1)
{
door_changed_flag =0; //door_changed_flag =0;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); door_status = HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0);
if (door_previous_status != door_status)
{
door_previous_status = door_status;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
}
//UTIL_TIMER_Start(&TxTimer); //UTIL_TIMER_Start(&TxTimer);
}
/* USER CODE BEGIN OnTxTimerEvent_2 */ /* USER CODE BEGIN OnTxTimerEvent_2 */
/* USER CODE END OnTxTimerEvent_2 */ /* USER CODE END OnTxTimerEvent_2 */