Changes in / [20:30]

Files:

• branches/nono240 (added)
• branches/nono240/I_PingSensor.xml (added)
• branches/nono240/S_PingSensor.xml (added)
• branches/nono240/D_PingSensor.xml (added)
• branches/nono240/D_PingSensor.json (added)
• tags/0.1.3-UI5 (added)
• tags/0.1.3-UI5/I_PingSensor.xml (added)
• tags/0.1.3-UI5/S_PingSensor.xml (added)
• tags/0.1.3-UI5/D_PingSensor.xml (added)
• tags/0.1.3-UI5/D_PingSensor.json (added)
• tags/0.1.4-UI5 (added)
• tags/0.1.4-UI5/I_PingSensor.xml (added)
• tags/0.1.4-UI5/S_PingSensor.xml (added)
• tags/0.1.4-UI5/D_PingSensor.xml (added)
• tags/0.1.4-UI5/D_PingSensor.json (added)
• tags/0.1.2-UI5-merge-broken (added)
• tags/0.1.2-UI5-merge-broken/I_PingSensor.xml (added)
• tags/0.1.2-UI5-merge-broken/S_PingSensor.xml (added)
• tags/0.1.2-UI5-merge-broken/D_PingSensor.xml (added)
• tags/0.1.2-UI5-merge-broken/D_PingSensor.json (added)
• trunk (modified) (1 prop)
• trunk/I_PingSensor.xml (modified) (10 diffs)
• trunk/D_PingSensor.xml (modified) (1 diff)
• trunk/D_PingSensor.json (modified) (18 diffs)

/trunk

@@ -1 +1 @@
 compressit
 pushit
+backup

@@ -1 +1 @@
 compressit
 pushit
+backup

/trunk/I_PingSensor.xml

@@ -11 +11 @@
   <functions>
     local PING_SID = "urn:demo-ted-striker:serviceId:PingSensor1"
+    local SWITCH_SID = "urn:upnp-org:serviceId:SwitchPower1"
     local SECURITY_SID = "urn:micasaverde-com:serviceId:SecuritySensor1"
     local HADEVICE_SID = "urn:micasaverde-com:serviceId:HaDevice1"
     local GATEWAY_SID = "urn:micasaverde-com:serviceId:HomeAutomationGateway1"
 
-    local DEBUG_MODE = false
+    local DEBUG_MODE = true
     local DEFAULT_PERIOD = 15
     local DEFAULT_ADDRESS = "127.0.0.1"
@@ -35 +36 @@
     -- Initializes variables if none were found in config
     --
-    local function initSettings(address, period, invert)
+    local function initSettings(address, period, invert, enable)
       --
       -- Create a fallback delay if no parameters are given
       --
-      if (period == nil or period &lt;= DEFAULT_PERIOD) then
+      if (period == nil or tonumber(period) &lt;= DEFAULT_PERIOD) then
         period = DEFAULT_PERIOD
       end
@@ -47 +48 @@
       --
       address = address or DEFAULT_ADDRESS
+
+      --
+      -- Default to being enabled.
+      --
+      enable = enable or "1"
 
       --
@@ -57 +63 @@
       luup.variable_set(PING_SID, "Address", address, parentDevice)
       luup.variable_set(PING_SID, "Invert", invert, parentDevice)
+      luup.variable_set(SWITCH_SID, "Target", enable, parentDevice)
+      luup.variable_set(SWITCH_SID, "Status", enable, parentDevice)
 
       luup.variable_set(HADEVICE_SID, "LastUpdate", os.time(os.date('*t')), parentDevice)
@@ -64 +72 @@
       log("Initialized variable: 'Period' = " .. period)
       log("Initialized variable: 'Invert' = " .. invert)
-
-      --
-      -- due to strange behavior we have to restart the lua engine
-      -- if we wouldn't, the sensor would not appear as sensor in the UI
-      -- (the results of the action call do not matter)
-      --
-      log("RESTARTING LUA TO INITIALIZE PING SENSOR!")
-      lul_resultcode, lul_resultstring, lul_job, lul_returnarguments = luup.call_action(GATEWAY_SID, "Reload", {}, 0)
-
-      return address, period, invert
+      log("Initialized variable: 'Enable' = " .. enable)
+
+      luup.task("Please restart Luup to initialize the plugin.", 1, "Ping Sensor", -1)
+
+      return address, period, invert, enable
     end
 
 
     local function readSettings(parentDevice)
