switch patterns

diff --git a/raspberrypi_gpio_relay_licht/rc.local b/raspberrypi_gpio_relay_licht/rc.local
index 918e217..254a556 100644 (file)
--- a/raspberrypi_gpio_relay_licht/rc.local
+++ b/raspberrypi_gpio_relay_licht/rc.local
@@ -35,5 +35,6 @@ if ! ifconfig eth0 && ifconfig wlan0 ; then
 fi
 
 su realraum -s /bin/sh -c "sleep 10 && /home/realraum/play-sound-status.py /home/realraum/play-sound-status.cfg &>/dev/null &" &
+su realraum -s /bin/sh -c "sleep 10 && /home/realraum/stuff.py &>/dev/null &" &
 
 exit 0

diff --git a/raspberrypi_gpio_relay_licht/switch.cgi b/raspberrypi_gpio_relay_licht/switch.cgi
index d6f152e..167c64b 100755 (executable)
--- a/raspberrypi_gpio_relay_licht/switch.cgi
+++ b/raspberrypi_gpio_relay_licht/switch.cgi
@@ -22,7 +22,7 @@ done
 
 
 GPIOPATH=/sys/class/gpio/gpio
-VALID_ONOFF_IDS="4 17 18 21 22 23"
+VALID_ONOFF_IDS="4 23 18 17 22 21"
 VALID_SEND_IDS=""
 
 print_gpio_state() {
@@ -56,12 +56,12 @@ if [ "$POWER" = "1" -o "$POWER" = "0" ]; then
   done
 fi
 
-DESC_23="Decke Links Leinwand"
-DESC_4="Decke Rechts Leinwand"
-DESC_18="Decke Eingang Mitte"
-DESC_17="Decke Durchgang Mitte"
-DESC_22="Decke Links Couch"
-DESC_21="Decke Rechts Couch"
+DESC_23="Decke Leinwand (S)"
+DESC_4="Decke E-Labor (SSW)"
+DESC_18="Decke Eingang (W)"
+DESC_17="Decke Durchgang (O)"
+DESC_22="Decke Auslage (N)"
+DESC_21="Decke Küche (NNO)"
 
 echo "Content-type: text/html"
 echo ""
@@ -205,6 +205,7 @@ for DISPID in $VALID_ONOFF_IDS; do
   fi
 done
 
+#Alle
 echo "<div class=\"switchbox\">"
 echo "<span class=\"alignbuttonsleft\">"
 echo -n " <button class=\"onbutton\" onClick='sendMultiButton(\""
@@ -216,6 +217,21 @@ echo "\");'>Off</button>"
 echo "</span>"
 echo -n "<div class=\"switchnameright\">Alle</div>"
 echo "</div>"
+
+if [ "$NOFLOAT" = "1" ]; then
+  echo "<br/>"
+fi
+
+#Pattern1
+echo "<div class=\"switchbox\">"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=0&23=0&18=1&17=1&22=0&21=0\");'>[&nbsp;|&nbsp;]</button>"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=1&23=1&18=0&17=0&22=1&21=1\");'>[|&nbsp;|]</button>"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=1&23=1&18=0&17=0&22=0&21=1\");'>[|&nbsp;.]</button>"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=0&23=1&18=0&17=1&22=0&21=1\");'>[***]</button>"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=1&23=0&18=0&17=0&22=0&21=1\");'>[.&nbsp;*]</button>"
+echo -n " <button class=\"sendbutton\" onClick='sendMultiButton(\"4=0&23=1&18=0&17=0&22=1&21=0\");'>[*&nbsp;.]</button>"
+echo "</div>"
+
 if [ "$NOFLOAT" = "1" ]; then
   echo "<br/>"
 fi