Changeset 11

Timestamp:

2012-05-23 20:00:58 (13 years ago)

Author:

mcvflorin

Message:

• Implemented bypass zones.
• Minor fixes and improvements.

Location:

trunk

Files:

• D_ConcordPartition.json (modified) (6 diffs)
• I_Concord.xml (modified) (1 diff)
• J_Concord.js (modified) (6 diffs)
• L_Concord.lua (modified) (8 diffs)
• S_Concord.xml (modified) (2 diffs)

trunk/D_ConcordPartition.json ¶

@@ -335 +335 @@
                     "ControlType": "label",
                     "Label": {
-                        "lang_tag": "bypass_sensors",
-                        "text": "<b>Bypass Sensors</b>"
+                        "lang_tag": "toggle_chime_mode",
+                        "text": "<b>Toggle Chime Mode</b>"
                     },
                     "Display": {
@@ -346 +346 @@
                 },
                 {
-                    "ControlType": "input",
-                    "ID": "zones",
-                    "Display": {
+                    "ControlType": "button",
+                    "Label": {
+                        "lang_tag": "chime_mode",
+                        "text": "Chime Mode"
+                    },
+                    "Display": {
+                        "Service": "urn:micasaverde-com:serviceId:AlarmPartition2",
+                        "Variable": "ChimeEnabled",
+                        "Value": "1",
                         "Top": 190,
                         "Left": 150,
                         "Width": 100,
                         "Height": 20
-                    }
-                },
-                {
-                    "ControlType": "button",
-                    "Label": {
-                        "lang_tag": "bypass",
-                        "text": "Bypass"
-                    },
-                    "Display": {
-                        "Top": 190,
-                        "Left": 260,
-                        "Width": 70,
-                        "Height": 20
                     },
                     "Command": {
                         "Service": "urn:micasaverde-com:serviceId:ConcordAlarmPanel1",
-                        "Action": "BypassZones",
-                        "Parameters": [
-                            {
-                                "Name": "Zones",
-                                "ID": "zones"
-                            },
-                            {
-                                "Name": "PINCode",
-                                "ID": "PINCode"
-                            }
-                        ]
+                        "Action": "ToggleChimeMode",
+                        "Parameters": []
                     }
                 },
@@ -385 +369 @@
                     "ControlType": "label",
                     "Label": {
-                        "lang_tag": "toggle_chime_mode",
-                        "text": "<b>Toggle Chime Mode</b>"
+                        "lang_tag": "panic_alarms",
+                        "text": "<b>Panic Alarms</b>"
                     },
                     "Display": {
@@ -398 +382 @@
                     "ControlType": "button",
                     "Label": {
-                        "lang_tag": "chime_mode",
-                        "text": "Chime Mode"
-                    },
-                    "Display": {
-                        "Service": "urn:micasaverde-com:serviceId:AlarmPartition2",
-                        "Variable": "ChimeEnabled",
-                        "Value": "1",
+                        "lang_tag": "police",
+                        "text": "Police"
+                    },
+                    "Display": {
                         "Top": 250,
                         "Left": 150,
-                        "Width": 100,
-                        "Height": 20
-                    },
-                    "Command": {
-                        "Service": "urn:micasaverde-com:serviceId:ConcordAlarmPanel1",
-                        "Action": "ToggleChimeMode",
-                        "Parameters": []
-                    }
-                },
-                {
-                    "ControlType": "label",
-                    "Label": {
-                        "lang_tag": "panic_alarms",
-                        "text": "<b>Panic Alarms</b>"
-                    },
-                    "Display": {
-                        "Top": 290,
-                        "Left": 155,
-                        "Width": 100,
-                        "Height": 20
-                    }
-                },
-                {
-                    "ControlType": "button",
-                    "Label": {
-                        "lang_tag": "police",
-                        "text": "Police"
-                    },
-                    "Display": {
-                        "Top": 310,
-                        "Left": 150,
                         "Width": 75,
                         "Height": 20
@@ -459 +409 @@
                     },
                     "Display": {
-                        "Top": 310,
+                        "Top": 250,
                         "Left": 230,
                         "Width": 75,
@@ -482 +432 @@
                     },
                     "Display": {
-                        "Top": 310,
+                        "Top": 250,
                         "Left": 310,
                         "Width": 75,

trunk/I_Concord.xml ¶

@@ -56 +56 @@
         </action>
         <action>
+            <serviceId>urn:micasaverde-com:serviceId:ConcordAlarmPanel1</serviceId>
+            <name>BypassZone</name>
+            <run>
+                concordPlugin.bypassZone(lul_device, lul_settings.bypass, lul_settings.pinCode)
+            </run>
+        </action>
+        <action>
             <serviceId>urn:micasaverde-com:serviceId:SecuritySensor1</serviceId>
             <name>SetArmed</name>
             <run>
-                concordPlugin.setArmed(lul_device, lul_settings.newArmedValue)
+                concordPlugin.setArmed(lul_settings.newArmedValue)
             </run>
         </action>

trunk/J_Concord.js ¶

@@ -8 +8 @@
 
 
-//*****************************************************************************
-// isEmpty: Returns true if an object has no properties.
-//*****************************************************************************
-function isEmpty(obj)
+function bypassZone (device, action)
 {
-    for (var key in obj)
-    {
-        if (map.hasOwnProperty(key))
-            return false;
-    }
-    return true;
-}
+    new Ajax.Request( data_request_url, {
+        method: "get",
+        parameters: {
+            id: "action",
+            DeviceNum: device,
+            serviceId: concord.PANEL_SID,
+            action: "BypassZone",
+            bypass: (action === "Bypass") && "1" || "0",
+            pinCode: document.getElementById("pin_code").value
+        }
+    });
 
-
-function updateZoneLabels()
-{
-    var zone = "";
-    var labelsRaw = "";
-
-    for (zone in concord.labels)
-    {
-        labelsRaw += ";" + zone + "-" + concord.addresses[zone] + "-" + concord.channels[zone] + "-" + concord.labels[zone];
-    }
-    labelsRaw = labelsRaw.substring(1); // Remove the first semicolon(;).
-
-    set_device_state(concord.device, concord.PANEL_SID, "Zones", labelsRaw, 0);
-
-    showCheatSheet(concord.device);
-}
-
-
-function addLabel()
-{
-    var zone = "";
-    var label = "";
-
-    zone = document.getElementById("vista_zone_no").value;
-    label = document.getElementById("vista_zone_label").value;
-    address = document.getElementById("vista_zone_address").value;
-    channel = document.getElementById("vista_zone_channel").value;
-
-    if (zone.match(/^(\d+)$/) === null || label === "")
-    {
-        return;
-    }
-
-    concord.labels[zone] = label;
-    concord.addresses[zone] = address;
-    concord.channels[zone] = channel;
-
-    updateZoneLabels();
-}
-
-
-function removeLabel(zone)
-{
-    delete concord.labels[zone];
-    delete concord.addresses[zone];
-    delete concord.channels[zone];
-    updateZoneLabels();
-}
-
-
-function pad (number, length)
-{
-    var str = "" + number;
-    while (str.length < length)
-    {
-        str = "0" + str;
-    }
-
-    return str;
-}
-
-
-function bypassZone (device)
-{
+    setTimeout( function() { showZones(); }, 6000)
 }
 
@@ -98 +36 @@
     var i;
 
-    concord.device = lul_device;
-
     html += '<table style="width:98%; border-collapse:collapse; border:1px solid #8BB0D6; margin-left:1%">';
     html += '<tr>';
@@ -107 +43 @@
     html += '<th style="text-align:center; border:1px solid #8BB0D6">Trouble</th>';
     html += '<th style="text-align:center; border:1px solid #8BB0D6">Armed</th>';
-    html += '<th style="border:1px solid #8BB0D6"></th>';
+    html += '<th style="text-align:center; border:1px solid #8BB0D6">Pin: <input id="pin_code" type="text" maxlength="4" size="4" /></th>';
     html += '</tr>';
 
@@ -116 +52 @@
         {
             var zoneNum  = zone.altid.substr(13);
-            var faulted  = (get_device_state( zone.id, concord.PANEL_SID, "Faulted")  === "1") && "&#10004;" || "&#10008;";
-            var trouble  = (get_device_state( zone.id, concord.PANEL_SID, "Trouble")  === "1") && "&#10004;" || "&#10008;";
-            var armed    = (get_device_state( zone.id, SES_SID, "Armed") === "1") && "&#10004;" || "&#10008;";
-            var disabled = (armed === "&#10004;") && "" || "disabled";
+            var faulted  = (get_device_state( zone.id, concord.PANEL_SID, "Faulted", 1)  === "1") && "&#10004;" || "&#10008;";
+            var trouble  = (get_device_state( zone.id, concord.PANEL_SID, "Trouble", 1)  === "1") && "&#10004;" || "&#10008;";
+            var armed    = (get_device_state( zone.id, SES_SID, "Armed", 1) === "1") && "&#10004;" || "&#10008;";
+            var action = (armed === "&#10004;") && "Bypass" || "Arm";
 
             // Show all zones ordered by zone # in ascending order.
@@ -128 +64 @@
             html += '<td style="border:1px solid #8BB0D6; text-align:center">' + trouble + '</td>';
             html += '<td style="border:1px solid #8BB0D6; text-align:center">' + armed + '</td>';
-            html += '<td style="border:1px solid #8BB0D6; text-align:center"><button name="bypass_' + zoneNum + '" type="button" onclick="bypassZone(' + zone.id + ')" ' + disabled + ' >Bypass</button></td>';
+            html += '<td style="border:1px solid #8BB0D6; text-align:center"><button type="button" onclick="bypassZone(' + zone.id + ', \'' + action + '\')" >' + action + '</button></td>';
             html += '</tr>';
         }
@@ -135 +71 @@
     html += '</table>';
 
+    //html += '<br />';
+
+    //html += '<p id="status"></p>';
+
     set_panel_html(html);
 }

trunk/L_Concord.lua ¶

@@ -342 +342 @@
     ["Chime"] = "0701",
     -- Bypass / arm zone
-    ["Bypass"] = "#"
+    ["Bypass"] = "0B"
 }
 
@@ -495 +495 @@
     sendAttempt = sendAttempt + 1
     if (sendAttempt == 3) then
+        -- Send CR/LF to reset the automation module's message queue.
         if (not luup.io.write(CHAR.CR .. s)) then
             task("Failed to send message", TASK.ERROR_PERM)
             return
         end
+        -- Remove the message from the queue, because there's a chance that the message is wrong.
         sendAttempt = 0
+        table.remove(messageQueue, 1)
     elseif (not luup.io.write(s)) then
+        -- Send the message normally.
         task("Failed to send message", TASK.ERROR_PERM)
         return
@@ -531 +535 @@
 
 
-local function expandPinCode (pinCode)
-    if (pinCode == nil) then
+-- Expands a number, e.g. 21 -> 0201
+local function expand (nr)
+    if (nr == nil) then
         return ""
     end
 
-    local expPinCode = ""
-    for i = 1, #pinCode do
-        local d = pinCode:sub(i, i)
-        expPinCode = expPinCode .. padLeft(d)
-    end
-
-    return expPinCode
+    local expNr = ""
+    for i = 1, #nr do
+        local d = nr:sub(i, i)
+        expNr = expNr .. padLeft(d)
+    end
+
+    return expNr
 end
 
@@ -904 +909 @@
     local action = (state == "Disarmed") and "disarm" or "arm"
 
+    if (pinCode == "undefined") then
+        pinCode = nil
+    end
+
     if (QUICK_ARM == false or action == "disarm") then
         -- Check if the PIN code exists and if it's valid.
         if (pinCode == nil or pinCode:find("^%d%d%d%d$") == nil) then
-            task("Invalid user code. Cannot ".. action .." partition.", TASK.ERROR)
+            task("Invalid access code. Cannot ".. action .." partition.", TASK.ERROR)
             return
         end
@@ -924 +933 @@
     -- 40h [PN] [AN] [KP1] 
  [KPn]
-    local command = "40" .. padLeft(partNum) .. "00" .. prefix .. COMMANDS[state] .. suffix .. expandPinCode(pinCode)
+    local command = "40" .. padLeft(partNum) .. "00" .. prefix .. COMMANDS[state] .. suffix .. expand(pinCode)
     addToQueue(command)
 
@@ -967 +976 @@
 function setArmed (device, newArmedValue, pinCode)
     local action = (newArmedValue == "1") and "arm" or "bypass"
-
-    if (QUICK_ARM == false) then
-        -- Check if the PIN code exists and if it's valid.
-        if (pinCode == nil or pinCode:find("^%d%d%d%d$") == nil) then
-            task("Invalid user code. Cannot ".. action .." zone.", TASK.ERROR)
-            return
-        end
+    task( "Please ".. action .." the zone from the Zones tab of the panel device.", TASK.ERROR)
+end
+
+
+function bypassZone (device, bypass, pinCode)
+
+    local action = (bypass == "1") and "bypass" or "arm"
+
+    if (pinCode == "undefined") then
+        pinCode = nil
+    end
+
+    -- Check if the PIN code exists and if it's valid.
+    if (pinCode == nil or pinCode:find("^%d%d%d%d$") == nil) then
+        task("Invalid access code. Cannot ".. action .." zone.", TASK.ERROR)
+        return
     end
 
@@ -981 +999 @@
         return
     end
-    debug("(ConcordPlugin::setArmed) ".. action .." zone #".. zoneNum ..".")
-
-    local command = "40".. padLeft( g_zones[zoneNum].partNum ) .."00".. COMMANDS["Bypass"] .. expandPinCode(pinCode) .. padLeft(zoneNum)
+    debug("(ConcordPlugin::bypassZone) ".. action .." zone #".. zoneNum ..".")
+
+    --local command = "40".. padLeft( g_zones[zoneNum].partNum ) .."00".. COMMANDS["Bypass"] .. expand(pinCode) .. expand( padLeft(zoneNum) )
+    local command = "40".. padLeft( g_zones[zoneNum].partNum ) .."00".. COMMANDS["Bypass"]
     addToQueue(command)
+    command = "40".. padLeft( g_zones[zoneNum].partNum ) .."00".. expand(pinCode)
+    addToQueue(command)
+    command = "40".. padLeft( g_zones[zoneNum].partNum ) .."00".. expand( padLeft(zoneNum) )
+    addToQueue(command)
+
     task( "Command to ".. action .." zone #".. zoneNum .." sent.", TASK.BUSY)
 end
@@ -995 +1019 @@
     log("(ConcordPlugin::init) Concord alarm panel plugin version " .. VERSION .. ".")
 
+    lug_device = lul_device
+
     -- Call the task function to get a handle.
     g_taskHandle = luup.task( "Starting up...", TASK.BUSY, "Concord Plugin", g_taskHandle)
-
-    lug_device = lul_device
 
     -- Check if Debug Mode is enabled.

trunk/S_Concord.xml ¶

@@ -16 +16 @@
         <stateVariable>
             <name>ExtraFeatures</name>
+            <datatype>string</datatype>
+        </stateVariable>
+        <stateVariable>
+            <name>A_ARG_TYPE_boolean</name>
             <datatype>boolean</datatype>
         </stateVariable>
+        <stateVariable>
+            <name>A_ARG_TYPE_string</name>
+            <datatype>string</datatype>
+        </stateVariable>
+        A_ARG_TYPE_
     </serviceStateTable>
     <actionList>
@@ -28 +37 @@
             <argumentList></argumentList>
         </action>
+        <action>
+            <name>BypassZone</name>
+            <argumentList>
+                <argument>
+                    <name>bypass</name>
+                    <direction>in</direction>
+                    <relatedStateVariable>A_ARG_TYPE_boolean</relatedStateVariable>
+                </argument>
+                <argument>
+                    <name>pinCode</name>
+                    <direction>in</direction>
+                    <relatedStateVariable>A_ARG_TYPE_string</relatedStateVariable>
+                </argument>
+            </argumentList>
+        </action>
     </actionList>
 </scpd>