From 12602f4579008a801ac66ad1c0140e91d4e287d1 Mon Sep 17 00:00:00 2001 From: mgfcf Date: Fri, 3 Dec 2021 18:21:09 +0100 Subject: [PATCH] Small fixes --- src/sensor/people_counter.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/sensor/people_counter.py b/src/sensor/people_counter.py index 7a13c55..5a199b1 100644 --- a/src/sensor/people_counter.py +++ b/src/sensor/people_counter.py @@ -159,26 +159,19 @@ class PeopleCounter (): th = threading.Thread(target=cb, args=(countChange, self.directionState)) th.start() - def getDirectionTime(self, direction: Directions, time: str) -> datetime: - if len(self.directionState[direction]) <= 0: - return None - - return self.directionState[direction][-1][time] - def updateState(self, direction: Directions, triggered: bool) -> bool: - currentlyTriggered = False + previouslyTriggered = False if len(self.directionState[direction]) > 0: - currentlyTriggered = self.getDirectionTime( - direction, END_TIME) is None + previouslyTriggered = self.directionState[direction][-1][END_TIME] is None - if triggered and not currentlyTriggered: + if triggered and not previouslyTriggered: # Set as new beginning for this direction self.directionState[direction].append({ START_TIME: datetime.now(), END_TIME: None }) return True - elif not triggered and currentlyTriggered: + elif not triggered and previouslyTriggered: # Set as end for this direction self.directionState[direction][-1][END_TIME] = datetime.now() return True