From 99c857b2726b935a6d3a73544f9ff081bc099788 Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Tue, 10 Oct 2017 11:31:36 -0700 Subject: [PATCH] Fixed repr import. Fixed docs for on_arm parameters. Added human-readable description for CID RESERVIED_653. --- alarmdecoder/decoder.py | 2 +- alarmdecoder/messages/base_message.py | 2 +- alarmdecoder/messages/lrr/events.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alarmdecoder/decoder.py b/alarmdecoder/decoder.py index 0d25cb4..df4c6c8 100644 --- a/alarmdecoder/decoder.py +++ b/alarmdecoder/decoder.py @@ -30,7 +30,7 @@ class AlarmDecoder(object): """ # High-level Events - on_arm = event.Event("This event is called when the panel is armed.\n\n**Callback definition:** *def callback(device)*") + on_arm = event.Event("This event is called when the panel is armed.\n\n**Callback definition:** *def callback(device, stay)*") on_disarm = event.Event("This event is called when the panel is disarmed.\n\n**Callback definition:** *def callback(device)*") on_power_changed = event.Event("This event is called when panel power switches between AC and DC.\n\n**Callback definition:** *def callback(device, status)*") on_alarm = event.Event("This event is called when the alarm is triggered.\n\n**Callback definition:** *def callback(device, zone)*") diff --git a/alarmdecoder/messages/base_message.py b/alarmdecoder/messages/base_message.py index fc8dd1e..d82e6e1 100644 --- a/alarmdecoder/messages/base_message.py +++ b/alarmdecoder/messages/base_message.py @@ -1,7 +1,7 @@ import datetime try: - from repr import repr + from reprlib import repr except ImportError: from repr import repr diff --git a/alarmdecoder/messages/lrr/events.py b/alarmdecoder/messages/lrr/events.py index 6d00b10..d2dfe8a 100644 --- a/alarmdecoder/messages/lrr/events.py +++ b/alarmdecoder/messages/lrr/events.py @@ -660,7 +660,7 @@ LRR_CID_MAP = { LRR_CID_EVENT.STATUS_LATCHKEY_SUPERVISION: 'Status: Latch-key Supervision', LRR_CID_EVENT.SPECIAL_ADT_AUTHORIZATION: 'Special: ADT Authorization', LRR_CID_EVENT.RESERVED_652: 'Reserved: For Ademco Use', - LRR_CID_EVENT.RESERVED_652: 'Reserved: For Ademco Use', + LRR_CID_EVENT.RESERVED_653: 'Reserved: For Ademco Use', LRR_CID_EVENT.TROUBLE_SYSTEM_INACTIVITY: 'Trouble: System Inactivity', LRR_CID_EVENT.TROUBLE_UNABLE_TO_OUTPUT_SIGNAL: 'Trouble: Unable To Output Signal (Derived Channel)', LRR_CID_EVENT.TROUBLE_STU_CONTROLLER_DOWN: 'Trouble: STU Controller Down (Derived Channel)',