diff --git a/74_AMAD.pm b/74_AMAD.pm
index 77c1f54..8e0e901 100644
--- a/74_AMAD.pm
+++ b/74_AMAD.pm
@@ -38,7 +38,7 @@ use Encode qw(encode);
my $modulversion = "2.0.2";
-my $flowsetversion = "2.0.3";
+my $flowsetversion = "2.0.4";
diff --git a/74_AMADautomagicFlowset_2.0.3.xml b/74_AMADautomagicFlowset_2.0.4.xml
similarity index 88%
rename from 74_AMADautomagicFlowset_2.0.3.xml
rename to 74_AMADautomagicFlowset_2.0.4.xml
index 56c0eff..10c2313 100644
--- a/74_AMADautomagicFlowset_2.0.3.xml
+++ b/74_AMADautomagicFlowset_2.0.4.xml
@@ -811,6 +811,14 @@ or global_deviceport!= {header_dport}
Flow Aktiv: SetCommands
SetCommands
+
+ true
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard)
+ /sdcard
+ true
+ true
+ 1024
+
true
Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
@@ -819,6 +827,14 @@ or global_deviceport!= {header_dport}
true
1024
+
+ true
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0)
+ /storage/sdcard0
+ true
+ true
+ 1024
+
true
Keyguard gesperrt
@@ -1212,6 +1228,12 @@ FHEMCMD: setreading
/storage/emulated/0/Download/file.bin
false
+
+ true
+ Dateien löschen: /sdcard/Download/currentFlowsetUpdate.xml
+ /sdcard/Download/currentFlowsetUpdate.xml
+ true
+
true
Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
@@ -1288,6 +1310,13 @@ FHEMCMD: setreading
/storage/emulated/0/Download/file.bin
false
+
+ true
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /sdcard/Download
+ http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml
+ /sdcard/Download
+ true
+
true
Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
@@ -1376,6 +1405,12 @@ FHEMCMD: setreading
false
false
+
+ true
+ Flows/Widgets importieren: /sdcard/Download/currentFlowsetUpdate.xml
+ /sdcard/Download/currentFlowsetUpdate.xml
+ true
+
true
Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
@@ -1943,8 +1978,8 @@ FHEMCMD: setreading
true
- Script: amad_flowset_version = "2.0.3"
-
+ Script: amad_flowset_version = "2.0.4"
+
true
@@ -2058,6 +2093,16 @@ nextalarmstate = "snooze"
Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff"
+
+ true
+ Script: notification_text = "Flow install: path for download not exist"
+
+
+
+ true
+ Script: notification_text = "Flowset Update: path for download not exist"
+
+
true
Script: notification_text = "not supported from your device"
@@ -2371,7 +2416,7 @@ FHEMCMD: setreading
Informations
- AMAD2 Info/Control Flowset v2.0.3
+ AMAD2 Info/Control Flowset v2.0.4
true
PARALLEL
900
@@ -2493,52 +2538,52 @@ FHEMCMD: setreading
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
- WLAN Verbunden: {global_apssid}
- Expression: global_apssid != "usb-ethernet"
- Script: airpcount = 0
- Pause: 2s (Gerät wach halten)
- Expression: global_apssid != "usb-ethernet"
- WLAN Verbunden: {global_apssid}
- Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/"
- Expression: global_fhemip != null or header_fhemip != null
- Dock Status: Docked
- Expression: global_bridgeport == null or global_bridgeport != {header_bport} or global_fhemip == null or global_fhemip != {header_fhemip} or global_fhemdevice == null or global_fhemdevice != {header_fhemdevice} or global_activetask == null or global_activetask != {header_activetask} or global_apssid == null or global_apssid != {header_apssid} or global_deviceport != null or global_deviceport!= {header_dport}
- Prüfe und setze globale Variablen
- Expression: udef_trigger == "setLockPin"
- Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic"
- Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked"
- Expression: global_activetask != null
- Script: amad_flowset_version = "2.0.3"
- Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein"
- App Task läuft: {global_activetask} (neuster)
- Script: global_artist = "no soundplayer active"; global_track = "no soundplayer active"; global_album = "no soundplayer active";
+ 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
+ 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
+ WLAN Verbunden: {global_apssid}
+ Expression: global_apssid != "usb-ethernet"
+ Script: airpcount = 0
+ Pause: 2s (Gerät wach halten)
+ Expression: global_apssid != "usb-ethernet"
+ WLAN Verbunden: {global_apssid}
+ Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/"
+ Expression: global_fhemip != null or header_fhemip != null
+ Dock Status: Docked
+ Expression: global_bridgeport == null or global_bridgeport != {header_bport} or global_fhemip == null or global_fhemip != {header_fhemip} or global_fhemdevice == null or global_fhemdevice != {header_fhemdevice} or global_activetask == null or global_activetask != {header_activetask} or global_apssid == null or global_apssid != {header_apssid} or global_deviceport != null or global_deviceport!= {header_dport}
+ Prüfe und setze globale Variablen
+ Expression: udef_trigger == "setLockPin"
+ Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic"
+ Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked"
+ Expression: global_activetask != null
+ Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein"
+ App Task läuft: {global_activetask} (neuster)
+ Script: global_artist = "no soundplayer active"; global_track = "no soundplayer active"; global_album = "no soundplayer active";
+ Automagic State
+ Script: notification_text = "not supported from your device"
+ Script: amad_flowset_version = "2.0.4"
-
+
-
+
@@ -2552,7 +2597,7 @@ FHEMCMD: setreading
-
+
@@ -2562,9 +2607,9 @@ FHEMCMD: setreading
-
-
-
+
+
+
@@ -2575,14 +2620,14 @@ FHEMCMD: setreading
-
-
-
-
+
+
+
+
-
+
@@ -2602,7 +2647,7 @@ FHEMCMD: setreading
-
+
@@ -2612,115 +2657,115 @@ FHEMCMD: setreading
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SetCommands
- AMAD2 Info/Control Flowset v2.0.3
+ AMAD2 Info/Control Flowset v2.0.4
true
QUEUE
900
@@ -2837,16 +2882,24 @@ FHEMCMD: setreading
URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass})
Vibrieren: Pattern 2 (-- --)
Expression: global_apssid != "usb-ethernet"
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Expression: installFlow"
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download
- Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname}
- Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download
- Flows/Widgets importieren: /storage/emulated/0/Download/installFlow_{param_flowname}
- Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname}
- Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname}
- Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0)
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
+ Expression: installFlow"
+ Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download
+ Flows/Widgets importieren: /storage/emulated/0/Download/installFlow_{param_flowname}
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname}
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname}
+ Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download
+ Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/sdcard0/Download
+ Flows/Widgets importieren: /storage/sdcard0/Download/installFlow_{param_flowname}
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /storage/sdcard0/Download/installFlow_{param_flowname}
+ Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname}
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard)
+ Automagic State
+ Script: notification_text = "Flow install: path for download not exist"
@@ -2956,54 +3009,78 @@ FHEMCMD: setreading
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Update AMAD Flowset
- AMAD2 Flowset Updater v1.0.12
+ AMAD2 Flowset Updater v1.0.13
true
PARALLEL
-
+ Prüfe und setze Bridgeport Variable
+
HTTP Request: /fhem-amad/currentFlowsetUpdate
- Prüfe und setze Bridgeport Variable
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/sdcard0/Download
- Flows/Widgets importieren: /storage/sdcard0/Download/currentFlowsetUpdate.xml
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
+ Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
Dateien löschen: /storage/sdcard0/Download/currentFlowsetUpdate.xml
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
- Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
-
-
+ Flows/Widgets importieren: /storage/sdcard0/Download/currentFlowsetUpdate.xml
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/sdcard0/Download
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0)
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0)
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /sdcard/Download
+ Flows/Widgets importieren: /sdcard/Download/currentFlowsetUpdate.xml
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /sdcard/Download/currentFlowsetUpdate.xml
+ Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard)
+ Script: notification_text = "Flowset Update: path for download not exist"
+ Automagic State
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
VoiceControl
- AMAD2 Info/Control Flowset v2.0.3
+ AMAD2 Info/Control Flowset v2.0.4
true
QUEUE
60