From 2a9f89fba7f140ebdf8194e1993eb2c5cec2fbc8 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Fri, 25 Mar 2016 21:54:02 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20des=20Bridgeports=20und=20der?= =?UTF-8?q?=20Deviceports=20m=C3=B6glich.=20Setzen=20und=20verwenden=20der?= =?UTF-8?q?=20Bridgeport=20Variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 51 +- ....xml => 74_AMADautomagicFlowset_1.9.65.xml | 751 +++++++++--------- 2 files changed, 411 insertions(+), 391 deletions(-) rename 74_AMADautomagicFlowset_1.9.61.xml => 74_AMADautomagicFlowset_1.9.65.xml (81%) diff --git a/74_AMAD.pm b/74_AMAD.pm index 0fd8856..a25bd1b 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "1.9.61"; -my $flowsetversion = "1.9.61"; +my $modulversion = "1.9.65"; +my $flowsetversion = "1.9.65"; @@ -194,10 +194,26 @@ my ( $cmd, $name, $attrName, $attrVal ) = @_; if( $cmd eq "set" ) { $hash->{PORT} = $attrVal; Log3 $name, 3, "AMAD ($name) - set port to $attrVal"; + + if( $hash->{BRIDGE} ) { + delete $modules{AMAD}{defptr}{BRIDGE}; + TcpServer_Close( $hash ); + Log3 $name, 3, "AMAD ($name) - CommBridge Port changed. CommBridge are closed and new open!"; + + AMAD_CommBridge_Open( $hash ); + } } else { $hash->{PORT} = 8090; Log3 $name, 3, "AMAD ($name) - set port to default"; + + if( $hash->{BRIDGE} ) { + delete $modules{AMAD}{defptr}{BRIDGE}; + TcpServer_Close( $hash ); + Log3 $name, 3, "AMAD ($name) - CommBridge Port changed. CommBridge are closed and new open!"; + + AMAD_CommBridge_Open( $hash ); + } } } @@ -250,6 +266,7 @@ sub AMAD_statusRequest($) { my $name = $hash->{NAME}; my $host = $hash->{HOST}; my $port = $hash->{PORT}; + my $bport = $bhash->{PORT}; my $apssid = $hash->{APSSID}; my $fhemip = ReadingsVal( $bname, "fhemServerIP", "none" ); my $activetask = AttrVal( $name, "checkActiveTask", "none" ); @@ -263,7 +280,7 @@ sub AMAD_statusRequest($) { timeout => 30, hash => $hash, method => "GET", - header => "fhemIP: $fhemip\r\nfhemDevice: $name\r\nactiveTask: $activetask\r\napSSID: $apssid", + header => "fhemIP: $fhemip\r\nfhemDevice: $name\r\nactiveTask: $activetask\r\napSSID: $apssid\r\nbport: $bport", doTrigger => 1, callback => \&AMAD_statusRequestErrorHandling, } @@ -980,22 +997,23 @@ sub AMAD_HTTP_POSTerrorHandling($$$) { sub AMAD_CommBridge_Open($) { - my ( $bhash ) = @_; - my $bname = $bhash->{NAME}; + my ( $hash ) = @_; + my $name = $hash->{NAME}; + my $port = $hash->{PORT}; # Oeffnen des TCP Sockets - my $bret = TcpServer_Open( $bhash, "8090", "global" ); + my $ret = TcpServer_Open( $hash, $port, "global" ); - if( $bret && !$init_done ) { - Log3 $bname, 3, "$bret. Exiting."; + if( $ret && !$init_done ) { + Log3 $name, 3, "$ret. Exiting."; exit(1); } - readingsSingleUpdate ( $bhash, "state", "opened", 1 ); - Log3 $bname, 5, "Socket wird geöffnet."; + readingsSingleUpdate ( $hash, "state", "opened", 1 ); + Log3 $name, 5, "Socket wird geöffnet."; - return $bret; + return $ret; } sub AMAD_CommBridge_Read($) { @@ -1024,6 +1042,7 @@ sub AMAD_CommBridge_Read($) { #### Verarbeitung der Daten welche über die AMADCommBridge kommen #### + Log3 $bname, 5, "AMAD ($bname) - Receive RAW Message in Debugging Mode: $buf"; ### ## Consume Content @@ -1067,7 +1086,7 @@ sub AMAD_CommBridge_Read($) { elsif ( $fhemcmd =~ /setreading\b/ ) { my $tv = $data[1]; - Log3 $name, 4, "AMAD ($name) - AMAD_CommBridge: processing receive reading values - Device: $device Data: $tv"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: processing receive reading values - Device: $device Data: $tv"; AMAD_ResponseProcessing($dhash,$tv); @@ -1086,7 +1105,7 @@ sub AMAD_CommBridge_Read($) { fhem ("set $fhemCmd") if( ReadingsVal( $bname, "expertMode", 0 ) eq "1" ); readingsSingleUpdate( $bhash, "receiveFhemCommand", "set ".$fhemCmd, 0 ); - Log3 $name, 4, "AMAD ($name) - AMAD_CommBridge: set reading receive fhem command"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: set reading receive fhem command"; $response = "header lines: \r\n AMADCommBridge receive Data complete\r\n FHEM execute set command now\r\n"; $c = $hash->{CD}; @@ -1105,7 +1124,7 @@ sub AMAD_CommBridge_Read($) { readingsBulkUpdate( $bhash, "receiveVoiceCommand", $fhemCmd ); readingsBulkUpdate( $bhash, "receiveVoiceDevice", $device ); readingsEndUpdate( $bhash, 1 ); - Log3 $name, 4, "AMAD ($name) - AMAD_CommBridge: set reading receive voice command"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: set reading receive voice command"; $response = "header lines: \r\n AMADCommBridge receive Data complete\r\n FHEM was processes\r\n"; $c = $hash->{CD}; @@ -1128,14 +1147,14 @@ sub AMAD_CommBridge_Read($) { "Content-Length: ".length($response)."\r\n\r\n", $response; - Log3 $name, 4, "AMAD ($name) - AMAD_CommBridge: response ReadingsVal Value to Automagic Device"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: response ReadingsVal Value to Automagic Device"; return; } elsif ( $fhemcmd =~ /fhemfunc\b/ ) { my $fhemCmd = $data[1]; - Log3 $name, 4, "AMAD ($name) - AMAD_CommBridge: receive fhem-function command"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: receive fhem-function command"; if( $fhemcmd =~ /^{.*}$/ ) { diff --git a/74_AMADautomagicFlowset_1.9.61.xml b/74_AMADautomagicFlowset_1.9.65.xml similarity index 81% rename from 74_AMADautomagicFlowset_1.9.61.xml rename to 74_AMADautomagicFlowset_1.9.65.xml index ee8cc69..2356085 100644 --- a/74_AMADautomagicFlowset_1.9.61.xml +++ b/74_AMADautomagicFlowset_1.9.65.xml @@ -738,7 +738,7 @@ irname=getString("name") false Airplainemode - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -789,7 +789,7 @@ FHEMCMD: setreading false Android Version - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -860,7 +860,7 @@ FHEMCMD: setreading false Automagic State - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -941,7 +941,7 @@ FHEMCMD: setreading false Bluetooth Device Status - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1044,7 +1044,7 @@ FHEMCMD: setreading false Bluetooth Status - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1084,7 +1084,7 @@ putString("{param_exkey2}", "{param_exval2}"); false Check run Task - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1111,7 +1111,7 @@ FHEMCMD: setreading false Daydream State - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1142,7 +1142,7 @@ FHEMCMD: setreading false Dock State - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1170,7 +1170,7 @@ FHEMCMD: setreading false Flow Status Informations - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1191,7 +1191,7 @@ FHEMCMD: setreading false Flow Status SetCommands - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1236,7 +1236,7 @@ FHEMCMD: setreading false Flowsetversion - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1319,7 +1319,7 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false Incoming Call - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1340,7 +1340,7 @@ FHEMCMD: setreading false Incoming WhatsApp Message - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1394,7 +1394,7 @@ FHEMCMD: setreading false IntentRadio Status - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1415,7 +1415,7 @@ FHEMCMD: setreading false KeyGuard Set - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1436,7 +1436,7 @@ FHEMCMD: setreading false Lautstärke / Volume - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1550,7 +1550,7 @@ FHEMCMD: setreading false Notification Volume - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1579,7 +1579,7 @@ FHEMCMD: setreading false Nächster Alarm - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1621,7 +1621,7 @@ FHEMCMD: setreading false Reading Music Metachanged.2 - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1649,7 +1649,7 @@ FHEMCMD: setreading false Screen Brightness - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1670,7 +1670,7 @@ FHEMCMD: setreading false Screen Orientation - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1691,7 +1691,7 @@ FHEMCMD: setreading false Screen State - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1726,8 +1726,8 @@ FHEMCMD: setreading true - Script: amad_flowset_version = "1.9.61" - + Script: amad_flowset_version = "1.9.65" + true @@ -1915,7 +1915,7 @@ global_album = "no soundplayer activ"; false Send Voice Input Value to AMADCommBridge - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -1936,7 +1936,7 @@ FHEMCMD: voiceinputvalue false Send Voice Input Value to AMADCommBridge left - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -2018,7 +2018,9 @@ FHEMCMD: voiceinputvalue +global_apssid = {header_apssid} +global_deviceport = {header_dport} +global_bridgeport = {header_bport} true @@ -2107,7 +2109,7 @@ global_apssid = {header_apssid} false Stromversorgung und Akkustand - http://{global_fhemip}:8090 + http://{global_fhemip}:{global_bridgeport} false false @@ -2143,11 +2145,102 @@ FHEMCMD: setreading Informations - AMAD2 Info/Control Flowset v1.9.61 + AMAD2 Info/Control Flowset v1.9.65 true PARALLEL 500 - + Get Android Version + Script: androidVersion = "not supported funktion" + 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 + 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}" + 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" + Expression: getAndroidSDKVersion() >= "19" + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Automagic + Script: notification_text = "not supported from your device" + 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" + WLAN Verbunden: {global_apssid} + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + Stromversorgung: Angeschlossen Genereller Broadcast: wenn org.smblott.intentradio.STATE Systemeinstellung verändert: System volume_music_headphone @@ -2179,281 +2272,190 @@ FHEMCMD: setreading Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker - Get Android Version - Script: androidVersion = "not supported funktion" - Android Version - Stromversorgung: Angeschlossen - Setze Globale Variablen - Expression: trigger == "Daydream Status: Gestartet" - Daydream State - 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 - Screen Brightness - 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" - Check run Task - 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 - 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: 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" - Dock 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}" - 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%" - Stromversorgung und Akkustand - Initialisiere Variable Systemeinstellung: volumeNotification - Notification Volume - Nächster Alarm - Lautstärke / Volume - 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"; - Reading Music Metachanged.2 - Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" - Bluetooth Status - Bluetooth eingeschaltet - Script: bluetooth_state = "off" - Script: bluetooth_state = "on" - Bluetooth Gerät verbunden: Beliebiges Geräte - Bluetooth Device Status - Script: connected_devices_names = "null"; connected_devices_addresses = "null" - Expression: udef_trigger == "setLockPin" - Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - KeyGuard Set - 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" - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: Automagic - Script: notification_text = "not supported from your device" - Automagic State - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Script: notification_text = "not supported from your device" - Incoming Call - Benachrichtigung in Statusbar angezeigt: WhatsApp - Incoming WhatsApp Message - IntentRadio Status - Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" - Airplainemode - Flowsetversion - WLAN Verbunden: {global_apssid} - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" - Script: amad_flowset_version = "1.9.61" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Android Version + Setze Globale Variablen + Check run Task + Screen State + Airplainemode + 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 + Script: amad_flowset_version = "1.9.65" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + SetCommands - AMAD2 Info/Control Flowset v1.9.61 + AMAD2 Info/Control Flowset v1.9.65 true QUEUE 500 @@ -2554,27 +2556,27 @@ FHEMCMD: setreading Script: udef_trigger = "setLockPin" Flows ausführen: udef_trigger setLockPin Lautstärken setzen param_volume - Flow Status Informations - Expression: trigger == "Sprachbefehl angefordert" - 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 - Download URL: http://{global_fhemip}:8090/currentFlowsetUpdate.xml to /storage/emulated/0/Download - 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 - - + Expression: trigger == "Sprachbefehl angefordert" + 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 + Download URL: http://{global_fhemip}:8090/currentFlowsetUpdate.xml to /storage/emulated/0/Download + 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 + + @@ -2632,7 +2634,7 @@ FHEMCMD: setreading - + @@ -2643,8 +2645,8 @@ FHEMCMD: setreading - - + + @@ -2653,66 +2655,65 @@ FHEMCMD: setreading - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VoiceControl - AMAD2 Info/Control Flowset v1.9.61 + AMAD2 Info/Control Flowset v1.9.65 true QUEUE 60 AMAD Voice Control - Expression: contains(value, " und ") - Send Voice Input Value to AMADCommBridge - Setze voice Variablen - Benachrichtigung auf Bildschirm: {value} (lange) - Expression: value != "" - Spracheingabe wurde nicht erkannt - Send Voice Input Value to AMADCommBridge left - Spracheingabe wurde nicht erkannt + Expression: contains(value, " und ") + Benachrichtigung auf Bildschirm: {value} (lange) + Expression: value != "" + Spracheingabe wurde nicht erkannt + Setze voice Variablen + Send Voice Input Value to AMADCommBridge left + Send Voice Input Value to AMADCommBridge - - - - - - - - + + + + + + + + \ No newline at end of file