Browse Source

Merge pull request #36 from nutechsoftware/dev

Bug fix and testing with buster
main
Sean Mathews 5 years ago
committed by GitHub
parent
commit
514fe67307
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
  1. +7
    -7
      alarmdecoder/decoder.py
  2. +2
    -2
      requirements.txt
  3. +1
    -1
      setup.py

+ 7
- 7
alarmdecoder/decoder.py View File

@@ -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:


+ 2
- 2
requirements.txt View File

@@ -1,2 +1,2 @@
future==0.14.3
pyserial==2.7
future>=0.14.3
pyserial>=2.7

+ 1
- 1
setup.py View File

@@ -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(),


Loading…
Cancel
Save