diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index 48a84e6..def72d0 100644 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -75,7 +75,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; my $modulversion = "4.1.99.30"; -my $flowsetversion = "4.1.99.5"; +my $flowsetversion = "4.1.99.6"; diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index c6253a1..6bf941e 100644 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -58,8 +58,8 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode "; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "4.1.99.33"; -my $flowsetversion = "4.1.99.5"; +my $modulversion = "4.1.99.37"; +my $flowsetversion = "4.1.99.6"; @@ -507,16 +507,16 @@ sub AMADDevice_Set($$@) { } elsif( lc $cmd eq 'volumenotification' ) { - my $vol = join( " ", @args ); + my $volnote = join( " ", @args ); - $path = "/fhem-amad/setCommands/setNotifiVolume?notifivolume=$vol"; + $path = "/fhem-amad/setCommands/setNotifiVolume?notifivolume=$volnote"; $method = "POST"; } elsif( lc $cmd eq 'volumeringsound' ) { - my $vol = join( " ", @args ); + my $volring = join( " ", @args ); - $path = "/fhem-amad/setCommands/setRingSoundVolume?ringsoundvolume=$vol"; + $path = "/fhem-amad/setCommands/setRingSoundVolume?ringsoundvolume=$volring"; $method = "POST"; } @@ -721,7 +721,7 @@ sub AMADDevice_Set($$@) { elsif( lc $cmd eq 'currentflowsetupdate' ) { - $path = "/fhem-amad/currentFlowsetUpdate"; + $path = "/fhem-amad/setCommands/currentFlowsetUpdate"; $method = "POST"; } diff --git a/74_AMADautomagicFlowset_4.1.99.5.xml b/74_AMADautomagicFlowset_4.1.99.6.xml similarity index 81% rename from 74_AMADautomagicFlowset_4.1.99.5.xml rename to 74_AMADautomagicFlowset_4.1.99.6.xml index 9c65917..fd538ca 100644 --- a/74_AMADautomagicFlowset_4.1.99.5.xml +++ b/74_AMADautomagicFlowset_4.1.99.6.xml @@ -250,14 +250,6 @@ irname=getString("name") false - - false - HTTP Request: /fhem-amad/currentFlowsetUpdate - true - /fhem-amad/currentFlowsetUpdate - 8090 - true - false HTTP Request: /fhem-amad/deviceInfo/ @@ -598,6 +590,11 @@ irname=getString("name") Expression: contains(value, " und ") contains(value, " und ") + + false + Expression: currentFlowsetUpdate" + request_path == "/fhem-amad/setCommands/currentFlowsetUpdate" + false Expression: do not Disturb" @@ -1816,6 +1813,15 @@ putString("{param_exkey2}", "{param_exval2}"); true false + + true + Flows ausführen: Update AMAD Flowset + Update AMAD Flowset + + false + false + false + true Flows ausführen: VoiceControl @@ -3280,7 +3286,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -