diff --git a/74_AMADautomagicFlows_1.9.17.xml b/74_AMADautomagicFlows_1.9.23.xml similarity index 85% rename from 74_AMADautomagicFlows_1.9.17.xml rename to 74_AMADautomagicFlows_1.9.23.xml index 410f2ca..98b6814 100644 --- a/74_AMADautomagicFlows_1.9.17.xml +++ b/74_AMADautomagicFlows_1.9.23.xml @@ -699,12 +699,6 @@ global_album = getString("album"); true true - - true - WLAN Verbunden: Alle SSIDs - true - - true WLAN Verbunden: {global_apssid} @@ -2022,241 +2016,241 @@ FHEMCMD: setreading Setze Globale Variablen Expression: trigger == "Daydream Status: Gestartet" Daydream State - Script: setCommandFlow_state = "aktiv" - Flow Status SetCommands - Setze Flow Status: Aktivieren SetCommands - Script: setCommandFlow_state = "inaktiv" - Notification Volume - Bluetooth Status - Script: bluetooth_state = "off" - Script: bluetooth_state = "on" - Bluetooth eingeschaltet - Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" - Expression: trigger == "Bluetooth Gerät getrennt" or trigger == "Bluetooth Gerät verbunden" - Bluetooth Device Status - Flow Aktiv: SetCommands - Lautstärke / Volume - Initialisiere Variable Systemeinstellung: screenBrightness - Script: volume = {volumeBT} - Script: volume = {volumeSP} - Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) - Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 - Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 - Script: daydream_state = "on" - Script: daydream_state = "off" - Bluetooth Gerät verbunden: Beliebiges Geräte - Script: next_alarmday = "{next_alarm,dateformat,c}" - Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" - Initialisiere Variable Nächster Alarm: next_alarm - Screen Brightness - App Task läuft: {global_activetask} (neuster) - Expression: getAndroidSDKVersion() >= "19" - Script: runTask = "1" - Script: runTask = "0" - Script: runTask = "not supported android version" - Script: runTask = "null" - Check run Task - Expression: global_activetask != "none" - Expression: trigger == "Akku Ladestand: grösser als 0%" - Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - WLAN Verbunden: {global_apssid} - Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" - Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" - Expression: trigger == "Systemeinstellung verändert: System next_alarm" - Expression: trigger == "Systemeinstellung verändert: System screen_brightness" - Pause: 1s (Gerät wach halten) - Musik Aktiv - Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ"; - Reading Music Metachanged.2 - Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" - WLAN Verbunden: {global_apssid} - Script: airplanemode = "off" - Airplainemode - Expression: trigger == "Flugmodus: Aus" - Script: airpcount = 0 - Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: airpcount < 11 - Script: airpcount = airpcount + 1 - Pause: 2s (Gerät wach halten) - Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" - Script: scrcount = 0 - Keyguard gesperrt - Script: keyguard = "locked" - Script: keyguard = "unlocked" - Display eingeschaltet - Script: screen_state = "on {keyguard}" - Script: screen_state = "off {keyguard}" - Screen State - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" - Expression: global_activetask != "none" - Expression: udef_trigger == "setLockPin" - Keyguard mit Sicherheit - Dock Status: Docked - Expression: getAndroidSDKVersion() >= "19" - Display Orientierung: Portrait - Script: screen_orientation = "portrait" - Script: screen_orientation = "landscape" - Display automatisch drehen eingeschaltet - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: Automagic - Script: notification_text = "not supported from your device" - Script: dock_state = "docked" - Script: dock_state = "undocked" - Script: keyguardSet = "1" - Script: keyguardSet = "0" - KeyGuard Set - Dock State - Automagic State - Screen Orientation - Script: screen_orientation_mode = "auto" - Script: screen_orientation_mode = "manual" - Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" - Pause: 2s (Gerät wach halten) - Script: airpcount = airpcount + 1 - Expression: keyguard == "locked" - Expression: airpcount < 6 - - + Script: setCommandFlow_state = "inaktiv" + Notification Volume + Bluetooth Status + Script: bluetooth_state = "off" + Script: bluetooth_state = "on" + Bluetooth eingeschaltet + Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" + Expression: trigger == "Bluetooth Gerät getrennt" or trigger == "Bluetooth Gerät verbunden" + Bluetooth Device Status + Lautstärke / Volume + Initialisiere Variable Systemeinstellung: screenBrightness + Script: volume = {volumeBT} + Script: volume = {volumeSP} + Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) + Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 + Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 + Script: daydream_state = "on" + Script: daydream_state = "off" + Bluetooth Gerät verbunden: Beliebiges Geräte + Script: next_alarmday = "{next_alarm,dateformat,c}" + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Initialisiere Variable Nächster Alarm: next_alarm + Screen Brightness + App Task läuft: {global_activetask} (neuster) + Expression: getAndroidSDKVersion() >= "19" + Script: runTask = "1" + Script: runTask = "0" + Script: runTask = "not supported android version" + Script: runTask = "null" + Check run Task + Expression: global_activetask != "none" + Expression: trigger == "Akku Ladestand: grösser als 0%" + Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" + WLAN Verbunden: {global_apssid} + Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" + Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" + Expression: trigger == "Systemeinstellung verändert: System next_alarm" + Expression: trigger == "Systemeinstellung verändert: System screen_brightness" + Pause: 1s (Gerät wach halten) + Musik Aktiv + Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ"; + Reading Music Metachanged.2 + Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" + WLAN Verbunden: {global_apssid} + Script: airplanemode = "off" + Airplainemode + Expression: trigger == "Flugmodus: Aus" + Script: airpcount = 0 + Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: airpcount < 11 + Script: airpcount = airpcount + 1 + Pause: 2s (Gerät wach halten) + Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" + Script: scrcount = 0 + Keyguard gesperrt + Script: keyguard = "unlocked" + Script: screen_state = "off {keyguard}" + Screen State + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" + Expression: global_activetask != "none" + Expression: udef_trigger == "setLockPin" + Keyguard mit Sicherheit + Dock Status: Docked + Expression: getAndroidSDKVersion() >= "19" + Display Orientierung: Portrait + Script: screen_orientation = "portrait" + Script: screen_orientation = "landscape" + Display automatisch drehen eingeschaltet + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Automagic + Script: notification_text = "not supported from your device" + Script: dock_state = "docked" + Script: dock_state = "undocked" + Script: keyguardSet = "1" + Script: keyguardSet = "0" + KeyGuard Set + Dock State + Automagic State + Screen Orientation + Script: screen_orientation_mode = "auto" + Script: screen_orientation_mode = "manual" + Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" + Script: setCommandFlow_state = "aktiv" + Flow Aktiv: SetCommands + Setze Flow Status: Aktivieren SetCommands + Flow Status SetCommands + Script: screen_state = "on {keyguard}" + Display eingeschaltet + Script: keyguard = "locked" + Pause: 2s (Gerät wach halten) + Script: airpcount = airpcount + 1 + Expression: airpcount < 6 + Expression: keyguard == "locked" + + + - - + - - - + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + SetCommands @@ -2371,23 +2365,22 @@ FHEMCMD: setreading Expression: setScreenlock" Broadcast senden: {param_action} Expression: sendIntent" - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - WLAN Verbunden: Alle SSIDs - Expression: trigger == "Akku Ladestand: grösser als 0%" - Expression: trigger == "Sprachbefehl angefordert" - Flow Status Informations - Setze Flow Status: Aktivieren Informations - Script: informationFlow_state = "aktiv" - Expression: Airplanemode - Pause: 1s (Gerät wach halten) - Airplainemode ON - Expression: param_lockmod == "lock" - Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen - Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin - Script: udef_trigger = "setLockPin" - Flows ausführen: udef_trigger setLockPin - Lautstärken setzen param_volume - + Setze Flow Status: Aktivieren Informations + Script: informationFlow_state = "aktiv" + Expression: Airplanemode + Pause: 1s (Gerät wach halten) + Airplainemode ON + Expression: param_lockmod == "lock" + Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen + Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin + Script: udef_trigger = "setLockPin" + Flows ausführen: udef_trigger setLockPin + Lautstärken setzen param_volume + Flow Status Informations + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + Expression: trigger == "Sprachbefehl angefordert" + WLAN Verbunden: {global_apssid} + @@ -2421,7 +2414,7 @@ FHEMCMD: setreading - + @@ -2437,7 +2430,7 @@ FHEMCMD: setreading - + @@ -2452,12 +2445,12 @@ FHEMCMD: setreading - + - + @@ -2472,45 +2465,43 @@ FHEMCMD: setreading - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VoiceControl