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

Set Befehle etwas verändert

Browse Source
This commit is contained in:
Marko Oldenburg
2015-08-05 09:26:54 +02:00
parent 08b72140cf
commit d215eec999
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
74_AMAD.pm
View File

@@ -41,7 +41,7 @@ sub AMAD_Initialize($) {
$hash->{AttrFn} = "AMAD_Attr"; $hash->{AttrFn} = "AMAD_Attr";
$hash->{ReadFn} = "AMAD_Read"; $hash->{ReadFn} = "AMAD_Read";
$hash->{AttrList} = $hash->{AttrList} =
"interval disable:0 " "interval disable:1 "
. $readingFnAttributes; . $readingFnAttributes;
} }
@@ -151,11 +151,11 @@ sub AMAD_Set($$@)
my $list = "screenMsg" my $list = "screenMsg"
. " ttsMsg" . " ttsMsg"
. " setVolume:slider,0,1,15" . " Volume:slider,0,1,15"
. " deviceState:online,offline" . " DeviceState:online,offline"
. " mediaPlayer:play,stop,next,back" . " MediaPlayer:play,stop,next,back"
. " setBrightness:slider,0,1,255" . " Brightness:slider,0,1,255"
. " setScreen:on,off" . " Screen:on,off"
. " openURL"; . " openURL";
@@ -167,13 +167,13 @@ sub AMAD_Set($$@)
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SetTtsMsg ($hash, @val); return AMAD_SetTtsMsg ($hash, @val);
} }
elsif (lc $cmd eq 'setvolume') { elsif (lc $cmd eq 'volume') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SetVolume ($hash, @val); return AMAD_SetVolume ($hash, @val);
} }
elsif (lc $cmd eq 'mediaplayer') { elsif (lc $cmd eq 'mediaplayer') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_setMediaplayer ($hash, @val); return AMAD_SetMediaplayer ($hash, @val);
} }
elsif (lc $cmd eq 'devicestate') { elsif (lc $cmd eq 'devicestate') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
@@ -183,15 +183,15 @@ sub AMAD_Set($$@)
return undef; return undef;
} }
elsif (lc $cmd eq 'setbrightness') { elsif (lc $cmd eq 'brightness') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SetBrightness ($hash, @val); return AMAD_SetBrightness ($hash, @val);
} }
elsif (lc $cmd eq 'setscreen') { elsif (lc $cmd eq 'screen') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SetScreen ($hash, @val); return AMAD_SetScreen ($hash, @val);
} }
elsif (lc $cmd eq 'setscreen') { elsif (lc $cmd eq 'openurl') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val);
return AMAD_SetOpenURL ($hash, @val); return AMAD_SetOpenURL ($hash, @val);
} }
@@ -362,8 +362,6 @@ sub AMAD_SetScreen($@) {
my $url = "http://" . $host . ":" . $port . "/automagic/setScreenOnOff?screen=$mod"; my $url = "http://" . $host . ":" . $port . "/automagic/setScreenOnOff?screen=$mod";
AMAD_GetUpdateLocal($hash);
Log3 $name, 4, "AMAD ($name) - Starte Update GetUpdateLocal";
return AMAD_HTTP_POST ($hash,$url); return AMAD_HTTP_POST ($hash,$url);
} }