diff --git a/74_AMAD.pm b/74_AMAD.pm
index 3477945..9f29c55 100644
--- a/74_AMAD.pm
+++ b/74_AMAD.pm
@@ -37,8 +37,8 @@ use TcpServerUtils;
use Encode qw(encode);
-my $modulversion = "2.3.10";
-my $flowsetversion = "2.3.16";
+my $modulversion = "2.3.12";
+my $flowsetversion = "2.3.17";
@@ -278,7 +278,7 @@ sub AMAD_statusRequest($) {
my $activetask = AttrVal( $name, "checkActiveTask", "none" );
- my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Path muß so im Automagic als http request Trigger drin stehen
+ my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Pfad muß so im Automagic als http request Trigger drin stehen
HttpUtils_NonblockingGet(
{
@@ -901,7 +901,7 @@ sub AMAD_HTTP_POST($$) {
HttpUtils_NonblockingGet(
{
url => $url,
- timeout => 15,
+ timeout => 60,
hash => $hash,
method => "POST",
header => "Connection: close",
@@ -1171,8 +1171,6 @@ sub AMAD_CommBridge_Read($) {
-
-
elsif ( $fhemcmd =~ /setreading\b/ ) {
my $tv = $data[1];
diff --git a/74_AMADautomagicFlowset_2.3.16.xml b/74_AMADautomagicFlowset_2.3.17.xml
similarity index 96%
rename from 74_AMADautomagicFlowset_2.3.16.xml
rename to 74_AMADautomagicFlowset_2.3.17.xml
index 05b652b..d38e050 100644
--- a/74_AMADautomagicFlowset_2.3.16.xml
+++ b/74_AMADautomagicFlowset_2.3.17.xml
@@ -545,6 +545,11 @@ irname=getString("name")
Expression: fhemcmd == "setreading"
fhemcmd == "setreading"
+
+ true
+ Expression: fhemcmd == "voiceinputvalue"
+ fhemcmd == "voiceinputvalue"
+
true
Expression: getAndroidSDKVersion() >= "16"
@@ -1674,7 +1679,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich"
text/plain
{fhemdata}
@@@@readingsNameXYZ@@readingsValueABC
- 10000
+ 25000
true
FHEMDEVICE: {global_fhemdevice}
FHEMCMD: setreading
@@ -1695,7 +1700,7 @@ FHEMCMD: setreading
text/plain
{fhemdata}
@@@@readingsNameXYZ@@readingsValueABC
- 10000
+ 25000
true
FHEMDEVICE: {global_fhemdevice}
FHEMCMD: readingsval
@@ -1716,7 +1721,7 @@ FHEMCMD: readingsval
text/plain
{fhemdata}
@@@@readingsNameXYZ@@readingsValueABC
- 10000
+ 25000
true
FHEMDEVICE: {global_fhemdevice}
FHEMCMD: set
@@ -1725,6 +1730,27 @@ FHEMCMD: set
/storage/emulated/0/Download/file.bin
false
+
+ false
+ HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge
+ http://{global_fhemip}:{global_bridgeport}
+ false
+ false
+
+ POST
+ GENERAL_TEXT
+ text/plain
+ {fhemdata}
+ @@@@readingsNameXYZ@@readingsValueABC
+ 25000
+ true
+ FHEMDEVICE: {global_fhemdevice}
+FHEMCMD: voiceinputvalue
+ true
+ response
+ /storage/emulated/0/Download/file.bin
+ true
+
false
Initialisiere Variable Nächster Alarm: next_alarm
@@ -2089,6 +2115,18 @@ fhemcmd = "setreading";
Script: doNotDisturb = "doNotDisturb@@" + {dndValue}; fhemcmd = "setreading";
+
+
+ true
+ Script: fhemdata = "value"; fhemcmd = "voiceinputvalue";
+
+
+
+ true
+ Script: fhemdata = "value"; fhemcmd = {left(value, (indexOf(value, " und ")))};
+
true
@@ -2326,7 +2364,7 @@ fhemcmd = "setreading";
false
Script: Set FHEMDATA
-
-
- false
- Send Voice Input Value to AMADCommBridge
- http://{global_fhemip}:{global_bridgeport}
- false
- false
-
- POST
- GENERAL_TEXT
- text/plain
- {value}
- @@@@readingsNameXYZ@@readingsValueABC
- 60000
- true
- FHEMDEVICE: {global_fhemdevice}
-FHEMCMD: voiceinputvalue
- true
- response
- /storage/emulated/0/Download/file.bin
- true
-
-
- false
- Send Voice Input Value to AMADCommBridge left
- http://{global_fhemip}:{global_bridgeport}
- false
- false
-
- POST
- GENERAL_TEXT
- text/plain
- {left(value, (indexOf(value, " und ")))}
- @@@@readingsNameXYZ@@readingsValueABC
- 60000
- true
- FHEMDEVICE: {global_fhemdevice}
-FHEMCMD: voiceinputvalue
- true
- response
- /storage/emulated/0/Download/file.bin
- true
-
true
Setze Alarm: um {param_hour}:{param_minute}
@@ -2672,7 +2668,7 @@ FHEMCMD: voiceinputvalue
Informations
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
900
@@ -2848,20 +2844,20 @@ FHEMCMD: voiceinputvalue
Script: incommingWhatsAppMessage = "incommingWhatsAppMessageFrom@@" + {notification_text}; fhemcmd = "setreading";
Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp"
Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE"
- Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"
+ Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"
Initialisiere Variable Systemeinstellung: screenBrightness
Script: screenBrightness = "screenBrightness@@" + {screenBrightness}; fhemcmd = "setreading";
Expression: trigger == "Systemeinstellung verändert: System screen_brightness"
Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker"
Initialisiere Variable Systemeinstellung: volumeNotification
Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2
- Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2
- Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution)
+ Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2
+ Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution)
Script: volumeNotification = "volumeNotification@@" + {volumeNotification}; fhemcmd = "setreading";
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"
Script: volumevalue = "volume@@" + {volume}; fhemcmd = "setreading";
- Script: volume = {volumeBT}
- Script: volume = {volumeSP}
+ Script: volume = {volumeBT}
+ Script: volume = {volumeSP}
@@ -3094,7 +3090,7 @@ FHEMCMD: voiceinputvalue
MultimediaControl
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
@@ -3175,29 +3171,33 @@ FHEMCMD: voiceinputvalue
Send Data to AMADCommBridge
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
900
-
- HTTP Request: send READINGSVAL data to AMADCommBridge
- Expression: fhemcmd == "setreading"
- Expression: fhemcmd == "set"
- Expression: fhemcmd == "readingsval"
- HTTP Request: send SET data to AMADCommBridge
+ Expression: fhemcmd == "setreading"
+ Expression: fhemcmd == "set"
+ Expression: fhemcmd == "readingsval"
+ Expression: fhemcmd == "voiceinputvalue"
+
+ Script: Set FHEMDATA
HTTP Request: send READINGS data to AMADCommBridge
- Script: Set FHEMDATA
-
-
-
-
-
-
-
+ HTTP Request: send SET data to AMADCommBridge
+ HTTP Request: send READINGSVAL data to AMADCommBridge
+ HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge
+
+
+
+
+
+
+
+
+
SetCommands
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
900
@@ -3492,7 +3492,7 @@ FHEMCMD: voiceinputvalue
Update AMAD Flowset
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
@@ -3542,26 +3542,30 @@ FHEMCMD: voiceinputvalue
VoiceControl
- AMAD2 Info/Control Flowset v2.3.16
+ AMAD2 Info/Control Flowset v2.3.17
true
QUEUE
- Expression: contains(value, " und ")
- Benachrichtigung auf Bildschirm: {value} (lange)
- Expression: value != ""
- Setze voice Variablen
- Send Voice Input Value to AMADCommBridge
- Spracheingabe wurde nicht erkannt
- Send Voice Input Value to AMADCommBridge left
- AMAD Voice Control
-
-
-
-
-
-
-
-
-
+ Expression: value != ""
+ AMAD Voice Control
+ Expression: contains(value, " und ")
+ Script: fhemdata = "value"; fhemcmd = "voiceinputvalue";
+ Flows ausführen: Send Data to AMADCommBridge
+ Benachrichtigung auf Bildschirm: {value} (lange)
+ Flows ausführen: Send Data to AMADCommBridge
+ Script: fhemdata = "value"; fhemcmd = {left(value, (indexOf(value, " und ")))};
+ Setze voice Variablen
+ Spracheingabe wurde nicht erkannt
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file