-      local address = ""
-      local period = ""
-      local invert = ""
-
       --
       -- Get local address and delay between repetition from configuration
       --
-      address = luup.variable_get(PING_SID, "Address", parentDevice)
-      period = luup.variable_get(PING_SID, "Period", parentDevice)
-      invert = luup.variable_get(PING_SID, "Invert", parentDevice)
+      local address = luup.variable_get(PING_SID, "Address", parentDevice)
+      local period = luup.variable_get(PING_SID, "Period", parentDevice)
+      local invert = luup.variable_get(PING_SID, "Invert", parentDevice)
+      local enable = luup.variable_get(SWITCH_SID, "Status", parentDevice)
 
       --
       -- init configuration variables if they were empty
       --
-      if (address == nil or period == nil or invert == nil) then
-        address, period, invert = initSettings(address, period, invert)
-      end
-
-      return address, period, invert
+      if (address == nil or period == nil or invert == nil or enable == nil) then
+        address, period, invert, enable = initSettings(address, period, invert, enable)
+      end
+
+      return address, period, invert, enable
     end
 
@@ -120 +120 @@
       --
       -- log("Address found was: " .. address .. " / Delay found was: " .. tostring(period) .. "s")
-      local address, period, invert = readSettings(parentDevice)
+      local address, period, invert, enable = readSettings(parentDevice)
       if (address == nil or period == nil) then
         log("#" .. tostring(parentDevice) .. " starting up with id " .. luup.devices[parentDevice].id .. "could not be started.")
@@ -131 +131 @@
       --
       PARENT_DEVICE = parentDevice
-      PING_ADDRESS = address
-      PING_DELAY = period
-      PING_INVERT = invert
 
       --
@@ -203 +200 @@
     local function setResult(parentDevice, pingResult)
       -- Store the current ping result only when it has changed
-      local currentState = luup.variable_get(SECURITY_SID, "Tripped", parentDevice)
-      if (currentState ~= pingResult) then
+      local origTripped = luup.variable_get(SECURITY_SID, "Tripped", parentDevice)
+      origTripped = origTripped or "0"
+
+      if (origTripped  ~= pingResult) then
         local time = os.time(os.date('*t'))
-        local origTripped = luup.variable_get(SECURITY_SID, "Tripped", parentDevice)
-        origTripped = origTripped or "0"
 
         luup.variable_set(SECURITY_SID, "Tripped", pingResult, parentDevice)
@@ -226 +223 @@
       --
       -- Reset the timer at the beginning, just in case the subsequent code fails.
