From 8ac893ddd228342eee12d2fb02379a9ec9fd383e Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Wed, 2 Mar 2016 11:00:16 +0100 Subject: [PATCH] Verbesserungen und Fehlerbeseitigung im Information Flow --- 74_AMAD.pm | 2 +- ...24.xml => 74_AMADautomagicFlows_1.9.27.xml | 493 +++++++++--------- 2 files changed, 244 insertions(+), 251 deletions(-) rename 74_AMADautomagicFlows_1.9.24.xml => 74_AMADautomagicFlows_1.9.27.xml (86%) diff --git a/74_AMAD.pm b/74_AMAD.pm index 2d0e6f7..2b09904 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,7 +37,7 @@ use TcpServerUtils; use Encode qw(encode); -my $version = "1.9.24"; +my $version = "1.9.27"; diff --git a/74_AMADautomagicFlows_1.9.24.xml b/74_AMADautomagicFlows_1.9.27.xml similarity index 86% rename from 74_AMADautomagicFlows_1.9.24.xml rename to 74_AMADautomagicFlows_1.9.27.xml index 7761a60..4a27687 100644 --- a/74_AMADautomagicFlows_1.9.24.xml +++ b/74_AMADautomagicFlows_1.9.27.xml @@ -574,11 +574,6 @@ global_album = getString("album"); Expression: 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" - - true - Expression: trigger == "Bluetooth Gerät getrennt" or trigger == "Bluetooth Gerät verbunden" - trigger == "Bluetooth Gerät getrennt" or trigger == "Bluetooth Gerät verbunden" - true Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" @@ -1986,275 +1981,273 @@ FHEMCMD: setreading Stromversorgung: Angeschlossen App Task Gestartet: {global_activetask} - Bluetooth Status: Schaltet ein, Ein Stromversorgung: Entfernt + Bluetooth Status: Schaltet ein, Ein Display Status: Aus Display Orientierung: Portrait Bluetooth Status: Schaltet aus, Aus Daydream Status: Gestoppt Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic - Systemeinstellung verändert: System volume_music_speaker - Systemeinstellung verändert: System screen_brightness Display Status: Ein + Systemeinstellung verändert: System screen_brightness + Systemeinstellung verändert: System volume_music_speaker Daydream Status: Gestartet Akku Ladestand: grösser als 0% - Dock Event: Docked com.android.music.playstatechanged + Dock Event: Docked Systemeinstellung verändert: System volume_music_bt_a2dp HTTP Request: /fhem-amad/deviceInfo/ com.android.music.metachanged - Systemeinstellung verändert: System next_alarm - App Task Beendet: {global_activetask} Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic + App Task Beendet: {global_activetask} + Systemeinstellung verändert: System next_alarm Dock Event: Undocked Display Orientierung: Landscape Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker Nächster Alarm - Stromversorgung und Akkustand - Get Android Version - Script: androidVersion = "not supported funktion" - Android Version - Initialisiere Variable Systemeinstellung: volumeNotification - Stromversorgung: Angeschlossen - Setze Globale Variablen - Expression: trigger == "Daydream Status: Gestartet" - Daydream State - 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" - 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 - 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: 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}" - WLAN Verbunden: {global_apssid} - Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" - Script: scrcount = 0 - Script: keyguard = "locked" - Display eingeschaltet - Keyguard gesperrt - Expression: scrcount < 5 - Script: scrcount = scrcount + 1 - Pause: 2s (Gerät wach halten) - Expression: keyguard == "locked" - - - - - - - - - - - - - - - + Get Android Version + Script: androidVersion = "not supported funktion" + Android Version + Initialisiere Variable Systemeinstellung: volumeNotification + Stromversorgung: Angeschlossen + Setze Globale Variablen + Expression: trigger == "Daydream Status: Gestartet" + Daydream State + 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" + 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" + 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 == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" + 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 + 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: 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}" + Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" + Script: scrcount = 0 + Script: keyguard = "locked" + Display eingeschaltet + Keyguard gesperrt + Expression: scrcount < 5 + Script: scrcount = scrcount + 1 + Pause: 2s (Gerät wach halten) + Expression: keyguard == "locked" + Bluetooth Gerät verbunden: Beliebiges Geräte + Bluetooth Device Status + WLAN Verbunden: {global_apssid} + Expression: trigger == "Akku Ladestand: grösser als 0%" + Stromversorgung und Akkustand + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + + SetCommands