From 25f0604a8f3fccfb33040c51eb2d26938a94246a Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 20 Jun 2013 13:04:54 -0700 Subject: [PATCH] Fixed an issue with not saving the last zone fault correctly. Fixed wrong constant use. --- pyad2usb/zonetracking.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyad2usb/zonetracking.py b/pyad2usb/zonetracking.py index c03f988..135e73b 100644 --- a/pyad2usb/zonetracking.py +++ b/pyad2usb/zonetracking.py @@ -54,7 +54,7 @@ class Zonetracker(object): zone = -1 if isinstance(message, messages.ExpanderMessage): - if message.type == messages.ExpanderMessage.EXPANDER: + if message.type == messages.ExpanderMessage.ZONE: zone = self._expander_to_zone(int(message.address), int(message.channel)) status = Zone.CLEAR @@ -99,8 +99,9 @@ class Zonetracker(object): self._zones_faulted.append(zone) self._zones_faulted.sort() - # Save our spot for the next message. - self._last_zone_fault = zone + # Save our spot for the next message. + self._last_zone_fault = zone + self._clear_expired_zones() def _clear_zones(self, zone):