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

sensor data ready =0, heart-beat-timer =0, after each send tx

This commit is contained in:
Yunhorn 2024-05-12 11:35:35 +08:00
parent 0d537d423f
commit 80dbb967e1
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Src/yunhorn_sts_process.c
View File

@ -730,10 +730,10 @@ void STS_PRESENCE_SENSOR_Prepare_Send_Data(void)
STS_Lamp_Bar_Refresh(); STS_Lamp_Bar_Refresh();
} }
} else }// else
{ //{
sts_occupancy_overtime_state = 0U; // sts_occupancy_overtime_state = 0U;
} // }
} }
#if 0 #if 0

10
LoRaWAN/App/lora_app.c
View File

@ -905,8 +905,8 @@ static void SendTxData(void)
UTIL_TIMER_Time_t nextTxIn = 0; UTIL_TIMER_Time_t nextTxIn = 0;
uint8_t i = 0; uint8_t i = 0;
APP_LOG(TS_OFF, VLEVEL_L, "\r\n\n\n**** heart_beat timer =%2u \r\n**** upload message_timer=%2u\r\n**** sensor_data_ready=%2u\r\n", APP_LOG(TS_OFF, VLEVEL_L, "\r\n\n\n**** heart_beat timer =%2u \r\n**** sensor_data_ready=%2u\r\n",
heart_beat_timer, upload_message_timer, sensor_data_ready); heart_beat_timer, sensor_data_ready);
if (LmHandlerIsBusy() == false) if (LmHandlerIsBusy() == false)
{ {
@ -924,6 +924,7 @@ static void SendTxData(void)
{ {
sensor_data_ready =0; sensor_data_ready =0;
upload_message_timer =0; upload_message_timer =0;
//AppData.Buffer[i++] = AppLedStateOn; //AppData.Buffer[i++] = AppLedStateOn;
//i = PrepareSendTxData(); //i = PrepareSendTxData();
STS_PRESENCE_SENSOR_Prepare_Send_Data(); STS_PRESENCE_SENSOR_Prepare_Send_Data();
@ -974,6 +975,11 @@ static void SendTxData(void)
sts_o7_sensorData.unconcious_state, sts_o7_sensorData.unconcious_duration, sts_o7_sensorData.fall_state ); sts_o7_sensorData.unconcious_state, sts_o7_sensorData.unconcious_duration, sts_o7_sensorData.fall_state );
#endif #endif
} }
heart_beat_timer=0;
sensor_data_ready =0;
upload_message_timer =0;
AppData.BufferSize = (sts_service_mask > STS_SERVICE_MASK_L1? 0:i); AppData.BufferSize = (sts_service_mask > STS_SERVICE_MASK_L1? 0:i);
APP_LOG(TS_OFF, VLEVEL_L, "\r\n\n\n** ** AppData.PORT =%3d ** ** AppData.BufferSize=%3d ** Count Size=%3d\r\n", AppData.Port, AppData.BufferSize, i); APP_LOG(TS_OFF, VLEVEL_L, "\r\n\n\n** ** AppData.PORT =%3d ** ** AppData.BufferSize=%3d ** Count Size=%3d\r\n", AppData.Port, AppData.BufferSize, i);

BIN
STM32CubeIDE/Release/STS_O7.bin
View File

Binary file not shown.