projects / svn42.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix powerids
[svn42.git] / powersensordaemon / switch.cgi
diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index fb67efa..4d99acf 100755 (executable)
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -10,6 +10,10 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
       POWER='?'
     elif [ "$POWER" == "?" ]; then
       POWER=$VALUE
       POWER='?'
     elif [ "$POWER" == "?" ]; then
       POWER=$VALUE
+    elif [ "$VALUE" == "mobile" ]; then
+      MOBILE='1'
+    elif [ "$POWER" == "?" ]; then
+      POWER=$VALUE
     elif [ "$VALUE" == "ajax" ]; then
       AJAX='?'
     elif [ "$AJAX" == "?" ]; then
     elif [ "$VALUE" == "ajax" ]; then
       AJAX='?'
     elif [ "$AJAX" == "?" ]; then
@@ -20,9 +24,10 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do
 done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
 done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
-VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler lichterkette"
+VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue"
 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_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
 
 [ "$POWER" == "send" ] && POWER=on
 if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
@@ -40,7 +45,7 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
     fi
   done
 
     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"
     if [ "$CHECKID" == "$ID" ]; then
       echo "$ID/" | nc wuerfel.realraum.at 8484
       echo "Content-type: text/html"
@@ -53,8 +58,25 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then
       exit 0
     fi
   done
       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 "<html>"
+      echo "<head>"
+      echo "<title>Realraum rf433ctl</title>"
+      echo '<script type="text/javascript">window.location="http://slug.realraum.at/cgi-bin/switch.cgi";</script>'
+      echo "</head></html>"
+      exit 0
+    fi
+  done
 fi
 
 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"
 DESC_werkzeug="Werkzeug LEDs"
 DESC_stereo="Receiver On/Off"
 DESC_ambientlights="Ambient Lichter"
@@ -65,7 +87,7 @@ DESC_logo="Logo"
 DESC_spots1="Spots"
 DESC_deckehinten="Decke Hinten"
 DESC_deckevorne="Decke Vorne"
 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_decke="Deckenlichter"
 DESC_lichter="Alle Lichter"
 DESC_all="Alles"
@@ -96,6 +118,11 @@ DESC_seep="Sleep Modus"
 DESC_panicled="HAL9000 says hi"
 DESC_blueled="Blue Led"
 DESC_moviemode="Movie Mode"
 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 "<html>"
 echo "Content-type: text/html"
 echo ""
 echo "<html>"
@@ -123,23 +150,33 @@ for DISPID in $VALID_ONOFF_IDS; do
 
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
 
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
-  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
+  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div>"
+  echo "<span style='float:right; text-align:right;'>"
   echo " <input type='submit' name='power' value='on' />"
   echo " <input type='submit' name='power' value='off' />"
   echo " <input type='submit' name='power' value='on' />"
   echo " <input type='submit' name='power' value='off' />"
-  echo "</span></div>"
+  echo "</span>"
+  echo "</div>"
   echo "</form>"
   
   else
   
   echo "</form>"
   
   else
   
-  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
+  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<span style='float:left; text-align:left;'>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>On</button>"
   echo " <button onClick='sendButton(\"off\",\"$DISPID\");'>Off</button>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>On</button>"
   echo " <button onClick='sendButton(\"off\",\"$DISPID\");'>Off</button>"
-  echo "</span></div>"
+  echo "</span>"
+  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "</div>"
   
   fi
   
   fi
+  if [ "$MOBILE" == "1" ]; then
+    echo "<br/>"
+  fi 
 done
 echo "</div>"
 done
 echo "</div>"
-echo "<div style=\"float:left; border:1px solid black;\">"
+if [ "$MOBILE" != "1" ]; then                                                                                   
+echo "<div style=\"float:left; border:1px solid black; margin-top:5px;\">"
 for DISPID in $VALID_SEND_IDS; do
   NAME="$(eval echo \$DESC_$DISPID)"
   [ -z "$NAME" ] && NAME=$DISPID
 for DISPID in $VALID_SEND_IDS; do
   NAME="$(eval echo \$DESC_$DISPID)"
   [ -z "$NAME" ] && NAME=$DISPID
@@ -154,15 +191,18 @@ for DISPID in $VALID_SEND_IDS; do
 
   else
   
 
   else
   
-  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
+  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<span style='float:left; text-align:left;'>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"
-  echo "</span></div>"
-  
+  echo "</span>"
+  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "</div>"
+    
   fi
 done
 echo "</div>"
   fi
 done
 echo "</div>"
-echo "<div style=\"float:left; border:1px solid black;\">"
-for DISPID in $VALID_BANSHEE_IDS; do
+echo "<div style=\"float:left; border:1px solid black; margin-top:5px;\">"
+for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do
   NAME="$(eval echo \$DESC_$DISPID)"
   [ -z "$NAME" ] && NAME=$DISPID
   if [ -z "$AJAX" ]; then
   NAME="$(eval echo \$DESC_$DISPID)"
   [ -z "$NAME" ] && NAME=$DISPID
   if [ -z "$AJAX" ]; then
@@ -170,19 +210,22 @@ for DISPID in $VALID_BANSHEE_IDS; do
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
   echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
   echo "<form action=\"/cgi-bin/switch.cgi\">"
   echo "<input type=\"hidden\" name=\"id\" value=\"$DISPID\" />"
   echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
-  echo " <input type='submit' name='power' value='on' />"
-  echo " <input type='submit' name='power' value='off' />"
+  echo " <input type='submit' name='power' value='send' />"
   echo "</span></div>"
   echo "</form>"
   echo "</span></div>"
   echo "</form>"
-  
+
   else
   
   else
   
-  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\"><div style='width:10em; display:inline-block; vertical-align:middle;'>$NAME</div><span style='float:right; text-align:right;'>"
+  echo "<div style=\"float:left; margin:2px; padding:1px; max-width:236px; font-size:10pt; border:1px solid black;\">"
+  echo "<span style='float:left; text-align:left;'>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"
   echo " <button onClick='sendButton(\"on\",\"$DISPID\");'>Send</button>"
-  echo "</span></div>"
-  
+  echo "</span>"
+  echo "<div style='width:10em; float:right; display:inline-block; margin-left:1ex; vertical-align:middle;'>$NAME</div>"
+  echo "</div>"
+    
   fi
 done
 echo "</div>"
   fi
 done
 echo "</div>"
+fi
 echo "</body>"
 echo "</html>"
 echo "</body>"
 echo "</html>"
import from old svn repo https://svn.spreadspace.org/realraum