From f228c53a5b6ce47e5118d0c3ab313c4eda40a083 Mon Sep 17 00:00:00 2001 From: f34rdotcom Date: Sat, 20 Jul 2019 15:41:52 -0700 Subject: [PATCH] bump revision. change in sending EXIT events. No longer sending updates in ARM event now sending in Ready(FALSE) events. --- alarmdecoder/decoder.py | 14 +++++++------- setup.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alarmdecoder/decoder.py b/alarmdecoder/decoder.py index 7aa19d9..2c662d4 100644 --- a/alarmdecoder/decoder.py +++ b/alarmdecoder/decoder.py @@ -813,26 +813,26 @@ class AlarmDecoder(object): # But just in case watch for it to change if old_entry_delay_off_status is not None: if entry_delay_off_status != old_entry_delay_off_status: - send_arm = True + send_ready = True # This bit can change after the armed bit is set # this will treat it like AWAY/Stay transition as an additional # arming event. if old_perimeter_only_status is not None: if perimeter_only_status != old_perimeter_only_status: - send_arm = True + send_ready = True if old_ready_status is not None: if ready_status != old_ready_status: send_ready = True - if send_ready: - self.on_ready_changed(status=self._ready_status) - - # Force sending a new ARMED event if the exit status changes while armed + # Send exist status updates in ready event if old_exit is not None: if exit != old_exit: - send_arm = True + send_ready = True + + if send_ready: + self.on_ready_changed(status=self._ready_status) if send_arm: if self._armed_status or self._armed_stay: diff --git a/setup.py b/setup.py index 2a79581..190dbd1 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ if sys.version_info < (3,): extra_requirements.append('future==0.14.3') setup(name='alarmdecoder', - version='1.13.6', + version='1.13.7', description='Python interface for the AlarmDecoder (AD2) family ' 'of alarm devices which includes the AD2USB, AD2SERIAL and AD2PI.', long_description=readme(),