X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=powersensordaemon%2Fswitch.cgi;h=19d863e27efab655de9e7ac09c2de611e580b5f3;hb=2d2b56de27b644964adcd5b8f90c03e558714547;hp=070d39ac514e1d9229525e9930dafa5d487d48c7;hpb=21fab0dd816f20a44adfbf77cc6eb4314c0cf541;p=svn42.git
diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index 070d39a..19d863e 100755
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -12,25 +12,25 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
POWER=$VALUE
elif [ "$VALUE" == "mobile" ]; then
MOBILE='1'
- elif [ "$POWER" == "?" ]; then
- POWER=$VALUE
- elif [ "$VALUE" == "ajax" ]; then
- AJAX='?'
- elif [ "$AJAX" == "?" ]; then
- AJAX=$VALUE
+ NOFLOAT='1'
+ elif [ "$VALUE" == "nofloat" ]; then
+ NOFLOAT='1'
fi
i=$i+1
done
done
+
UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette"
-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_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue"
+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"
+#VALID_CAM_MOTOR_IDS="c C w W"
[ "$POWER" == "send" ] && POWER=on
if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
- for CHECKID in $VALID_ONOFF_IDS $VALID_SEND_IDS; do
+ for CHECKID in $VALID_ONOFF_IDS $VALID_SEND_IDS $VALID_SEND_IDS_CUSTOM_DISPLAY; do
if [ "$CHECKID" == "$ID" ]; then
echo "power $POWER $ID" | usocket $UNIXSOCK
echo "Content-type: text/html"
@@ -44,7 +44,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,8 +57,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_bikewcblue="Blaue Lichterkette WC"
+DESC_weissB="WeissB"
DESC_werkzeug="Werkzeug LEDs"
DESC_stereo="Receiver On/Off"
DESC_ambientlights="Ambient Lichter"
@@ -69,17 +86,17 @@ DESC_logo="Logo"
DESC_spots1="Spots"
DESC_deckehinten="Decke Hinten"
DESC_deckevorne="Decke Vorne"
-DESC_lichterkette="Blaue Lichterkette"
+DESC_whiteboard="Whiteboard Vorne"
DESC_decke="Deckenlichter"
DESC_lichter="Alle Lichter"
DESC_all="Alles"
-DESC_ymhpoweron="Receiver On"
+DESC_ymhpoweron="Receiver On (off+tgl)"
DESC_ymhpoweroff="Receiver Off"
DESC_ymhpower="Receiver On/Off"
DESC_ymhvolup="VolumeUp"
DESC_ymhvoldown="VolumeDown"
DESC_ymhcd="Input CD"
-DESC_ymhwdtv="Input WDlxTV"
+DESC_ymhwdtv="Input S/PDIF Wuerfel"
DESC_ymhtuner="Input Tuner"
DESC_ymhvolmute="Mute"
DESC_ymhmenu="Menu"
@@ -100,6 +117,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 ""
@@ -115,92 +137,158 @@ echo ' //google chrome workaround'
echo ' req.setRequestHeader("googlechromefix","");'
echo ' req.send(null);'
echo '}'
+[ "$NOFLOAT" == "1" ] && tail -n+6 /www/ymhremote.html | head -n 58
echo ''
+[ "$NOFLOAT" == "1" ] && tail -n+67 /www/ymhremote.html | head -n 37
+echo ''
echo ""
echo ""
#echo "Realraum rf433ctl
"
-echo ""
+#echo "
"
+echo "
"
+echo "
"
for DISPID in $VALID_ONOFF_IDS; do
NAME="$(eval echo \$DESC_$DISPID)"
[ -z "$NAME" ] && NAME=$DISPID
- if [ -z "$AJAX" ]; then
-
- echo "
"
-
- else
-
- echo "
"
- echo "
"
- echo " "
- echo " "
+
+echo ""
+ echo "
"
+ echo " "
+ echo " "
echo ""
- echo "
$NAME
"
+ echo "
$NAME
"
echo "
"
- fi
- if [ "$MOBILE" == "1" ]; then
+ if [ "$NOFLOAT" == "1" ]; then
echo "
"
fi
done
+
+#Custom Buttons Start
+echo ""
+echo "
"
+echo " "
+echo " "
+echo ""
+echo "
Receiver Power
"
+echo "
"
+ if [ "$NOFLOAT" == "1" ]; then
+ echo "
"
+ fi
+echo ""
+echo "
"
+echo " "
+echo " "
+echo ""
+echo "
Receiver Volume
"
echo "
"
-if [ "$MOBILE" != "1" ]; then
-echo ""
+ if [ "$NOFLOAT" == "1" ]; then
+ echo "
"
+ fi
+#Custom Buttons End
+
+echo "
"
+
+if [ "$MOBILE" != "1" ]; then
+
+echo ""
+
+ITEMCOUNT=0
+
for DISPID in $VALID_SEND_IDS; do
+ ITEMCOUNT=$((ITEMCOUNT+1))
NAME="$(eval echo \$DESC_$DISPID)"
[ -z "$NAME" ] && NAME=$DISPID
- if [ -z "$AJAX" ]; then
-
- echo "
"
-
- else
- echo "
"
- echo "
"
- echo " "
+ echo ""
+ echo "
"
+ echo " "
echo ""
- echo "
$NAME
"
+ echo "
$NAME
"
echo "
"
-
- fi
+ if [ "$NOFLOAT" == "1" -a $((ITEMCOUNT % 2 )) -ne 1 ]; then
+ echo "
"
+ fi
+
done
+echo ''
echo ""
-echo "
"
-for DISPID in $VALID_BANSHEE_IDS; do
+
+ if [ "$NOFLOAT" == "1" ]; then
+ echo "
"
+ tail -n+107 /www/ymhremote.html | head -n 5
+ echo "
"
+ fi
+
+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
-
- echo "
"
-
- else
- echo "
$NAME
"
- echo " "
- echo ""
-
- fi
+ echo "
"
+ echo "
"
+ echo " "
+ echo ""
+ echo "
$NAME
"
+ echo "
"
+ if [ "$NOFLOAT" == "1" ]; then
+ echo "
"
+ fi
+
done
echo "
"
fi
+echo "
"
echo ""
echo "