FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timepicker für set nextAlarm eingebaut, defaultVolume als Reading stellt den Volumewert das aktuell verwendeten Outputes da - also entweder Speaker oder Bluetooth oder Headphone

Browse Source
This commit is contained in:
Marko Oldenburg 2015-08-10 22:14:58 +02:00
parent b765bd9540
commit 1300ef742f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
74_AMAD.pm
View File

@ -154,24 +154,24 @@ sub AMAD_Set($$@)
my $list = "screenMsg" my $list = "screenMsg"
. " ttsMsg" . " ttsMsg"
. " Volume:slider,0,1,15" . " defaultVolume:slider,0,1,15"
. " DeviceState:online,offline" . " DeviceState:online,offline"
. " MediaPlayer:play,stop,next,back" . " MediaPlayer:play,stop,next,back"
. " Brightness:slider,0,1,255" . " screenBrightness:slider,0,1,255"
. " Screen:on,off" . " Screen:on,off"
. " openURL" . " openURL"
. " Alarmtime:00:00,00:15,00:30,00:45,01:00,01:15,01:30,01:45,02:00,02:15,02:30,02:45,03:00,03:15,03:30,03:45,04:00,04:15,04:30,04:45,05:00,05:15,05:30,05:45,06:00,06:15,06:30,06:45,07:00,07:15,07:30,07:45,08:00,08:15,08:30,08:45,09:00,09:15,09:30,09:45,10:00,10:15,10:30,10:45,11:00,11:15,11:30,11:45,12:00,12:15,12:30,12:45,13:00,13:15,13:30,13:45,14:00,14:15,14:30,14:45,15:00,15:15,15:30,15:45,16:00,16:15,16:30,16:45,17:00,17:15,17:30,17:45,18:00,18:15,18:30,18:45,19:00,19:15,19:30,19:45,20:00,20:15,20:30,20:45,21:00,21:15,21:30,21:45,22:00,22:15,22:30,22:45,23:00,23:15,23:30,23:45"; . " nextAlarmTime:time";
if (lc $cmd eq 'screenmsg' if (lc $cmd eq 'screenmsg'
|| lc $cmd eq 'ttsmsg' || lc $cmd eq 'ttsmsg'
|| lc $cmd eq 'volume' || lc $cmd eq 'defaultvolume'
|| lc $cmd eq 'mediaplayer' || lc $cmd eq 'mediaplayer'
|| lc $cmd eq 'devicestate' || lc $cmd eq 'devicestate'
|| lc $cmd eq 'brightness' || lc $cmd eq 'screenbrightness'
|| lc $cmd eq 'screen' || lc $cmd eq 'screen'
|| lc $cmd eq 'openurl' || lc $cmd eq 'openurl'
|| lc $cmd eq 'alarmtime') { || lc $cmd eq 'nextalarmtime') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SelectSetCmd ($hash, $cmd, @val); return AMAD_SelectSetCmd ($hash, $cmd, @val);
@ -321,11 +321,13 @@ sub AMAD_SelectSetCmd($$@)
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
elsif (lc $cmd eq 'volume') { elsif (lc $cmd eq 'defaultvolume') {
my $vol = join(" ", @data); my $vol = join(" ", @data);
my $url = "http://" . $host . ":" . $port . "/automagic/setVolume?volume=$vol"; my $url = "http://" . $host . ":" . $port . "/automagic/setVolume?volume=$vol";
readingsSingleUpdate ($hash,$cmd,$vol,1);
AMAD_GetUpdateLocal($hash); AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal"; Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
@ -347,7 +349,7 @@ sub AMAD_SelectSetCmd($$@)
return undef; return undef;
} }
elsif (lc $cmd eq 'brightness') { elsif (lc $cmd eq 'screenbrightness') {
my $bri = join(" ", @data); my $bri = join(" ", @data);
my $url = "http://" . $host . ":" . $port . "/automagic/setBrightness?brightness=$bri"; my $url = "http://" . $host . ":" . $port . "/automagic/setBrightness?brightness=$bri";
@ -372,7 +374,7 @@ sub AMAD_SelectSetCmd($$@)
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }
elsif (lc $cmd eq 'alarmtime') { elsif (lc $cmd eq 'nextalarmtime') {
my $alarmTime = join(" ", @data); my $alarmTime = join(" ", @data);
my @alarm = split(":", $alarmTime); my @alarm = split(":", $alarmTime);