-      -- 
+      --
       -- The last parameter is temporary, can be removed in later builds once bug fix
       -- is in place (http://forum.micasaverde.com/index.php?topic=1608.0)
       --
-      luup.call_timer("refreshCache", 1, tostring(PING_DELAY), "")
-
-      -- ping the address, write result, inverted if necessary.
-      setResult(PARENT_DEVICE, invertResult(executePing(PING_ADDRESS), PING_INVERT))
+      local address, period, invert, enable = readSettings(parentDevice)
+      luup.call_timer("refreshCache", 1, tostring(period), "")
+
+      --
+      -- To avoid having to be able to "cancel" a running timer, esp after repeated
+      -- enable/disable calls, we simply "do nothing" in this code if the timer is
+      -- disabled.  The actual timer itself is never stopped, we simply don't respond
+      -- if we're disabled.
+      --
+      if (enable == "1") then
+        -- ping the address, write result, inverted if necessary.
+        setResult(PARENT_DEVICE, invertResult(executePing(address), invert))
+        debug("Ping Enabled, executed")
+      else
+        debug("Ping Disabled, not executed " .. (enable or "No value"))
+      end
     end
   </functions>
@@ -295 +304 @@
       </run>
     </action>
+
+    <action>
+      <serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
+      <name>SetTarget</name>
+      <run>
+        luup.variable_set(SWITCH_SID, "Target", lul_settings.newTargetValue, parentDevice)
+        luup.variable_set(SWITCH_SID, "Status", lul_settings.newTargetValue, parentDevice)
+      </run>
+    </action>
   </actionList>
 </implementation>

/trunk/D_PingSensor.xml

@@ -25 +25 @@
         <SCPDURL>S_SecuritySensor1.xml</SCPDURL>
       </service>
+      <service>
+        <serviceType>urn:schemas-upnp-org:service:SwitchPower:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
+        <SCPDURL>S_SwitchPower1.xml</SCPDURL>
+      </service>
     </serviceList>
     <implementationList>

/trunk/D_PingSensor.json

@@ -7 +7 @@
     "imgIconMax": "",
     "halloIconsDir": "pics\/hallo",
+    "inScene": "1",
     "DisplayStatus": {
         "Service": "urn:micasaverde-com:serviceId:SecuritySensor1",
         "Variable": "Tripped",
         "MinValue": "0",
-        "MaxValue": "1" 
+        "MaxValue": "1"
     },
         "doc_url": {
@@ -18 +19 @@
         "doc_version": 1,
         "doc_platform": 0,
-        "doc_page": "sensors" 
+        "doc_page": "sensors"
     },
     "ToggleButton": 1,
@@ -25 +26 @@
             "Label": {
                 "lang_tag": "tabname_control",
-                "text": "Control" 
+                "text": "Control"
             },
             "Position": "0",
             "TabType": "flash",
+            "SceneGroup":[
+                {
+                    "id": "1",
+                    "top": "0.5",
+                    "left": "0",
+                    "x": "2",
+                    "y": "1"
+                },
+                {
+                    "id": "2",
+                    "top": "2",
+                    "left": "0",
+                    "x": "2",
+                    "y": "1"
+                }
+            ],
             "ControlGroup":[
             {
                 "id": "1",
-                "isSingle": "1"
+                "isSingle": "1",
+                "scenegroup": "1"
             },
             {
                 "id": "2",
-                "isSingle": "1"
+                "isSingle": "1",
+                "scenegroup": "2"
             }
             ],
@@ -45 +64 @@
                     "Label": {
                         "lang_tag": "cmd_arm",
-                        "text": "Arm" 
+                        "text": "Arm"
                     },
                     "Display": {
@@ -54 +73 @@
                         "Left": 50,
                         "Width": 75,
-                        "Height": 20 
+                        "Height": 20
                     },
                     "Command": {
@@ -62 +81 @@
                             {
                                 "Name": "newArmedValue",
-                                "Value": "1" 
-                            } 
-                        ] 
-                    } 
+                                "Value": "1"
+                            }
+                        ]
+                    }
                 },
                 {
@@ -72 +91 @@
                     "Label": {
                         "lang_tag": "cmd_bypass",
-                        "text": "Bypass" 
-                    },
+                        "text": "Bypass"
+                    },
+                    "left": "1",
                     "Display": {
                         "Service": "urn:micasaverde-com:serviceId:SecuritySensor1",
@@ -81 +101 @@
                         "Left": 145,
                         "Width": 75,
-                        "Height": 20 
+                        "Height": 20
                     },
                     "Command": {
@@ -89 +109 @@
                             {
                                 "Name": "newArmedValue",
-                                "Value": "0" 
-                            } 
-                        ] 
-                    } 
+                                "Value": "0"
+                            }
+                        ]
+                    }
                 },
                 {
@@ -144 +164 @@
                         "text": "Invert"
                     },
+                    "left": "1",
                     "Display": {
                         "Service": "urn:demo-ted-striker:serviceId:PingSensor1",
@@ -164 +185 @@
                     }
                 }
