diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index 6c19f04..23858b4 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -529,10 +529,15 @@ void STS_Combined_Status_Processing(void) } } - if ((sts_rss_result_changed_flag + sts_reed_hall_changed_flag + sts_tof_result_changed_flag +sts_water_leakage_changed_flag) != 0 ) + if ((sts_rss_result_changed_flag)|| (sts_reed_hall_changed_flag) || (sts_tof_result_changed_flag) || (sts_water_leakage_changed_flag)) + { sensor_data_ready = 1; - STS_PRESENCE_SENSOR_Prepare_Send_Data(); - + STS_PRESENCE_SENSOR_Prepare_Send_Data(); + sts_rss_result_changed_flag =0; + sts_reed_hall_changed_flag =0; + sts_tof_result_changed_flag =0; + sts_water_leakage_changed_flag=0; + } } void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 4dd335e..480f8fd 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -2044,7 +2044,7 @@ void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char AppData.Port = appDataPort; AppData.BufferSize = (sts_service_mask >1 ?0:appBufferSize); - APP_LOG(TS_OFF, VLEVEL_L, "###########Service Mask = %d Buffer Size =%d \r\n", sts_service_mask, AppData.BufferSize); + //APP_LOG(TS_OFF, VLEVEL_L, "###########Service Mask = %d Buffer Size =%d \r\n", sts_service_mask, AppData.BufferSize); if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET)) {