Changeset 406

Timestamp:

2015-08-13 23:01:41 (10 years ago)

Author:

amg0

Message:

different up cycle time and down cycle time

Location:

trunk

Files:

• J_IPX800.js (modified) (2 diffs)
• L_IPX800.lua (modified) (4 diffs)

trunk/J_IPX800.js ¶

@@ -87 +87 @@
     var htmlrefresh = 'Update Frequency:</td><td><input id="updatefrequency" size="5" min="0" max="9999" type="number" value="'+updatefrequency+'" onchange="ipx_SetUpdateFrequency(' + deviceID + ', \'UpdateFrequency\', this.value)"> seconds.';
     var htmlpushmsg = 'you can also configure a PUSH from the ipx800 with the following path: /data_request?id=lr_IPX800_Handler&mac=$M&deviceID='+deviceID;
-    var htmloutput = 'Show Output Relays:</td><td><input id="ipx800_OutputRelays" type="text" size="15" value="'+outputRelays+'" onchange="ipx_SetOutputRelays(' + deviceID + ', \'OutputRelays\', this.value);">'+' csv list of numbers (1..32) & optional type W for window cover.ex: 1,5,6 or 1W-2-3-30,5,6 for up,"W","-",stop,"-",down,"-",cycle duration in sec. Relays must be configured in pulse mode for window cover )';
+    var htmloutput = 'Show Output Relays:</td><td><input id="ipx800_OutputRelays" type="text" size="15" value="'+outputRelays+'" onchange="ipx_SetOutputRelays(' + deviceID + ', \'OutputRelays\', this.value);">'+' csv list of numbers (1..32) & optional type W for window cover.ex: 1,5,6 or 1W-2-3-30-40,5,6 for up,"W","-",stop,"-",down,"-",up cycle,"-",down cycle duration in sec. Relays must be configured in pulse mode for window cover )';
     var htmlinput = 'Show Digital Input:</td><td><input id="ipx800_InputRelays" type="text" size="15" value="'+inputRelays+'" onchange="ipx_SetInputRelays(' + deviceID + ', \'InputRelays\', this.value);">'+' csv list of numbers & optional type : 1,2 or 1P,2M';
     var htmlanainput = 'Show Analog Inputs:</td><td><input id="ipx800_AnalogInputs" type="text" size="15" value="'+analogInputs+'" onchange="ipx_SetAnalogInputs(' + deviceID + ', \'AnalogInputs\', this.value);">'+' csv list of numbers & optional type TLH : 1,2 or 1T,2L';
@@ -177 +177 @@
 {
     // ex: 1W-2-3-20,2,3W-2-3-40,3W-2-3-40
-    var reg =  /^(\d+(W-\d+-\d+(-\d+)?|P)?)+(,\d+(W-\d+-\d+(-\d+)?|P)?)*$/; 
+    var reg =  /^(\d+(W-\d+-\d+(-\d+)*|P)?)+(,\d+(W-\d+-\d+(-\d+)*|P)?)*$/; 
     return(reg.test(v));
 }

trunk/L_IPX800.lua ¶

@@ -5 +5 @@
 local version = "v0.49"
 local UI7_JSON_FILE= "D_IPX800_UI7.json"
+local DEFAULT_DELAY = 60
 
 local http = require("socket.http")
@@ -573 +574 @@
                 return tbl
             end
-            -- t = W-2-3-30
+            -- t = W-2-3-30-40
             tbl = t:split("-")
+            if (tbl[4]==nil) then
+                tbl[4]=DEFAULT_DELAY
+                tbl[5]=DEFAULT_DELAY
+            else
+                if (tbl[5]==nil) then
+                    tbl[5]=tbl[4]
+                end
+            end
             return tbl
         end
@@ -676 +685 @@
         old = tonumber(old)
         local percentage = math.abs(newLoadlevelTarget - old)
+        local whichdelay = 4
         -- W-2-3-30
         if (action=="up") then
             setLoadLevel(lul_device,newLoadlevelTarget)
             setIPXLed(lul_device,ipxnum,1)      -- relay for up is this altid
+            whichdelay=4
         elseif (action=="down") then
             setLoadLevel(lul_device,newLoadlevelTarget)
             setIPXLed(lul_device,tonumber(options[3])-1,1)  -- relay for down is #3
+            whichdelay=5
         elseif (action=="stop") then
             setIPXLed(lul_device,tonumber(options[2])-1,1)  -- relay for stop is #2
@@ -689 +701 @@
         if (newLoadlevelTarget~=0) and (newLoadlevelTarget~=100) then
             -- if percent is not 100 , we need to stop a STOP command after some time
-            local delay = math.floor(tonumber(options[4]) * math.abs(newLoadlevelTarget-old)/100)
+            local delay = math.floor(tonumber(options[whichdelay]) * math.abs(newLoadlevelTarget-old)/100)
             debug(string.format("Programming stop in %d seconds",delay))
             local data = {}