Changes in / [1:3]

Location:

/trunk

Files:

• I_Rain8_1.xml (modified) (3 diffs)
• S_Rain8Switch_1.xml (added)
• D_Rain8_1.json (added)
• D_Rain8_1.xml (modified) (2 diffs)

/trunk/I_Rain8_1.xml

@@ -16 +16 @@
         function sendCommand(command)
             luup.log("rain8net: sending command: " .. textToHex(tostring(command)) )
-            if (luup.io.write(command) == false) then
+            if (luup.io.write(tostring(command)) == false) then
                 luup.log("Cannot send command " .. textToHex(tostring(command)) .. " communications error", 1)
                 luup.set_failure(true)
                 return false
+            end
+            --TODO: Verify ACK from device?
+            return true
         end
-        --TODO: Verify ACK from device?
-        return true
-    end
 
-    function buildCommand( unit, zone, command )
-        -- 0x40 [unit] [command | zone]
-        return string.char( 0x40, unit, (command + zone) )
-    end
+        function buildCommand( unit, zone, command )
+            -- 0x40 [unit] [command | zone]
+            return string.char( 0x40, unit, (command + zone) )
+        end
 
-    function rain8Startup(lul_device)
-        luup.log("Running I_Rain8_1.xml")
-        -- TODO: Should get poll device for current state?
-    end
+        function rain8Startup(lul_device)
+            luup.log("Running I_Rain8_1.xml")
+            -- TODO: Should get poll device for current state?
+        end
     </functions>
 
@@ -47 +47 @@
 
         <action>
-            <serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
+            <serviceId>urn:upnp-org:serviceId:Rain8Switch_1</serviceId>
             <name>SetTarget</name>
             <run>
                 local power = lul_settings[ 'newTargetValue']
-                local unit = 1 --luup.variable_get("urn:edmidor-com:serviceId:Rain8_1", "Unit", lul_device)
-                local zone = 1 --luup.variable_get("urn:edmidor-com:serviceId:Rain8_1", "Zone", lul_device)
+                local unit = luup.variable_get( "urn:upnp-org:serviceId:Rain8Switch_1", "Unit", lul_device )
+                local zone = luup.variable_get( "urn:upnp-org:serviceId:Rain8Switch_1", "Zone", lul_device )
 
                 if( power == "1" ) then
@@ -61 +61 @@
                     sendCommand( buildCommand(unit, zone, 0x40) );
                 end
+
+                -- Indicate we have run
+                -- TODO: Move to when we have verified valve is on (ACK)
+                luup.variable_set( "urn:upnp-org:serviceId:Rain8Switch_1", "Status", power, lul_device )
+
                 return true
             </run>
         </action>
 
+        <action>
+            <serviceId>urn:upnp-org:serviceId:Rain8Switch_1</serviceId>
+            <name>SetAddress</name>
+            <run>
+                luup.log("Rain8: Set address to " .. lul_settings['Unit'] .. ":" .. lul_settings['Zone'] )
+                luup.variable_set( "urn:upnp-org:serviceId:Rain8Switch_1", "Unit", lul_settings['Unit'], lul_device )
+                luup.variable_set( "urn:upnp-org:serviceId:Rain8Switch_1", "Zone", lul_settings['Zone'], lul_device )
+            </run>
+        </action>
+
         </actionList>
 </implementation>

/trunk/D_Rain8_1.xml

@@ -6 +6 @@
   </specVersion>
   <device>
-    <deviceType>urn:schemas-upnp-org:device:BinaryLight:1</deviceType>
-    <staticJson>D_BinaryLight1.json</staticJson>
+    <deviceType>urn:schemas-upnp-org:device:Rain8_1:1</deviceType>
+    <staticJson>D_Rain8_1.json</staticJson>
     <friendlyName>Rain8net Irigation Controller over RS232</friendlyName>
     <manufacturer>WGL Designs</manufacturer>
@@ -24 +24 @@
     <serviceList>
         <service>
-           <serviceType>urn:schemas-upnp-org:service:SwitchPower:1</serviceType>
-       <serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
-           <controlURL>/upnp/control/SwitchPower1</controlURL>
-           <eventSubURL>/upnp/event/SwitchPower1</eventSubURL>
-           <SCPDURL>S_SwitchPower1.xml</SCPDURL>
+           <serviceType>urn:schemas-upnp-org:service:Rain8Switch_1:1</serviceType>
+       <serviceId>urn:upnp-org:serviceId:Rain8Switch_1</serviceId>
+           <controlURL>/upnp/control/Rain8Switch_1</controlURL>
+           <eventSubURL>/upnp/event/Rain8Switch_1</eventSubURL>
+           <SCPDURL>S_Rain8Switch_1.xml</SCPDURL>
         </service>
     </serviceList>
-
+    <sceneList>
+{
+    "group_1":{
+        "cmd_1": 
+        {
+            "label": "ON",
+            "serviceId": "urn:upnp-org:serviceId:Rain8Switch_1",
+            "action": "SetTarget",
+            "arguments":
+            {
+                "newTargetValue": "1"
+            }
+        },
+        "cmd_2": 
+        {
+            "label": "OFF",
+            "serviceId": "urn:upnp-org:serviceId:Rain8Switch_1",
+            "action": "SetTarget",
+            "arguments":
+            {
+                "newTargetValue": "0"
+            }
+        }
+    }
+}   
+    </sceneList>
+    <eventList>
+{
+    "event_1":{
+        "label": "A device is turned on or off",
+        "serviceId": "urn:upnp-org:serviceId:Rain8Switch_1",
+        "argumentList" :
+        {
+            "argument_1" :
+            {
+                "dataType": "boolean",
+                "defaultValue": "1",
+                "allowedValueList" : 
+                {
+                    "Off" : "0",
+                    "On" : "1"
+                },
+                "name": "Status",
+                "comparisson": "=",
+                "prefix": "Which mode",
+                "suffix": ""
+            }
+        }
+    }
+}
+  </eventList>  
   </device>
 </root>