Changeset 10

Timestamp:

2010-04-16 16:16:40 (15 years ago)

Author:

javier_guerra

Message:

some more typos, on dimmer devices

File:

• L_sPhoneUI.lua (modified) (34 diffs)

L_sPhoneUI.lua ¶

@@ -5 +5 @@
         return
     end
-    
+
     function string:template(variables)
         return (self:gsub('%%{(.-)}%%', function (key) return tostring(variables[key] or '') end))
@@ -26 +26 @@
         <title>Vera Mobile</title>
         <meta http-equiv="pragma" content="nocache"/>
-        <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;"/> 
+        <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;"/>
         <script src="/cmh/js/mobile.js" language="javascript"></script>
         <link rel="stylesheet" href="/cmh/iphone_file/css/iui.css" type="text/css" />
@@ -44 +44 @@
 ]]}
         local time = os.clock()
-        
+
         for k,v in pairs(luup.scenes) do
             if( v.room_num==0 and v.hidden==false ) then
@@ -142 +142 @@
                 lul_arguments[k]=v
             end
-            
+
             luup.log(("lug_sPhoneRequest_action: %s=%s"):format(tostring(k),v))
         end
@@ -246 +246 @@
         local lul_room = lul_parameters.room
         local lul_job = lul_parameters.job
-        
+
         local lul_job_status,lul_job_text = luup.job.status(lul_job,tonumber(lul_device))
-        
+
         local lul_text = ""
 
@@ -283 +283 @@
                 Unknown status:]] .. tostring(lul_job_status)
         end
-            
+
         return ([[
             %{html_header}%
@@ -308 +308 @@
         local lul_Level = luup.variable_get("urn:upnp-org:serviceId:Dimming1","LoadLevelStatus",lul_device)
         local levelnum = tonumber(lul_Level)
-        
+
         local tmpl_params =  {
             description = lul_description,
@@ -321 +321 @@
             status_100 = (levelnum>=87.5) and '_h' or '',
         }
-    
+
         if( lul_js=='1' ) then
             return ([[
                 <img src="/cmh/iphone_file/icons/dimmable.gif" alt="" width="44" height="43" align="absmiddle" class="icon"/>%{description}%<br/>
                 <img src="/cmh/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=25&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=50&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=75&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/buttons/on%{status_100}%.gif" alt="" border="0"/></a> (%{level%}%)
+                <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=25&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=50&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=75&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/buttons/on%{status_100}%.gif" alt="" border="0"/></a> (%{level}%)
             ]]):template (tmpl_params)
         else
@@ -336 +336 @@
                 <img src="/cmh/iphone_file/icons/dimmable.gif" alt="" width="44" height="43" align="absmiddle" class="icon"/>%{description}%<br/>
                 <img src="/cmh/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=25&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=50&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=75&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/buttons/on%{status_100}%.gif" alt="" border="0"/></a> (%{level%}%)
-            ]]):template (tmpl_params)
-        end         
+                <a href="javascript:void(0);" onClick="set_device_icon(%{device}%,1);send_command('data_request?id=lr_sPhone_action_js&room=%{room_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=25&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=50&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=75&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/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_num}%&device=%{device}%&service=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=1&time=%{time}%',%{device}%)"><img src="/cmh/iphone_file/buttons/on%{status_100}%.gif" alt="" border="0"/></a> (%{level}%)
+            ]]):template (tmpl_params)
+        end
     end
 
     function lug_sPhoneRequest_switch(lul_device,lul_description,lul_js)
         local lul_Status = luup.variable_get("urn:upnp-org:serviceId:SwitchPower1","Status",lul_device)
-        
+
         local tmpl_params = {
             device = lul_device,
@@ -356 +356 @@
             status_100 = lul_Status=="1" and '_h' or '',
         }
-        
+
         if( lul_js=='1' ) then
             return ([[
@@ -376 +376 @@
         local lul_Armed = luup.variable_get("urn:micasaverde-com:serviceId:SecuritySensor1","Armed",lul_device)
         local lul_Tripped = luup.variable_get("urn:micasaverde-com:serviceId:SecuritySensor1","Tripped",lul_device)
-        
+
         local tmpl_params = {
             device = lul_device,
@@ -389 +389 @@
             tmpl_params.status_arm = '_h'
             tmpl_params.status_bypass = ''
-        end 
-        
+        end
+
         if( lul_js=='1' ) then
             return ([[
@@ -406 +406 @@
                 <a href="data_request?id=lu_variableset&DeviceNum=%{device}%&serviceId=urn:micasaverde-com:serviceId:SecuritySensor1&Variable=Armed&Value=0&time=%{time}%"><img src="/cmh/iphone_file/buttons/bypass%{status_bypass}%.gif" alt="" border="0"/></a>
             ]]):template (tmpl_params)
-        end         
+        end
     end
 
     function lug_sPhoneRequest_temp(lul_device,lul_description,lul_js)
-        local lul_Temp = luup.variable_get("urn:upnp-org:serviceId:TemperatureSensor1","CurrentTemperature",lul_device)     
+        local lul_Temp = luup.variable_get("urn:upnp-org:serviceId:TemperatureSensor1","CurrentTemperature",lul_device)
         local tmpl_params = {
             device = lul_device,
@@ -428 +428 @@
                 Temperature: %{temp}%&deg;<br/>
             ]]):template (tmpl_params)
-        end         
+        end
     end
 
@@ -450 +450 @@
                 Light level: %{lul_Level}%<br/>
             ]]):template(tmpl_params)
