From 6e402f5a2971cccf5c10499b17815be5d59692e7 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Tue, 12 Sep 2017 20:05:41 +0000 Subject: [PATCH] 73_AMADCommBridge: fix commandref and Flowset git-svn-id: https://svn.fhem.de/fhem/trunk@15059 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AMADCommBridge.pm | 4 +- fhem/FHEM/74_AMADDevice.pm | 6 +- ....xml => 74_AMADautomagicFlowset_4.0.9.xml} | 1487 +++++++++-------- 4 files changed, 759 insertions(+), 739 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.0.8.xml => 74_AMADautomagicFlowset_4.0.9.xml} (91%) diff --git a/fhem/CHANGED b/fhem/CHANGED index d9ca74a21..ea0db4b02 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. + - bugfix: 73_AMADCommBridge: fix commandref and Flowset - feature: 74_AMADautomagicFlowset: add support for wired headset plugged - feature: 74_AMADDevice: add change temporary ttsMsg language, code clean - feature: 50_TelegramBot: new set cmd msgDelete diff --git a/fhem/FHEM/73_AMADCommBridge.pm b/fhem/FHEM/73_AMADCommBridge.pm index 27f6f516d..3520c6247 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.5"; -my $flowsetversion = "4.0.8"; +my $modulversion = "4.0.6"; +my $flowsetversion = "4.0.9"; diff --git a/fhem/FHEM/74_AMADDevice.pm b/fhem/FHEM/74_AMADDevice.pm index 6a79a45f3..257a40427 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.9"; -my $flowsetversion = "4.0.8"; +my $modulversion = "4.0.10"; +my $flowsetversion = "4.0.9"; @@ -1012,6 +1012,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • userFlowState - current state of a Flow, established under setUserFlowState Attribut
  • volume - media volume setting
  • volumeNotification - notification volume setting
    • +
  • wiredHeadsetPlugged - 0/1 headset plugged out or in

    • Prerequisite for using the reading checkActivTask the package name of the application to be checked needs to be defined in the attribute checkActiveTask. Example: attr Nexus10Wohnzimmer checkActiveTask com.android.chrome für den Chrome Browser. @@ -1182,6 +1183,7 @@ sub AMADDevice_CreateChangeBtDeviceValue($$) {
  • userFlowState - aktueller Status eines Flows, festgelegt unter dem setUserFlowState Attribut
  • volume - Media Lautstärkewert
  • volumeNotification - Benachrichtigungs Lautstärke
    • +
  • wiredHeadsetPlugged - 0/1 gibt an ob ein Headset eingesteckt ist oder nicht

    • Beim Reading checkActivTask muß zuvor der Packagename der zu prüfenden App als Attribut checkActiveTask angegeben werden. Beispiel: attr Nexus10Wohnzimmer checkActiveTask com.android.chrome für den Chrome Browser. diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.8.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.9.xml similarity index 91% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.8.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.9.xml index 61e649e02..cc1d9379c 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.8.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.9.xml @@ -246,7 +246,7 @@ - irstate=getString("state"); + irstate=getString("state"); irname=getString("name") false @@ -992,8 +992,8 @@ irname=getString("name") true 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/" - trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" - or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" + 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/" @@ -1009,10 +1009,10 @@ irname=getString("name") true 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/" - 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" + 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/" @@ -1023,31 +1023,31 @@ irname=getString("name") true Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - trigger == "Daydream Status: Gestartet" + trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" true 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/" - trigger == "Display Orientierung: Landscape" - or trigger == "Display Orientierung: Portrait" - or trigger == "Display Status: Ein" - or trigger == "Display Status: Aus" + 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/" true Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "Display Status: Aus" - or trigger == "Display Status: Ein" - or udef_trigger == "setLockPin" + trigger == "Display Status: Aus" + or trigger == "Display Status: Ein" + or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "Dock Event: Docked" - or trigger == "Dock Event: Undocked" + trigger == "Dock Event: Docked" + or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1058,16 +1058,16 @@ irname=getString("name") true Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "Flugmodus: Aus" + trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true 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/" - 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" + 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/" @@ -1093,7 +1093,7 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true Expression: trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "Medien Session verändert" + trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1114,7 +1114,7 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "Systemeinstellung verändert: System next_alarm" + trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1125,9 +1125,9 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true 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" - 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" + 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" @@ -1143,10 +1143,10 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true 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/" - 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" + 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/" @@ -1172,7 +1172,7 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" true Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - udef_trigger == "setLockPin" + udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1246,6 +1246,10 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" {global_fhemip} {global_bridgeport} + + true + Kabelgebundenes Headset verbunden + true Keyguard gesperrt @@ -1551,7 +1555,7 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" FLAG_ACTIVITY_NEW_TASK - putString("{param_exkey1}", "{param_exval1}"); + putString("{param_exkey1}", "{param_exval1}"); putString("{param_exkey2}", "{param_exval2}"); false @@ -1797,59 +1801,59 @@ putString("{param_exkey2}", "{param_exval2}"); false Get Android Version - @@ -1982,8 +1986,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" @@@@readingsNameXYZ@@readingsValueABC 15000 true - FHEMDEVICE: {global_fhemdevice} -FHEMCMD: voiceinputvalue + FHEMDEVICE: {global_fhemdevice} +FHEMCMD: voiceinputvalue Connection: close true respvoiceinputvalue @@ -2323,39 +2327,39 @@ Connection: close false Prüfe und setze Bridgeport Variable - false Prüfe und setze globale Variable - @@ -2385,13 +2389,13 @@ if (header_userflowstate != null or header_userflowstate != {global_userflowstat true Script: airplanemode = "\"airplanemode\":" + " \"" + {airplanemode} + "\""; fhemcmd = "setreading"; - true Script: airplanemode = "airplanemode@@on"; fhemcmd = "setreading"; - @@ -2412,7 +2416,7 @@ fhemcmd = "setreading"; true Script: androidVersion = "\"androidVersion\":" + " \"" + {androidVersion} + "\""; fhemcmd = "setreading"; - @@ -2423,13 +2427,13 @@ fhemcmd = "setreading"; true Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - true Script: bluetooth = "\"bluetooth\":" + " \"" + {bluetooth_state} + "\""; fhemcmd = "setreading"; - @@ -2445,37 +2449,37 @@ fhemcmd = "setreading"; true Script: btdeviceinfo = "\"connectedBTdevices\":" + " \"" + {connected_devices_names} + "\"" + "," + "\"connectedBTdevicesMAC\":" + " \"" + {connected_devices_addresses} + "\""; fhemcmd = "setreading"; - true Script: checkActiveTask = "\"checkActiveTask\":" + " \"" + {runTask} + "\""; fhemcmd = "setreading"; - true Script: connected_devices_names = "none"; connected_devices_addresses = "none" - true Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading"; - true Script: daydream = "\"daydream\":" + " \"" + {daydream_state} + "\""; fhemcmd = "setreading"; - @@ -2491,7 +2495,7 @@ fhemcmd = "setreading"; true Script: deviceState = "\"deviceState\": \"online\""; fhemcmd = "setreading"; - @@ -2527,31 +2531,31 @@ fhemcmd = "setreading"; true Script: dockingState = "\"dockingState\":" + " \"" + {dock_state} + "\""; fhemcmd = "setreading"; - true Script: doNotDisturb = "\"doNotDisturb\":" + " \"" + {dndValue} + "\""; fhemcmd = "setreading"; - true Script: flow_informations = "\"flow_informations\":" + " \"" + {informationFlow_state} + "\""; fhemcmd = "setreading"; - true Script: flow_informations = "\"userFlowState\":" + " \"" + {flowState} + "\""; fhemcmd = "setreading"; - true Script: flow_SetCommands = "\"flow_SetCommands\":" + " \"" + {setCommandFlow_state} + "\""; fhemcmd = "setreading"; - @@ -2567,8 +2571,8 @@ fhemcmd = "setreading"; true Script: global_activetask = "none"; global_apssid = "none"; global_userflowstate = "none"; - @@ -2591,179 +2595,178 @@ global_userflowstate = "none"; Script: global_fhemip = {value} + + true + Script: headsetValue = 1 + + + + true + Script: headsetValue = 0 + + true Script: if (trigger == "NFC TagIDs" ) { nfcLastTagID = "\"nfcLastTagID\":" + " \"" + {nfc_tag_ids} + "\""} if (trigger == "NFC State" ) { nfc = "\"nfc\":" + " \"" + {nfc_state} + "\""} fhemcmd = "setreading"; - true Script: if(index == 0) { sprachassi = "ja"; } else if(index == 1) { sprachassi = "nein"; } - true Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } if(package_name == "com.google.android.videos") { musicapp = "Google Video" } if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } if(package_name == "tunein.player") { musicapp = "TuneIn Player" } if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } - true Script: if(playback_state == 0) { playback_state = "keiner" } if(playback_state == 1) { playback_state = "gestoppt" } if(playback_state == 2) { playback_state = "pausiert" } if(playback_state == 3) { playback_state = "spielt ab" } if(playback_state == 4) { playback_state = "spult vorwärts" } if(playback_state == 5) { playback_state = "spült rückwärts" } if(playback_state == 6) { playback_state = "buffert" } if(playback_state == 7) { playback_state = "Fehler" } if(playback_state == 8) { playback_state = "verbindet" } if(playback_state == 9) { playback_state = "springt zum vorherigen" } if(playback_state == 10) { playback_state = "springt zum nächsten" } if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } - true Script: if(togocount > 0) { togocount = togocount + 1; } else { togocount = 0; togocount = togocount + 1; } - true 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" } - - - - true - Script: if(trigger == "Kabelgebundenes Headset Verbunden") { wiredHeadsetPlugged = "\"wiredHeadsetPlugged\": \"in\""; } else if(trigger == "Kabelgebundenes Headset Getrennt") { wiredHeadsetPlugged = "\"wiredHeadsetPlugged\": \"out\""; } fhemcmd = "setreading"; - true Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading"; - true Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - true Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - @@ -2779,8 +2782,8 @@ fhemcmd = "setreading"; true Script: intentRadioState = "\"intentRadioState\":" + " \"" + {irstate} + "\"" + "," + "\"intentRadioName\":" + " \"" + {irname} + "\""; fhemcmd = "setreading"; - @@ -2806,7 +2809,7 @@ fhemcmd = "setreading"; true Script: keyguardSet = "\"keyguardSet\":" + " \"" + {keyguardSet} + "\""; fhemcmd = "setreading"; - @@ -2827,14 +2830,14 @@ fhemcmd = "setreading"; true Script: nextAlarm = "\"nextAlarmTime\":" + " \"" + {next_alarmtime} + "\"" + "," + "\"nextAlarmDay\":" + " \"" + {next_alarmday} + "\""; fhemcmd = "setreading"; - true Script: nextAlarmState = "\"nextAlarmState\":" + " \"" + {nextalarmstate} + "\""; fhemcmd = "setreading"; - @@ -2865,17 +2868,17 @@ fhemcmd = "setreading"; true Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading"; - true Script: readingsvalcmd = "{global_fhemdevice} deviceState kaputt"; fhemcmd = "readingsval"; respfirstrun = "none"; - @@ -2911,7 +2914,7 @@ respfirstrun = "none"; true Script: screen = "\"screen\":" + " \"" + {screen_state} + "\""; fhemcmd = "setreading"; - @@ -2957,14 +2960,14 @@ fhemcmd = "setreading"; true Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading"; - true Script: screenOrientation = "\"screenOrientation\":" + " \"" + {screen_orientation} + "\"" + "," + "\"screenOrientationMode\":" + " \"" + {screen_orientation_mode} + "\""; fhemcmd = "setreading"; - @@ -2975,107 +2978,107 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON - @@ -3111,10 +3114,10 @@ fhemdata = "\{\"amad\": \{\"amad_id\": \"" + {global_amadid} + "\",\"fhemcmd\": true Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" - @@ -3125,13 +3128,13 @@ icon = "no player active" true Script: voiceinputdata = value; fhemcmd = "voiceinputvalue"; - true Script: voiceinputdata = {left(value, (indexOf(value, " und ")))}; fhemcmd = "voiceinputvalue"; - @@ -3147,76 +3150,82 @@ fhemcmd = "voiceinputvalue"; true Script: volumeNotification = "\"volumeNotification\":" + " \"" + {volumeNotification} + "\""; fhemcmd = "setreading"; - true Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading"; - true Script: volumevalue = "\"volume\":" + " \"" + {volume} + "\""; fhemcmd = "setreading"; - + + + true + Script: wiredHeadsetPlugged = "\"wiredHeadsetPlugged\":" + " \"" + {headsetValue} + "\""; fhemcmd = "setreading"; + false Script: Zuordnung Mediaplayer - @@ -3453,10 +3462,10 @@ if(param_mplayer == "mediaSamsungMusic") true - Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device online. + Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device online. Soll der Assistent gelöscht werden? MUSIC - Die Einrichtung ist nun abgeschlossen und das Amaad Device online. + Die Einrichtung ist nun abgeschlossen und das Amaad Device online. Soll der Assistent gelöscht werden? de_DE true @@ -3471,10 +3480,10 @@ Soll der Assistent gelöscht werden? true - Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. + Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. Soll der Assistent gelöscht werden? MUSIC - Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. + Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. Soll der Assistent gelöscht werden? de_DE true @@ -3489,10 +3498,10 @@ Soll der Assistent gelöscht werden? true - Sprachausgabe: Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. + Sprachausgabe: Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. Auf Wiedersehen. MUSIC - Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. + Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. Auf Wiedersehen. de_DE true @@ -3555,10 +3564,10 @@ Auf Wiedersehen. true - Sprachausgabe: Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. + Sprachausgabe: Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. Soll der Assistent gelöscht werden? MUSIC - Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. + Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. Soll der Assistent gelöscht werden? de_DE true @@ -3666,7 +3675,7 @@ Soll der Assistent gelöscht werden? First Run Assistant - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 false PARALLEL @@ -3686,7 +3695,7 @@ Soll der Assistent gelöscht werden? Eingabedialog: FHEM Devicename Einzeiliger Text Wie soll das Device in FHEM heißen? Script: global_bridgeport = {value} Eingabedialog: AMADCommBridge Port Einzeiliger Text Bitte gebe den Port der AMADCommBridge vom FHEM Server an. - Sprachausgabe: Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. + Sprachausgabe: Du möchtest also nicht fortfahren. Das ist schade. Bitte bedenke das dieses Android Gerät somit nicht als Amaad Device in Fhem angelegt ist. Du kannst jeder Zeit den Assistenten Flow neu aktivieren und von vorn beginnen. Auf Wiedersehen. AMAD Voice Control Lautstärke einstellen: Medien auf Level 8 @@ -3723,16 +3732,16 @@ Auf Wiedersehen. Meldungsdialog: Alle Informationen wurden nun erfasst und zur Amaad Comm Bridge gesendet. Ich werde gleich einmal prüfen ob die Einrichtung des Devices in Fhem gelungen ist. Gib mir bitte bis zu einer Minute Zeit für die Prüfung. Expression: respreadingsval != "kaputt" and respreadingsval != "none" Expression: sprachassi == "ja" - Sprachausgabe: Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. + Sprachausgabe: Leider scheint es ein Problem beim einrichten des Fhem Devices gegeben zu haben. Hast Du die Amaad Comm Bridge definiert? Und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an Cooltux alias Leon, im Fhem Forum. Soll der Assistent gelöscht werden? Meldungsdialog: Leider scheint es ein Problem beim Einrichten des FHEM Devices gegeben zu haben. Hast Du die AMADCommBridge definiert, und ist sie auch aktiv? Sollte es weiterhin Probleme geben, wende Dich bitte an CoolTux alias Leon, im FHEM Forum. Expression: sprachassi == "ja" - Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. + Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Amaad, Flows aktiv sind. Soll der Assistent gelöscht werden? Meldungsdialog: Die Einrichtung ist nun abgeschlossen und das Amaad Device wurde angelegt. Es scheint aber noch keine Verbindung zwischen Fhem und Deinem Amaad Device zu bestehen. Mache am besten einmal ein Status Request in Fhem für das Amaad Device. Ist der Status in Fhem weiterhin offline schaue bitte ob alle Am Expression: respreadingsval == "online" Expression: sprachassi == "ja" - Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device online. + Sprachausgabe: Die Einrichtung ist nun abgeschlossen und das Amaad Device online. Soll der Assistent gelöscht werden? AMAD First Run Assistent Begrüßung Expression: value == "ja" @@ -3839,7 +3848,7 @@ Soll der Assistent gelöscht werden? Informations - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true QUEUE 900 @@ -3971,105 +3980,108 @@ Soll der Assistent gelöscht werden? Script: notification_text = "not supported from your device" Expression: getAndroidSDKVersion() >= "19" Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" - Benachrichtigung in Statusbar angezeigt: WhatsApp - Script: notification_text = "not supported from your device" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger" - Initialisiere Variable Systemeinstellung: screenBrightness - Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" - 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: if(playback_state == 0) { playback_state = "keiner" } if(playback_state == 1) { playback_state = "gestoppt" } if(playback_state == 2) { playback_state = "pausiert" } if(playback_state == 3) { playback_state = "spielt ab" } if(playback_state == 4) { playback_state = "spult vorwärts" } if(playback_state == 5) { playback_state = "spült rückwärts" } if(playback_state == 6) { playback_state = "buffert" } if(playback_state == 7) { playback_state = "Fehler" } if(playback_state == 8) { playback_state = "verbindet" } if(playback_state == 9) { playback_state = "springt zum vorherigen" } if(playback_state == 10) { playback_state = "springt zum nächsten" } if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } - Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading"; - Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } if(package_name == "com.google.android.videos") { musicapp = "Google Video" } if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } if(package_name == "tunein.player") { musicapp = "TuneIn Player" } if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } - 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}" - Expression: trigger == "Systemeinstellung verändert: System volume_ring" - Host erreichbar: {global_fhemip}:{global_bridgeport} - Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading"; - Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading"; - Expression: trigger == "Kabelgebundenes Headset Verbunden" or trigger == "Kabelgebundenes Headset Getrennt" - Script: if(trigger == "Kabelgebundenes Headset Verbunden") { wiredHeadsetPlugged = "\"wiredHeadsetPlugged\": \"in\""; } else if(trigger == "Kabelgebundenes Headset Getrennt") { wiredHeadsetPlugged = "\"wiredHeadsetPlugged\": \"out\""; } fhemcmd = "setreading"; - - - + 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: if(playback_state == 0) { playback_state = "keiner" } if(playback_state == 1) { playback_state = "gestoppt" } if(playback_state == 2) { playback_state = "pausiert" } if(playback_state == 3) { playback_state = "spielt ab" } if(playback_state == 4) { playback_state = "spult vorwärts" } if(playback_state == 5) { playback_state = "spült rückwärts" } if(playback_state == 6) { playback_state = "buffert" } if(playback_state == 7) { playback_state = "Fehler" } if(playback_state == 8) { playback_state = "verbindet" } if(playback_state == 9) { playback_state = "springt zum vorherigen" } if(playback_state == 10) { playback_state = "springt zum nächsten" } if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } + Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading"; + Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } if(package_name == "com.google.android.videos") { musicapp = "Google Video" } if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } if(package_name == "tunein.player") { musicapp = "TuneIn Player" } if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } + 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" + Script: headsetValue = 1 + Script: headsetValue = 0 + 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 + + + - - - - + + + + @@ -4088,7 +4100,7 @@ Soll der Assistent gelöscht werden? - + @@ -4100,52 +4112,52 @@ Soll der Assistent gelöscht werden? - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - - + + + + + - + - + - + - - + + - - + + - + @@ -4154,156 +4166,161 @@ Soll der Assistent gelöscht werden? - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NFC Tag Support - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true PARALLEL @@ -4317,7 +4334,7 @@ Soll der Assistent gelöscht werden? Send Data to AMADCommBridge - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true PARALLEL 900 @@ -4391,7 +4408,7 @@ Soll der Assistent gelöscht werden? SetCommands - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true QUEUE 900 @@ -4769,7 +4786,7 @@ Soll der Assistent gelöscht werden? Update AMAD Flowset - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true QUEUE @@ -4831,7 +4848,7 @@ Soll der Assistent gelöscht werden? VoiceControl - AMADNG Info/Control Flowset v4.0.8 + AMADNG Info/Control Flowset v4.0.9 true QUEUE @@ -4865,4 +4882,4 @@ Soll der Assistent gelöscht werden? - \ No newline at end of file +