Changes in trunk/L_VistaAlarmPanel1.lua [82:83]

File:

• trunk/L_VistaAlarmPanel1.lua (modified) (5 diffs)

trunk/L_VistaAlarmPanel1.lua

@@ -8 +8 @@
 
 -- Constants
-local VERSION = "2.45"
+local VERSION = "3.89"
 
 local NUM_PARTITIONS = 1 -- Number of partitions.
@@ -51 +51 @@
 }
 
-local FILE = "" --"/tmp/havsc"
+local FILE = "/etc/cmh-ludl/havsc"
 
 -- Globals
@@ -866 +866 @@
         return processRELEXPMessages(data)
     elseif (data:sub(1,1) == "!") then
-        local overNetwork = luup.variable_get(SID.PANEL, "overNetwork", lul_device) or ""
-        if overNetwork == "0" then
-            -- Ignore messages starting with '!'.
-            return true
-        end
+        -- Ignore messages starting with '!'.
+        return true
     end
 
@@ -1140 +1137 @@
     
     luup.variable_set(SID.PANEL, "PluginVersion", VERSION, lul_device)
-    local overNetwork = luup.variable_get(SID.PANEL, "overNetwork", lul_device) or ""
-    if overNetwork == "" then
-        luup.variable_set(SID.PANEL, "overNetwork", "0", lul_device)
-    else
-        if overNetwork == 0 then 
-            FILE = "/etc/cmh-ludl/havsc"
-        else
-            FILE = "/tmp/havsc"
-            -- IP based serial port code
-            -- Copyright (C) 2009-2011 Deborah Pickett
-            -- Adapted From: http://code.mios.com/trac/mios_caddxnx584/browser/trunk/L_CaddxNX584Security.lua
-            local ioDevice = luup.variable_get("urn:micasaverde-com:serviceId:HaDevice1", "IODevice", lul_device)
-            local useSocket = false
-            if (ioDevice == nil or ioDevice == "") then
-                useSocket = true
-            end
-            if (useSocket) then
-                local ip = luup.devices[lul_device].ip
-                local ipv4, tcpport = ip:match("(%d+%.%d+%.%d+%.%d+):(%d+)")
-                if (ipv4 ~= nil and tcpport ~= nil) then
-                    luup.log(string.format("(VistaAlarmPanel::main) Opening socket to %s port %s", ipv4, tcpport))
-                    luup.io.open(lul_device, ipv4, tcpport)
-                else
-                    luup.log("(VistaAlarmPanel::main) No serial device specified; exiting")
-                    return false, "(VistaAlarmPanel::main) No serial device specified. Please configure the plugin.",
-                    string.format("%s[%d]", luup.devices[lul_device].description, lul_device)
-                end
-            else
-                luup.log("(VistaAlarmPanel::main) Opening serial port")
-            end
-              -- End IP based serial port code
-        end
-    end
-    
+
+  -- IP based serial port code
+  -- Copyright (C) 2009-2011 Deborah Pickett
+  -- Adapted From: http://code.mios.com/trac/mios_caddxnx584/browser/trunk/L_CaddxNX584Security.lua
+  local ioDevice = luup.variable_get("urn:micasaverde-com:serviceId:HaDevice1", "IODevice", lul_device)
+  local useSocket = false
+  if (ioDevice == nil or ioDevice == "") then
+    luup.log("(VistaAlarmPanel::main) No IO device specified; going to check for IP based config")  
+    useSocket = true
+  end
+  if (useSocket) then
+    local ip = luup.devices[lul_device].ip
+    luup.log("(VistaAlarmPanel::main) Configured ip address: " .. ip)  
+    local ipv4, tcpport = ip:match("(%d+%.%d+%.%d+%.%d+):(%d+)")
+    if (ipv4 ~= nil and tcpport ~= nil) then
+      luup.log(string.format("(VistaAlarmPanel::main) Opening socket to %s port %s", ipv4, tcpport))
+      luup.io.open(lul_device, ipv4, tcpport)
+    else
+      luup.log("(VistaAlarmPanel::main) No serial device specified; exiting")
+      return false, "(VistaAlarmPanel::main) No serial device specified. Please configure the plugin.",
+        string.format("%s[%d]", luup.devices[lul_device].description, lul_device)
+    end
+  else
+    luup.log("(VistaAlarmPanel::main) Opening serial port")
+  end
+  -- End IP based serial port code
+  
     getDebugMode()
 
@@ -1235 +1225 @@
     -- Start the timer that checks the connection status.
     luup.call_delay("checkConnection", CHECK_CONNECTION_DELAY, "")
-    luup.set_failure(0, lul_device)
+    
+    if (luup.version_major >= 7) then
+        luup.set_failure(0, lul_device)
+  end
+
     log("(VistaAlarmPanel::main) SUCCESS: Startup successful.")
     return true, "Startup successful.", "Vista Alarm Panel"