Changeset 18

Timestamp:

2011-06-08 19:40:28 (14 years ago)

Author:

mcvflorin

Message:

+ Implemented Arm/Bypass? for sensors.

File:

• I_ElkAlarmPanel1.lua (modified) (22 diffs)

I_ElkAlarmPanel1.lua ¶

@@ -28 +28 @@
 local lug_device = nil
 local g_errorMessage = nil
-local g_isStartupMode = true
+local g_pinCode = nil
 local g_taskHandle = -1
 
@@ -366 +366 @@
 
 
----------------------------- Action implementations ---------------------------
+---------------------------- Action Implementations ---------------------------
+
+
+function storePinCode (pinCode)
+    debug ("(storePinCode) pinCode=" .. tostring (pinCode))
+
+    if (not pinCode or pinCode == "") then
+        log ("(storePinCode) ERROR: Invalid PIN code.")
+        task ("ERROR: Invalid PIN code.", TASK_ERROR)
+        return false
+    end
+
+    pinCode = padLeft (pinCode, 6, '0')
+    if (not pinCode:match ("^%d%d%d%d%d%d$")) then
+        log ("(storePinCode) ERROR: Invalid PIN code.")
+        task ("ERROR: Invalid PIN code.", TASK_ERROR)
+        return false
+    end
+
+    g_pinCode = pinCode
+end
 
 
 function requestArmMode (device, state, pinCode)
     debug (string.format ("(requestArmMode) device=%d, state=%s, pinCode=%s", device, state, tostring (pinCode)))
+
+    if ((not pinCode or pinCode == "") and (not g_pinCode)) then
+        log ("(requestArmMode) ERROR: PIN code required.")
+        task ("ERROR: PIN code required.", TASK_ERROR)
+        return false
+    end
 
     local partition = extractPartition (luup.devices[device].id)
     if (not partition) then
         log ("(requestArmMode) ERROR: Found unexpected child.")
-        task ("Unknown error encountered.", TASK_ERROR)
+        task ("ERROR: Unknown error encountered.", TASK_ERROR)
         return false
     end
@@ -404 +430 @@
     end
 
-    local data = partition .. padLeft (pinCode, 6, '0')
+    local data
+    if (pinCode and pinCode ~= "") then
+        data = partition .. padLeft (pinCode, 6, '0')
+    else
+        data = partition .. g_pinCode
+    end
 
     local status = sendCommand (command, data)
@@ -412 +443 @@
         return false
     end
-    
+
+    g_pinCode = pinCode
     return true
 end
@@ -424 +456 @@
 
 
-local function bypassZone (zoneNo, pinCode)
+local function unbypassZone (zoneNo, tryCount)
+    local functionName = "unbypassZone"
+    local errorMessage = string.format ("Failed to unbypass zone %d.", zoneNo)
+
+    local status = sendIntercepted ("zb", functionName, errorMessage, string.format ("%s1%s", padLeft (zoneNo, 3, '0'), padLeft (g_pinCode, 6, '0')))
+    if (not status) then
+        return false
+    end
+
+    local zone, status = readResponse ("ZB", functionName, errorMessage)
+    if (zone ~= zoneNo)
+        log (string.format ("(%s) ERROR: %s", functionName, errorMessage))
+        task ("ERROR: " .. errorMessage, TASK_ERROR)
+        return false
+    end
+
+    if (zone == "unbypassed") then
+        debug (string.format ("(%s) SUCCESS: Unbypass successful.", functionName))
+        return true
+    end
+        
+    tryCount = (tryCount or 0) + 1
+    if (tryCount >= 4) then
+        log (string.format ("(%s) ERROR: %s", functionName, errorMessage))
+        task ("ERROR: " .. errorMessage, TASK_ERROR)
+        return false
+    end
+    
+    return unbypassZone (zoneNo, tryCount)
+end
+
+
+local function bypassZone (zoneNo, tryCount)
     local functionName = "bypassZone"
     local errorMessage = string.format ("Failed to bypass zone %d.", zoneNo)
 
-    local status = sendIntercepted ("zb", functionName, errorMessage, string.format ("%s1%s", padLeft (zoneNo, 3, '0'), padLeft (pinCode, 6, '0')))
+    local status = sendIntercepted ("zb", functionName, errorMessage, string.format ("%s1%s", padLeft (zoneNo, 3, '0'), padLeft (g_pinCode, 6, '0')))
     if (not status) then
         return false
     end
-    
+
     local zone, status = readResponse ("ZB", functionName, errorMessage)
