From db990c9027295e2440e1e255b3bb5c7b07accae6 Mon Sep 17 00:00:00 2001 From: CoolTux Date: Wed, 11 Oct 2017 20:13:09 +0000 Subject: [PATCH] 74_AMADDevice: add set command userFlowRun git-svn-id: https://svn.fhem.de/fhem/trunk@15234 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AMADCommBridge.pm | 2 +- fhem/FHEM/74_AMADDevice.pm | 15 +- ...xml => 74_AMADautomagicFlowset_4.0.11.xml} | 346 +++++++++--------- 4 files changed, 196 insertions(+), 168 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.0.10.xml => 74_AMADautomagicFlowset_4.0.11.xml} (94%) diff --git a/fhem/CHANGED b/fhem/CHANGED index a53d93ac2..f226ba36e 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 74_AMADDevice: add set command userFlowRun - change: 57_CALVIEW.pm: -new readings weekdayname and weekday -new attr weekdayformat - feature: 88_HMCCU: Added parameter waitforccu to define command diff --git a/fhem/FHEM/73_AMADCommBridge.pm b/fhem/FHEM/73_AMADCommBridge.pm index 673768347..e86a4f208 100644 --- a/fhem/FHEM/73_AMADCommBridge.pm +++ b/fhem/FHEM/73_AMADCommBridge.pm @@ -75,7 +75,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; my $modulversion = "4.0.7"; -my $flowsetversion = "4.0.10"; +my $flowsetversion = "4.0.11"; diff --git a/fhem/FHEM/74_AMADDevice.pm b/fhem/FHEM/74_AMADDevice.pm index a59d56ccd..ff2f1bbb6 100644 --- a/fhem/FHEM/74_AMADDevice.pm +++ b/fhem/FHEM/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.0.11"; -my $flowsetversion = "4.0.10"; +my $modulversion = "4.0.12"; +my $flowsetversion = "4.0.11"; @@ -463,6 +463,13 @@ sub AMADDevice_Set($$@) { $method = "POST"; } + elsif( lc $cmd eq 'userflowrun' ) { + my $flow = join( " ", @args ); + + $uri = $host . ":" . $port . "/fhem-amad/setCommands/flowRun?flowname=".urlEncode($flow); + $method = "POST"; + } + elsif( lc $cmd eq 'volume' or $cmd eq 'mute' or $cmd =~ 'volume[Down|Up]' ) { my $vol = AMADDevice_CreateVolumeValue($hash,$cmd,@args); @@ -689,7 +696,7 @@ sub AMADDevice_Set($$@) { my $btdev = AttrVal( $name, "setBluetoothDevice", "none" ); - my $list = "screenMsg ttsMsg mediaGoogleMusic:play/pause,stop,next,back mediaSamsungMusic:play/pause,stop,next,back mediaAmazonMusic:play/pause,stop,next,back mediaSpotifyMusic:play/pause,stop,next,back mediaTuneinRadio:play/pause,stop,next,back mediaAldiMusic:play/pause,stop,next,back mediaYouTube:play/pause,stop,next,back mediaYouTubeKids:play/pause,stop,next,back mediaVlcPlayer:play/pause,stop,next,back mediaAudible:play/pause,stop,next,back screenBrightness:slider,0,1,255 screen:on,off,lock,unlock openURL nextAlarmTime:time timer:slider,1,1,60 statusRequest:noArg bluetooth:on,off notifySndFile clearNotificationBar:All,Automagic activateVoiceInput:noArg vibrate:noArg sendIntent openCall closeCall:noArg currentFlowsetUpdate:noArg installFlowSource doNotDisturb:never,always,alarmClockOnly,onlyImportant userFlowState sendSMS startDaydream:noArg volumeUp:noArg volumeDown:noArg mute:on,off showHomeScreen:noArg"; + my $list = "screenMsg ttsMsg mediaGoogleMusic:play/pause,stop,next,back mediaSamsungMusic:play/pause,stop,next,back mediaAmazonMusic:play/pause,stop,next,back mediaSpotifyMusic:play/pause,stop,next,back mediaTuneinRadio:play/pause,stop,next,back mediaAldiMusic:play/pause,stop,next,back mediaYouTube:play/pause,stop,next,back mediaYouTubeKids:play/pause,stop,next,back mediaVlcPlayer:play/pause,stop,next,back mediaAudible:play/pause,stop,next,back screenBrightness:slider,0,1,255 screen:on,off,lock,unlock openURL nextAlarmTime:time timer:slider,1,1,60 statusRequest:noArg bluetooth:on,off notifySndFile clearNotificationBar:All,Automagic activateVoiceInput:noArg vibrate:noArg sendIntent openCall closeCall:noArg currentFlowsetUpdate:noArg installFlowSource doNotDisturb:never,always,alarmClockOnly,onlyImportant userFlowState userFlowRun sendSMS startDaydream:noArg volumeUp:noArg volumeDown:noArg mute:on,off showHomeScreen:noArg"; $list .= " screenOrientation:auto,landscape,portrait" if( AttrVal( $name, "setScreenOrientation", "0" ) eq "1" ); $list .= " screenFullscreen:on,off" if( AttrVal( $name, "setFullscreen", "0" ) eq "1" ); @@ -1049,6 +1056,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • timer - set a countdown timer in the "Clock" stock app. Only minutes are allowed as parameter.
  • ttsMsg - send a message which will be played as voice message (to change laguage temporary set first character &en; or &de;)
  • userFlowState - set Flow/s active or inactive,set Nexus7Wohnzimmer Badezimmer:inactive vorheizen or set Nexus7Wohnzimmer Badezimmer vorheizen,Nachtlicht Steven:inactive
    • +
  • userFlowRun - executes the specified flow
  • vibrate - vibrate Android device
  • volume - set media volume. Works on internal speaker or, if connected, bluetooth speaker or speaker connected via stereo jack
  • volumeNotification - set notifications volume
    • @@ -1219,6 +1227,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • timer - setzt einen Timer innerhalb der als Standard definierten ClockAPP auf dem Device. Es können nur Minuten angegeben werden.
  • ttsMsg - versendet eine Nachricht welche als Sprachnachricht ausgegeben wird (um die Sprache für diese eine Durchsage zu ändern setze vor Deinem eigentlichen Text &en; oder &de;)
  • userFlowState - aktiviert oder deaktiviert einen oder mehrere Flows,set Nexus7Wohnzimmer Badezimmer vorheizen:inactive oder set Nexus7Wohnzimmer Badezimmer vorheizen,Nachtlicht Steven:inactive
    • +
  • userFlowRun - führt den angegebenen Flow aus
  • vibrate - lässt das Androidgerät vibrieren
  • volume - setzt die Medialautstärke. Entweder die internen Lautsprecher oder sofern angeschlossen die Bluetoothlautsprecher und per Klinkenstecker angeschlossene Lautsprecher, + oder - vor dem Wert reduziert die aktuelle Lautstärke um den Wert. Der maximale Sliderwert kann über das Attribut setVolMax geregelt werden.
  • volumeUp - erhöh;t die Lautstärke um den angegeben Wert im entsprechenden Attribut. Ist kein Attribut angegeben wird per default 2 genommen.
    • diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.10.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml similarity index 94% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.10.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml index c200c2a61..220956975 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.10.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml @@ -619,6 +619,11 @@ irname=getString("name") Expression: fhemcmd == "voiceinputvalue" fhemcmd == "voiceinputvalue" + + false + Expression: flowRun" + request_path == "/fhem-amad/setCommands/flowRun" + false Expression: flowState" @@ -1766,6 +1771,15 @@ putString("{param_exkey2}", "{param_exval2}"); false false + + true + Flows ausführen: {param_flowname} + {param_flowname} + + false + false + false + true Flows löschen: First Run Assistant @@ -3014,7 +3028,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -