Changeset 139

Timestamp:

2015-02-13 15:00:17 (10 years ago)

Author:

mcvflorin

Message:

• Save the current pan/tilt angles before rebooting the camera, and restore them after reboot.
• Added implementation for the 'Reboot' action.

File:

• branches/UI7/I_ApexisUI7.xml (modified) (7 diffs)

branches/UI7/I_ApexisUI7.xml ¶

@@ -549 +549 @@
             elseif msConfStage == MS_CONF_STAGES.CREATE_DEVICE then
 
-                gatewayAddress = FindAddress()
+                local gatewayAddress = FindAddress()
                 luup.variable_set(CAM_SID, "GatewayAddress", gatewayAddress, lug_device)
                 if gatewayAddress == "" then
@@ -675 +675 @@
 --------------------------------------------------------------------------------
 
-        function RebootCamera()
+        function Reboot()
 
             local IP = luup.attr_get("ip", lug_device)
@@ -682 +682 @@
             password = UrlEncode(password)
 
-            local url = ""
+            local url, status, content
+
+            -- The camera's pan/tilt angles are resetting to the defaults when we reboot the camera,
+            -- so if the user sets other angles for the camera, but doesn't set them as defaults,
+            -- they will be lost after the reboot. Try to prevent this by saving the current pan/tilt angles,
+            -- and restoring them after the camera reboots.
+            if lug_model == MODEL_VISTACAM_PT then
+                -- Save current pan/tilt angles as preset 16.
+                url = "http://".. IP .."/decoder_control.cgi?user=".. username .."&pwd=".. password .."&command=60"
+                luup.log("ApexisUI7:Reboot- Save preset 16")
+                status, content = luup.inet.wget(url)
+                if not content or not content:lower():find("ok") then
+                    luup.log("ApexisUI7:Reboot- Failed to save preset 16", 1)
+                end
+
+                -- Set preset 16 as startup preset.
+                url = "http://".. IP .."/set_misc.cgi?user=".. username .."&pwd=".. password .."&ptz_preset_onstart=16"
+                luup.log("ApexisUI7:Reboot- Set preset 16 as startup preset")
+                status, content = luup.inet.wget(url)
+                if not content or not content:lower():find("ok") then
+                    luup.log("ApexisUI7:Reboot- Failed to set preset 16 as startup preset", 1)
+                end
+            end
+
             if not lug_cgiBin then
                 url = "http://".. IP .."/reboot.cgi?user=".. username .."&pwd=".. password
@@ -689 +712 @@
             end
 
-            local status, content = luup.inet.wget(url)
+            luup.log("ApexisUI7:Reboot- Reboot camera")
+            status, content = luup.inet.wget(url)
             if content and content:find("ok", 1, true) then
-                luup.log("ApexisUI7:RebootCamera- Request sent OK")
-            else
-                luup.log("ApexisUI7:RebootCamera- Failed to reboot camera", 1)
+                luup.log("ApexisUI7:Reboot- Request sent OK")
+            else
+                luup.log("ApexisUI7:Reboot- Failed to reboot camera", 1)
             end
         end
@@ -859 +883 @@
 
             if rebootCamera then
-                RebootCamera(model)
+                Reboot(model)
             end
         end
@@ -1604 +1628 @@
             end
 
-            luup.call_timer("RebootCamera", 2, "1:55:00", "1,2,3,4,5,6,7")
+            luup.call_timer("Reboot", 2, "1:55:00", "1,2,3,4,5,6,7")
             luup.log("ApexisUI7:Startup- Startup OK")
         end
@@ -1917 +1941 @@
 
         <action>
+            <serviceId>urn:micasaverde-com:serviceId:Camera1</serviceId>
+            <name>Reboot</name>
+            <run>
+                Reboot()
+            </run>
+        </action>
+
+        <action>
             <serviceId>urn:micasaverde-com:serviceId:SecuritySensor1</serviceId>
             <name>SetArmed</name>