--- add sum count of day/week/month/year/lifecycle
This commit is contained in:
parent
88776ff525
commit
5e8049f946
|
@ -28,7 +28,7 @@
|
||||||
#include "app_tof_peoplecount.h"
|
#include "app_tof_peoplecount.h"
|
||||||
/* Private includes ----------------------------------------------------------*/
|
/* Private includes ----------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN Includes */
|
/* USER CODE BEGIN Includes */
|
||||||
volatile uint8_t sts_lorawan_joined=0;
|
volatile uint8_t sts_lorawan_joined=0, sts_tx_timer=0;
|
||||||
extern volatile _Bool sts_people_count_number_changed;
|
extern volatile _Bool sts_people_count_number_changed;
|
||||||
/* USER CODE END Includes */
|
/* USER CODE END Includes */
|
||||||
|
|
||||||
|
@ -126,15 +126,6 @@ int main(void)
|
||||||
/* USER CODE END WHILE */
|
/* USER CODE END WHILE */
|
||||||
|
|
||||||
MX_LoRaWAN_Process();
|
MX_LoRaWAN_Process();
|
||||||
if (sts_lorawan_joined !=0)
|
|
||||||
{
|
|
||||||
//APP_LOG(TS_OFF, VLEVEL_M,"############### SUB-PROCESS running .... \r\n");
|
|
||||||
do
|
|
||||||
{
|
|
||||||
STS_TOF_VL53LX_PeopleCounting_Process_Start();
|
|
||||||
|
|
||||||
} while(sts_people_count_number_changed==0);
|
|
||||||
}
|
|
||||||
//STS_TOF_VL53LX_PeopleCounting_Process();
|
//STS_TOF_VL53LX_PeopleCounting_Process();
|
||||||
|
|
||||||
/* USER CODE BEGIN 3 */
|
/* USER CODE BEGIN 3 */
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
/* USER CODE BEGIN Includes */
|
/* USER CODE BEGIN Includes */
|
||||||
#include "app_tof_pin_conf.h"
|
#include "app_tof_pin_conf.h"
|
||||||
#include "app_tof_peoplecount.h"
|
#include "app_tof_peoplecount.h"
|
||||||
extern volatile bool sts_people_count_number_changed;
|
extern volatile uint8_t sts_people_count_number_changed, sts_tx_timer;
|
||||||
extern volatile uint8_t sts_lorawan_joined;
|
extern volatile uint8_t sts_lorawan_joined;
|
||||||
/* USER CODE END Includes */
|
/* USER CODE END Includes */
|
||||||
|
|
||||||
|
@ -299,7 +299,7 @@ static TxEventType_t EventType = TX_ON_TIMER;
|
||||||
* @brief Timer to handle the application Tx
|
* @brief Timer to handle the application Tx
|
||||||
*/
|
*/
|
||||||
static UTIL_TIMER_Object_t TxTimer;
|
static UTIL_TIMER_Object_t TxTimer;
|
||||||
|
static UTIL_TIMER_Object_t WakeUpScanTimer;
|
||||||
/**
|
/**
|
||||||
* @brief Tx Timer period
|
* @brief Tx Timer period
|
||||||
*/
|
*/
|
||||||
|
@ -426,7 +426,7 @@ void LoRaWAN_Init(void)
|
||||||
if (EventType == TX_ON_TIMER)
|
if (EventType == TX_ON_TIMER)
|
||||||
{
|
{
|
||||||
/* send every time timer elapses */
|
/* send every time timer elapses */
|
||||||
UTIL_TIMER_Create(&TxTimer, TxPeriodicity, UTIL_TIMER_ONESHOT, OnTxTimerEvent, NULL);
|
UTIL_TIMER_Create(&TxTimer, TxPeriodicity, UTIL_TIMER_PERIODIC, OnTxTimerEvent, NULL);
|
||||||
UTIL_TIMER_Start(&TxTimer);
|
UTIL_TIMER_Start(&TxTimer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -437,6 +437,8 @@ void LoRaWAN_Init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN LoRaWAN_Init_Last */
|
/* USER CODE BEGIN LoRaWAN_Init_Last */
|
||||||
|
UTIL_TIMER_Create(&WakeUpScanTimer, 50, UTIL_TIMER_PERIODIC, STS_TOF_VL53LX_PeopleCounting_Process_Start, NULL);
|
||||||
|
UTIL_TIMER_Start(&WakeUpScanTimer);
|
||||||
|
|
||||||
/* USER CODE END LoRaWAN_Init_Last */
|
/* USER CODE END LoRaWAN_Init_Last */
|
||||||
}
|
}
|
||||||
|
@ -652,6 +654,20 @@ static void SendTxData(void)
|
||||||
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Count_Period) & 0xFF);
|
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Count_Period) & 0xFF);
|
||||||
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Count_Period_Unit) & 0xFF);
|
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Count_Period_Unit) & 0xFF);
|
||||||
|
|
||||||
|
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Sum_Day_Walk_In_People_Count>>8) & 0xFF);
|
||||||
|
AppData.Buffer[i++] = (uint8_t)(sts_p2_sensor_data.Sum_Day_Walk_In_People_Count & 0xFF);
|
||||||
|
|
||||||
|
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Sum_Day_Walk_Out_People_Count>>8) & 0xFF);
|
||||||
|
AppData.Buffer[i++] = (uint8_t)(sts_p2_sensor_data.Sum_Day_Walk_Out_People_Count & 0xFF);
|
||||||
|
|
||||||
|
AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Sum_Day_Walk_Around_People_Count>>8) & 0xFF);
|
||||||
|
AppData.Buffer[i++] = (uint8_t)(sts_p2_sensor_data.Sum_Day_Walk_Around_People_Count & 0xFF);
|
||||||
|
|
||||||
|
APP_LOG(TS_OFF, VLEVEL_M, "\n******* Sum_day_In=%u, Out=%u, Around=%u\r\n",
|
||||||
|
sts_p2_sensor_data.Sum_Day_Walk_In_People_Count,
|
||||||
|
sts_p2_sensor_data.Sum_Day_Walk_Out_People_Count,
|
||||||
|
sts_p2_sensor_data.Sum_Day_Walk_Around_People_Count);
|
||||||
|
|
||||||
AppData.BufferSize = i;
|
AppData.BufferSize = i;
|
||||||
|
|
||||||
if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET))
|
if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET))
|
||||||
|
@ -690,19 +706,37 @@ static void OnTxTimerEvent(void *context)
|
||||||
/* USER CODE BEGIN OnTxTimerEvent_1 */
|
/* USER CODE BEGIN OnTxTimerEvent_1 */
|
||||||
|
|
||||||
/* USER CODE END OnTxTimerEvent_1 */
|
/* USER CODE END OnTxTimerEvent_1 */
|
||||||
sts_people_count_number_changed == 1;
|
|
||||||
{
|
|
||||||
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
|
|
||||||
|
|
||||||
/*Wait for next tx slot*/
|
sts_tx_timer ++;
|
||||||
UTIL_TIMER_Start(&TxTimer);
|
if (sts_tx_timer == 6)
|
||||||
|
{
|
||||||
|
UTIL_TIMER_Stop(&WakeUpScanTimer);
|
||||||
|
|
||||||
|
|
||||||
|
sts_tx_timer = 0;
|
||||||
|
APP_LOG(TS_OFF, VLEVEL_M, "\r\nTxTimer count =%u", sts_tx_timer);
|
||||||
|
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
|
||||||
|
//UTIL_TIMER_Start(&TxTimer);
|
||||||
sts_people_count_number_changed = 0;
|
sts_people_count_number_changed = 0;
|
||||||
|
|
||||||
|
UTIL_TIMER_Start(&WakeUpScanTimer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN OnTxTimerEvent_2 */
|
/* USER CODE BEGIN OnTxTimerEvent_2 */
|
||||||
|
|
||||||
/* USER CODE END OnTxTimerEvent_2 */
|
/* USER CODE END OnTxTimerEvent_2 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void STS_SendTxData(void)
|
||||||
|
{
|
||||||
|
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
|
||||||
|
|
||||||
|
|
||||||
|
UTIL_TIMER_Start(&TxTimer);
|
||||||
|
sts_people_count_number_changed = 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN PrFD_LedEvents */
|
/* USER CODE BEGIN PrFD_LedEvents */
|
||||||
static void OnTxTimerLedEvent(void *context)
|
static void OnTxTimerLedEvent(void *context)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:63:5:_write 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:63:5:_write 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:149:6:SystemClock_Config 3
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:140:6:SystemClock_Config 3
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:75:5:main 3
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:75:5:main 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:201:6:Error_Handler 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:192:6:Error_Handler 1
|
||||||
|
|
Binary file not shown.
|
@ -1,4 +1,4 @@
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:63:5:_write 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:63:5:_write 8 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:149:6:SystemClock_Config 112 static,ignoring_inline_asm
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:140:6:SystemClock_Config 112 static,ignoring_inline_asm
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:75:5:main 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:75:5:main 8 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:201:6:Error_Handler 0 static,ignoring_inline_asm
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/Core/Src/main.c:192:6:Error_Handler 0 static,ignoring_inline_asm
|
||||||
|
|
|
@ -1,24 +1,25 @@
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:819:13:OnSysTimeUpdate 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:853:13:OnSysTimeUpdate 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:867:13:OnTxFrameCtrlChanged 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:901:13:OnTxFrameCtrlChanged 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:878:13:OnPingSlotPeriodicityChanged 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:912:13:OnPingSlotPeriodicityChanged 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:826:13:OnClassChange 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:860:13:OnClassChange 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:688:13:OnTxTimerEvent 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:867:13:OnMacProcessNotify 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:833:13:OnMacProcessNotify 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:879:13:OnTxPeriodicityChanged 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:845:13:OnTxPeriodicityChanged 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:787:13:OnJoinRequest 4
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:753:13:OnJoinRequest 4
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:974:13:OnStopJoinTimerEvent 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:940:13:OnStopJoinTimerEvent 2
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:746:13:OnRxTimerLedEvent 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:712:13:OnRxTimerLedEvent 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:741:13:OnTxTimerLedEvent 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:707:13:OnTxTimerLedEvent 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1045:13:OnRestoreContextRequest 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1011:13:OnRestoreContextRequest 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:937:13:StopJoin 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:903: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:561:13:SendTxData 9
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:751:13:OnJoinTimerLedEvent 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:717:13:OnJoinTimerLedEvent 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:818:13:OnBeaconStatusChange 4
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:784:13:OnBeaconStatusChange 4
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1012:13:OnNvmDataChange 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:978:13:OnNvmDataChange 2
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:704:13:OnTxTimerEvent 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:889:13:OnSystemReset 3
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:923:13:OnSystemReset 3
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:724:13:OnTxData 4
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:758:13:OnTxData 4
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:481:13:OnRxData 14
|
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:996:13:OnStoreContextRequest 2
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1030:13:OnStoreContextRequest 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:956:13:StoreContext 3
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:990: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:351:6:LoRaWAN_Init 2
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:446:6:HAL_GPIO_EXTI_Callback 4
|
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:730:6:STS_SendTxData 1
|
||||||
|
|
Binary file not shown.
|
@ -1,24 +1,25 @@
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:819:13:OnSysTimeUpdate 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:853:13:OnSysTimeUpdate 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:867:13:OnTxFrameCtrlChanged 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:901:13:OnTxFrameCtrlChanged 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:878:13:OnPingSlotPeriodicityChanged 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:912:13:OnPingSlotPeriodicityChanged 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:826:13:OnClassChange 16 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:860:13:OnClassChange 16 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:688:13:OnTxTimerEvent 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:867:13:OnMacProcessNotify 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:833:13:OnMacProcessNotify 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:879:13:OnTxPeriodicityChanged 8 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:845:13:OnTxPeriodicityChanged 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:787:13:OnJoinRequest 24 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:753:13:OnJoinRequest 24 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:974:13:OnStopJoinTimerEvent 8 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:940:13:OnStopJoinTimerEvent 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:746:13:OnRxTimerLedEvent 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:712:13:OnRxTimerLedEvent 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:741:13:OnTxTimerLedEvent 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:707:13:OnTxTimerLedEvent 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1045:13:OnRestoreContextRequest 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1011:13:OnRestoreContextRequest 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:937:13:StopJoin 16 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:903:13:StopJoin 16 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:563:13:SendTxData 120 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:561:13:SendTxData 80 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:751:13:OnJoinTimerLedEvent 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:717:13:OnJoinTimerLedEvent 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:818:13:OnBeaconStatusChange 56 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:784:13:OnBeaconStatusChange 56 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1012:13:OnNvmDataChange 0 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:978:13:OnNvmDataChange 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:704:13:OnTxTimerEvent 24 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:889:13:OnSystemReset 8 static,ignoring_inline_asm
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:923:13:OnSystemReset 8 static,ignoring_inline_asm
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:724:13:OnTxData 24 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:758:13:OnTxData 24 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:481:13:OnRxData 48 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:996:13:OnStoreContextRequest 16 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:1030:13:OnStoreContextRequest 16 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:956:13:StoreContext 8 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:990: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:351:6:LoRaWAN_Init 48 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/LoRaWAN/App/lora_app.c:446:6:HAL_GPIO_EXTI_Callback 0 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:730:6:STS_SendTxData 8 static
|
||||||
|
|
|
@ -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:55:5:ProcessPeopleCountingData 23
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:224:6:STS_people_count_sensor_Read 1
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:224:6:STS_people_count_sensor_Read 1
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:249:6:sts_tof_vl53lx_peoplecount 4
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:324:6:sts_tof_vl53lx_peoplecount 4
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:233: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:308: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:358:6:sts_tof_vl53lx_peoplecount_subprocess 7
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:434:6:sts_tof_vl53lx_peoplecount_subprocess 7
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:240: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:315:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 1
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,6 @@
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:55:5:ProcessPeopleCountingData 40 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:55:5:ProcessPeopleCountingData 40 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:224: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:224: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:249:6:sts_tof_vl53lx_peoplecount 32 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:324:6:sts_tof_vl53lx_peoplecount 32 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:233: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:308: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:358:6:sts_tof_vl53lx_peoplecount_subprocess 32 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:434:6:sts_tof_vl53lx_peoplecount_subprocess 32 static
|
||||||
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:240:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 0 static
|
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_P2_VL53L1/TOF/App/app_tof_peoplecount.c:315:6:STS_TOF_VL53LX_PeopleCounting_Process_Start 0 static
|
||||||
|
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -13,8 +13,8 @@
|
||||||
/* USER CODE BEGIN PV */
|
/* USER CODE BEGIN PV */
|
||||||
/* Private variables ---------------------------------------------------------*/
|
/* Private variables ---------------------------------------------------------*/
|
||||||
extern I2C_HandleTypeDef hi2c2;
|
extern I2C_HandleTypeDef hi2c2;
|
||||||
volatile sts_people_count_sensor_data_t sts_people_count_sensor_data={0,0,0,2,'M'};
|
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 _Bool sts_people_count_number_changed = 0;
|
volatile uint8_t sts_people_count_number_changed = 0;
|
||||||
uint16_t dev=0x52;
|
uint16_t dev=0x52;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
volatile int IntCount;
|
volatile int IntCount;
|
||||||
|
@ -228,6 +228,81 @@ void STS_people_count_sensor_Read(sts_people_count_sensor_data_t *sts_p2_sensor_
|
||||||
sts_p2_sensor_data->Walk_Around_People_Count = sts_people_count_sensor_data.Walk_Around_People_Count;
|
sts_p2_sensor_data->Walk_Around_People_Count = sts_people_count_sensor_data.Walk_Around_People_Count;
|
||||||
sts_p2_sensor_data->Count_Period = sts_people_count_sensor_data.Count_Period;
|
sts_p2_sensor_data->Count_Period = sts_people_count_sensor_data.Count_Period;
|
||||||
sts_p2_sensor_data->Count_Period_Unit = sts_people_count_sensor_data.Count_Period_Unit;
|
sts_p2_sensor_data->Count_Period_Unit = sts_people_count_sensor_data.Count_Period_Unit;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//reset counter of counting period
|
||||||
|
sts_people_count_sensor_data.Walk_In_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Walk_Out_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Walk_Around_People_Count = 0;
|
||||||
|
|
||||||
|
// Sum Day counting
|
||||||
|
// if not end of day ---
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count += sts_people_count_sensor_data.Walk_In_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count += sts_people_count_sensor_data.Walk_Out_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count += sts_people_count_sensor_data.Walk_Around_People_Count;
|
||||||
|
|
||||||
|
sts_p2_sensor_data->Sum_Day_Walk_In_People_Count = sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count;
|
||||||
|
sts_p2_sensor_data->Sum_Day_Walk_Out_People_Count = sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count;
|
||||||
|
sts_p2_sensor_data->Sum_Day_Walk_Around_People_Count = sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
|
||||||
|
// else reset day counter
|
||||||
|
#if 0
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Sum Week counting
|
||||||
|
// if not end of week ---
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_In_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_Out_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_Around_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count;
|
||||||
|
// else reset week counter
|
||||||
|
#if 0
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_In_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_Out_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Week_Walk_Around_People_Count = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Sum Month counting
|
||||||
|
// if not end of month ---
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_In_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_Out_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_Around_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count;
|
||||||
|
// else reset month counter
|
||||||
|
#if 0
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_In_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_Out_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Month_Walk_Around_People_Count = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Sum Year counting
|
||||||
|
// if not end of year ---
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_In_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_Out_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_Around_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count;
|
||||||
|
// else reset year counter
|
||||||
|
#if 0
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_In_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_Out_People_Count = 0;
|
||||||
|
sts_people_count_sensor_data.Sum_Year_Walk_Around_People_Count = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Sum LifeCycle counting
|
||||||
|
sts_people_count_sensor_data.Sum_LifeCycle_Walk_In_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_In_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_LifeCycle_Walk_Out_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Out_People_Count;
|
||||||
|
sts_people_count_sensor_data.Sum_LifeCycle_Walk_Around_People_Count += sts_people_count_sensor_data.Sum_Day_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
// reset counter at end of day TODO XXX
|
||||||
|
// reset counter at end of week TODO XXX
|
||||||
|
// reset counter at end of month TODO XXX
|
||||||
|
// reset counter at end of year TODO XXX
|
||||||
|
// reset counter at end of year TODO XXX
|
||||||
|
|
||||||
|
// write to NVM store TODO XXX
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void)
|
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void)
|
||||||
|
@ -354,15 +429,16 @@ void sts_tof_vl53lx_peoplecount(void)
|
||||||
APP_LOG(TS_OFF, VLEVEL_L,"Error in start ranging\n");
|
APP_LOG(TS_OFF, VLEVEL_L,"Error in start ranging\n");
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
void sts_tof_vl53lx_peoplecount_subprocess(void)
|
void sts_tof_vl53lx_peoplecount_subprocess(void)
|
||||||
{
|
{
|
||||||
uint8_t byteData, sensorState=0;
|
//uint8_t byteData, sensorState=0;
|
||||||
uint16_t wordData;
|
//uint16_t wordData;
|
||||||
uint16_t Distance, Signal;
|
uint16_t Distance, Signal;
|
||||||
uint8_t RangeStatus;
|
uint8_t RangeStatus;
|
||||||
uint8_t dataReady;
|
uint8_t dataReady;
|
||||||
char DisplayStr[5];
|
//char DisplayStr[5];
|
||||||
#if 0
|
#if 0
|
||||||
int PplCounter;
|
int PplCounter;
|
||||||
int center[2] = {FRONT_ZONE_CENTER, BACK_ZONE_CENTER}; /* these are the spad center of the 2 4*16 zones */
|
int center[2] = {FRONT_ZONE_CENTER, BACK_ZONE_CENTER}; /* these are the spad center of the 2 4*16 zones */
|
||||||
|
@ -413,5 +489,5 @@ void sts_tof_vl53lx_peoplecount_subprocess(void)
|
||||||
//APP_LOG(TS_OFF, VLEVEL_H,"%d,%d,%d\n", Zone, Distance, Signal);
|
//APP_LOG(TS_OFF, VLEVEL_H,"%d,%d,%d\n", Zone, Distance, Signal);
|
||||||
Zone++;
|
Zone++;
|
||||||
Zone = Zone%2;
|
Zone = Zone%2;
|
||||||
|
HAL_Delay(5);
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
#define MIN_DISTANCE 0 // mm
|
#define MIN_DISTANCE 0 // mm
|
||||||
#define DIST_THRESHOLD 1600 // mm
|
#define DIST_THRESHOLD 1600 // mm
|
||||||
#define ROWS_OF_SPADS 8 // 8x16 SPADs ROI
|
#define ROWS_OF_SPADS 8 // 8x16 SPADs ROI
|
||||||
#define TIMING_BUDGET 33 // was 20 ms, I found 33 ms has better succes rate with lower reflectance target
|
#define TIMING_BUDGET 20 //33 // was 20 ms, I found 33 ms has better succes rate with lower reflectance target
|
||||||
#define DISTANCE_MODE DISTANCE_MODE_LONG
|
#define DISTANCE_MODE DISTANCE_MODE_LONG
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -74,17 +74,39 @@
|
||||||
|
|
||||||
/* Exported functions --------------------------------------------------------*/
|
/* Exported functions --------------------------------------------------------*/
|
||||||
typedef struct STS_People_Count_Sensor_Data_Type {
|
typedef struct STS_People_Count_Sensor_Data_Type {
|
||||||
int Walk_In_People_Count;
|
uint16_t Walk_In_People_Count;
|
||||||
int Walk_Out_People_Count;
|
uint16_t Walk_Out_People_Count;
|
||||||
int Walk_Around_People_Count;
|
uint16_t Walk_Around_People_Count;
|
||||||
uint8_t Count_Period;
|
uint8_t Count_Period;
|
||||||
uint8_t Count_Period_Unit
|
uint8_t Count_Period_Unit;
|
||||||
|
|
||||||
|
uint16_t Sum_Day_Walk_In_People_Count;
|
||||||
|
uint16_t Sum_Day_Walk_Out_People_Count;
|
||||||
|
uint16_t Sum_Day_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
uint16_t Sum_Week_Walk_In_People_Count;
|
||||||
|
uint16_t Sum_Week_Walk_Out_People_Count;
|
||||||
|
uint16_t Sum_Week_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
uint16_t Sum_Month_Walk_In_People_Count;
|
||||||
|
uint16_t Sum_Month_Walk_Out_People_Count;
|
||||||
|
uint16_t Sum_Month_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
uint16_t Sum_Year_Walk_In_People_Count;
|
||||||
|
uint16_t Sum_Year_Walk_Out_People_Count;
|
||||||
|
uint16_t Sum_Year_Walk_Around_People_Count;
|
||||||
|
|
||||||
|
uint32_t Sum_LifeCycle_Walk_In_People_Count;
|
||||||
|
uint32_t Sum_LifeCycle_Walk_Out_People_Count;
|
||||||
|
uint32_t Sum_LifeCycle_Walk_Around_People_Count;
|
||||||
|
|
||||||
} sts_people_count_sensor_data_t;
|
} sts_people_count_sensor_data_t;
|
||||||
|
|
||||||
void STS_TOF_VL53LX_PeopleCounting_Process(void);
|
void STS_TOF_VL53LX_PeopleCounting_Process(void);
|
||||||
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void);
|
void STS_TOF_VL53LX_PeopleCounting_Process_Init(void);
|
||||||
void STS_TOF_VL53LX_PeopleCounting_Process_Start(void);
|
void STS_TOF_VL53LX_PeopleCounting_Process_Start(void);
|
||||||
void sts_tof_vl53lx_peoplecount(void);
|
void sts_tof_vl53lx_peoplecount(void);
|
||||||
|
void STS_SendTxData(void);
|
||||||
|
|
||||||
//int sts_tof_vl53lx_peoplecount(void);
|
//int sts_tof_vl53lx_peoplecount(void);
|
||||||
int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatus);
|
int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatus);
|
||||||
|
|
Loading…
Reference in New Issue