add gas-control app

5 files changed, 254 insertions, 70 deletions

diff --git a/examples/scripts/gas/script.py b/examples/scripts/gas/script.py
new file mode 100644
index 0000000..4ac95d0
--- /dev/null
+++ b/examples/scripts/gas/script.py
@@ -0,0 +1,104 @@
+import webiopi
+
+webiopi.setDebug()
+
+GPIO = webiopi.GPIO
+
+ICMP_DEVICE = "icmp0"
+GAS_PORT = 0
+SLEEP = 1
+
+class State(object):
+    def __init__(self, name, checks, expr, func):
+        self.name    = name
+        self.checks  = checks
+        self.cnt     = 0
+        self.enabled = True
+        self.expr    = expr
+        self.func    = func
+
+    def incr(self, duration):
+        if not self.expr(duration):
+            self.cnt = 0
+            return
+        if self.cnt_reached():
+            return
+        self.cnt += 1
+        if self.cnt_reached() and self.enabled:
+            self.trigger()
+
+    def trigger(self):
+        webiopi.debug("GAS script - %s triggered" % (self.name))
+        self.func()
+
+    def cnt_reached(self):
+        return self.cnt >= self.checks
+
+    def __str__(self):
+        enabled = "enabled" if self.enabled else "disabled"
+        return "%s(%s) %d/%d" % (self.name, enabled, self.cnt,
+            self.checks)
+
+_online = State('Online',  5, lambda x: x > 0 and x < 300,
+    lambda: GPIO.digitalWrite(GAS_PORT, GPIO.LOW))
+_offline = State('Offline', 30, lambda x: not _online.expr(x),
+    lambda: GPIO.digitalWrite(GAS_PORT, GPIO.HIGH))
+STATES = [ _online, _offline ]
+
+def setup():
+    webiopi.debug("GAS script - setup")
+    GPIO.setFunction(GAS_PORT, GPIO.OUT)
+    GPIO.digitalWrite(GAS_PORT, GPIO.HIGH)
+
+def loop():
+    icmp = webiopi.deviceInstance(ICMP_DEVICE)
+    if icmp is not None:
+        duration = icmp.getMilliseconds()
+        webiopi.debug("GAS script - %s: %dms" % (ICMP_DEVICE, duration))
+        for s in STATES:
+            s.incr(duration)
+            webiopi.debug("GAS script - %s" % (s))
+    webiopi.sleep(SLEEP)
+
+def destroy():
+    webiopi.debug("GAS script - destroy")
+    GPIO.setFunction(GAS_PORT, GPIO.OUT)
+    GPIO.digitalWrite(GAS_PORT, GPIO.HIGH)
+
+@webiopi.macro
+def gas_getPort():
+    global GAS_PORT
+    return str(GAS_PORT)
+
+_force = None
+
+@webiopi.macro
+def gas_getForce():
+    global _force
+    if _force is None:
+        return ""
+    return _force.name
+
+@webiopi.macro
+def gas_setForce(state = None):
+    global _force
+    webiopi.debug("GAS script - forcing state %s" % (state))
+
+    if state is None:
+        _force = None
+        for s in STATES:
+            s.enabled = True
+            # trigger again if mode is automatic
+            if s.cnt_reached():
+                s.trigger()
+    else:
+        for s in STATES:
+            if s.name == state:
+                _force = s
+                break
+        if _force is not None:
+            for s in STATES:
+                s.enabled = False
+            _force.trigger()
+
+    return gas_getForce()
diff --git a/examples/scripts/icmp/script.py b/examples/scripts/icmp/script.py
deleted file mode 100644
index 41de666..0000000
--- a/examples/scripts/icmp/script.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import webiopi
-
-webiopi.setDebug()
-
-GPIO = webiopi.GPIO
-
-ICMP_DEVICE = "icmp0"
-GAS_PORT = 0
-SLEEP = 1
-
-class State(object):
-    def __init__(self, name, checks, expr, func):
-        self.name   = name
-        self.checks = checks
-        self.cur    = 0
-        self.expr   = expr
-        self.func   = func
-
-    def set(self, duration):
-        if not self.expr(duration):
-            self.cur = 0
-            return
-        if (self.cur >= self.checks):
-            return
-        self.cur += 1
-        if (self.cur == self.checks):
-            webiopi.debug("ICMP script - State(%s) triggered" % (self.name))
-            self.func()
-
-    def __str__(self):
-        return "State(%s) %d/%d" % (self.name, self.cur, self.checks)
-
-online = State('Online',  2, lambda x: x > 0 and x < 300,
-    lambda: GPIO.digitalWrite(GAS_PORT, GPIO.LOW))
-offline = State('Offline', 30, lambda x: not online.expr(x),
-    lambda: GPIO.digitalWrite(GAS_PORT, GPIO.HIGH))
-STATES = [ online, offline ]
-
-def setup():
-    webiopi.debug("ICMP script - setup")
-    GPIO.setFunction(GAS_PORT, GPIO.OUT)
-    GPIO.digitalWrite(GAS_PORT, GPIO.HIGH)
-
-def loop():
-    icmp0 = webiopi.deviceInstance(ICMP_DEVICE)
-    if icmp0 is None:
-        webiopi.sleep(SLEEP)
-        return
-
-    duration = icmp0.getMilliseconds()
-    webiopi.debug("ICMP script - %s: %dms" % (ICMP_DEVICE, duration))
-    for s in STATES:
-        s.set(duration)
-        webiopi.debug("ICMP script - %s" % (s))
-    webiopi.sleep(SLEEP)
-
-def destroy():
-    webiopi.debug("ICMP script - destroy")
-    GPIO.setFunction(GAS_PORT, GPIO.OUT)
-    GPIO.digitalWrite(GAS_PORT, GPIO.HIGH)
diff --git a/htdocs/app/gas-control/index.html b/htdocs/app/gas-control/index.html
new file mode 100644
index 0000000..0e9b3a1
--- /dev/null
+++ b/htdocs/app/gas-control/index.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Gas Control</title>
+        <script type="text/javascript" src="/webiopi.js"></script>
+        <script type="text/javascript">
+                webiopi().ready(function() {
+                        var GAS_PORT = 0;
+                        webiopi().callMacro("gas_getPort", [ ], function(macro, args, data) {
+                                GAS_PORT = parseInt(data)
+                        });
+
+
+                        var valveButton = w().createGPIOButton(GAS_PORT, "Gas Ventil: unbekannt");
+                        valveButton.unbind("click");
+                        valve_old_value = -1
+                        valveButton.on("updateValue", function(event, gpio, old_value, value) {
+                                if (valve_old_value != value) {
+                                        valveButton.text(value == 0 ? "Gas Ventil auf" : "Gas Ventil zu");
+                                        valve_old_value = value
+                                }
+                        });
+                        $("#valve").html(valveButton);
+
+
+                        var forceModes = [ "", "Online", "Offline" ];
+                        var forceMode = forceModes[0];
+                        var forceButton;
+                        var onForce = function(macro, args, data) {
+                                forceMode = data;
+
+                                var style = (forceMode == "") ? "automatic" : forceMode;
+                                var text  = "Automatisch";
+                                switch(forceMode)
+                                {
+                                        case forceModes[0]:
+                                                break;
+                                        case forceModes[1]:
+                                                text = "Gas Ventil auf";
+                                                break;
+                                        case forceModes[2]:
+                                                text = "Gas Ventil zu";
+                                                break;
+                                }
+
+                                forceButton.attr("class", style.toUpperCase());
+                                forceButton.text(text);
+                        }
+
+                        forceButton = webiopi().createButton("force", "Unbekannt", function() {
+                                var i;
+                                for (i = 0; i < forceModes.length; i++) {
+                                        if (forceModes[i] == forceMode)
+                                                break;
+                                }
+                                i = (i == forceModes.length - 1) ? 0 : i + 1;
+                                webiopi().callMacro("gas_setForce", [ forceModes[i] ], onForce);
+                        });
+                        $("#force").html(forceButton);
+
+
+                        w().refreshGPIO(true);
+
+                        var forceRefresh = function() {
+                                webiopi().callMacro("gas_getForce", [ ], onForce);
+                                setTimeout(function() { forceRefresh() }, 1000);
+                        };
+                        forceRefresh();
+                });
+        </script>
+        <style type="text/css">
+                body {
+                        margin: 50px 0px;
+                        padding: 0px;
+                }
+
+                #content {
+                        width: 300pt;
+                        margin: 0px auto;
+                        text-align: left;
+                        padding: 15px;
+                        border: 1px dashed #333;
+                        background-color: #eee;
+                        line-height: 35pt;
+                }
+
+                button {
+                        width: auto;
+                }
+
+                .LOW {
+                         background-color: red;
+                }
+
+                .HIGH {
+                        background-color: green;
+                }
+
+                .ONLINE {
+                         background-color: red;
+                }
+
+                .OFFLINE {
+                        background-color: green;
+                }
+
+                .AUTOMATIC {
+                        background-color: gray;
+                }
+        </style>
+</head>
+<body>
+        <div id="content">
+                Ventil: <span id="valve"></span><br />
+                Automatik: <span id="force"></span<br />
+        </div>
+</body>
+</html>
diff --git a/htdocs/dev.html b/htdocs/dev.html
new file mode 100644
index 0000000..68c49c9
--- /dev/null
+++ b/htdocs/dev.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
+        <title>WebIOPi | Raspberry Pi IoT Framework</title>
+</head>
+<body>
+
+<h1>WebIOPi Main Menu</h1>
+
+<h2><a href="/app/gpio-header">GPIO Header</a></h2>
+<p>Control and Debug the Raspberry Pi GPIO with a display which looks like the physical header.</p>
+
+<h2><a href="/app/gpio-list">GPIO List</a></h2>
+<p>Control and Debug the Raspberry Pi GPIO ordered in a single column.</p>
+
+<h2><a href="/app/serial-monitor">Serial Monitor</a></h2>
+<p>Use the browser to play with Serial interfaces configured in WebIOPi.</p>
+
+<h2><a href="/app/devices-monitor">Devices Monitor</a></h2>
+<p>Control and Debug devices and circuits wired to your Pi and configured in WebIOPi.</p>
+
+</body>
+</html>
diff --git a/htdocs/index.html b/htdocs/index.html
index 68c49c9..a1671bb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -4,22 +4,17 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta name="viewport" content = "height = device-height, width = 420, user-scalable = no" /> 
         <title>WebIOPi | Raspberry Pi IoT Framework</title>
+  <meta http-equiv="refresh" content="0; url=/app/gas-control" />
 </head>
 <body>
 
 <h1>WebIOPi Main Menu</h1>
 
-<h2><a href="/app/gpio-header">GPIO Header</a></h2>
-<p>Control and Debug the Raspberry Pi GPIO with a display which looks like the physical header.</p>
+<h2><a href="/app/gas-control">Gas Control</a></h2>
+<p>Gas Control.</p>
 
-<h2><a href="/app/gpio-list">GPIO List</a></h2>
-<p>Control and Debug the Raspberry Pi GPIO ordered in a single column.</p>
-
-<h2><a href="/app/serial-monitor">Serial Monitor</a></h2>
-<p>Use the browser to play with Serial interfaces configured in WebIOPi.</p>
-
-<h2><a href="/app/devices-monitor">Devices Monitor</a></h2>
-<p>Control and Debug devices and circuits wired to your Pi and configured in WebIOPi.</p>
+<h2><a href="/dev.html">Developer tools</a></h2>
+<p>Developer tools.</p>
 
 </body>
 </html>