From b4df3762b0b4df60afdc0e83305ec221d42e4ca7 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Sat, 14 Dec 2013 20:39:24 +0000 Subject: [PATCH] switch patterns --- raspberrypi_gpio_relay_licht/rc.local | 1 + raspberrypi_gpio_relay_licht/switch.cgi | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/raspberrypi_gpio_relay_licht/rc.local b/raspberrypi_gpio_relay_licht/rc.local index 918e217..254a556 100644 --- 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 --- 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 "
" echo "" echo -n " " echo "" echo -n "
Alle
" echo "
" + +if [ "$NOFLOAT" = "1" ]; then + echo "
" +fi + +#Pattern1 +echo "
" +echo -n " " +echo -n " " +echo -n " " +echo -n " " +echo -n " " +echo -n " " +echo "
" + if [ "$NOFLOAT" = "1" ]; then echo "
" fi -- 1.7.10.4