diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 2cfa67f..46e7e79 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1034,7 +1034,7 @@ static void SendTxData(void) #ifdef STS_P2 #ifdef VL53LX // VL53L1X - AppData.Buffer[i++] = (uint8_t) 6; //sum of below + AppData.Buffer[i++] = (uint8_t) 15; //sum of below AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Walk_In_People_Count>>8) & 0xFF); AppData.Buffer[i++] = (uint8_t)(sts_p2_sensor_data.Walk_In_People_Count & 0xFF); @@ -1044,7 +1044,7 @@ static void SendTxData(void) AppData.Buffer[i++] = (uint8_t)((sts_p2_sensor_data.Walk_Around_People_Count>>8) & 0xFF); AppData.Buffer[i++] = (uint8_t)(sts_p2_sensor_data.Walk_Around_People_Count & 0xFF); #endif // VL53L1X -#if 0 +#if 1 #ifdef VL53LX // VL53L1X 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); diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf index c606595..42c6c1b 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ diff --git a/STS/TOF/App/app_tof_peoplecount.c b/STS/TOF/App/app_tof_peoplecount.c index 04cf701..58d8525 100644 --- a/STS/TOF/App/app_tof_peoplecount.c +++ b/STS/TOF/App/app_tof_peoplecount.c @@ -369,8 +369,8 @@ int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatu if (PathTrackFillingSize == 4) { // check exit or entry. no need to check PathTrack[0] == 0 , it is always the case - // if ((PathTrack[1] == 1) && (PathTrack[2] == 3) && (PathTrack[3] == 2)) { - if ((PathTrack[1] == 1) && (PathTrack[2] == 3)) { // 2025-JAN-90 aggressive mode + if ((PathTrack[1] == 1) && (PathTrack[2] == 3) && (PathTrack[3] == 2)) { + // if ((PathTrack[1] == 1) && (PathTrack[2] == 3)) { // 2025-JAN-90 aggressive mode // This an entry PeopleCount ++; // reset the table filling size in case an entry or exit just found @@ -387,8 +387,8 @@ int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatu // LED1_ON; //TODO XXX, CHANGE TO (LED_IN_ON && LED_OUT_OFF); // LED1_TOGGLE; - // } else if ((PathTrack[1] == 2) && (PathTrack[2] == 3) && (PathTrack[3] == 1)) { - } else if ((PathTrack[1] == 2) && (PathTrack[2] == 3)) { // 2025-JAN-90 aggressive mode + } else if ((PathTrack[1] == 2) && (PathTrack[2] == 3) && (PathTrack[3] == 1)) { + // } else if ((PathTrack[1] == 2) && (PathTrack[2] == 3)) { // 2025-JAN-90 aggressive mode // This an exit PeopleCount --; // reset the table filling size in case an entry or exit just found