projects / svn42.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e79631f)
more ir code stuff, still missing button 7
authorBernhard Tittelbach <xro@realraum.at>
Fri, 15 Oct 2010 18:21:55 +0000 (18:21 +0000)
committerBernhard Tittelbach <xro@realraum.at>
Fri, 15 Oct 2010 18:21:55 +0000 (18:21 +0000)
powersensordaemon/powerids.txt patch | blob | history
powersensordaemon/switch.cgi patch | blob | history
powersensordaemon/ymhremote.html patch | blob | history
rf433ctl/rf433ctl.pde patch | blob | history

diff --git a/powersensordaemon/powerids.txt b/powersensordaemon/powerids.txt
index 72dee80..de2c01b 100644 (file)
--- a/powersensordaemon/powerids.txt
+++ b/powersensordaemon/powerids.txt
@@ -10,6 +10,7 @@ all           acdefgh
 decke         gh
 lichter       acdfgh
 ambientlights acf
+blueled       °
 panicled      ^
 ymhpoweroff   :
 ymhpower      .
@@ -20,6 +21,7 @@ ymhtape       3
 ymhwdtv       4
 ymhsattv      5
 ymhvcr        6
+ymh7          7
 ymhaux        8
 ymhextdec     9
 ymhtest       0
@@ -36,4 +38,5 @@ ymhminus      !
 ymhtimelevel  =
 ymhprgdown    $
 ymhprgup      %
-ymhp5         &
+ymhsleep      (
+ymhp5         )
diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi
index a4a5190..8e4f4b5 100755 (executable)
--- a/powersensordaemon/switch.cgi
+++ b/powersensordaemon/switch.cgi
@@ -21,7 +21,7 @@ done
 
 UNIXSOCK=/var/run/powersensordaemon/cmd.sock
 VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo idee deckehinten deckevorne"
-VALID_SEND_IDS="ymhpoweron ymhpoweroff ymhpower ymhvolup ymhvoldown ymhcd ymhwdtv ymhtuner ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec panicled"
+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"
 
 
 [ "$POWER" == "send" ] && POWER=on
@@ -76,7 +76,9 @@ DESC_ymhtunabcde="Tuner ABCDE"
 DESC_ymhtape="Tape"
 DESC_ymhvcr="VCR"
 DESC_ymhextdec="ExtDec Toggle"
+DESC_seep="Sleep Modus"
 DESC_panicled="HAL9000 says hi"
+DESC_blueled="Blue Led"
 echo "Content-type: text/html"
 echo ""
 echo "<html>"
diff --git a/powersensordaemon/ymhremote.html b/powersensordaemon/ymhremote.html
index 8bfac5f..afb1931 100755 (executable)
--- a/powersensordaemon/ymhremote.html
+++ b/powersensordaemon/ymhremote.html
@@ -52,9 +52,9 @@ function remoteKeyboard( e )
                case 50: sendButton( 'ymhtuner' ); break;       // 2
                case 51: sendButton( 'ymhtape' ); break;        // 3
                case 52: sendButton( 'ymhwdtv' ); break;        // 4
-               //case 53: sendButton( 'ymhsat' ); break;       // 5
+               case 53: sendButton( 'ymhsattv' ); break;       // 5
                case 54: sendButton( 'ymhvcr' ); break; // 6
-               //case 55: sendButton( '' ); break;     // 7
+               case 55: sendButton( 'ymh7' ); break;   // 7
                case 56: sendButton( 'ymhaux' ); break; // 8
                case 57: sendButton( 'ymhextdec' ); break;      // 9
        }
@@ -79,9 +79,9 @@ document.onkeydown = remoteKeyboard;
 <area shape ="circle" coords ="88,98,17" onClick="sendButton('ymhtuner');" alt="ymhtuner" />
 <area shape ="circle" coords ="142,98,17" onClick="sendButton('ymhtape');" alt="ymhtape" />
 <area shape ="circle" coords ="36,145,17" onClick="sendButton('ymhwdtv');" alt="ymhwdtv" />
-<!--area shape ="circle" coords ="88,145,17" onClick="sendButton('ymhsat);" alt="ymhsat" /-->
+<area shape ="circle" coords ="88,145,17" onClick="sendButton('ymhsattv');" alt="ymhsattv" />
 <area shape ="circle" coords ="142,145,17" onClick="sendButton('ymhvcr');" alt="ymhvcr" />
-<!--area shape ="circle" coords ="36,192,17" onClick="sendButton('ymh7);" alt="ymh7" /-->
+<area shape ="circle" coords ="36,192,17" onClick="sendButton('ymh7');" alt="ymh7" />
 <area shape ="circle" coords ="88,192,17" onClick="sendButton('ymhaux');" alt="ymhaux" />
 <area shape ="circle" coords ="142,192,17" onClick="sendButton('ymhextdec');" alt="ymhextdec" />
 <area shape ="circle" coords ="36,240,17" onClick="sendButton('ymhtest');" alt="ymhtest" />
@@ -95,7 +95,7 @@ document.onkeydown = remoteKeyboard;
 <area shape ="circle" coords ="89,377,16" onClick="sendButton('ymhmute');" alt="ymhmute" />
 
 <area shape ="circle" coords ="36,455,17" onClick="sendButton('ymhsleep');" alt="ymhsleep" />
-<!--area shape ="circle" coords ="142,455,17" onClick="sendButton('ymhdsp');" alt="ymhdsp" /-->
+<area shape ="circle" coords ="142,455,17" onClick="sendButton('ymhdsp');" alt="ymhp5" />
 
 <area shape ="rect" coords ="18,278,67,301" onClick="sendButton('ymhtunminus');"  />
 <area shape ="rect" coords ="111,278,160,301" onClick="sendButton('ymhtunplus');"  />
diff --git a/rf433ctl/rf433ctl.pde b/rf433ctl/rf433ctl.pde
index 29ebfe5..c050dc5 100644 (file)
--- a/rf433ctl/rf433ctl.pde
+++ b/rf433ctl/rf433ctl.pde
@@ -615,7 +615,9 @@ void loop()
       send_yamaha_ir_signal(YAMAHA_PRG_DOWN);
     else if (command == '%')
       send_yamaha_ir_signal(YAMAHA_PRG_UP);
-    else if (command == '&')
+    else if (command == '(')
+      send_yamaha_ir_signal(YAMAHA_SLEEP);
+    else if (command == ')')
       send_yamaha_ir_signal(YAMAHA_P5);
     else
       Serial.println("Error: unknown command");
import from old svn repo https://svn.spreadspace.org/realraum