Browse Source

Fixed repr import. Fixed docs for on_arm parameters. Added human-readable description for CID RESERVIED_653.

pyserial_fix
Scott Petersen 7 years ago
parent
commit
99c857b272
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      alarmdecoder/decoder.py
  2. +1
    -1
      alarmdecoder/messages/base_message.py
  3. +1
    -1
      alarmdecoder/messages/lrr/events.py

+ 1
- 1
alarmdecoder/decoder.py View File

@@ -30,7 +30,7 @@ class AlarmDecoder(object):
""" """


# High-level Events # 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_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_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)*") on_alarm = event.Event("This event is called when the alarm is triggered.\n\n**Callback definition:** *def callback(device, zone)*")


+ 1
- 1
alarmdecoder/messages/base_message.py View File

@@ -1,7 +1,7 @@
import datetime import datetime


try: try:
from repr import repr
from reprlib import repr
except ImportError: except ImportError:
from repr import repr from repr import repr




+ 1
- 1
alarmdecoder/messages/lrr/events.py View File

@@ -660,7 +660,7 @@ LRR_CID_MAP = {
LRR_CID_EVENT.STATUS_LATCHKEY_SUPERVISION: 'Status: Latch-key Supervision', LRR_CID_EVENT.STATUS_LATCHKEY_SUPERVISION: 'Status: Latch-key Supervision',
LRR_CID_EVENT.SPECIAL_ADT_AUTHORIZATION: 'Special: ADT Authorization', 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_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_SYSTEM_INACTIVITY: 'Trouble: System Inactivity',
LRR_CID_EVENT.TROUBLE_UNABLE_TO_OUTPUT_SIGNAL: 'Trouble: Unable To Output Signal (Derived Channel)', 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)', LRR_CID_EVENT.TROUBLE_STU_CONTROLLER_DOWN: 'Trouble: STU Controller Down (Derived Channel)',


Loading…
Cancel
Save