Merge pull request #40 from nutechsoftware/dev

Add support for CHIME and fix BYPASS status. Bump Version.

ad2web/decoder.py

@@ -42,7 +42,7 @@
 from .notifications.constants import (ARM, DISARM, POWER_CHANGED, ALARM, ALARM_RESTORED,
                                         FIRE, BYPASS, BOOT, LRR, CONFIG_RECEIVED, ZONE_FAULT,
                                         ZONE_RESTORE, LOW_BATTERY, PANIC, RELAY_CHANGED,
-                                        LRR, READY, DEFAULT_EVENT_MESSAGES)
+                                        LRR, READY, CHIME, DEFAULT_EVENT_MESSAGES)
 
 from .cameras import CameraSystem
 from .cameras.models import Camera
@@ -66,6 +66,7 @@
     BOOT: 'on_boot',
     LRR: 'on_lrr_message',
     READY: 'on_ready_changed',
+    CHIME: 'on_chime_changed',
     CONFIG_RECEIVED: 'on_config_received',
     ZONE_FAULT: 'on_zone_fault',
     ZONE_RESTORE: 'on_zone_restore',
@@ -321,6 +322,7 @@ def bind_events(self):
         self.device.on_message += build_message_handler('panel')
         self.device.on_lrr_message += build_message_handler('lrr')
         self.device.on_ready_changed += build_message_handler('ready')
+        self.device.on_chime_changed += build_message_handler('chime')
         self.device.on_rfx_message += build_message_handler('rfx')
         try:
             self.device.on_aui_message += build_message_handler('aui')
@@ -349,6 +351,7 @@ def remove_events(self):
             self.device.on_message.clear()
             self.device.on_lrr_message.clear()
             self.device.on_ready_changed.clear()
+            self.device.on_chime_changed.clear()
             self.device.on_rfx_message.clear()
             try:
                 self.device.on_aui_message.clear()

ad2web/log/__init__.py

@@ -2,6 +2,6 @@
 
 from .constants import ARM, DISARM, POWER_CHANGED, ALARM, FIRE, BYPASS, BOOT, \
                         CONFIG_RECEIVED, ZONE_FAULT, ZONE_RESTORE, LOW_BATTERY, \
-                        PANIC, RELAY_CHANGED, EVENT_TYPES, LRR, READY
+                        PANIC, RELAY_CHANGED, EVENT_TYPES, LRR, READY, CHIME
 from .models import EventLogEntry
 from .views import log

ad2web/log/constants.py

@@ -16,6 +16,7 @@
 ALARM_RESTORED = 13
 LRR = 14
 READY = 15
+CHIME = 16
 
 EVENT_TYPES = {
     ARM: 'ARM',
@@ -33,5 +34,6 @@
     RELAY_CHANGED: 'RELAY CHANGED',
     ALARM_RESTORED: 'ALARM RESTORED',
     LRR: 'LRR',
-    READY: 'READY'
+    READY: 'READY',
+    CHIME: 'CHIME'
 }

ad2web/notifications/constants.py

@@ -18,6 +18,7 @@
 ALARM_RESTORED = 13
 LRR = 14
 READY = 15
+CHIME = 16
 
 CRITICAL_EVENTS = [POWER_CHANGED, ALARM, BYPASS, ARM, DISARM, ZONE_FAULT, \
                     ZONE_RESTORE, FIRE, PANIC]
@@ -38,6 +39,7 @@
     PANIC: 'Panic!',
     LRR: 'Received LRR / Contact ID event',
     READY: 'Ready status has changed to {status}',
+    CHIME: 'Chime status has changed to {status}',
     RELAY_CHANGED: 'A relay at {address}:{channel} has changed to {status}.'
 }
 
@@ -57,6 +59,7 @@
     RELAY_CHANGED: 'relay changed',
     LRR: 'lrr',
     READY: 'ready changed',
+    CHIME: 'chime changed',
     ALARM_RESTORED: 'alarm restored'
 }
 
@@ -118,6 +121,7 @@
     (RELAY_CHANGED, 'A relay has been changed'),
     (LRR, 'A LRR event was detected'),
     (READY, 'A READY event was detected'),
+    (CHIME, 'A CHIME event was detected'),
 ])
 
 PUSHOVER_URL = "api.pushover.net:443"

ad2web/notifications/types.py

@@ -70,7 +70,7 @@
                         GROWL_PRIORITIES, GROWL, CUSTOM, URLENCODE, JSON, XML, CUSTOM_CONTENT_TYPES, CUSTOM_USER_AGENT, CUSTOM_METHOD,
                         ZONE_FAULT, ZONE_RESTORE, BYPASS, CUSTOM_METHOD_GET, CUSTOM_METHOD_POST, CUSTOM_METHOD_GET_TYPE,
                         CUSTOM_TIMESTAMP, CUSTOM_MESSAGE, CUSTOM_REPLACER_SEARCH, TWIML, ARM, DISARM, ALARM, PANIC, FIRE, SMARTTHINGS,
-                        UPNPPUSH, LRR, READY, TIME_MULTIPLIER, XML_EVENT_TEMPLATE, XML_EVENT_PROPERTY, RELAY_CHANGED, EVENT_TYPES)
+                        UPNPPUSH, LRR, READY, CHIME, TIME_MULTIPLIER, XML_EVENT_TEMPLATE, XML_EVENT_PROPERTY, RELAY_CHANGED, EVENT_TYPES)
 
 from .models import Notification, NotificationSetting, NotificationMessage
 from ..extensions import db
@@ -379,7 +379,7 @@ def __init__(self, obj):
 
         # FIXME ADD additional types EX. RFX, REL, EXP
         #  Make this user configurable.
-        self._events = [LRR, READY, ARM, DISARM, ALARM, PANIC, FIRE, BYPASS, ZONE_FAULT, ZONE_RESTORE, RELAY_CHANGED]
+        self._events = [LRR, READY, CHIME, ARM, DISARM, ALARM, PANIC, FIRE, BYPASS, ZONE_FAULT, ZONE_RESTORE, RELAY_CHANGED]
         self.description = 'UPNPPush'
         self.api_token = obj.get_setting('token')
         self.api_endpoint = obj.get_setting('url')
@@ -445,7 +445,8 @@ def _build_panel_state(self):
             'panel_powered': current_app.decoder.device._power_status,
             'panel_alarming': current_app.decoder.device._alarm_status,
             'panel_ready': getattr(current_app.decoder.device, "_ready_status", True),
-            'panel_bypassed': current_app.decoder.device._bypass_status,
+            'panel_chime': getattr(current_app.decoder.device, "_chime_status", False),
+            'panel_bypassed': None in current_app.decoder.device._bypass_status,
             'panel_armed': current_app.decoder.device._armed_status,
             'panel_fire_detected': current_app.decoder.device._fire_status,
             'panel_on_battery': current_app.decoder.device._battery_status[0],

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="alarmdecoder-webapp",
-    version='0.8.1',
+    version='0.8.2',
     url='https://github.com/nutechsoftware/alarmdecoder-webapp',
     description='AlarmDecoder-webapp provides a web interface for your AlarmDecoder device.',
     author='Nu Tech Software Solutions, Inc.',