Changeset 11

Timestamp:

2011-05-23 19:30:08 (14 years ago)

Author:

mcvflorin

Message:

• Updated the code to use 'luup.io.intercept' in the startup initialization functions.

File:

• I_ElkAlarmPanel1.lua (modified) (21 diffs)

I_ElkAlarmPanel1.lua ¶

@@ -30 +30 @@
 local log = luup.log
 
----------- Generic Utilities ----------
+------------------------------ Generic Utilities ------------------------------
 
 local function debug (text)
@@ -149 +149 @@
 end
 
----------- Action implementations ----------
+---------------------------- Action implementations ---------------------------
 
 local function requestArmMode (device, state, pinCode)
@@ -190 +190 @@
 end
 
----------- Message Handling ----------
+------------------------- Message Handling: Constants -------------------------
 
 --[[ Here only for reference:
@@ -388 +388 @@
     ['T'] = "Intercom Key"
 }
+
+----------------- Message Processing: Function Implementations ----------------
 
 local function processZoneChangeUpdate (data)
@@ -579 +581 @@
 end
 
----------- Incoming Message Processing ----------
+------------------------- Incoming Message Processing -------------------------
 
 local PANEL_RESPONSES = {
@@ -587 +589 @@
             debug ("Message type description: Zone Definition Data")
             processZoneDefinitionData (data)
+            return true
         end
     },
@@ -594 +597 @@
             debug ("Message type description: Zone Partion Report")
             processZonePartitionReport (data)
+            return true
         end
     },
@@ -601 +605 @@
             debug ("Message type description: Zone and Partition Labels")
             processLabels (data)
+            return true
         end
     },
@@ -608 +613 @@
             debug ("Message type description: Zone Status Report")
             processZoneStatusReport (data)
+            return true
         end
     },
@@ -615 +621 @@
             debug ("Message type description: Arming Status Report")
             processArmingStatusReport (data)
+            return true
         end
     },
@@ -622 +629 @@
             debug ("Message type description: Keypad Function Key Press")
             processKeypadKeyPress (data)
+            return true
         end
     },
@@ -629 +637 @@
             debug ("Message type description: System Trouble Status")
             processSystemTroubleStatus (data)
+            return true
         end
     },
@@ -636 +645 @@
             debug ("Message type description: Log Data")
             processLogData (data)
+            return true
         end
     },
@@ -643 +653 @@
             debug ("Message type description: Zone Change Update")
             processZoneChangeUpdate (data)
+            return true
+        end
+    },
+    ["VN"] = {
+        "M1 Version Number",
+        function (data)
+            debug ("Message type description: M1 Version Number")
+            if (data == "") then
+                log ("ERROR: Missing version data.")
+                return
+            end
+            local uver, mver, lver = data:match ("^(%w%w)(%w%w)(%w%w)")
+            return string.format ("%d.%d.%d", tonumber (uver, 16), tonumber (mver, 16), tonumber (lver, 16))
         end
     }
@@ -676 +699 @@
 end
 
----------- Startup Functions ----------
+------------------------------ Startup Functions ------------------------------
 
 local function sendCommand (command, data)
@@ -686 +709 @@
     debug ("(sendCommand) Command to send: " .. cmd)
     if (not luup.io.write (cmd)) then
-        local message = string.format ("ERROR (sendCommand): Cannot send command: '%s'", cmd)
-        log (message)
-        luup.set_failure (true)
-
-        return false, message
-    end
-
-    return true, "Ok"
+        log (string.format ("(sendCommand) ERROR: Failed to send command: '%s'", cmd))
+        return false
+    end
+
+    return true
 end
 
@@ -756 +776 @@
 
 
+local function getZonesStatus()
+    luup.io.intercept()
+    local status = sendCommand ("zs")
+    if (not status) then
+        log ("(getZonesStatus) ERROR: Failed to get zones status.")
+        return false, "Failed to get zones status."
+    end
+    local msg = luup.io.read()
+    status = processMessage (msg)
+    if (not status) then
+        log ("(getZonesStatus) ERROR: Failed to get zones status.")
+        return false, "Failed to get zones status."
+    end
+
+end
+
+
 local function getZoneNames()
     for i in ipairs (g_childDevices.zones) do
