From 918452bc53b1a88b1bd7040cc17af9fd71a39a2c Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Wed, 15 Jan 2014 20:14:33 +0000 Subject: [PATCH] switch --- powersensordaemon/powerids.txt | 4 ++-- powersensordaemon/switch.cgi | 3 ++- raspberrypi_gpio_relay_licht/move_lights.sh | 2 +- raspberrypi_gpio_relay_licht/switch.cgi | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/powersensordaemon/powerids.txt b/powersensordaemon/powerids.txt index 4e979dd..399a9b5 100644 --- a/powersensordaemon/powerids.txt +++ b/powersensordaemon/powerids.txt @@ -5,16 +5,16 @@ bluebar e labortisch z couchred a couchwhite i +mashatable d unset1 l unset2 n unset3 f unset4 m -unset5 d pollind j deckehinten g deckevorne h decke gh -all bcezadijlnfmgh +all dbcezadijlnfmgh lichter cezai ambientlights ceai blueled & diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi index 5387cf1..062d621 100755 --- a/powersensordaemon/switch.cgi +++ b/powersensordaemon/switch.cgi @@ -22,7 +22,7 @@ done UNIXSOCK=/var/run/powersensordaemon/cmd.sock -VALID_ONOFF_IDS="regalleinwand labortisch bluebar couchred couchwhite all lichter ambientlights boiler" +VALID_ONOFF_IDS="regalleinwand labortisch bluebar couchred couchwhite all lichter ambientlights mashatable boiler" VALID_SEND_IDS_CUSTOM_DISPLAY="ymhpoweroff ymhpower ymhvolup ymhvoldown" VALID_SEND_IDS="ymhpoweron ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec ymhsleep ymhp5 panicled blueled moviemode" #VALID_BANSHEE_IDS="playPause next prev" @@ -78,6 +78,7 @@ DESC_bluebar="Blaue LEDs Bar" DESC_labortisch="Labortisch" DESC_couchred="LEDs Couch Red" DESC_couchwhite="LEDS Couch White" +DESC_mashatable="MaSha Tablelamp" DESC_ambientlights="Ambient Lichter" DESC_boiler="Warmwasser Küche" DESC_lichter="Alle Lichter" diff --git a/raspberrypi_gpio_relay_licht/move_lights.sh b/raspberrypi_gpio_relay_licht/move_lights.sh index 7c7e7c7..cf7b075 100644 --- a/raspberrypi_gpio_relay_licht/move_lights.sh +++ b/raspberrypi_gpio_relay_licht/move_lights.sh @@ -1,2 +1,2 @@ #!/bin/sh -curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=1&23=0&18=0&17=0&22=0&21=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=1&23=1&18=0&17=0&22=0&21=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=1&18=0&17=1&22=0&21=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=0&18=1&17=1&22=0&21=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=0&18=1&17=0&22=1&21=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=0&18=0&17=0&22=1&21=1'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=0&18=0&17=0&22=0&21=1'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?4=0&23=0&18=0&17=0&22=0&21=0'; +curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=1&ceiling2=0&ceiling3=0&ceiling4=0&ceiling5=0&ceiling6=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=1&ceiling2=1&ceiling3=0&ceiling4=0&ceiling5=0&ceiling6=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=1&ceiling3=0&ceiling4=1&ceiling5=0&ceiling6=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=0&ceiling3=1&ceiling4=1&ceiling5=0&ceiling6=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=0&ceiling3=1&ceiling4=0&ceiling5=1&ceiling6=0'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=0&ceiling3=0&ceiling4=0&ceiling5=1&ceiling6=1'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=0&ceiling3=0&ceiling4=0&ceiling5=0&ceiling6=1'; sleep 3; curl 'http://licht.realraum.at/cgi-bin/mswitch.cgi?ceiling1=0&ceiling2=0&ceiling3=0&ceiling4=0&ceiling5=0&ceiling6=0'; diff --git a/raspberrypi_gpio_relay_licht/switch.cgi b/raspberrypi_gpio_relay_licht/switch.cgi index c99782e..d4e3683 100755 --- a/raspberrypi_gpio_relay_licht/switch.cgi +++ b/raspberrypi_gpio_relay_licht/switch.cgi @@ -23,8 +23,8 @@ done VALID_ONOFF_IDS="ceiling1 ceiling2 ceiling3 ceiling4 ceiling5 ceiling6" VALID_SEND_IDS="" -DESC_ceiling1="Decke Leinwand (S)" -DESC_ceiling2="Decke E-Labor (SSW)" +DESC_ceiling1="Decke E-Labor (SSW)" +DESC_ceiling2="Decke Leinwand (S)" DESC_ceiling3="Decke Eingang (W)" DESC_ceiling4="Decke Durchgang (O)" DESC_ceiling5="Decke Auslage (N)" -- 1.7.10.4