-            ] 
+            ]
         },
         {
             "Label": {
                 "lang_tag": "advanced",
-                "text": "Advanced" 
+                "text": "Advanced"
             },
             "Position": "2",
             "TabType": "javascript",
             "ScriptName": "shared.js",
-            "Function": "advanced_device" 
+            "Function": "advanced_device"
         },
         {
             "Label": {
                 "lang_tag": "logs",
-                "text": "Logs" 
+                "text": "Logs"
             },
             "Position": "4",
             "TabType": "javascript",
             "ScriptName": "shared.js",
-            "Function": "device_logs" 
+            "Function": "device_logs"
         },
         {
             "Label": {
                 "lang_tag": "notifications",
-                "text": "Notifications" 
+                "text": "Notifications"
             },
             "Position": "5",
             "TabType": "javascript",
             "ScriptName": "shared.js",
-            "Function": "device_notifications" 
-        } 
+            "Function": "device_notifications"
+        }
     ],
     "sceneList": {
@@ -204 +225 @@
                 "action": "SetArmed",
                 "arguments": {
-                    "newArmedValue": "1" 
+                    "newArmedValue": "1"
                 },
                 "display": {
@@ -210 +231 @@
                     "variable": "Armed",
                     "value": "1"
-                } 
+                }
             },
             "cmd_2": {
@@ -217 +238 @@
                 "action": "SetArmed",
                 "arguments": {
-                    "newArmedValue": "0" 
+                    "newArmedValue": "0"
                 },
                 "display": {
@@ -223 +244 @@
                     "variable": "Armed",
                     "value": "0"
-                } 
-            } 
-        } 
+                }
+            }
+        },
+        "group_2": {
+            "cmd_3": {
+                "label": "Enable",
+                "serviceId": "urn:upnp-org:serviceId:SwitchPower1",
+                "action": "SetTarget",
+                "arguments": {
+                    "newTargetValue": "1"
+                },
+                "display": {
+                    "service": "urn:upnp-org:serviceId:SwitchPower1",
+                    "variable": "Status",
+                    "value": "1"
+                }
+            },
+            "cmd_4": {
+                "label": "Disable",
+                "serviceId": "urn:upnp-org:serviceId:SwitchPower1",
+                "action": "SetTarget",
+                "arguments": {
+                    "newTargetValue": "0"
+                },
+                "display": {
+                    "service": "urn:upnp-org:serviceId:SwitchPower1",
+                    "variable": "Status",
+                    "value": "0"
+                }
+            }
+        }
     },
     "eventList": {
@@ -237 +286 @@
                     "allowedValueList": {
                         "Yes": "1",
-                        "No": "0" 
+                        "No": "0"
                     },
                     "name": "Tripped",
                     "comparisson": "=",
                     "prefix": "Tripped?",
-                    "suffix": "" 
-                } 
-            } 
+                    "suffix": ""
+                }
+            }
         },
         "event_2": {
@@ -252 +301 @@
                 "Armed": {
                     "value": "1",
-                    "comparisson": "=" 
-                } 
+                    "comparisson": "="
+                }
             },
             "argumentList": {
@@ -260 +309 @@
                     "allowedValueList": {
                         "Yes": "1",
-                        "No": "0" 
+                        "No": "0"
                     },
                     "name": "Tripped",
                     "comparisson": "=",
                     "prefix": "Tripped?",
-                    "suffix": " " 
-                } 
-            } 
+                    "suffix": " "
+                }
+            }
         }
     },
-    "DeviceType": "urn:schemas-micasaverde-com:device:MotionSensor:1",
+    "eventList2": [
+        {
+            "id": 1,
+            "label": {
+                "lang_tag": "door_window_motion_sensor_is_tripped",
+                "text": "A sensor (door\/window\/motion\/etc.) is tripped"
+            },
+            "serviceId": "urn:micasaverde-com:serviceId:SecuritySensor1",
+            "argumentList": [
+                {
+                    "id": 1,
+                    "dataType": "boolean",
+                    "defaultValue": "",
+                    "allowedValueList": [
+                        {
+                            "Yes": "1",
+                            "HumanFriendlyText": {
+                                "lang_tag": "",
+                                "text": "_DEVICE_NAME_ is Tripped"
+                            }
+                        },
+                        {
+                            "No": "0",
+                            "HumanFriendlyText": {
+                                "lang_tag": "",
+                                "text": "_DEVICE_NAME_ is not Tripped"
+                            }
+                        }
+                    ],
+                    "name": "Tripped",
+                    "comparisson": "=",
+                    "prefix": {},
+                    "suffix": {}
+                }
+            ]
+        },
+        {
+            "id": 2,
+            "label": {
+                "lang_tag": "an_armed_sensor_is_tripped",
+                "text": "An armed sensor is tripped"
+            },
+            "serviceId": "urn:micasaverde-com:serviceId:SecuritySensor1",
+            "serviceStateTable": {
+                "Armed": {
+                    "value": "1",
+                    "comparisson": "="
+                }
+            },
+            "argumentList": [
+                {
+                    "id": 1,
+                    "dataType": "boolean",
+                    "allowedValueList": [
+                        {
+                            "Yes": "1",
+                            "HumanFriendlyText": {
+                                "lang_tag": "hft_sensor_tripped",
+                                "text": "_DEVICE_NAME_ is Tripped"
+                            }
+                        },
+                        {
+                            "No": "0",
+                            "HumanFriendlyText": {
+                                "lang_tag": "hft_sensor_not_tripped",
+                                "text": "_DEVICE_NAME_ is not Tripped"
+                            }
+                        }
+                    ],
+                    "name": "Tripped",
+                    "comparisson": "=",
+                    "prefix": {},
+                    "suffix": {}
+                }
+            ]
+        }
+    ],
+    "DeviceType": "urn:schemas-micasaverde-com:device:MotionSensor:1"
 }

@@ -1 +1 @@
 compressit
 pushit
+backup