diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 4fd245d..5ff51c2 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -706,7 +706,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) sts_hall1_read = HALL1_STATE; HAL_Delay(30); //de-bouncing - if (sts_hall1_read == HALL1_STATE) + if ((sts_hall1_read == HALL1_STATE)) // && (sts_hall1_read == STS_Status_Door_Close)) 2024-07-22 only process door close event { //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) @@ -721,8 +721,10 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) // if (EventType == TX_ON_EVENT) { //sensor_data_ready =1; - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); + //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); + STS_YunhornSTSEventP1_Process(); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); + //SendTxData(); } last_sts_hall1_read = sts_hall1_read; @@ -747,7 +749,8 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) APP_LOG(TS_OFF, VLEVEL_L, "\n\n SOS Button Read = %02x --%s\r\n", sts_hall2_read, sts_sos_status_code[sts_hall2_read]); OnSensor2StateChanged(); //sensor_data_ready =1; - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); + //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); + STS_YunhornSTSEventP1_Process(); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); }