-        sendCommand ("sd", string.format ("00%03d", i))
+        luup.io.intercept()
+        local status = sendCommand ("sd", string.format ("00%03d", i))
+        if (not status) then
+            log ("(getZoneNames) ERROR: Failed to get zones names.")
+        end
+        local msg = luup.io.read()
+        status = processMessage (msg)
+        if (not status) then
+            log ("(getZoneNames) ERROR: Failed to get zones names.")
+        end
     end
 end
@@ -792 +838 @@
 
 
-local function getPartitionNames()
+ local function getPartitionsStatus()
+    luup.io.intercept()
+    local status = sendCommand ("as")
+    if (not status) then
+        log ("(getPartitionsStatus) ERROR: Failed to get partitions status.")
+        return false, "Failed to get partitions status."
+    end
+    local msg = luup.io.read()
+    status = processMessage (msg)
+    if (not status) then
+        log ("(getPartitionsStatus) ERROR: Failed to get partitions status.")
+        return false, "Failed to get partitions status."
+    end
+ end
+
+
+local function getPartitionsName()
     for i in ipairs (g_childDevices.partitions) do
-        sendCommand ("sd", string.format ("01%03d", i))
+        luup.io.intercept()
+        local status = sendCommand ("sd", string.format ("01%03d", i))
+        if (not status) then
+            log ("(getPartitionNames) ERROR: Failed to get partition names.")
+            return
+        end
+        local msg = luup.io.read()
+        status = processMessage (msg)
+        if (not status) then
+            log ("(getPartitionNames) ERROR: Failed to get partition names.")
+            return
+        end
     end
 end
@@ -801 +874 @@
 local function getZonesAndPartitions()
     -- Get zone information.
-    local status, message = sendCommand ("zd")
-    if (status) then
-        -- Get partition information.
-        status, message = sendCommand ("zp")
-    end
-
-    return status, message
+    luup.io.intercept()
+    local status = sendCommand ("zd")
+    if (not status) then
+        log ("(getZonesAndPartitions) ERROR: Failed to get zones and partitions.")
+        return false, "Failed to get zones and partitions."
+    end
+    local msg = luup.io.read()
+    status = processMessage (msg)
+    if (not status) then
+        log ("(getZonesAndPartitions) ERROR: Failed to get zones and partitions.")
+        return false, "Failed to get zones and partitions."
+    end
+
+    -- Get partition information.
+    luup.io.intercept()
+    status = sendCommand ("zp")
+    if (not status) then
+        log ("(getZonesAndPartitions) ERROR: Failed to get zones and partitions.")
+        return false, "Failed to get zones and partitions."
+    end
+    msg = luup.io.read()
+    status = processMessage (msg)
+    if (not status) then
+        log ("(getZonesAndPartitions) ERROR: Failed to get zones and partitions.")
+        return false, "Failed to get zones and partitions."
+    end
+
+    return true
 end
 
@@ -813 +907 @@
 local function getVersion()
     luup.io.intercept()
-    sendCommand ("vn")
-    local msg = luup.io.read()
-    local msgType, data = checkMessage (message)
-    if (not msgType || data == "") then
-        debug ("(getVersion) ERROR: Missing version data.")
-        return "N/A"
-    end
-    
-    local uver, mver, lver = data:match ("^(%w%w)(%w%w)(%w%w)")
-    
-    return string.format ("%d.%d.%d", tonumber (uver, 16), tonumber (mver, 16), tonumber (lver, 16))
-end
-
---------------------------------------------------------------------------------------------------
+    local status = sendCommand ("vn")
+    if (status) then
+        local msg = luup.io.read()
+        return processMessage (msg)
+    end
+end
+
+-------------------------------------------------------------------------------
 
 function start (lul_device)
@@ -847 +935 @@
         end
 
-        getPartitionNames()
+        getPartitionsName()
+
         -- Get each Partition's status.
-        status, message = sendCommand ("as")
+        status, message = getPartitionsStatus()
         if (not status) then
             return status, message, "Elk Alarm Panel"
         end
+
         -- Get the Chime Mode for each partition.
         sendCommand ("kf", "010")
+
         -- Create a device for each active partition.
         appendPartitions (rootPtr)
 
         getZoneNames()
+
         -- Get each Zone's status.
-        status, message = sendCommand ("zs")
+        status, message = getZonesStatus()
         if (not status) then
             return status, message, "Elk Alarm Panel"
         end
+
         -- Create a device for each zone.
         appendZones (rootPtr)