-        end         
+        end
     end
 
@@ -456 +456 @@
         local lul_Status = luup.variable_get("urn:upnp-org:serviceId:HVAC_UserOperatingMode1","ModeStatus",lul_device)
         local lul_fan_status = luup.variable_get("urn:upnp-org:serviceId:HVAC_FanOperatingMode1","ModeStatus",lul_device)
-        
+
         tmpl_params = {
             description = lul_description,
@@ -472 +472 @@
             status_fan_on = lul_fan_status=='Auto' and '' or '_h',
         }
-        
-        
+
+
         if( lul_js=='1' ) then
             return ([[
@@ -490 +490 @@
                         <td><img src="/cmh/images/set_deasupra.gif" border="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:TemperatureSetpoint1_Heat&action=SetCurrentSetpoint&NewCurrentSetpoint='+document.getElementById('NewCurrentSetpoint_Heat_%{device}%').value+'&time=%{time}%',%{device}%);" border="0"></td>
                     </tr>
-                
+
                     <tr>
                         <td>Cool: </td>
@@ -531 +531 @@
                 <input type="hidden" name="action" value="SetCurrentSetpoint">
                 <input type="hidden" name="time" value="%{time}%">
-                
+
                     <tr>
                         <td>Cool: </td>
@@ -543 +543 @@
                 Set point cool: %{setPointCool}%&deg;'
             ]]).template (tmpl_params)
-        end         
+        end
     end
 
@@ -549 +549 @@
         local lul_Status = luup.variable_get("urn:micasaverde-com:serviceId:DoorLock1","Status",lul_device)
         local lul_PinCodes = luup.variable_get("urn:micasaverde-com:serviceId:DoorLock1","PinCodes",lul_device)
-        
+
         local tmpl_params = {
             device = lul_device,
@@ -559 +559 @@
             existing_codes = '',
         }
-        
+
         if( lul_PinCodes~=nil and #lul_PinCodes>0 ) then
             local o = {'<table cellpadding="2" cellspacing="0">'}
@@ -641 +641 @@
                 %{existing_codes}%
             ]]):template (tmpl_params)
-        end         
+        end
     end
 
@@ -658 +658 @@
         end
         tmpl_params.js = lul_js
-        
+
         if( lul_js=='1' ) then
             return ([[
@@ -688 +688 @@
                 <br><a href="data_request?id=lr_sPhone_camimg&device=%{device}%&time=%{time}%&js=%{js}%">Refresh</a>
             ]]):template (tmpl_params)
-        end         
-        
+        end
+
     end
 
@@ -698 +698 @@
             lul_js = 0;
         end
-        
+
         luup.log("lul_js = " .. lul_js)
-        
+
         if( lul_room==nill or tonumber(lul_room)==0 ) then -- Room 0 means the main menu
             return lug_sPhoneRequest(lul_request,lul_parameters,lul_outputformat)
         end
-        
+
         local tmpl_params = {
             room = lul_room,
@@ -716 +716 @@
                 <li class="group">Scenes</li>
         ]]):template (tmpl_params)}
-        
+
         for k,v in pairs(luup.scenes) do
             if( v.room_num==tonumber(lul_room) and v.hidden==false ) then
@@ -723 +723 @@
                 tmpl_params.page = v.page
                 tmpl_params.description = v.description
-                
+
                 if(lul_js==0) then
                     table.insert (lul_html, ([[
@@ -743 +743 @@
                         </li>
                     ]]):template (tmpl_params))
-                    
+
                 end
             end
@@ -749 +749 @@
 
         table.insert (lul_html,'<li class="group">Devices</li>\n')
-            
+
         for k,v in pairs(luup.devices) do
             if( v.room_num==tonumber(lul_room) and v.hidden==false and v.invisible==false ) then
@@ -806 +806 @@
                 lul_arguments[k]=v
             end
-            
+
             luup.log("lug_sPhoneRequest_action: " .. tostring(k) .. "=" .. v)
         end
@@ -819 +819 @@
 
         if( lul_resultcode~=0 ) then
-            return 'ERROR: ' .. tostring(lul_resultcode) .. ': ' .. tostring(lul_resultstring) 
+            return 'ERROR: ' .. tostring(lul_resultcode) .. ': ' .. tostring(lul_resultstring)
         end
         luup.log("lul_resultcode: " .. lul_resultcode)
@@ -834 +834 @@
         local lul_room = lul_parameters["room"]
         local lul_job = lul_parameters["job"]
-        
+
         local lul_job_status,lul_job_text = luup.job.status(lul_job,tonumber(lul_device))
-        
+
         local lul_text = ""
 
@@ -850 +850 @@
             lul_text = 'ERROR: Unknown status:' .. tostring(lul_job_status)
         end
-            
+
         return lul_text
     end