X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=powersensordaemon%2Fswitch.cgi;h=7034c8e0042ba4bb6aab391d6f8273152e2b4ea3;hb=432e27ec9a4658719c639df9ba255f54258954d6;hp=8198e906db847c4fb12c071805d2f94d5d7c66a4;hpb=b6342a662ef769c079e09b8035e2d805ec2a5f92;p=svn42.git
diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index 8198e90..7034c8e 100755
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -24,9 +24,10 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
done
UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette pcblueleds"
+VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette pcblueleds pollina weissB"
VALID_SEND_IDS="ymhpoweron ymhpoweroff ymhpower ymhvolup ymhvoldown 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"
+VALID_CAM_MOTOR_IDS="c C w W"
[ "$POWER" == "send" ] && POWER=on
if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
@@ -44,7 +45,7 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
fi
done
- for CHECKID in $VALID_BANSHEE_IDS; do
+ for CHECKID in $VALID_BANSHEE_IDS; do
if [ "$CHECKID" == "$ID" ]; then
echo "$ID/" | nc wuerfel.realraum.at 8484
echo "Content-type: text/html"
@@ -57,11 +58,25 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
exit 0
fi
done
+
+ for CHECKID in $VALID_CAM_MOTOR_IDS; do
+ if [ "$CHECKID" == "$ID" ]; then
+ echo "$ID" > /dev/ttyACM0
+ echo "Content-type: text/html"
+ echo ""
+ echo ""
+ echo ""
+ echo "Realraum rf433ctl"
+ echo ''
+ echo ""
+ exit 0
+ fi
+ done
fi
DESC_pcblueleds="Blaue Leds PC"
-DESC_pollina="Pollin A"
-DESC_pollinb="Pollin B"
+DESC_pollina="Blaue Lichterkette"
+DESC_weissB="WeissB"
DESC_werkzeug="Werkzeug LEDs"
DESC_stereo="Receiver On/Off"
DESC_ambientlights="Ambient Lichter"
@@ -72,7 +87,7 @@ DESC_logo="Logo"
DESC_spots1="Spots"
DESC_deckehinten="Decke Hinten"
DESC_deckevorne="Decke Vorne"
-DESC_lichterkette="Blaue Lichterkette"
+DESC_lichterkette="Whiteboard Vorne"
DESC_decke="Deckenlichter"
DESC_lichter="Alle Lichter"
DESC_all="Alles"
@@ -103,6 +118,11 @@ DESC_seep="Sleep Modus"
DESC_panicled="HAL9000 says hi"
DESC_blueled="Blue Led"
DESC_moviemode="Movie Mode"
+DESC_w="Cam >"
+DESC_W="Cam >>"
+DESC_c="Cam <"
+DESC_C="Cam <<"
+
echo "Content-type: text/html"
echo ""
echo ""
@@ -156,7 +176,7 @@ for DISPID in $VALID_ONOFF_IDS; do
done
echo ""
if [ "$MOBILE" != "1" ]; then
-echo "
"
+echo "
"
for DISPID in $VALID_SEND_IDS; do
NAME="$(eval echo \$DESC_$DISPID)"
[ -z "$NAME" ] && NAME=$DISPID
@@ -181,8 +201,8 @@ for DISPID in $VALID_SEND_IDS; do
fi
done
echo "
"
-echo "
"
-for DISPID in $VALID_BANSHEE_IDS; do
+echo "
"
+for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do
NAME="$(eval echo \$DESC_$DISPID)"
[ -z "$NAME" ] && NAME=$DISPID
if [ -z "$AJAX" ]; then
@@ -190,17 +210,19 @@ for DISPID in $VALID_BANSHEE_IDS; do
echo ""
-
+
else
- echo "