From 1781ff97276a703acb3c42ff7d83b380a94c1c50 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Tue, 14 Jan 2014 00:33:50 +0000 Subject: [PATCH] brockmanngasse 15 funksteckdose --- powersensordaemon/powerids.txt | 31 +++++++++++++++---------------- powersensordaemon/switch.cgi | 22 +++++++--------------- rf433ctl/rf433ctl.pde | 12 ++++++------ 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/powersensordaemon/powerids.txt b/powersensordaemon/powerids.txt index b5fdf51..4e979dd 100644 --- a/powersensordaemon/powerids.txt +++ b/powersensordaemon/powerids.txt @@ -1,23 +1,22 @@ -werkzeug l boiler b stereo . -weissB c -dart n -logo e -idee f -spots1 m +regalleinwand c +bluebar e +labortisch z +couchred a +couchwhite i +unset1 l +unset2 n +unset3 f +unset4 m +unset5 d +pollind j deckehinten g deckevorne h -whiteboard z -bikewcblue a -labor d -pollinc i -pcblueleds i -pollind j -all ilcefghmnnza decke gh -lichter ilcdfghmnnza -ambientlights ilcfmnnza +all bcezadijlnfmgh +lichter cezai +ambientlights ceai blueled & panicled ^ ymhpoweroff : @@ -48,4 +47,4 @@ ymhprgdown $ ymhprgup % ymhsleep ( ymhp5 ) -moviemode :c.f5gh4lnmz +moviemode :.ei diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi index 19d863e..afc9ef6 100755 --- a/powersensordaemon/switch.cgi +++ b/powersensordaemon/switch.cgi @@ -22,7 +22,7 @@ done UNIXSOCK=/var/run/powersensordaemon/cmd.sock -VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue" +VALID_ONOFF_IDS="regalleinwand labortisch bluebar couchred couchwhite all lichter ambientlights 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" @@ -73,21 +73,13 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then 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_regalleinwand="LEDs Regal Leinwand" +DESC_bluebar="Blaue LEDs Bar" +DESC_labortisch="Labortisch" +DESC_couchred="LEDs Couch Red" +DESC_couchwhite="LEDS Couch White" DESC_ambientlights="Ambient Lichter" -DESC_labor="Labor Licht" -DESC_boiler="Warmwasser WC" -DESC_dart="Dart Scheibe" -DESC_logo="Logo" -DESC_spots1="Spots" -DESC_deckehinten="Decke Hinten" -DESC_deckevorne="Decke Vorne" -DESC_whiteboard="Whiteboard Vorne" -DESC_decke="Deckenlichter" +DESC_boiler="Warmwasser Küche" DESC_lichter="Alle Lichter" DESC_all="Alles" DESC_ymhpoweron="Receiver On (off+tgl)" diff --git a/rf433ctl/rf433ctl.pde b/rf433ctl/rf433ctl.pde index f42fa35..5b3c4b2 100644 --- a/rf433ctl/rf433ctl.pde +++ b/rf433ctl/rf433ctl.pde @@ -475,21 +475,21 @@ void loop() else if(command == 'a') send_rf_cmd("\x8a\xa0\x2a"); // pollin 00101 a 0 else if(command == 'B') - send_rf_cmd("\xa0\xa2\xa8"); + send_rf_cmd("\xa0\xa2\xa8"); //white remote A 2 on else if(command == 'b') - send_rf_cmd("\xa0\xa2\x28"); + send_rf_cmd("\xa0\xa2\x28"); //white remote A 2 off else if(command == 'C') - send_rf_cmd("\xa2\xa0\xa8"); + send_rf_cmd("\xa2\xa0\xa8"); //white remote B 1 on else if(command == 'c') - send_rf_cmd("\xa2\xa0\x28"); + send_rf_cmd("\xa2\xa0\x28"); //white remote B 1 off else if(command == 'D') send_rf_cmd("\x8a\x88\x8a"); //pollin 00101 b 1 else if(command == 'd') send_rf_cmd("\x8a\x88\x2a"); //pollin 00101 b 0 else if(command == 'E') - send_rf_cmd("\xa8\xa0\xa8"); + send_rf_cmd("\xa8\xa0\xa8"); //white remote C 1 on else if(command == 'e') - send_rf_cmd("\xa8\xa0\x28"); + send_rf_cmd("\xa8\xa0\x28"); //white remote C 1 off else if(command == 'F') send_rf_cmd("\xa8\xa2\xa8"); else if(command == 'f') -- 1.7.10.4