Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove time-based expiration of faults #55

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remove time-based expiration of faults #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions alarmdecoder/zonetracking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ class Zonetracker(object):
on_fault = event.Event("This event is called when the device detects a zone fault.\n\n**Callback definition:** *def callback(device, zone)*")
on_restore = event.Event("This event is called when the device detects that a fault is restored.\n\n**Callback definition:** *def callback(device, zone)*")

EXPIRE = 30
"""Zone expiration timeout."""

@property
def zones(self):
Expand Down Expand Up @@ -211,7 +209,6 @@ def update(self, message):
# A new zone fault, so it is out of sequence.
self._last_zone_fault = 0

self._clear_expired_zones()

def expander_to_zone(self, address, channel, panel_type=ADEMCO):
"""
Expand Down Expand Up @@ -306,18 +303,6 @@ def _clear_zones(self, zone):
if self._zones[z].expander is False:
self._update_zone(z, Zone.CLEAR)

def _clear_expired_zones(self):
"""
Update zone status for all expired zones.
"""
zones = []

for z in list(self._zones.keys()):
zones += [z]

for z in zones:
if self._zones[z].status != Zone.CLEAR and self._zone_expired(z):
self._update_zone(z, Zone.CLEAR)

def _add_zone(self, zone, name='', status=Zone.CLEAR, expander=False):
"""
Expand Down Expand Up @@ -365,13 +350,3 @@ def _update_zone(self, zone, status=None):
if old_status != status and status is not None:
self.on_fault(zone=zone)

def _zone_expired(self, zone):
"""
Determine if a zone is expired or not.

:param zone: zone number
:type zone: int

:returns: whether or not the zone is expired
"""
return (time.time() > self._zones[zone].timestamp + Zonetracker.EXPIRE) and self._zones[zone].expander is False