Changes in / [20:30]

Files:

• branches/Foscam (added)
• branches/Foscam/I_FoscamPTZ.xml (added)
• tags/2.6/I_FoscamPTZ.xml (modified) (23 diffs)
• trunk/I_VistaCamPT.xml (added)
• trunk/I_FoscamPTZ.xml (deleted)

/tags/2.6/I_FoscamPTZ.xml

@@ -21 +21 @@
             local lastTrip = luup.variable_get("urn:micasaverde-com:serviceId:SecuritySensor1", "LastTrip", sensorId) or 0
             local now = os.time()
-            if (os.difftime(now, lastTrip) >= ON_TIME) then -- 20 minutes
+            if os.difftime(now, lastTrip) >= ON_TIME then -- 20 minutes
                 luup.variable_set("urn:micasaverde-com:serviceId:SecuritySensor1", "Tripped", "0", sensorId)
             end
@@ -30 +30 @@
 
             local sensorId = tonumber(parameters.sensor_id, 10) or 0
-            if (sensorId == 0) then
+            if sensorId == 0 then
                 return "failed"
             end
@@ -44 +44 @@
 
         local function urlEncode (s)
-            if (s ~= nil) then
+            if s ~= nil then
                 s = s:gsub("\n", "\r\n")
                 s = s:gsub("([^%w ])", function (c)
@@ -64 +64 @@
 
             local sensorId = tonumber(luup.variable_get(CMD_SID, "MotionSensorID", lug_device) , 10) or 0
-            if (sensorId > 0) then
+            if sensorId > 0 then
                 return sensorId
             end
@@ -71 +71 @@
             local altid = "foscam_".. lug_device .."_sensor"
             for dev, attr in pairs(luup.devices) do
-                if (attr.id == altid) then
+                if attr.id == altid then
                     sensorId = dev
                     break
@@ -77 +77 @@
             end
 
-            if (sensorId == 0) then
+            if sensorId == 0 then
                 -- We haven't created the motion sensor. Set State to STATE_CREATE_MS.
                 luup.log("(".. luup.devices[lug_device].description .."::State=".. state ..") Motion sensor doesn't exist. Set State to STATE_CREATE_MS(".. STATE_CREATE_MS ..").")
@@ -96 +96 @@
 
             -- Check if we have the correct category number.
-            if (luup.devices[lul_device].category_num ~= 6) then
+            if luup.devices[lul_device].category_num ~= 6 then
                 luup.attr_set("category_num", "6", lul_device)
             end
@@ -105 +105 @@
             lug_ip = luup.devices[lul_device].ip or ""
 
-            lug_path = luup.variable_get(CAM_SID, "URL", lul_device) or ""
-            if (lug_path == "") then
+            local snapshotUrl = luup.variable_get(CAM_SID, "URL", lul_device) or ""
+            if snapshotUrl == "" then
                 luup.variable_set(CAM_SID, "URL", "/snapshot.cgi", lul_device)
             end
 
             lug_stepSize = luup.variable_get(CAM_SID, "StepSize", lul_device) or ""
-            if (lug_stepSize == "") then
+            if lug_stepSize == "" then
                 lug_stepSize = "1"
                 luup.variable_set(CAM_SID, "StepSize", lug_stepSize, lul_device)
@@ -117 +117 @@
 
             lug_reversePan = luup.variable_get(CAM_SID, "ReversePan", lul_device) or ""
-            if (lug_reversePan == "") then
+            if lug_reversePan == "" then
                 lug_reversePan = "0"
                 luup.variable_set(CAM_SID, "ReversePan", lug_reversePan, lul_device)
@@ -123 +123 @@
 
             lug_reverseTilt = luup.variable_get(CAM_SID, "ReverseTilt", lul_device) or ""
-            if (lug_reverseTilt == "") then
+            if lug_reverseTilt == "" then
                 lug_reverseTilt = "0"
                 luup.variable_set(CAM_SID, "ReverseTilt", lug_reverseTilt, lul_device)
@@ -130 +130 @@
             -- Disable zoom buttons by default.
             local commands = luup.variable_get(HAD_SID, "Commands", lul_device)
-            if (not commands) then
+            if not commands then
                 commands = "camera_up,camera_down,camera_left,camera_right,camera_full_screen,camera_preset,camera_archive_snapshot"
                 luup.variable_set(HAD_SID, "Commands", commands, lul_device)
@@ -143 +143 @@
             luup.log("(".. luup.devices[lul_device].description ..") State=".. state)
 
-            if (state == "") then
+            if state == "" then
                 -- If it's an upgrade from an older plugin version, State is ConfiguredMD.
                 state = luup.variable_get(CMD_SID, "ConfiguredMD", lul_device) or ""
-                if (state == "") then
+                if state == "" then
                     -- Not an upgrade, the plugin is freshly installed.
                     state = STATE_MD_DISABLED
@@ -162 +162 @@
             -- Motion detection disabled
             ----------------------------------------------------------------------------------------
-            if (state == STATE_MD_DISABLED) then -- Disable the motion detection.
+            if state == STATE_MD_DISABLED then -- Disable the motion detection.
                 return
             ----------------------------------------------------------------------------------------
             -- Motion sensor not created. Create the motion sensor.
             ----------------------------------------------------------------------------------------
-            elseif (state == STATE_CREATE_MS) then
+            elseif state == STATE_CREATE_MS then
 
                 -- We can't configure the camera for motion detection if we don't know its URL/IP address.
-                if (lug_ip == "") then
+                if lug_ip == "" then
                     luup.log("(".. luup.devices[lul_device].description .."::State=".. state ..") Missing camera IP.")
                     return false, "Missing camera IP address", luup.devices[lul_device].description
@@ -176 +176 @@
 
                 local gatewayAddress = luup.variable_get(CMD_SID, "GatewayAddress", lul_device) or ""
-                if (gatewayAddress == "") then
+                if gatewayAddress == "" then
                     -- Vera's IP address hasn't been specified. Try to get it based on the camera's IP address.
                     -- Get the camera subnet.
                     local camSubnet = lug_ip:match("%d+%.%d+%.%d+")
-                    if (camSubnet ~= nil) then
+                    if camSubnet ~= nil then
                         -- Try the WAN IP.
                         local stdout = io.popen("GetNetworkState.sh ip_wan")
@@ -186 +186 @@
                         stdout:close()
 
-                        if (not gatewayAddress:find(camSubnet, 1, true)) then
+                        if not gatewayAddress:find(camSubnet, 1, true) then
                             -- Try the LAN IP.
                             stdout = io.popen("GetNetworkState.sh ip_lan")
@@ -192 +192 @@
                             stdout:close()
 
-                            if (not gatewayAddress:find(camSubnet, 1, true)) then
+                            if not gatewayAddress:find(camSubnet, 1, true) then
                                 -- The camera is in a different network than Vera.
                                 gatewayAddress = ""
@@ -200 +200 @@
                 end
 
-                if (gatewayAddress == "") then
+                if gatewayAddress == "" then
                     -- Vera's IP address isn't specified and we couldn't get it based on the camera's IP address.
                     -- Create the variable so that it can be set up by the user.
@@ -212 +212 @@
 
                 -- Create the motion sensor.
+                luup.log("(".. luup.devices[lul_device].description .."::State=".. state ..") Create the motion sensor.")
                 local ptr = luup.chdev.start(lul_device)
-                luup.chdev.append(lul_device, ptr, "foscam_".. lul_device .."_sensor", "Foscam #".. lul_device .." Motion Sensor", "urn:schemas-micasaverde-com:device:MotionSensor:1", "D_MotionSensor1.xml", "", SES_SID ..",Armed=1\n".. SES_SID ..",Tripped=0", true, false)
+                luup.chdev.append(lul_device, ptr, "foscam_".. lul_device .."_sensor", luup.devices[lul_device].description .." Motion Sensor",
+                    "urn:schemas-micasaverde-com:device:MotionSensor:1", "D_MotionSensor1.xml", "", SES_SID ..",Armed=1\n".. SES_SID ..",Tripped=0", true, false)
                 luup.chdev.sync(lul_device, ptr)
+
             ----------------------------------------------------------------------------------------
             -- Motion sensor created. Configure the camera for motion detection reporting.
             ----------------------------------------------------------------------------------------
-            elseif (state == STATE_CONFIGURE_CAM) then
+            elseif state == STATE_CONFIGURE_CAM then
 
                 -- We can't configure the camera if we don't know Vera's URL / IP address.
                 local gatewayAddress = luup.variable_get(CMD_SID, "GatewayAddress", lul_device) or ""
-                if (gatewayAddress == "") then
+                if gatewayAddress == "" then
                     luup.log("(".. luup.devices[lul_device].description .."::State=".. state ..") GatewayAddress is empty.")
                     return false, "Missing Gateway IP address", luup.devices[lul_device].description
@@ -229 +232 @@
                 -- Get the motion sensor's device ID.
                 local sensorId = getMotionSensorId(state)
-                if (not sensorId) then
+                if not sensorId then
                     luup.call_delay("showSysMessage", 2, "Reload Luup to create motion sensor")
                     return
@@ -240 +243 @@
                 local url = "http://".. gatewayAddress ..":3480/data_request?id=lr_foscam_tripped&sensor_id=".. sensorId
                 local status = luup.inet.wget("http://".. lug_ip .."/set_alarm.cgi?motion_armed=1&http=1&http_url=".. urlEncode(url) .."&user=".. lug_username .."&pwd=".. urlEncode(lug_password), 5)
-                if (status ~= 0) then
+                if status ~= 0 then
                     luup.log("(".. luup.devices[lul_device].description .."::State=".. state ..") Failed to configure camera, status = ".. status ..".")
                     return false, "Failed to configure camera", luup.devices[lul_device].description
@@ -254 +257 @@
                 -- The configuration was successful.
                 luup.variable_set(CMD_SID, "State", STATE_CONFIGURED_OK, lul_device)
+
             ----------------------------------------------------------------------------------------
             -- Camera configured
@@ -261 +265 @@
                 -- Get the motion sensor's device ID.
                 local sensorId = getMotionSensorId(state)
-                if (not sensorId) then
-                    return false, "Reload Luup to create motion sensor", luup.devices[lul_device].description
+                if not sensorId then
+                    luup.call_delay("showSysMessage", 2, "Reload Luup to create motion sensor")
+                    return
                 end
 
                 -- Get and update the time until the sensor is considered untripped.
                 local onTime = luup.variable_get(SES_SID, "OnTime", sensorId) or ""
-                if (onTime:find("^%d+$") ~= nil) then
+                if onTime:find("^%d+$") ~= nil then
                     ON_TIME = tonumber(onTime, 10) or ON_TIME
                 else
@@ -275 +280 @@
                 -- Untrip the sensor if the OnTime has passed.
                 local lastTrip = luup.variable_get(SES_SID, "LastTrip", sensorId) or 0
-                if (os.difftime(os.time(), lastTrip) >= ON_TIME) then
+                if os.difftime(os.time(), lastTrip) >= ON_TIME then
                     luup.variable_set(SES_SID, "Tripped", "0", sensorId)
                 end