diff --git a/74_AMAD.pm b/74_AMAD.pm
index 8882c07..733956f 100644
--- a/74_AMAD.pm
+++ b/74_AMAD.pm
@@ -37,8 +37,8 @@ use TcpServerUtils;
use Encode qw(encode);
-my $modulversion = "1.9.66";
-my $flowsetversion = "1.9.69";
+my $modulversion = "1.9.67";
+my $flowsetversion = "1.9.70";
@@ -541,7 +541,7 @@ sub AMAD_Set($$@) {
|| lc $cmd eq 'statusrequest'
|| lc $cmd eq 'sendintent'
|| lc $cmd eq 'currentflowsetupdate'
- || lc $cmd eq 'installFlowSource'
+ || lc $cmd eq 'installflowsource'
|| lc $cmd eq 'vibrate') {
Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val);
@@ -823,7 +823,7 @@ sub AMAD_SelectSetCmd($$@) {
return AMAD_HTTP_POST( $hash,$url );
}
- elsif( lc $cmd eq 'installFlowSource' ) {
+ elsif( lc $cmd eq 'installflowsource' ) {
my $flowname = join( " ", @data );
@@ -1071,16 +1071,18 @@ sub AMAD_CommBridge_Read($) {
return;
}
- if ( $data[0] =~ /^installflow/ ) {
+ elsif ( $data[0] =~ /installFlow_([^.]*.xml)/ ) {
- $response = qx(cat /tmp/installflow.xml);
- $c = $hash->{CD};
- print $c "HTTP/1.1 200 OK\r\n",
- "Content-Type: text/plain\r\n",
- "Content-Length: ".length($response)."\r\n\r\n",
- $response;
+ if( defined($1) ){
+ $response = qx(cat /tmp/$1);
+ $c = $hash->{CD};
+ print $c "HTTP/1.1 200 OK\r\n",
+ "Content-Type: text/plain\r\n",
+ "Content-Length: ".length($response)."\r\n\r\n",
+ $response;
- return;
+ return;
+ }
}
elsif ( $fhemcmd =~ /setreading\b/ ) {
diff --git a/74_AMADautomagicFlowsetUpdater.xml b/74_AMADautomagicFlowsetUpdater.xml
deleted file mode 100644
index e7ed4b5..0000000
--- a/74_AMADautomagicFlowsetUpdater.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- false
- HTTP Request: /fhem-amad/currentFlowsetUpdate
- true
- /fhem-amad/currentFlowsetUpdate
- 8090
- true
-
-
- true
- Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- /storage/emulated/0/Download/currentFlowsetUpdate.xml
- true
-
-
- true
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
- http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml
- /storage/emulated/0/Download
- true
-
-
- true
- Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- /storage/emulated/0/Download/currentFlowsetUpdate.xml
- true
-
-
- true
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- true
- {imported_flow_names,listformat,comma}
-
-
-
- Update AMAD Flowset
- AMAD2 Flowset Updater
- true
- PARALLEL
- Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
-
- HTTP Request: /fhem-amad/currentFlowsetUpdate
-
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
-
-
-
-
-
-
\ No newline at end of file
diff --git a/74_AMADautomagicFlowset_1.9.69.xml b/74_AMADautomagicFlowset_1.9.70.xml
similarity index 93%
rename from 74_AMADautomagicFlowset_1.9.69.xml
rename to 74_AMADautomagicFlowset_1.9.70.xml
index deb0016..acf2ba9 100644
--- a/74_AMADautomagicFlowset_1.9.69.xml
+++ b/74_AMADautomagicFlowset_1.9.70.xml
@@ -188,6 +188,14 @@ global_album = getString("album");
irname=getString("name")
false
+
+ false
+ HTTP Request: /fhem-amad/currentFlowsetUpdate
+ true
+ /fhem-amad/currentFlowsetUpdate
+ 8090
+ true
+
false
HTTP Request: /fhem-amad/deviceInfo/
@@ -394,6 +402,11 @@ irname=getString("name")
Expression: global_activetask != "none"
global_activetask != "none"
+
+ false
+ Expression: installFlow"
+ request_path == "/fhem-amad/setCommands/installFlow"
+
true
Expression: keyguard == "locked"
@@ -1167,6 +1180,13 @@ FHEMCMD: setreading
/storage/emulated/0/Download
true
+
+ true
+ Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download
+ http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname}
+ /storage/emulated/0/Download
+ true
+
false
Flow Status Informations
@@ -1732,8 +1752,8 @@ FHEMCMD: setreading
true
- Script: amad_flowset_version = "1.9.69"
-
+ Script: amad_flowset_version = "1.9.70"
+
true
@@ -2150,7 +2170,7 @@ FHEMCMD: setreading
Informations
- AMAD2 Info/Control Flowset v1.9.69
+ AMAD2 Info/Control Flowset v1.9.70
true
PARALLEL
500
@@ -2298,10 +2318,10 @@ FHEMCMD: setreading
Script: androidVersion = "not supported funktion"
Setze Globale Variablen
Prüfe und setze Bridgeport Variable
- Script: amad_flowset_version = "1.9.69"
- Get Android Version
+ Get Android Version
+ Script: notification_text = "not supported from your device"
Expression: getAndroidSDKVersion() >= "19"
- Script: notification_text = "not supported from your device"
+ Script: amad_flowset_version = "1.9.70"
@@ -2403,7 +2423,7 @@ FHEMCMD: setreading
-
+
@@ -2449,21 +2469,21 @@ FHEMCMD: setreading
-
+
-
-
-
+
+
+
-
-
-
+
+
+
SetCommands
- AMAD2 Info/Control Flowset v1.9.69
+ AMAD2 Info/Control Flowset v1.9.70
true
QUEUE
500
@@ -2569,23 +2589,23 @@ FHEMCMD: setreading
WLAN Verbunden: {global_apssid}
Lautstärken setzen param_notifivolume
Setze Alarm: um {param_hour}:{param_minute}
- Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*"
- Expression: setAlarm"
- Expression: setTimer"
- Setze Timer
- Expression: setVibrate"
- Expression: openApp"
- App Task läuft: App (neuster)
- App Starten: App
- Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
- Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- Expression: setVibrate"
- Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
- Schalte Display ein: Hell für {param_screenontime}s
- Flow Status Informations
- Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
+ Expression: setAlarm"
+ Expression: setTimer"
+ Setze Timer
+ Expression: setVibrate"
+ Expression: openApp"
+ App Starten: App
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
+ Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
+ Schalte Display ein: Hell für {param_screenontime}s
+ Flow Status Informations
+ Expression: installFlow"
+ App Task läuft: App (neuster)
+ Download URL: http://{global_fhemip}:{global_bridgeport}/installFlow_{param_flowname} to /storage/emulated/0/Download
+ Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*"
-
+
@@ -2654,8 +2674,8 @@ FHEMCMD: setreading
-
-
+
+
@@ -2664,45 +2684,62 @@ FHEMCMD: setreading
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Update AMAD Flowset
+ AMAD2 Flowset Updater v1.0.3
+ true
+ PARALLEL
+
+ HTTP Request: /fhem-amad/currentFlowsetUpdate
+
+ Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml
+ Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma}
+ Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml
+ Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download
+
+
+
+
VoiceControl
- AMAD2 Info/Control Flowset v1.9.69
+ AMAD2 Info/Control Flowset v1.9.70
true
QUEUE
60