From 22388471aad7dd11b787052c1431751ffb2095dd Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Tue, 2 Jan 2018 11:10:14 +0000 Subject: [PATCH] 74_AMADDevice: change DEF and add Attribut IODev, add Reading incommingSmsText git-svn-id: https://svn.fhem.de/fhem/trunk@15752 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 + fhem/FHEM/73_AMADCommBridge.pm | 7 +- fhem/FHEM/74_AMADDevice.pm | 45 +- ...xml => 74_AMADautomagicFlowset_4.0.12.xml} | 1602 +++++++++-------- 4 files changed, 840 insertions(+), 816 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.0.11.xml => 74_AMADautomagicFlowset_4.0.12.xml} (82%) diff --git a/fhem/CHANGED b/fhem/CHANGED index addb77737..97eeacd92 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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. + - change: 74_AMADDevice: change DEF and add Attribut IODev, add Reading + incommingSmsText - change: 74_XiaomiFlowerSens: fix Problems with sshHost Methode - change: 73_GardenaSmartBridge/74_GardenaSmartDevice: add NotifyFn Support change AttrFn Routine diff --git a/fhem/FHEM/73_AMADCommBridge.pm b/fhem/FHEM/73_AMADCommBridge.pm index e86a4f208..c7a073c04 100644 --- a/fhem/FHEM/73_AMADCommBridge.pm +++ b/fhem/FHEM/73_AMADCommBridge.pm @@ -74,8 +74,8 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode "; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "4.0.7"; -my $flowsetversion = "4.0.11"; +my $modulversion = "4.0.8"; +my $flowsetversion = "4.0.12"; @@ -788,7 +788,8 @@ sub AMADCommBridge_ResponseProcessing($$) { return Log3 $bname, 3, "AMADCommBridge ($name) - AMADCommBridge: processing receive no reading values from Device: $fhemDevice" unless( (defined($decode_json->{payload}) and ($decode_json->{payload})) or (defined($decode_json->{firstrun}) and ($decode_json->{firstrun})) ); - Log3 $bname, 4, "AMADCommBridge ($bname) - AMADCommBridge: processing receive reading values - Device: $fhemDevice Data: $decode_json->{payload}" unless( defined($decode_json->{payload}) and ($decode_json->{payload}) ); + Log3 $bname, 4, "AMADCommBridge ($bname) - AMADCommBridge: processing receive reading values - Device: $fhemDevice Data: $decode_json->{payload}" + if( defined($decode_json->{payload}) and ($decode_json->{payload}) ); Dispatch($bhash,$json,undef); Log3 $bname, 4, "AMADCommBridge ($bname) - call Dispatcher"; diff --git a/fhem/FHEM/74_AMADDevice.pm b/fhem/FHEM/74_AMADDevice.pm index ff2f1bbb6..3e69c2f2f 100644 --- a/fhem/FHEM/74_AMADDevice.pm +++ b/fhem/FHEM/74_AMADDevice.pm @@ -59,7 +59,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; my $modulversion = "4.0.12"; -my $flowsetversion = "4.0.11"; +my $flowsetversion = "4.0.12"; @@ -120,6 +120,8 @@ sub AMADDevice_Initialize($) { "setAPSSID ". "root:0,1 ". "disable:1 ". + "remoteServer:Automagic,Autoremote,TNES,other ". + "IODev ". $readingFnAttributes; foreach my $d(sort keys %{$modules{AMADDevice}{defptr}}) { @@ -134,27 +136,17 @@ sub AMADDevice_Define($$) { my ( $hash, $def ) = @_; my @a = split( "[ \t]+", $def ); - splice( @a, 1, 1 ); - my $iodev; - my $i = 0; - - foreach my $param ( @a ) { - if( $param =~ m/IODev=([^\s]*)/ ) { - - $iodev = $1; - splice( @a, $i, 3 ); - last; - } - - $i++; - } - - return "too few parameters: define AMADDevice " if( @a != 3 ); + return "too few parameters: define AMADDevice " if( @a != 5 ); return "Cannot define a AMAD device. Perl modul $missingModul is missing." if ( $missingModul ); + + my $name = $a[0]; + my $host = $a[2]; + my $amad_id = $a[3]; + my $remoteServer = $a[4]; - my ($name,$host,$amad_id) = @a; + $hash->{DEF} = "$host $amad_id Automagic" if( $remoteServer ne 'Automagic' ); $hash->{HOST} = $host; $hash->{AMAD_ID} = $amad_id; @@ -165,21 +157,22 @@ sub AMADDevice_Define($$) { $hash->{helper}{setCmdErrorCounter} = 0; $hash->{helper}{deviceStateErrorCounter} = 0; + + + + CommandAttr(undef,"$name IODev $modules{AMADCommBridge}{defptr}{BRIDGE}->{NAME}") if(AttrVal($name,'IODev','none') eq 'none'); + + my $iodev = AttrVal($name,'IODev','none'); - - AssignIoPort($hash,$iodev) if( !$hash->{IODev} ); if(defined($hash->{IODev}->{NAME})) { - Log3 $name, 3, "AMADDevice ($name) - I/O device is " . $hash->{IODev}->{NAME}; - } else { - Log3 $name, 1, "AMADDevice ($name) - no I/O device"; } - - + + $iodev = $hash->{IODev}->{NAME}; my $d = $modules{AMADDevice}{defptr}{$amad_id}; @@ -749,7 +742,7 @@ sub AMADDevice_Parse($$) { } else { - return "UNDEFINED $fhemDevice AMADDevice $decode_json->{firstrun}{'amaddevice_ip'} $decode_json->{amad}{'amad_id'} IODev=$name"; + return "UNDEFINED $fhemDevice AMADDevice $decode_json->{firstrun}{'amaddevice_ip'} $decode_json->{amad}{'amad_id'} Automagic"; } } diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.12.xml similarity index 82% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.12.xml index 220956975..7420fdd2b 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.11.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.12.xml @@ -288,7 +288,7 @@ irname=getString("name") false - Medien Session verändert.2 + Medien Session verändert true com.amazon.mp3,com.audible.application,com.rhapsody.alditalk,com.sec.android.app.music,com.spotify.music,de.maxdome.app.android,com.google.android.videos,com.google.android.music,org.smblott.intentradioio,com.amazon.avod.thirdpartyclient,tunein.player,org.videolan.vlc,com.google.android.youtube,com.google.android.apps.youtube.kids @@ -331,6 +331,15 @@ irname=getString("name") true false + + false + SMS Empfangen: Alle + true + true + + + false + true Sprachbefehl angefordert @@ -1111,6 +1120,11 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + + true + Expression: trigger == "SMS Empfangen: Alle" + trigger == "SMS Empfangen: Alle" + true Expression: trigger == "Sprachbefehl angefordert" @@ -1905,7 +1919,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {fhemfunc} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -1929,7 +1943,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {firstrundata} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -1953,7 +1967,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {fhemdata} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -1977,7 +1991,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {readingsvalcmd} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -2001,7 +2015,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {setcmd} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -2025,7 +2039,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" POST GENERAL_TEXT - text/json + application/json {voiceinputdata} @@@@readingsNameXYZ@@readingsValueABC upload_field @@ -2805,6 +2819,12 @@ nextalarmstate = "snooze" Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading"; + + + true + Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + @@ -3028,7 +3048,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON - + false @@ -3731,7 +3753,7 @@ Soll der Assistent gelöscht werden? First Run Assistant - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 false PARALLEL @@ -3805,10 +3827,10 @@ Soll der Assistent gelöscht werden? Expression: sprachassi == "ja" Expression: sprachassi == "nein" Script: if(index == 0) { sprachassi = "ja"; } else if(index == 1) { sprachassi = "nein"; } - Script: global_activetask = "none"; global_apssid = "none"; global_userflowstate = "none"; - Script: global_amadid = getDate(); - Setze Flow Status: Aktivieren Send Data to AMADCommBridge - Setze Flow Status: Deaktivieren First Run Assistant + Script: global_activetask = "none"; global_apssid = "none"; global_userflowstate = "none"; + Script: global_amadid = getDate(); + Setze Flow Status: Aktivieren Send Data to AMADCommBridge + Setze Flow Status: Deaktivieren First Run Assistant Meldungsdialog: Wunderbar. Bitte nimm Dir Zeit und lese Dir die Hilfe Dialoge genau durch. Wenn Du Dir unsicher bist, kannst Du die Standardeinstellung, sofern vorhanden, belassen. Lass uns nun mit der Einrichtung beginnen. Flows löschen: First Run Assistant Flows löschen: First Run Assistant @@ -3904,17 +3926,189 @@ Soll der Assistent gelöscht werden? Informations - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true QUEUE 900 - + Script: daydream_state = "on" + Script: daydream_state = "off" + Script: keyguard = "unlocked" + Display Orientierung: Portrait + Script: screen_orientation = "portrait" + Script: screen_orientation = "landscape" + Script: dock_state = "docked" + Script: dock_state = "undocked" + Script: keyguardSet = "0" + Script: screen_orientation_mode = "manual" + Script: scrcount = 0 + Script: keyguard = "locked" + Expression: scrcount < 5 + Script: scrcount = scrcount + 1 + Pause: 2s (Gerät wach halten) + Dock Status: Docked + Display automatisch drehen eingeschaltet + Expression: trigger == "Daydream Status: Gestartet" + Bluetooth eingeschaltet + Keyguard gesperrt + Expression: keyguard == "locked" + Expression: getAndroidSDKVersion() >= "16" + Script: keyguardSet = "not supported from your device" + Display eingeschaltet + Display eingeschaltet + Expression: getAndroidSDKVersion() >= "16" + Unterbrechnungen-Modus: Nur Wecker (Android 6+) + Unterbrechnungen-Modus: Keine / Nicht unterbrechen + Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen + Unterbrechnungen-Modus: Alle / Immer unterbrechen + Script: dndValue = "always" + Script: dndValue = "onlyImportant" + Script: dndValue = "never" + Script: dndValue = "alarmClockOnly" + Script: screen_state = "on" + Script: screen_state = "off" + Script: screen_state = "on {keyguard}" + Script: screen_state = "off {keyguard}" + Script: airplanemode = "off" + Script: bluetooth_state = "on" + Script: androidVersion = "not supported funktion" + App Task läuft: {global_activetask} (neuster) + Script: runTask = "1" + Script: runTask = "0" + Expression: getAndroidSDKVersion() >= "19" + Script: runTask = "not supported android version" + Script: runTask = "null" + Expression: global_activetask != null + Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" + Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Akku Ladestand: grösser als 0%" + Stromversorgung: Angeschlossen + Script: screen_orientation_mode = "auto" + Script: bluetooth_state = "off" + Keyguard mit Sicherheit + Script: keyguardSet = "1" + Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" + Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Systemeinstellung verändert: System screen_brightness" + Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) + Script: volume = {volumeBT} + Pause: 2s (Gerät wach halten) + Musik Aktiv + Benachrichtigung auf Bildschirm: [AMAD2] Nicht mehr benötigte AMAD Flows wurden entfernt! (lange) + Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" or trigger == "Systemeinstellung verändert: System volume_music_headphone" or trigger == "Systemeinstellung verändert: System volume_music_headset" + Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 + Script: volume = {volumeSP} + Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 + Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: getAndroidSDKVersion() >= "21" + Script: airpcount = 0 + Host erreichbar: {global_fhemip}:{global_bridgeport} + WLAN Reassoziieren + Expression: global_fhemip != null or global_bridgeport != null + Expression: getAndroidSDKVersion() >= "19" + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Script: notification_text = "not supported from your device" + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + Benachrichtigung in Statusbar angezeigt: WhatsApp + Initialisiere Variable Systemeinstellung: screenBrightness + Initialisiere Variable Systemeinstellung: volumeNotification + Expression: trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Get Android Version + WLAN verfügbar: {global_apssid} + Script: intentRadioState = "\"intentRadioState\":" + " \"" + {irstate} + "\"" + "," + "\"intentRadioName\":" + " \"" + {irname} + "\""; fhemcmd = "setreading"; + Script: keyguardSet = "\"keyguardSet\":" + " \"" + {keyguardSet} + "\""; fhemcmd = "setreading"; + Script: dockingState = "\"dockingState\":" + " \"" + {dock_state} + "\""; fhemcmd = "setreading"; + Script: screenOrientation = "\"screenOrientation\":" + " \"" + {screen_orientation} + "\"" + "," + "\"screenOrientationMode\":" + " \"" + {screen_orientation_mode} + "\""; fhemcmd = "setreading"; + Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading"; + Script: daydream = "\"daydream\":" + " \"" + {daydream_state} + "\""; fhemcmd = "setreading"; + Script: volumeNotification = "\"volumeNotification\":" + " \"" + {volumeNotification} + "\""; fhemcmd = "setreading"; + Script: airplanemode = "\"airplanemode\":" + " \"" + {airplanemode} + "\""; fhemcmd = "setreading"; + Script: nextAlarmState = "\"nextAlarmState\":" + " \"" + {nextalarmstate} + "\""; fhemcmd = "setreading"; + Script: doNotDisturb = "\"doNotDisturb\":" + " \"" + {dndValue} + "\""; fhemcmd = "setreading"; + Script: checkActiveTask = "\"checkActiveTask\":" + " \"" + {runTask} + "\""; fhemcmd = "setreading"; + Expression: Leon == "Gaultier" + Flows löschen: MultimediaControl + Script: androidVersion = "\"androidVersion\":" + " \"" + {androidVersion} + "\""; fhemcmd = "setreading"; + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: getAndroidSDKVersion() >= "19" + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Automagic + Script: deviceState = "\"deviceState\": \"online\""; fhemcmd = "setreading"; + Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Flows ausführen: Send Data to AMADCommBridge + Prüfe und setze globale Variable + Script: bluetooth = "\"bluetooth\":" + " \"" + {bluetooth_state} + "\""; fhemcmd = "setreading"; + Script: connected_devices_names = "none"; connected_devices_addresses = "none" + Script: btdeviceinfo = "\"connectedBTdevices\":" + " \"" + {connected_devices_names} + "\"" + "," + "\"connectedBTdevicesMAC\":" + " \"" + {connected_devices_addresses} + "\""; fhemcmd = "setreading"; + Bluetooth Gerät verbunden: Beliebiges Geräte + Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Script: flow_SetCommands = "\"flow_SetCommands\":" + " \"" + {setCommandFlow_state} + "\""; fhemcmd = "setreading"; + Setze Flow Status: Aktivieren SetCommands + Script: setCommandFlow_state = "aktiv" + Script: setCommandFlow_state = "inaktiv" + Flow Aktiv: SetCommands + Expression: trigger == "Periodischer Timer: alle 120s" + Expression: global_userflowstate != "none" + Flow Aktiv: {global_userflowstate} + Script: flowState = "inactive" + Script: flowState = "active" + Script: flow_informations = "\"userFlowState\":" + " \"" + {flowState} + "\""; fhemcmd = "setreading"; + Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Flow Aktiv: Send Data to AMADCommBridge + Setze Flow Status: Aktivieren Send Data to AMADCommBridge + Expression: trigger == "Periodischer Timer: alle 120s" + Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading"; + Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Pause: 2s (Gerät wach halten) + Script: airpcount = airpcount + 1 + Expression: airpcount < 11 + Script: notification_text = "not supported from your device" + Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading"; + Script: screen = "\"screen\":" + " \"" + {screen_state} + "\""; fhemcmd = "setreading"; + Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading"; + Script: volumevalue = "\"volume\":" + " \"" + {volume} + "\""; fhemcmd = "setreading"; + Script: nextAlarm = "\"nextAlarmTime\":" + " \"" + {next_alarmtime} + "\"" + "," + "\"nextAlarmDay\":" + " \"" + {next_alarmday} + "\""; fhemcmd = "setreading"; + Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" + Expression: package_name == {global_activetask} + Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "App Task Beendet" or trigger == "App Task Gestartet" + Expression: trigger == "App Task Gestartet" or trigger == "Periodischer Timer: alle 120s" + Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Script: if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT") { nextalarmstate = "alert" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS") { nextalarmstate = "dismiss" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE") { nextalarmstate = "done" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE") { nextalarmstate = "snooze" } + Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Initialisiere Variable Nächster Alarm: next_alarm + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Script: next_alarmday = "{next_alarm,dateformat,c}" + Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading"; + Script: wiredHeadsetPlugged = "\"wiredHeadsetPlugged\":" + " \"" + {headsetValue} + "\""; fhemcmd = "setreading"; + Expression: trigger == "Kabelgebundenes Headset Verbunden" or trigger == "Kabelgebundenes Headset Getrennt" + Expression: trigger == "Systemeinstellung verändert: System volume_ring" + Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" + Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Kabelgebundenes Headset verbunden + Script: headsetValue = 1 + Script: headsetValue = 0 + Initialisiere Variable Systemeinstellung: volumeRingSound + Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" + Script: if(playback_state == 0) { playback_state = "keiner" } else if(playback_state == 1) { playback_state = "gestoppt" } else if(playback_state == 2) { playback_state = "pausiert" } else if(playback_state == 3) { playback_state = "spielt ab" } else if(playback_state == 4) { playback_state = "spult vorwärts" } else if(playback_state == 5) { playback_state = "spült rückwärts" } else if(playback_state == 6) { playback_state = "buffert" } else if(playback_state == 7) { playback_state = "Fehler" } else if(playback_state == 8) { playback_state = "verbindet" } else if(playback_state == 9) { playback_state = "springt zum vorherigen" } else if(playback_state == 10) { playback_state = "springt zum nächsten" } else if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } + Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } else if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } else if(package_name == "com.google.android.videos") { musicapp = "Google Video" } else if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } else if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } else if(package_name == "com.google.android.apps.youtube.kids") { musicapp = "YouTube Kids" } else if(package_name == "tunein.player") { musicapp = "TuneIn Player" } else if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } else if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } else if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } + Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Telegram Messenger + Script: notification_text = "not supported from your device" + Expression: getAndroidSDKVersion() >= "19" + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger" + Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE Kabelgebundenes Headset Verbunden Genereller Broadcast: wenn org.smblott.intentradio.STATE Systemeinstellung verändert: System volume_music_headphone - Stromversorgung: Angeschlossen + Medien Session verändert + Kabelgebundenes Headset Getrennt Systemeinstellung verändert: System volume_music_headset + Stromversorgung: Angeschlossen Bluetooth Status: Schaltet ein, Ein Display Status: Aus Display Orientierung: Portrait @@ -3926,457 +4120,291 @@ Soll der Assistent gelöscht werden? Daydream Status: Gestoppt Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic Eingehender Anruf. Status: Klingelt, Nummern: Alle - Systemeinstellung verändert: System screen_brightness - Systemeinstellung verändert: System volume_music_speaker Display Status: Ein - Bluetooth Gerät verbunden: Alle Geräte + Systemeinstellung verändert: System volume_music_speaker + Systemeinstellung verändert: System screen_brightness Daydream Status: Gestartet + Bluetooth Gerät verbunden: Alle Geräte Bluetooth Gerät getrennt: Alle Geräte - Dock Event: Docked Periodischer Timer: alle 120s + Dock Event: Docked Systemeinstellung verändert: System volume_music_bt_a2dp Akku Ladestand: grösser als 0% - Unterbrechnungen-Modus: Alle / Immer unterbrechen App Task Beendet + Unterbrechnungen-Modus: Alle / Immer unterbrechen HTTP Request: /fhem-amad/deviceInfo/ Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT - Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic - Systemeinstellung verändert: System next_alarm - Stromversorgung: Entfernt Benachrichtigung in Statusbar angezeigt: org.telegram.messenger + Stromversorgung: Entfernt + Systemeinstellung verändert: System next_alarm + Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic App Task Gestartet Unterbrechnungen-Modus: Keine / Nicht unterbrechen Dock Event: Undocked Display Orientierung: Landscape - Systemeinstellung verändert: System volume_ring Unterbrechnungen-Modus: Nur Wecker (Android 6+) + Systemeinstellung verändert: System volume_ring Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker - Kabelgebundenes Headset Getrennt - Medien Session verändert.2 + SMS Empfangen: Alle - Script: daydream_state = "on" - Script: daydream_state = "off" - Script: keyguard = "unlocked" - Display Orientierung: Portrait - Script: screen_orientation = "portrait" - Script: screen_orientation = "landscape" - Script: dock_state = "docked" - Script: dock_state = "undocked" - Script: keyguardSet = "0" - Script: screen_orientation_mode = "manual" - Script: scrcount = 0 - Script: keyguard = "locked" - Expression: scrcount < 5 - Script: scrcount = scrcount + 1 - Pause: 2s (Gerät wach halten) - Dock Status: Docked - Display automatisch drehen eingeschaltet - Expression: trigger == "Daydream Status: Gestartet" - Bluetooth eingeschaltet - Keyguard gesperrt - Expression: keyguard == "locked" - Expression: getAndroidSDKVersion() >= "16" - Script: keyguardSet = "not supported from your device" - Display eingeschaltet - Display eingeschaltet - Expression: getAndroidSDKVersion() >= "16" - Unterbrechnungen-Modus: Nur Wecker (Android 6+) - Unterbrechnungen-Modus: Keine / Nicht unterbrechen - Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen - Unterbrechnungen-Modus: Alle / Immer unterbrechen - Script: dndValue = "always" - Script: dndValue = "onlyImportant" - Script: dndValue = "never" - Script: dndValue = "alarmClockOnly" - Script: screen_state = "on" - Script: screen_state = "off" - Script: screen_state = "on {keyguard}" - Script: screen_state = "off {keyguard}" - Script: airplanemode = "off" - Script: bluetooth_state = "on" - Script: androidVersion = "not supported funktion" - App Task läuft: {global_activetask} (neuster) - Script: runTask = "1" - Script: runTask = "0" - Expression: getAndroidSDKVersion() >= "19" - Script: runTask = "not supported android version" - Script: runTask = "null" - Expression: global_activetask != null - Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Akku Ladestand: grösser als 0%" - Stromversorgung: Angeschlossen - Script: screen_orientation_mode = "auto" - Script: bluetooth_state = "off" - Keyguard mit Sicherheit - Script: keyguardSet = "1" - Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" - Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Systemeinstellung verändert: System screen_brightness" - Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) - Script: volume = {volumeBT} - Pause: 2s (Gerät wach halten) - Musik Aktiv - Benachrichtigung auf Bildschirm: [AMAD2] Nicht mehr benötigte AMAD Flows wurden entfernt! (lange) - Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" or trigger == "Systemeinstellung verändert: System volume_music_headphone" or trigger == "Systemeinstellung verändert: System volume_music_headset" - Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 - Script: volume = {volumeSP} - Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 - Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: getAndroidSDKVersion() >= "21" - Script: airpcount = 0 - Host erreichbar: {global_fhemip}:{global_bridgeport} - WLAN Reassoziieren - Expression: global_fhemip != null or global_bridgeport != null - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Script: notification_text = "not supported from your device" - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" - Benachrichtigung in Statusbar angezeigt: WhatsApp - Script: notification_text = "not supported from your device" - Initialisiere Variable Systemeinstellung: screenBrightness - Initialisiere Variable Systemeinstellung: volumeNotification - Initialisiere Variable Systemeinstellung: volumeRingSound - Expression: trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Get Android Version - WLAN verfügbar: {global_apssid} - Script: intentRadioState = "\"intentRadioState\":" + " \"" + {irstate} + "\"" + "," + "\"intentRadioName\":" + " \"" + {irname} + "\""; fhemcmd = "setreading"; - Script: keyguardSet = "\"keyguardSet\":" + " \"" + {keyguardSet} + "\""; fhemcmd = "setreading"; - Script: dockingState = "\"dockingState\":" + " \"" + {dock_state} + "\""; fhemcmd = "setreading"; - Script: screenOrientation = "\"screenOrientation\":" + " \"" + {screen_orientation} + "\"" + "," + "\"screenOrientationMode\":" + " \"" + {screen_orientation_mode} + "\""; fhemcmd = "setreading"; - Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading"; - Script: daydream = "\"daydream\":" + " \"" + {daydream_state} + "\""; fhemcmd = "setreading"; - Script: volumeNotification = "\"volumeNotification\":" + " \"" + {volumeNotification} + "\""; fhemcmd = "setreading"; - Script: airplanemode = "\"airplanemode\":" + " \"" + {airplanemode} + "\""; fhemcmd = "setreading"; - Script: nextAlarmState = "\"nextAlarmState\":" + " \"" + {nextalarmstate} + "\""; fhemcmd = "setreading"; - Script: doNotDisturb = "\"doNotDisturb\":" + " \"" + {dndValue} + "\""; fhemcmd = "setreading"; - Script: checkActiveTask = "\"checkActiveTask\":" + " \"" + {runTask} + "\""; fhemcmd = "setreading"; - Expression: Leon == "Gaultier" - Flows löschen: MultimediaControl - Script: androidVersion = "\"androidVersion\":" + " \"" + {androidVersion} + "\""; fhemcmd = "setreading"; - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: Automagic - Script: deviceState = "\"deviceState\": \"online\""; fhemcmd = "setreading"; - Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Flows ausführen: Send Data to AMADCommBridge - Prüfe und setze globale Variable - Script: bluetooth = "\"bluetooth\":" + " \"" + {bluetooth_state} + "\""; fhemcmd = "setreading"; - Script: connected_devices_names = "none"; connected_devices_addresses = "none" - Script: btdeviceinfo = "\"connectedBTdevices\":" + " \"" + {connected_devices_names} + "\"" + "," + "\"connectedBTdevicesMAC\":" + " \"" + {connected_devices_addresses} + "\""; fhemcmd = "setreading"; - Bluetooth Gerät verbunden: Beliebiges Geräte - Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Script: flow_SetCommands = "\"flow_SetCommands\":" + " \"" + {setCommandFlow_state} + "\""; fhemcmd = "setreading"; - Setze Flow Status: Aktivieren SetCommands - Script: setCommandFlow_state = "aktiv" - Script: setCommandFlow_state = "inaktiv" - Flow Aktiv: SetCommands - Expression: trigger == "Periodischer Timer: alle 120s" - Expression: global_userflowstate != "none" - Flow Aktiv: {global_userflowstate} - Script: flowState = "inactive" - Script: flowState = "active" - Script: flow_informations = "\"userFlowState\":" + " \"" + {flowState} + "\""; fhemcmd = "setreading"; - Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Flow Aktiv: Send Data to AMADCommBridge - Setze Flow Status: Aktivieren Send Data to AMADCommBridge - Expression: trigger == "Periodischer Timer: alle 120s" - Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading"; - Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Benachrichtigung in Statusbar angezeigt: Telegram Messenger - Pause: 2s (Gerät wach halten) - Script: airpcount = airpcount + 1 - Expression: airpcount < 11 - Script: notification_text = "not supported from your device" - Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" - Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading"; - Script: screen = "\"screen\":" + " \"" + {screen_state} + "\""; fhemcmd = "setreading"; - Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading"; - Script: volumevalue = "\"volume\":" + " \"" + {volume} + "\""; fhemcmd = "setreading"; - Script: nextAlarm = "\"nextAlarmTime\":" + " \"" + {next_alarmtime} + "\"" + "," + "\"nextAlarmDay\":" + " \"" + {next_alarmday} + "\""; fhemcmd = "setreading"; - Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" - Expression: package_name == {global_activetask} - Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "App Task Beendet" or trigger == "App Task Gestartet" - Expression: trigger == "App Task Gestartet" or trigger == "Periodischer Timer: alle 120s" - Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Script: if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT") { nextalarmstate = "alert" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS") { nextalarmstate = "dismiss" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE") { nextalarmstate = "done" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE") { nextalarmstate = "snooze" } - Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Initialisiere Variable Nächster Alarm: next_alarm - Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" - Script: next_alarmday = "{next_alarm,dateformat,c}" - Host erreichbar: {global_fhemip}:{global_bridgeport} - Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading"; - Script: wiredHeadsetPlugged = "\"wiredHeadsetPlugged\":" + " \"" + {headsetValue} + "\""; fhemcmd = "setreading"; - Expression: trigger == "Kabelgebundenes Headset Verbunden" or trigger == "Kabelgebundenes Headset Getrennt" - Expression: trigger == "Systemeinstellung verändert: System volume_ring" - Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger" - Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Kabelgebundenes Headset verbunden - Script: if(playback_state == 0) { playback_state = "keiner" } else if(playback_state == 1) { playback_state = "gestoppt" } else if(playback_state == 2) { playback_state = "pausiert" } else if(playback_state == 3) { playback_state = "spielt ab" } else if(playback_state == 4) { playback_state = "spult vorwärts" } else if(playback_state == 5) { playback_state = "spült rückwärts" } else if(playback_state == 6) { playback_state = "buffert" } else if(playback_state == 7) { playback_state = "Fehler" } else if(playback_state == 8) { playback_state = "verbindet" } else if(playback_state == 9) { playback_state = "springt zum vorherigen" } else if(playback_state == 10) { playback_state = "springt zum nächsten" } else if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } - Script: headsetValue = 1 - Script: headsetValue = 0 - Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } else if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } else if(package_name == "com.google.android.videos") { musicapp = "Google Video" } else if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } else if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } else if(package_name == "com.google.android.apps.youtube.kids") { musicapp = "YouTube Kids" } else if(package_name == "tunein.player") { musicapp = "TuneIn Player" } else if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } else if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } else if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Host erreichbar: {global_fhemip}:{global_bridgeport} + Expression: trigger == "SMS Empfangen: Alle" + Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NFC Tag Support - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true PARALLEL @@ -4390,7 +4418,7 @@ Soll der Assistent gelöscht werden? Send Data to AMADCommBridge - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true PARALLEL 900 @@ -4414,57 +4442,57 @@ Soll der Assistent gelöscht werden? Flow Aktiv: SetCommands Expression: trigger == "WLAN Verbunden: toGo" In Datei Schreiben: Aktiviere Flows in /storage/emulated/0/file.txt (anhängen) - HTTP Request: send READINGS data to AMADCommBridge JSON - HTTP Request: send SET data to AMADCommBridge JSON - HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge - Script: if(togocount > 0) { togocount = togocount + 1; } else { togocount = 0; togocount = togocount + 1; } - Expression: amadcmd == "firstrun" - HTTP Request: send FIRSTRUN data to AMADCommBridge JSON - Expression: fhemcmd == "readingsval" - Script: Set FHEMREADINGSVALCMD JSON - Host erreichbar: {global_fhemip}:{global_bridgeport} - Script: Set FHEMDATA JSON First Run Assistant - Expression: fhemcmd == "fhemfunc" - Script: Set FHEMCALLSUB JSON - HTTP Request: send FHEMFUNC data to AMADCommBridge JSON + Script: if(togocount > 0) { togocount = togocount + 1; } else { togocount = 0; togocount = togocount + 1; } + Expression: amadcmd == "firstrun" + Expression: fhemcmd == "readingsval" + Script: Set FHEMREADINGSVALCMD JSON + Host erreichbar: {global_fhemip}:{global_bridgeport} + Expression: fhemcmd == "fhemfunc" + Script: Set FHEMCALLSUB JSON + HTTP Request: send FHEMFUNC data to AMADCommBridge JSON + HTTP Request: send FIRSTRUN data to AMADCommBridge JSON + HTTP Request: send READINGS data to AMADCommBridge JSON + HTTP Request: send SET data to AMADCommBridge JSON + HTTP Request: send READINGSVAL data to AMADCommBridge JSON + HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge Expression: fhemcmd == "setreading" - HTTP Request: send READINGSVAL data to AMADCommBridge JSON - Script: Set FHEMDATA JSON - + Script: Set FHEMDATA JSON + Script: Set FHEMDATA JSON First Run Assistant + - - + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + SetCommands - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true QUEUE 900 @@ -4509,151 +4537,151 @@ Soll der Assistent gelöscht werden? Setze Display Helligkeit: {param_brightness} Expression: setScreenlock" Expression: sendIntent" - Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen - Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin - Expression: trigger == "Sprachbefehl angefordert" - Expression: setAlarm" - Expression: screenMsg" - Benachrichtigung auf Bildschirm: {param_message} (lange) - Script: udef_trigger = "setLockPin" - Display eingeschaltet - Gerät sperren - Schalte Display ein - Gerät sperren - Expression: setTimer" - Expression: param_option - Pause: {param_hanguptime}s (Gerät wach halten) - Anruf beenden - Broadcast senden: {param_action} - URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) - Setze Unterbrechnungen-Modus: Alle / Immer unterbrechen - Setze Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen - Setze Unterbrechnungen-Modus: Keine / Nicht unterbrechen - Setze Unterbrechnungen-Modus: Nur Wecker (Android 6+) - Expression: openURL" - Expression: param_fullscreen == "on" - Expression: do not Disturb" - Expression: param_disturbmod == "always" - Expression: param_disturbmod == "onlyImportant" - Expression: param_disturbmod == "never" - Expression: param_disturbmod == "alarmClockOnly" - Expression: setBluetooth" - Expression: param_screen=="on" - Expression: setScreenOnOff" - Gerät sperren - Expression: param_screen=="off" - Expression: openApp" - App Task läuft: App (neuster) - Expression: setVolume" - App Starten: App - Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname} - Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname} - Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname} - Script: notification_text = "Flow install: path for download not exist" - Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname} - Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} - Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download - Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download - Flows/Widgets importieren: /storage/emulated/0/Download/installFlow_{param_flowname} - Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname} - Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0) - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard) - Expression: installFlow" - Neustart - Expression: Reboot - Expression: System Command" - Expression: Shutdown - Script: airplanemode = "airplanemode@@on"; fhemcmd = "setreading"; - Flows ausführen: Send Data to AMADCommBridge mit warten - Flugmodus ein-/ausschalten: Ein - Herunterfahren - Notification Lautstärke Wiederherstellen - Expression: param_notifyfile == "RedAlert.mp3" - Benachrichtigung aus Statusbar entfernen: Alle - Benachrichtigung aus Statusbar entfernen: Alle (Automagic) - Expression: Automagic - Expression: All - Expression: notifysnd" - NotificationLautstärke auf Level 7 - Notification Lautstärke Speichern - Expression: param_notifyfile == "RedAlert.mp3" - Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} - Expression: Clear Automagic Meldungen" - Expression: setVibrate" - Vibrieren: Pattern 2 (-- --) - Audio Player steuern: Medienknopf Zurück ({pname}/{kname}) - Expression: param_button == "stop" - Expression: param_button == "next" - Expression: param_button == "back" - Schalte Display ein: Hell für {param_screenontime}s - Expression: global_fhemip != null or global_bridgeport != null - Setze Alarm: um {param_hour}:{param_minute} - Audio Player steuern: Medienknopf Weiter ({pname}/{kname}) - Expression: openCall" - Nummer anrufen: {param_callnumber} - Expression: param_flowstate == "active" or param_flowstate == "inactive" - Expression: param_flowstate == "active" - Setze Flow Status: Deaktivieren {param_flowname} - Script: notification_text = "Flow '{param_flowname}' has been set {param_flowstate}" - Expression: multimediaControl" - Starte Daydream - Expression: startDaydream" - Lautstärken setzen param_volume - Expression: setNotifiVolume" - Lautstärken setzen param_notifivolume - Expression: param_button == "play/pause" - Audio Player steuern: Medienknopf Play/Pause (/{kname}) - Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung - Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) - Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download - Script: flow_informations = "\"flow_informations\":" + " \"" + {informationFlow_state} + "\""; fhemcmd = "setreading"; - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Flows ausführen: Send Data to AMADCommBridge - Flows ausführen: udef_trigger setLockPin - Flow Aktiv: Informations - Script: informationFlow_state = "aktiv" - Script: informationFlow_state = "inaktiv" - Setze Flow Status: Aktivieren Informations - Host erreichbar: {global_fhemip}:{global_bridgeport} - Flow Aktiv: Send Data to AMADCommBridge - Setze Flow Status: Aktivieren Send Data to AMADCommBridge - Audio Player steuern: Medienknopf Stopp ({pname}/{kname}) - SMS senden an: an {param_smsnumber} '{param_smsmessage}' (10 in 12h) - Expression: param_lockmod == "lock" - Expression: Airplanemode - Expression: param_nfc == "on" - Expression: param_nfc == "off" - NFC ein-/ausschalten: Aus - Expression: sendSms" - Expression: closeCall" - Expression: nfc" - NFC ein-/ausschalten: Ein - Expression: setRingSoundVolume" - Lautstärken setzen param_ringsoundvolume - Zeige Home Screen - Expression: showhomescreen" - Setze Timer - Expression: ttsMsg" - Expression: ttsMsgLang" - Medianlautstärken Speichern - Lautstärke einstellen: Medien auf Level {param_msgvol} - Script: Zuordnung Mediaplayer - Expression: param_msgvol == "none" - Sprachausgabe: Englisch - Sprachausgabe: Deutsch - Expression: param_msgvol == "none" - Medienlautstärke Wiederherstellen - Expression: flowState" - Setze Flow Status: Aktivieren {param_flowname} - Flows ausführen: VoiceControl - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - Expression: flowRun" - Flows ausführen: {param_flowname} - + Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin + Expression: trigger == "Sprachbefehl angefordert" + Expression: setAlarm" + Expression: screenMsg" + Benachrichtigung auf Bildschirm: {param_message} (lange) + Script: udef_trigger = "setLockPin" + Display eingeschaltet + Gerät sperren + Schalte Display ein + Gerät sperren + Expression: setTimer" + Expression: param_option + Pause: {param_hanguptime}s (Gerät wach halten) + Anruf beenden + Broadcast senden: {param_action} + URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) + Setze Unterbrechnungen-Modus: Alle / Immer unterbrechen + Setze Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen + Setze Unterbrechnungen-Modus: Keine / Nicht unterbrechen + Setze Unterbrechnungen-Modus: Nur Wecker (Android 6+) + Expression: openURL" + Expression: param_fullscreen == "on" + Expression: do not Disturb" + Expression: param_disturbmod == "always" + Expression: param_disturbmod == "onlyImportant" + Expression: param_disturbmod == "never" + Expression: param_disturbmod == "alarmClockOnly" + Expression: setBluetooth" + Expression: param_screen=="on" + Expression: setScreenOnOff" + Gerät sperren + Expression: param_screen=="off" + Expression: openApp" + App Task läuft: App (neuster) + Expression: setVolume" + App Starten: App + Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname} + Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname} + Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname} + Script: notification_text = "Flow install: path for download not exist" + Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname} + Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} + Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download + Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download + Flows/Widgets importieren: /storage/emulated/0/Download/installFlow_{param_flowname} + Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname} + Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0) + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard) + Expression: installFlow" + Neustart + Expression: Reboot + Expression: System Command" + Expression: Shutdown + Script: airplanemode = "airplanemode@@on"; fhemcmd = "setreading"; + Flows ausführen: Send Data to AMADCommBridge mit warten + Flugmodus ein-/ausschalten: Ein + Herunterfahren + Notification Lautstärke Wiederherstellen + Expression: param_notifyfile == "RedAlert.mp3" + Benachrichtigung aus Statusbar entfernen: Alle + Benachrichtigung aus Statusbar entfernen: Alle (Automagic) + Expression: Automagic + Expression: All + Expression: notifysnd" + NotificationLautstärke auf Level 7 + Notification Lautstärke Speichern + Expression: param_notifyfile == "RedAlert.mp3" + Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} + Expression: Clear Automagic Meldungen" + Expression: setVibrate" + Vibrieren: Pattern 2 (-- --) + Audio Player steuern: Medienknopf Zurück ({pname}/{kname}) + Expression: param_button == "stop" + Expression: param_button == "next" + Expression: param_button == "back" + Schalte Display ein: Hell für {param_screenontime}s + Expression: global_fhemip != null or global_bridgeport != null + Setze Alarm: um {param_hour}:{param_minute} + Audio Player steuern: Medienknopf Weiter ({pname}/{kname}) + Expression: openCall" + Nummer anrufen: {param_callnumber} + Expression: param_flowstate == "active" or param_flowstate == "inactive" + Expression: param_flowstate == "active" + Setze Flow Status: Deaktivieren {param_flowname} + Script: notification_text = "Flow '{param_flowname}' has been set {param_flowstate}" + Expression: multimediaControl" + Starte Daydream + Expression: startDaydream" + Lautstärken setzen param_volume + Expression: setNotifiVolume" + Lautstärken setzen param_notifivolume + Expression: param_button == "play/pause" + Audio Player steuern: Medienknopf Play/Pause (/{kname}) + Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download + Script: flow_informations = "\"flow_informations\":" + " \"" + {informationFlow_state} + "\""; fhemcmd = "setreading"; + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; + Flows ausführen: Send Data to AMADCommBridge + Flows ausführen: udef_trigger setLockPin + Flow Aktiv: Informations + Script: informationFlow_state = "aktiv" + Script: informationFlow_state = "inaktiv" + Setze Flow Status: Aktivieren Informations + Host erreichbar: {global_fhemip}:{global_bridgeport} + Flow Aktiv: Send Data to AMADCommBridge + Setze Flow Status: Aktivieren Send Data to AMADCommBridge + Audio Player steuern: Medienknopf Stopp ({pname}/{kname}) + SMS senden an: an {param_smsnumber} '{param_smsmessage}' (10 in 12h) + Expression: param_lockmod == "lock" + Expression: Airplanemode + Expression: param_nfc == "on" + Expression: param_nfc == "off" + NFC ein-/ausschalten: Aus + Expression: sendSms" + Expression: closeCall" + Expression: nfc" + NFC ein-/ausschalten: Ein + Expression: setRingSoundVolume" + Lautstärken setzen param_ringsoundvolume + Zeige Home Screen + Expression: showhomescreen" + Setze Timer + Expression: ttsMsg" + Expression: ttsMsgLang" + Medianlautstärken Speichern + Lautstärke einstellen: Medien auf Level {param_msgvol} + Script: Zuordnung Mediaplayer + Expression: param_msgvol == "none" + Sprachausgabe: Englisch + Sprachausgabe: Deutsch + Expression: param_msgvol == "none" + Medienlautstärke Wiederherstellen + Expression: flowState" + Setze Flow Status: Aktivieren {param_flowname} + Flows ausführen: VoiceControl + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + Expression: flowRun" + Flows ausführen: {param_flowname} + Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen + - + @@ -4680,175 +4708,175 @@ Soll der Assistent gelöscht werden? - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Update AMAD Flowset - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true QUEUE @@ -4910,7 +4938,7 @@ Soll der Assistent gelöscht werden? VoiceControl - AMADNG Info/Control Flowset v4.0.11 + AMADNG Info/Control Flowset v4.0.12 true QUEUE