diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.0.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.0.xml
index 392200796..1da2a61b2 100644
--- a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.0.xml
+++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.0.xml
@@ -2304,124 +2304,7 @@ FHEMCMD: setreading
true
PARALLEL
500
- Stromversorgung: Angeschlossen
- Expression: trigger == "Daydream Status: Gestartet"
- Script: setCommandFlow_state = "inaktiv"
- 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
- 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"
- Expression: global_activetask != "none"
- Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker"
- Expression: trigger == "Systemeinstellung verändert: System next_alarm"
- Expression: trigger == "Systemeinstellung verändert: System screen_brightness"
- WLAN Verbunden: {global_apssid}
- Script: airplanemode = "off"
- Expression: trigger == "Flugmodus: Aus"
- Script: airpcount = 0
- Expression: airpcount < 11
- Pause: 2s (Gerät wach halten)
- Script: keyguard = "unlocked"
- Script: screen_state = "off {keyguard}"
- Expression: global_activetask != "none"
- Keyguard mit Sicherheit
- Dock Status: Docked
- Display Orientierung: Portrait
- Script: screen_orientation = "portrait"
- Script: screen_orientation = "landscape"
- Display automatisch drehen eingeschaltet
- Script: dock_state = "docked"
- Script: dock_state = "undocked"
- Script: keyguardSet = "1"
- Script: keyguardSet = "0"
- 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
- Script: screen_state = "on {keyguard}"
- 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"
- Expression: trigger == "Akku Ladestand: grösser als 0%"
- Initialisiere Variable Systemeinstellung: volumeNotification
- 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"
- Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged"
- Pause: 1s (Gerät wach halten)
- Musik Aktiv
- Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ";
- Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein"
- Bluetooth eingeschaltet
- Script: bluetooth_state = "off"
- Script: bluetooth_state = "on"
- Bluetooth Gerät verbunden: Beliebiges Geräte
- Script: connected_devices_names = "null"; connected_devices_addresses = "null"
- Expression: udef_trigger == "setLockPin"
- Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt"
- Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/"
- Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle"
- Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic"
- Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff"
- Benachrichtigung in Statusbar angezeigt: Automagic
- Expression: getAndroidSDKVersion() >= "19"
- Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff"
- Script: notification_text = "not supported from your device"
- Benachrichtigung in Statusbar angezeigt: WhatsApp
- Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE"
- Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp"
- Check run Task
- Screen State
- Reading Music Metachanged.2
- Bluetooth Status
- Bluetooth Device Status
- Notification Volume
- Lautstärke / Volume
- Nächster Alarm
- Stromversorgung und Akkustand
- Daydream State
- Screen Brightness
- Screen Orientation
- Automagic State
- Dock State
- KeyGuard Set
- Incoming Call
- Incoming WhatsApp Message
- IntentRadio Status
- Flowsetversion
- Flow Status SetCommands
- Android Version
- Script: androidVersion = "not supported funktion"
- Get Android Version
- Script: notification_text = "not supported from your device"
- Expression: getAndroidSDKVersion() >= "19"
- Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin"
- Airplainemode
- Script: airpcount = airpcount + 1
- 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"
- 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" }
- WLAN Verbunden: {global_apssid}
- Next Alarm State
- Script: amad_flowset_version = "2.0.0"
-
+
Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE
Stromversorgung: Angeschlossen
Genereller Broadcast: wenn org.smblott.intentradio.STATE
@@ -2457,170 +2340,288 @@ FHEMCMD: setreading
Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE
Benachrichtigung in Statusbar angezeigt: com.whatsapp
- Expression: global_fhemip != null
- Expression: global_bridgeport == null or global_fhemip == null or global_fhemdevice == null or global_activetask == null or global_apssid == null
- Prüfe und setze globale Variablen
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Stromversorgung: Angeschlossen
+ Expression: trigger == "Daydream Status: Gestartet"
+ Script: setCommandFlow_state = "inaktiv"
+ 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
+ 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"
+ Expression: global_activetask != "none"
+ Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker"
+ Expression: trigger == "Systemeinstellung verändert: System next_alarm"
+ Expression: trigger == "Systemeinstellung verändert: System screen_brightness"
+ WLAN Verbunden: {global_apssid}
+ Script: airplanemode = "off"
+ Expression: trigger == "Flugmodus: Aus"
+ Script: airpcount = 0
+ Expression: airpcount < 11
+ Pause: 2s (Gerät wach halten)
+ Script: keyguard = "unlocked"
+ Script: screen_state = "off {keyguard}"
+ Expression: global_activetask != "none"
+ Keyguard mit Sicherheit
+ Dock Status: Docked
+ Display Orientierung: Portrait
+ Script: screen_orientation = "portrait"
+ Script: screen_orientation = "landscape"
+ Display automatisch drehen eingeschaltet
+ Script: dock_state = "docked"
+ Script: dock_state = "undocked"
+ Script: keyguardSet = "1"
+ Script: keyguardSet = "0"
+ 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
+ Script: screen_state = "on {keyguard}"
+ 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"
+ Expression: trigger == "Akku Ladestand: grösser als 0%"
+ Initialisiere Variable Systemeinstellung: volumeNotification
+ 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"
+ Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged"
+ Pause: 1s (Gerät wach halten)
+ Musik Aktiv
+ Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ";
+ Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein"
+ Bluetooth eingeschaltet
+ Script: bluetooth_state = "off"
+ Script: bluetooth_state = "on"
+ Bluetooth Gerät verbunden: Beliebiges Geräte
+ Script: connected_devices_names = "null"; connected_devices_addresses = "null"
+ Expression: udef_trigger == "setLockPin"
+ Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt"
+ Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/"
+ Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle"
+ Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic"
+ Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff"
+ Benachrichtigung in Statusbar angezeigt: Automagic
+ Expression: getAndroidSDKVersion() >= "19"
+ Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff"
+ Script: notification_text = "not supported from your device"
+ Benachrichtigung in Statusbar angezeigt: WhatsApp
+ Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE"
+ Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp"
+ Check run Task
+ Screen State
+ Reading Music Metachanged.2
+ Bluetooth Status
+ Bluetooth Device Status
+ Notification Volume
+ Lautstärke / Volume
+ Nächster Alarm
+ Stromversorgung und Akkustand
+ Daydream State
+ Screen Brightness
+ Screen Orientation
+ Automagic State
+ Dock State
+ KeyGuard Set
+ Incoming Call
+ Incoming WhatsApp Message
+ IntentRadio Status
+ Flowsetversion
+ Flow Status SetCommands
+ Android Version
+ Script: androidVersion = "not supported funktion"
+ Get Android Version
+ Script: notification_text = "not supported from your device"
+ Expression: getAndroidSDKVersion() >= "19"
+ Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin"
+ Airplainemode
+ Script: airpcount = airpcount + 1
+ 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"
+ 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" }
+ Next Alarm State
+ Script: amad_flowset_version = "2.0.0"
+ Expression: global_fhemip != null
+ Expression: global_bridgeport == null or global_fhemip == null or global_fhemdevice == null or global_activetask == null or global_apssid == null
+ Prüfe und setze globale Variablen
+ WLAN Verbunden: {global_apssid}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SetCommands