Changeset 23

Timestamp:

2010-07-05 08:01:46 (15 years ago)

Author:

javier_guerra

Message:

aded humidity sensor and window coverings (limited)

File:

• L_sPhoneUI.lua (modified) (5 diffs)

L_sPhoneUI.lua ¶

@@ -48 +48 @@
                 end
                 
-                if( v.category_num==2 ) then -- DEVICE_CATEGORY_DIMMABLE_LIGHT
+                if( v.category_num==2 or v.category_num==8 ) then -- DEVICE_CATEGORY_DIMMABLE_LIGHT
                     table.insert (out, '<li class="bg">' .. lug_sPhoneRequest_light(k,v.description,lul_js) .. "</li>\n")
                 elseif( v.category_num==5 ) then -- DEVICE_CATEGORY_HVAC
@@ -58 +58 @@
                 elseif( v.category_num==17 ) then -- DEVICE_CATEGORY_TEMPERATURE
                     table.insert (out, '<li class="bg">' .. lug_sPhoneRequest_temp(k,v.description,lul_js) .. "</li>\n")
+                elseif( v.category_num==16 ) then -- DEVICE_CATEGORY_HUMIDITY
+                    table.insert (out, '<li class="bg">' .. lug_sPhoneRequest_humid(k,v.description,lul_js) .. "</li>\n")
                 elseif( v.category_num==18 ) then -- DEVICE_CATEGORY_LIGHT
                     table.insert (out, '<li class="bg">' .. lug_sPhoneRequest_bright(k,v.description,lul_js) .. "</li>\n")
@@ -387 +389 @@
                 <a href="data_request?id=lr_sPhone_action&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%"><img src="/cmh/iphone_file/buttons/on%{status_100}%.gif" alt="" border="0"/></a>
             ]]):template (tmpl_params)
-        
---          return ([[
---              <img src="/port_3480/L_sPhoneUI_layout/icons/dimmable.gif" alt="" width="44" height="43" align="absmiddle" class="icon"/>%{description}%<br/>
---              <img src="/port_3480/L_sPhoneUI_layout/images/spacer.gif" border="0" width="20" height="20" id="action_icon_%{device}%">
---              <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&time=%{time}%',%{device}%)"><img src="/port_3480/L_sPhoneUI_layout/buttons/off%{status_0}%.gif" alt="" border="0"/></a>
---              <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=25&time=%{time}%',%{device}%)"><img src="/port_3480/L_sPhoneUI_layout/buttons/25%{status_25}%.gif" alt="" border="0"/></a>
---              <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=50&time=%{time}%',%{device}%)"><img src="/port_3480/L_sPhoneUI_layout/buttons/50%{status_50}%.gif" alt="" border="0"/></a>
---              <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=75&time=%{time}%',%{device}%)"><img src="/port_3480/L_sPhoneUI_layout/buttons/75%{status_75}%.gif" alt="" border="0"/></a>
---              <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%',%{device}%)"><img src="/port_3480/L_sPhoneUI_layout/buttons/on%{status_100}%.gif" alt="" border="0"/></a> (%{level}%)
---          ]]):template (tmpl_params)
         end
     end
@@ -492 +484 @@
         end
     end
+    
+    function lug_sPhoneRequest_humid(lul_device, lul_description, lul_js)
+        local lul_humid = luup.variable_get ('urn:micasaverde-com:serviceId:HumiditySensor1', 'CurrentLevel', lul_device)
+        local tmpl_params = {
+            device = lul_device,
+            description = lul_description,
+            humid = lul_humid or 'N/A',
+        }
+        
+        if (lul_js=='1') then
+            return ([[
+                <img src="/port_3480/L_sPhoneUI_layout/icons/thermostat.gif" alt="" width="44" height="43" align="absmiddle" class="icon" id="pic_device_%{device}%" />%{description}%<br>
+                <img src="/port_3480/L_sPhoneUI_layout/images/spacer.gif" border="0" width="20" height="20" id="action_icon_%{device}%">
+                Humidity: %{humid}%%<br/>
+            ]]):template (tmpl_params)
+        else
+            return ([[
+                <img src="/port_3480/L_sPhoneUI_layout/icons/thermostat.gif" alt="" width="44" height="43" align="absmiddle" class="icon" />%{description}%<br>
+                Humidity: %{humid}%%<br/>
+            ]]):template (tmpl_params)
+        end
+    end
 
     function lug_sPhoneRequest_bright(lul_device,lul_description,lul_js)
@@ -505 +519 @@
                 <img src="/port_3480/L_sPhoneUI_layout/icons/brightness.gif" alt="" width="44" height="43" align="absmiddle" class="icon" id="pic_device_%{device}%" />%{description}%<br>
                 <img src="/port_3480/L_sPhoneUI_layout/images/spacer.gif" border="0" width="20" height="20" id="action_icon_%{device}%">
-                Light level: %{level}%<br/>
+                Light level: %{level}%%<br/>
             ]]):template(tmpl_params)
         else
             return ([[
                 <img src="/port_3480/L_sPhoneUI_layout/icons/brightness.gif" alt="" width="44" height="43" align="absmiddle" class="icon" />%{description}%<br>
-                Light level: %{level}%<br/>
+                Light level: %{level}%%<br/>
             ]]):template(tmpl_params)
         end