diff --git a/74_AMAD.pm b/74_AMAD.pm
index 4b56fe3..2d0e6f7 100644
--- a/74_AMAD.pm
+++ b/74_AMAD.pm
@@ -37,7 +37,7 @@ use TcpServerUtils;
use Encode qw(encode);
-my $version = "1.9.23";
+my $version = "1.9.24";
diff --git a/74_AMADautomagicFlows_1.9.23.xml b/74_AMADautomagicFlows_1.9.24.xml
similarity index 90%
rename from 74_AMADautomagicFlows_1.9.23.xml
rename to 74_AMADautomagicFlows_1.9.24.xml
index 98b6814..7761a60 100644
--- a/74_AMADautomagicFlows_1.9.23.xml
+++ b/74_AMADautomagicFlows_1.9.24.xml
@@ -324,11 +324,6 @@ global_album = getString("album");
Expression: airpcount < 11
airpcount < 11
-
- true
- Expression: airpcount < 6
- airpcount < 6
-
false
Expression: Airplanemode
@@ -484,6 +479,11 @@ global_album = getString("album");
Expression: Reboot
param_syscmd == "reboot"
+
+ true
+ Expression: scrcount < 5
+ scrcount < 5
+
false
Expression: screenMsg"
@@ -1732,6 +1732,11 @@ global_album = "no soundplayer activ";
Script: scrcount = 0
+
+ true
+ Script: scrcount = scrcount + 1
+
+
true
Script: screen_orientation = "landscape"
@@ -2049,70 +2054,69 @@ FHEMCMD: setreading
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}"
+ 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
- Script: keyguard = "locked"
- Pause: 2s (Gerät wach halten)
- Script: airpcount = airpcount + 1
- Expression: airpcount < 6
- Expression: keyguard == "locked"
-
-
-
+ Keyguard gesperrt
+ Expression: scrcount < 5
+ Script: scrcount = scrcount + 1
+ Pause: 2s (Gerät wach halten)
+ Expression: keyguard == "locked"
+
+
@@ -2121,8 +2125,8 @@ FHEMCMD: setreading
-
-
+
+
@@ -2156,101 +2160,101 @@ FHEMCMD: setreading
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SetCommands