-    
-    if (zone ~= zoneNo or status ~= "bypassed")
+    if (zone ~= zoneNo)
         log (string.format ("(%s) ERROR: %s", functionName, errorMessage))
         task ("ERROR: " .. errorMessage, TASK_ERROR)
@@ -441 +504 @@
     end
 
-    debug (string.format ("(%s) SUCCESS: Bypass successful.", functionName))
-    return true
-end
-
-
--- TODO: get PIN code
+    if (zone == "bypassed") then
+        debug (string.format ("(%s) SUCCESS: Bypass successful.", functionName))
+        return true
+    end
+        
+    tryCount = (tryCount or 0) + 1
+    if (tryCount >= 4) then
+        log (string.format ("(%s) ERROR: %s", functionName, errorMessage))
+        task ("ERROR: " .. errorMessage, TASK_ERROR)
+        return false
+    end
+    
+    return bypassZone (zoneNo, tryCount)
+end
+
+
 function setArmed (device, newArmedValue)
-    debug (string.format ("(setArmed) device=%d, newArmedValue=%s", device, newArmedValue))
-    
+    debug (string.format ("(setArmed) device=%d, newArmedValue=%s, g_pinCode=%s", device, newArmedValue, tostring (g_pinCode)))
+
+    if (not g_pinCode) then
+        log (string.format ("(%s) ERROR: Pin code required.", functionName))
+        task ("ERROR: Pin code required.", TASK_ERROR)
+        return false
+    end
+
     local zone = extractZone (luup.devices[device].id)
     if (not zone) then
@@ -456 +535 @@
         return false
     end
-    
+
     local status;
     if (newArmedValue == "0") then
         status = bypassZone (zone)
     else
-    end
-    
+        status = unbypassZone (zone)
+    end
+
     if (status) then
         luup.variable_set (SECURITY_SID, "Armed", newArmedValue, device)
@@ -789 +869 @@
 local function readResponse (expectedMsgType, functionName, errorMsg)
     local retryCount = 0
-    
+
     local msg = luup.io.read()
     local pos = msg:find (expectedMsgType)
@@ -798 +878 @@
         retryCount = retryCount + 1
     end
-    
+
     if (not pos) then
         log (string.format ("(%s) ERROR: %s", functionName, errorMsg))
@@ -811 +891 @@
         return status
     end
-    
+
     return status
 end
@@ -841 +921 @@
         return false
     end
-    
+
     return true
 end
@@ -943 +1023 @@
         return readResponse ("ZS", functionName, errorMessage)
     end
-    
+
     return false
 end
@@ -961 +1041 @@
         end
     end
-    
+
     return true
 end
@@ -1003 +1083 @@
         return readResponse ("KF", functionName, errorMessage)
     end
-    
+
     return false
 end
@@ -1016 +1096 @@
         return readResponse ("AS", functionName, errorMessage)
     end
-    
+
     return false
  end
@@ -1034 +1114 @@
         end
     end
-    
+
     return true
 end
@@ -1041 +1121 @@
 local function getZonesAndPartitions()
     local functionName = "getZonesAndPartitions"
-    
+
     -- Get zone information.
     local errorMessage = "Failed to get zones."
@@ -1058 +1138 @@
         return readResponse ("ZP", functionName, errorMessage)
     end
-    
+
     return false
 end
@@ -1071 +1151 @@
         return readResponse ("VN", functionName, errorMessage)
     end
-        
+
     return nil
 end
@@ -1091 +1171 @@
 
     -- Get all the zones and active partitions.
-    local status, message = getZonesAndPartitions()
+    local status = getZonesAndPartitions()
     if (not status) then
-        return false, tostring (message), "Elk Alarm Panel"
+        return false, g_errorMessage, "Elk Alarm Panel"
     end
 
@@ -1099 +1179 @@
 
     -- Get each Partition's status.
-    status, message = getPartitionStatuses()
+    status = getPartitionStatuses()
     if (not status) then
-        return false, tostring (message), "Elk Alarm Panel"
+        return false, g_errorMessage, "Elk Alarm Panel"
     end
 
@@ -1119 +1199 @@
     -- Get a list with the created child devices.
     getChildDevices()
-    
+
     -- Get each Zone's status.
-    status, message = getZoneStatuses()
+    status = getZoneStatuses()
     if (not status) then
-        return false, tostring (message), "Elk Alarm Panel"
+        return false, g_errorMessage, "Elk Alarm Panel"
     end