Changes in / [1:3]

File:

• I_FoscamPTZ.xml (modified) (6 diffs)

/I_FoscamPTZ.xml

@@ -49 +49 @@
 
         function lug_startup (lul_device)
+
+            -- Check if we have the correct category number.
+            if (luup.devices[lul_device].category_num ~= 6) then
+                luup.attr_set("category_num", "6", lul_device)
+            end
+
             lug_username = luup.devices[lul_device].user or luup.variable_get(CAM_SID, "Username", lul_device) or ""
             lug_password = luup.devices[lul_device].pass or luup.variable_get(CAM_SID, "Password", lul_device) or ""
@@ -78 +84 @@
             local ver = luup.version_branch * 10000 + luup.version_major * 1000 + luup.version_minor
             if (ver < 15390) then
+                luup.log("(".. luup.devices[lul_device].description ..") Version ".. luup.version .." is too old.")
                 return
             end
 
-            -- The camera was already configured for motion detection.
+            -- Check if the camera was configured for motion detection.
             local configuredMd = luup.variable_get(CMD_SID, "ConfiguredMD", lul_device) or "0"
             if (configuredMd == "0") then
 
+                luup.log("(".. luup.devices[lul_device].description ..") ComfiguredMD = ".. configuredMd)
+
                 -- We can't configure the camera for motion detection if we don't know its URL/IP address.
                 if (lug_ip == "") then
-                    return
+                    luup.log("(".. luup.devices[lul_device].description .."::ComfiguredMD/".. configuredMd ..") Missing camera IP.")
+                    return false, "Missing camera IP address.", luup.devices[lul_device].description
                 end
 
@@ -118 +128 @@
                 end
 
-                -- Set the configured flag now because the Luup engine is restarted after 'sync'.
+                -- Set the ConfiguredMD variable here, because no value can be saved in the user_data after luup.chdev.sync has run.
                 luup.variable_set(CMD_SID, "ConfiguredMD", "1", lul_device)
 
@@ -128 +138 @@
             elseif (configuredMd == "1") then
 
+                luup.log("(".. luup.devices[lul_device].description ..") ComfiguredMD = ".. configuredMd)
+
                 -- We can't configure the camera if we don't know Vera's URL / IP address.
-                local veraAddress = luup.variable_get(CMD_SID, "VeraAddress", lul_device)
+                local veraAddress = luup.variable_get(CMD_SID, "VeraAddress", lul_device) or ""
                 if (veraAddress == "") then
-                    return
+                    luup.log("(".. luup.devices[lul_device].description .."::ComfiguredMD/".. configuredMd ..") VeraAddress is empty.")
+                    return false, "Missing Vera IP address.", luup.devices[lul_device].description
                 end
 
@@ -144 +157 @@
                 end
 
+                -- We haven't created the motion sensor. Reset the ConfiguredMD variable.
+                if (sensorId == 0) then
+                    luup.log("(".. luup.devices[lul_device].description .."::ComfiguredMD/".. configuredMd ..") Motion sensor doesn't exist.")
+                    luup.variable_set(CMD_SID, "ConfiguredMD", "0", lul_device)
+                    return
+                end
+
                 -- Configure the camera:
                 -- 1. Enable motion detection.
@@ -151 +171 @@
                 luup.inet.wget("http://".. lug_ip .."/set_alarm.cgi?motion_armed=1&http=1&http_url=".. urlEncode(url) .."&user=".. lug_username .."&pwd=".. lug_password, 5)
 
-                if (sensorId ~= 0) then
-                    -- Get and set the time until the sensor is considered untripped.
-                    local onTime = luup.variable_get(SES_SID, "OnTime", sensorId) or ""
-                    if (onTime:find("^%d+$") ~= nil) then
-                        ON_TIME = tonumber(onTime, 10) or ON_TIME
-                    else
-                        luup.variable_set(SES_SID, "OnTime", tostring(ON_TIME), sensorId)
-                    end
+                -- Get and set the time until the sensor is considered untripped.
+                local onTime = luup.variable_get(SES_SID, "OnTime", sensorId) or ""
+                if (onTime:find("^%d+$") ~= nil) then
+                    ON_TIME = tonumber(onTime, 10) or ON_TIME
+                else
+                    luup.variable_set(SES_SID, "OnTime", tostring(ON_TIME), sensorId)
                 end
 
                 luup.variable_set(CMD_SID, "ConfiguredMD", "2", lul_device)
             else
+                luup.log("(".. luup.devices[lul_device].description ..") ComfiguredMD = ".. configuredMd)
                 -- Run the 'trip' function when notified.
                 luup.register_handler("trip", "foscam_tripped")