--- minor revise

This commit is contained in:
Yunhorn 2024-08-27 18:28:36 +08:00
parent 4ccd68e784
commit c556343fca
11 changed files with 1744 additions and 1695 deletions

View File

@ -568,6 +568,7 @@ static void SendTxData(void)
sensor_t sensor_data;
UTIL_TIMER_Time_t nextTxIn = 0;
sts_people_count_sensor_data_t sts_p2_sensor_data;
if (LmHandlerIsBusy() == false)
{
#ifdef CAYENNE_LPP

View File

@ -1,25 +1,25 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:848:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:896:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:907:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:855:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:862:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:874:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:782:13:OnJoinRequest 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:969:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:741:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:736:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1040:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:932:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:849:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:897:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:908:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:856:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:863:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:875:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:783:13:OnJoinRequest 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:970:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:742:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:737:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1041:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:933:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:563:13:SendTxData 9
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:746:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:813:13:OnBeaconStatusChange 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1007:13:OnNvmDataChange 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:699:13:OnTxTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:918:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:753:13:OnTxData 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:747:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:814:13:OnBeaconStatusChange 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1008:13:OnNvmDataChange 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:700:13:OnTxTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:919:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:754:13:OnTxData 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:483:13:OnRxData 14
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1025:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:985:13:StoreContext 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1026:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:986:13:StoreContext 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:351:6:LoRaWAN_Init 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:448:6:HAL_GPIO_EXTI_Callback 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:725:6:STS_SendTxData 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:726:6:STS_SendTxData 1

View File

@ -1,25 +1,25 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:848:13:OnSysTimeUpdate 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:896:13:OnTxFrameCtrlChanged 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:907:13:OnPingSlotPeriodicityChanged 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:855:13:OnClassChange 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:862:13:OnMacProcessNotify 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:874:13:OnTxPeriodicityChanged 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:782:13:OnJoinRequest 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:969:13:OnStopJoinTimerEvent 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:741:13:OnRxTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:736:13:OnTxTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1040:13:OnRestoreContextRequest 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:932:13:StopJoin 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:849:13:OnSysTimeUpdate 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:897:13:OnTxFrameCtrlChanged 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:908:13:OnPingSlotPeriodicityChanged 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:856:13:OnClassChange 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:863:13:OnMacProcessNotify 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:875:13:OnTxPeriodicityChanged 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:783:13:OnJoinRequest 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:970:13:OnStopJoinTimerEvent 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:742:13:OnRxTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:737:13:OnTxTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1041:13:OnRestoreContextRequest 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:933:13:StopJoin 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:563:13:SendTxData 112 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:746:13:OnJoinTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:813:13:OnBeaconStatusChange 56 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1007:13:OnNvmDataChange 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:699:13:OnTxTimerEvent 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:918:13:OnSystemReset 8 static,ignoring_inline_asm
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:753:13:OnTxData 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:747:13:OnJoinTimerLedEvent 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:814:13:OnBeaconStatusChange 56 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1008:13:OnNvmDataChange 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:700:13:OnTxTimerEvent 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:919:13:OnSystemReset 8 static,ignoring_inline_asm
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:754:13:OnTxData 24 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:483:13:OnRxData 48 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1025:13:OnStoreContextRequest 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:985:13:StoreContext 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1026:13:OnStoreContextRequest 16 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:986:13:StoreContext 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:351:6:LoRaWAN_Init 48 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:448:6:HAL_GPIO_EXTI_Callback 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:725:6:STS_SendTxData 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:726:6:STS_SendTxData 8 static

View File

@ -1,6 +1,6 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:55:5:ProcessPeopleCountingData 23
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:213:6:STS_people_count_sensor_Read 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:313:5:sts_tof_vl53lx_peoplecount 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:295:6:STS_TOF_VL53LX_PeopleCounting_Process_Init 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:372:5:sts_tof_vl53lx_peoplecount_subprocess 7
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:302:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:67:5:ProcessPeopleCountingData 24
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:225:6:STS_people_count_sensor_Read 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:325:5:sts_tof_vl53lx_peoplecount_init 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:307:6:STS_TOF_VL53LX_PeopleCounting_Process_Init 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:386:5:sts_tof_vl53lx_peoplecount_start 7
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:314:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 1

View File

@ -1,6 +1,6 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:55:5:ProcessPeopleCountingData 32 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:213:6:STS_people_count_sensor_Read 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:313:5:sts_tof_vl53lx_peoplecount 32 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:295:6:STS_TOF_VL53LX_PeopleCounting_Process_Init 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:372:5:sts_tof_vl53lx_peoplecount_subprocess 32 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:302:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:67:5:ProcessPeopleCountingData 32 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:225:6:STS_people_count_sensor_Read 0 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:325:5:sts_tof_vl53lx_peoplecount_init 40 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:307:6:STS_TOF_VL53LX_PeopleCounting_Process_Init 8 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:386:5:sts_tof_vl53lx_peoplecount_start 32 static
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:314:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 8 static

File diff suppressed because it is too large Load Diff

View File

@ -14,6 +14,18 @@
/* Private variables ---------------------------------------------------------*/
extern I2C_HandleTypeDef hi2c2;
volatile sts_people_count_sensor_data_t sts_people_count_sensor_data={0,0,0,2,'M',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
volatile sts_ppc_cfg_type_t ppc_cfg[3] = {
{DOOR_JAM_2000, 8, 2000,0,1600,8,33,DISTANCE_MODE_SHORT,175,247},
{DOOR_JAM_2000, 8, 2000,0,1600,8,33,DISTANCE_MODE_SHORT,175,247},
{DOOR_JAM_2400, 10, 2400,0,1600,8,33,DISTANCE_MODE_LONG,175,231},
};
volatile sts_zone_center_by_rows_of_spads_t zone_center[3]={
{4, 151, 247},
{6, 159, 239},
{8, 175, 231},
};
volatile uint8_t sts_distance_mode = DISTANCE_MODE_LONG;
volatile uint8_t sts_people_count_number_changed = 0;
uint16_t dev=0x52;
int status = 0;
@ -21,7 +33,7 @@ volatile int IntCount;
#define isInterrupt 1 /* If isInterrupt = 1 then device working in interrupt mode, else device working in polling mode */
/* USER CODE END PV */
static int PplCounter;
static int center[2] = {FRONT_ZONE_CENTER, BACK_ZONE_CENTER}; /* these are the spad center of the 2 4*16 zones */
static int center[2] = {FRONT_ZONE_CENTER,BACK_ZONE_CENTER}; //{ppc_cfg[sts_distance_mode].front_zone_center, ppc_cfg[sts_distance_mode].back_zone_center}; /* these are the spad center of the 2 4*16 zones */
static int Zone = 0;
static int PathTrack[] = {0,0,0,0};
static int PathTrackFillingSize = 1; // init this to 1 as we start from state where nobody is any of the zones
@ -67,14 +79,14 @@ int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatu
int AnEventHasOccured = 0;
// Add just picked distance to the table of the corresponding zone
if (DistancesTableSize[zone] < DISTANCES_ARRAY_SIZE) {
if (DistancesTableSize[zone] < ppc_cfg[sts_distance_mode].distance_array_size) {
Distances[zone][DistancesTableSize[zone]] = Distance;
DistancesTableSize[zone] ++;
}
else {
for (i=1; i<DISTANCES_ARRAY_SIZE; i++)
for (i=1; i<ppc_cfg[sts_distance_mode].distance_array_size; i++)
Distances[zone][i-1] = Distances[zone][i];
Distances[zone][DISTANCES_ARRAY_SIZE-1] = Distance;
Distances[zone][ppc_cfg[sts_distance_mode].distance_array_size-1] = Distance;
}
// pick up the min distance
@ -86,7 +98,7 @@ int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatu
}
}
if (MinDistance < DIST_THRESHOLD) {
if (MinDistance < ppc_cfg[sts_distance_mode].dist_threshold) {
// Someone is in !
CurrentZoneStatus = SOMEONE;
}
@ -295,7 +307,7 @@ void STS_people_count_sensor_Read(sts_people_count_sensor_data_t *sts_p2_sensor_
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void)
{
APP_LOG(TS_OFF, VLEVEL_M,"############### TOF VL53LX_ PEOPLE COUNTING PROCESS INITIALIZATION\r\n");
sts_tof_vl53lx_peoplecount();
sts_tof_vl53lx_peoplecount_init();
}
@ -304,13 +316,13 @@ void STS_TOF_VL53LX_PeopleCounting_Process_Start(void* context)
//APP_LOG(TS_OFF, VLEVEL_M,"############### TOF VL53LX_ PEOPLE COUNTING SUB-PROCESS \r\n");
{
status = sts_tof_vl53lx_peoplecount_subprocess();
status = sts_tof_vl53lx_peoplecount_start();
//APP_LOG(TS_OFF, VLEVEL_M,"############### SUB-PROCESS running .... \r\n");
}
}
int sts_tof_vl53lx_peoplecount(void)
int sts_tof_vl53lx_peoplecount_init(void)
{
//int8_t error;
uint8_t byteData, sensorState=0;
@ -352,10 +364,12 @@ int sts_tof_vl53lx_peoplecount(void)
/* Initialize and configure the device according to people counting need */
status = VL53L1X_SensorInit(dev);
status += VL53L1X_SetDistanceMode(dev, DISTANCE_MODE); /* 1=short, 2=long */
status += VL53L1X_SetTimingBudgetInMs(dev, TIMING_BUDGET); /* in ms possible values [15, 20, 50, 100, 200, 500] */
status += VL53L1X_SetInterMeasurementInMs(dev, TIMING_BUDGET);
status += VL53L1X_SetROI(dev, ROWS_OF_SPADS, 16); /* minimum ROI 4,4 */
status += VL53L1X_SetDistanceMode(dev, ppc_cfg[sts_distance_mode].distance_mode); /* 1=short, 2=long, DISTANCE_MODE */
status += VL53L1X_SetTimingBudgetInMs(dev, ppc_cfg[sts_distance_mode].timing_budget); /* TIMING_BUDGET, in ms possible values [15, 20, 50, 100, 200, 500] */
status += VL53L1X_SetInterMeasurementInMs(dev, ppc_cfg[sts_distance_mode].timing_budget);
status += VL53L1X_SetROI(dev, ppc_cfg[sts_distance_mode].rows_of_SPADS, 16); /* minimum ROI 4,4 */
center[0]=ppc_cfg[sts_distance_mode].front_zone_center;
center[1]=ppc_cfg[sts_distance_mode].back_zone_center;
if (status != 0) {
APP_LOG(TS_OFF, VLEVEL_L,"Initialization or configuration of the device\n");
return (-1);
@ -369,7 +383,7 @@ int sts_tof_vl53lx_peoplecount(void)
}
return 0;
}
int sts_tof_vl53lx_peoplecount_subprocess(void)
int sts_tof_vl53lx_peoplecount_start(void)
{
//uint8_t byteData, sensorState=0;
//uint16_t wordData;
@ -410,11 +424,11 @@ int sts_tof_vl53lx_peoplecount_subprocess(void)
// 8 VL53L1_RANGESTATUS_PROCESSING_ FAIL Internal algorithm underflow or overflow
// 14 VL53L1_RANGESTATUS_RANGE_INVALID The reported range is invalid
if ((RangeStatus == 0) || (RangeStatus == 4) || (RangeStatus == 7)) {
if (Distance <= MIN_DISTANCE) // wraparound case see the explanation at the constants definition place
Distance = MAX_DISTANCE + MIN_DISTANCE;
if (Distance <= ppc_cfg[sts_distance_mode].min_distance) //MIN_DISTANCE) // wraparound case see the explanation at the constants definition place
Distance = ppc_cfg[sts_distance_mode].max_distance + ppc_cfg[sts_distance_mode].min_distance; //MAX_DISTANCE + MIN_DISTANCE;
}
else // severe error cases
Distance = MAX_DISTANCE;
Distance = ppc_cfg[sts_distance_mode].max_distance; //MAX_DISTANCE;
// inject the new ranged distance in the people counting algorithm
PplCounter = ProcessPeopleCountingData(Distance, Zone, RangeStatus);
//printf("\PplCounter =%d \n\r", PplCounter);

View File

@ -37,18 +37,26 @@
#define LEFT 0
#define RIGHT 1
#define DOOR_JAM_2000 0
#define DOOR_JAM_2400 1
#define DOOR_JAM_2000 2
#define DOOR_JAM_3000 2
#define ON_SIDE 3
#define DISTANCE_MODE_LONG 2
// define here the profile for your case.
#define PPC_PROFILE DOOR_JAM_2400
#define PPC_PROFILE DOOR_JAM_2400
#define TRACE_PPC 1
// time budget in ms 20,33,50,100,200,500
#define tbms_20 20
#define tbms_33 33
#define tbms_50 50
#define tbms_100 100
#define tbms_200 200
#define tbms_500 500
//PPC_PROFILE DOOR_JAM_2400
#if PPC_PROFILE == DOOR_JAM_2400
#define PROFILE_STRING "DOOR_JAM_2400"
@ -57,7 +65,7 @@
#define MIN_DISTANCE 0 // mm
#define DIST_THRESHOLD 1600 // mm
#define ROWS_OF_SPADS 8 // 8x16 SPADs ROI
#define TIMING_BUDGET 20 //33 // was 20 ms, I found 33 ms has better succes rate with lower reflectance target
#define TIMING_BUDGET 33 //33 // was 20 ms, I found 33 ms has better succes rate with lower reflectance target
#define DISTANCE_MODE DISTANCE_MODE_LONG
#endif
@ -73,6 +81,31 @@
#endif
/* Exported functions --------------------------------------------------------*/
enum distance_mode {
DISTANCE_MODE_SIDE=0,
DISTANCE_MODE_SHORT,
DISTANCE_MODE_LONG,
};
typedef struct STS_ZONE_CENTRE_BY_ROWS_OF_SPADS
{
uint8_t rows_of_spads;
uint8_t front_zone_center;
uint8_t back_zone_center;
} sts_zone_center_by_rows_of_spads_t;
typedef struct STS_PPC_CFG_Type {
uint8_t profile_name;
uint8_t distance_array_size;
uint16_t max_distance;
uint16_t min_distance;
uint16_t dist_threshold;
uint8_t rows_of_SPADS; /* minimum ROI 4,4 */
uint16_t timing_budget; /* TIMING_BUDGET, in ms possible values [15, 20, 33, 50, 100, 200, 500] */
uint8_t distance_mode; /* 1=short, 2=long, DISTANCE_MODE */
uint8_t front_zone_center;
uint8_t back_zone_center;
} sts_ppc_cfg_type_t;
typedef struct STS_People_Count_Sensor_Data_Type {
uint16_t Walk_In_People_Count;
uint16_t Walk_Out_People_Count;
@ -104,8 +137,8 @@
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void);
void STS_TOF_VL53LX_PeopleCounting_Process_Start(void*);
int sts_tof_vl53lx_peoplecount(void);
int sts_tof_vl53lx_peoplecount_subprocess(void);
int sts_tof_vl53lx_peoplecount_init(void);
int sts_tof_vl53lx_peoplecount_start(void);
//int sts_tof_vl53lx_peoplecount(void);
int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatus);
void STS_people_count_sensor_Read(sts_people_count_sensor_data_t *sts_p2_sensor_data);