diff --git a/74_AMAD.pm b/74_AMAD.pm index 86a52a0..0cf072a 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "1.9.57"; -my $flowsetversion = "1.9.53"; +my $modulversion = "1.9.60"; +my $flowsetversion = "1.9.60"; @@ -61,6 +61,7 @@ sub AMAD_Initialize($) { "setScreenBrightness:noArg ". "setBluetoothDevice ". "setScreenlockPIN ". + "setScreenOnForTimer ". "root:0,1 ". "port ". "disable:1 ". @@ -68,7 +69,8 @@ sub AMAD_Initialize($) { foreach my $d(sort keys %{$modules{AMAD}{defptr}}) { my $hash = $modules{AMAD}{defptr}{$d}; - $hash->{VERSIONMODUL} = $modulversion; + $hash->{VERSIONMODUL} = $modulversion; + $hash->{VERSIONFLOWSET} = $flowsetversion; } } @@ -437,10 +439,10 @@ sub AMAD_ResponseProcessing($$) { readingsBulkUpdate( $hash, "deviceState", "offline" ) if( $t eq "airplanemode" && $v eq "on" ); readingsBulkUpdate( $hash, "deviceState", "online" ) if( $t eq "airplanemode" && $v eq "off" ); - $v =~ s/null/off/g if( ($t eq "nextAlarmDay" || $t eq "nextAlarmTime") && $v eq "null" ); + $v =~ s/\bnull\b/off/g if( ($t eq "nextAlarmDay" || $t eq "nextAlarmTime") && $v eq "null" ); - $v =~ s/null//g; + $v =~ s/\bnull\b//g; readingsBulkUpdate( $hash, $t, $v ); } @@ -484,7 +486,7 @@ sub AMAD_Set($$@) { $list .= "openURL "; $list .= "openApp:$apps " if( AttrVal( $name, "setOpenApp", "none" ) ne "none" ); $list .= "nextAlarmTime:time "; - $list .= "timer:time "; + $list .= "timer:slider,1,1,60 "; $list .= "statusRequest:noArg "; $list .= "system:reboot,shutdown,airplanemodeON " if( AttrVal( $name, "root", "0" ) eq "1" ); $list .= "bluetooth:on,off "; @@ -496,6 +498,7 @@ sub AMAD_Set($$@) { $list .= "vibrate:noArg "; $list .= "sendIntent "; $list .= "currentFlowsetUpdate:noArg "; + $list .= "installFlowSource "; if( lc $cmd eq 'screenmsg' || lc $cmd eq 'ttsmsg' @@ -521,6 +524,7 @@ sub AMAD_Set($$@) { || lc $cmd eq 'statusrequest' || lc $cmd eq 'sendintent' || lc $cmd eq 'currentflowsetupdate' + || lc $cmd eq 'installFlowSource' || lc $cmd eq 'vibrate') { Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val); @@ -636,10 +640,12 @@ sub AMAD_SelectSetCmd($$@) { elsif( lc $cmd eq 'screen' ) { my $mod = join( " ", @data ); + my $scot = AttrVal( $name, "setScreenOnForTimer", undef ); + $scot = 60 if( !$scot ); if ($mod eq "on" || $mod eq "off") { - my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOnOff?screen=$mod" if ($mod eq "on" || $mod eq "off"); + my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setScreenOnOff?screen=".$mod."&screenontime=".$scot if ($mod eq "on" || $mod eq "off"); return AMAD_HTTP_POST( $hash,$url ); } @@ -704,10 +710,9 @@ sub AMAD_SelectSetCmd($$@) { elsif (lc $cmd eq 'timer') { - my $value = join( " ", @data ); - my @timer = split( ":", $value ); + my $timer = join( " ", @data ); - my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setTimer?minute=".$timer[1]; + my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/setTimer?minute=$timer"; return AMAD_HTTP_POST( $hash, $url ); } @@ -801,6 +806,15 @@ sub AMAD_SelectSetCmd($$@) { return AMAD_HTTP_POST( $hash,$url ); } + elsif( lc $cmd eq 'installFlowSource' ) { + + my $flowname = join( " ", @data ); + + my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/installFlow?flowname=$flowname"; + + return AMAD_HTTP_POST( $hash,$url ); + } + elsif( lc $cmd eq 'currentflowsetupdate' ) { my $url = "http://" . $host . ":" . $port . "/fhem-amad/currentFlowsetUpdate"; @@ -1038,6 +1052,18 @@ sub AMAD_CommBridge_Read($) { return; } + if ( $data[0] =~ /^installflow/ ) { + + $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; + + return; + } + elsif ( $fhemcmd =~ /setreading\b/ ) { my $tv = $data[1]; diff --git a/74_AMADautomagicFlows_1.9.53.xml b/74_AMADautomagicFlowset_1.9.60.xml similarity index 71% rename from 74_AMADautomagicFlows_1.9.53.xml rename to 74_AMADautomagicFlowset_1.9.60.xml index 573d0cd..2393149 100644 --- a/74_AMADautomagicFlows_1.9.53.xml +++ b/74_AMADautomagicFlowset_1.9.60.xml @@ -32,6 +32,17 @@ false false + + true + Benachrichtigung in Statusbar angezeigt: com.whatsapp + true + com.whatsapp + TEXT + CONTAINS_TEXT + + false + false + true Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic @@ -143,12 +154,40 @@ global_album = getString("album"); true false + + true + Eingehender Anruf. Status: Klingelt, Nummern: Alle + true + true + + true + true + false + false + false + true Flugmodus: Aus true false + + true + Genereller Broadcast: wenn org.smblott.intentradio.STATE + true + org.smblott.intentradio.STATE + + + + + + + + irstate=getString("state"); +irname=getString("name") + false + false HTTP Request: /fhem-amad/deviceInfo/ @@ -238,32 +277,8 @@ global_album = getString("album"); false - App Task läuft: App3 (neuster) - - true - - - false - App Task läuft: App4 (neuster) - - true - - - false - App Task läuft: App5 (neuster) - - true - - - false - App Task läuft: gplay (neuster) - com.google.android.music - true - - - false - App Task läuft: tuneinradio (neuster) - tunein.player + App Task läuft: App (neuster) + {param_app} true @@ -284,6 +299,18 @@ global_album = getString("album"); false false + + false + Benachrichtigung in Statusbar angezeigt: WhatsApp + com.whatsapp + true + 1 + TEXT + CONTAINS_TEXT + + false + false + true Bluetooth eingeschaltet @@ -342,21 +369,6 @@ global_album = getString("album"); Expression: All param_app == "All" - - false - Expression: App3 - param_app == "" - - - false - Expression: App4 - param_app == "" - - - false - Expression: App5 - param_app == "" - false Expression: Automagic @@ -382,11 +394,6 @@ global_album = getString("album"); Expression: global_activetask != "none" global_activetask != "none" - - false - Expression: gplay - param_app == "gplay" - true Expression: keyguard == "locked" @@ -592,6 +599,11 @@ global_album = getString("album"); Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" + + true + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + true Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" @@ -622,11 +634,21 @@ global_album = getString("album"); Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" + + true + Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" + trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" + true Expression: trigger == "Flugmodus: Aus" trigger == "Flugmodus: Aus" + + true + Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" + trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" + true Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -667,11 +689,6 @@ global_album = getString("album"); Expression: ttsMsg" request_path == "/fhem-amad/setCommands/ttsMsg" - - false - Expression: tuneinradio - param_app == "tuneinradio" - true Expression: udef_trigger == "setLockPin" @@ -792,32 +809,8 @@ FHEMCMD: setreading false - App Starten: App3 - - - - - false - App Starten: App4 - - - - - false - App Starten: App5 - - - - - false - App Starten: PlayMusic - com.google.android.music - - - - false - App Starten: tuneinradio - tunein.player + App Starten: App + {param_app} @@ -1109,6 +1102,12 @@ FHEMCMD: setreading /storage/emulated/0/Download/file.bin false + + true + Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml + /storage/emulated/0/Download/currentFlowsetUpdate.xml + true + false Daydream State @@ -1161,6 +1160,13 @@ FHEMCMD: setreading /storage/emulated/0/Download/file.bin false + + true + Download URL: http://{global_fhemip}:8090/currentFlowsetUpdate.xml to /storage/emulated/0/Download + http://{global_fhemip}:8090/currentFlowsetUpdate.xml + /storage/emulated/0/Download + true + false Flow Status Informations @@ -1221,6 +1227,33 @@ FHEMCMD: setreading false false + + true + Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml + /storage/emulated/0/Download/currentFlowsetUpdate.xml + true + + + false + Flowsetversion + http://{global_fhemip}:8090 + false + false + + POST + GENERAL_TEXT + text/plain + flowsetVersionAtDevice@@{amad_flowset_version}@@@@ + @@@@readingsNameXYZ@@readingsValueABC + 60000 + true + FHEMDEVICE: {global_fhemdevice} +FHEMCMD: setreading + true + response + /storage/emulated/0/Download/file.bin + false + true Flugmodus ein-/ausschalten: Ein @@ -1283,6 +1316,48 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" true Herunterfahren + + false + Incoming Call + http://{global_fhemip}:8090 + false + false + + POST + GENERAL_TEXT + text/plain + incomingCallerName@@{contact_name}@@@@incomingCallerNumber@@{incoming_number}@@@@ + @@@@readingsNameXYZ@@readingsValueABC + 60000 + true + FHEMDEVICE: {global_fhemdevice} +FHEMCMD: setreading + true + response + /storage/emulated/0/Download/file.bin + false + + + false + Incoming WhatsApp Message + http://{global_fhemip}:8090 + false + false + + POST + GENERAL_TEXT + text/plain + incommingWhatsAppMessageFrom@@{notification_text}@@@@ + @@@@readingsNameXYZ@@readingsValueABC + 60000 + true + FHEMDEVICE: {global_fhemdevice} +FHEMCMD: setreading + true + response + /storage/emulated/0/Download/file.bin + false + false Initialisiere Variable Nächster Alarm: next_alarm @@ -1316,6 +1391,27 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" volume_ring_speaker volumeNotification + + false + IntentRadio Status + http://{global_fhemip}:8090 + false + false + + POST + GENERAL_TEXT + text/plain + intentRadioState@@{irstate}@@@@intentRadioName@@{irname}@@@@ + @@@@readingsNameXYZ@@readingsValueABC + 60000 + true + FHEMDEVICE: {global_fhemdevice} +FHEMCMD: setreading + true + response + /storage/emulated/0/Download/file.bin + false + false KeyGuard Set @@ -1545,9 +1641,9 @@ FHEMCMD: setreading true - Schalte Display ein: Hell für 120s + Schalte Display ein: Hell für {param_screenontime}s true - 120s + {param_screenontime}s true @@ -1628,6 +1724,11 @@ FHEMCMD: setreading Script: airplanemode = "off" + + true + Script: amad_flowset_version = "1.9.60" + + true Script: androidVersion = "not supported funktion" @@ -1904,6 +2005,13 @@ FHEMCMD: voiceinputvalue SetCommands + + true + Setze Flow Status: Aktivieren {imported_flow_names,listformat,comma} + true + {imported_flow_names,listformat,comma} + + false Setze Globale Variablen @@ -2035,12 +2143,125 @@ FHEMCMD: setreading Informations - AMAD2 Info/Control Flowset v1.9.53 + AMAD2 Info/Control Flowset v1.9.60 true PARALLEL 500 - + 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 + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + IntentRadio Status + Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" + Stromversorgung: Angeschlossen + Genereller Broadcast: wenn org.smblott.intentradio.STATE + Systemeinstellung verändert: System volume_music_headphone App Task Gestartet: {global_activetask} Bluetooth Status: Schaltet ein, Ein Stromversorgung: Entfernt @@ -2049,6 +2270,7 @@ FHEMCMD: setreading Bluetooth Status: Schaltet aus, Aus Daydream Status: Gestoppt Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic + Eingehender Anruf. Status: Klingelt, Nummern: Alle Systemeinstellung verändert: System volume_music_speaker Systemeinstellung verändert: System screen_brightness Display Status: Ein @@ -2064,259 +2286,174 @@ FHEMCMD: setreading Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic Dock Event: Undocked Display Orientierung: Landscape + Benachrichtigung in Statusbar angezeigt: com.whatsapp Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker - Systemeinstellung verändert: System volume_music_headphone - 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 == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - 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" - Airplainemode - 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: 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}" - 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 - Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Notification Volume - WLAN Verbunden: {global_apssid} - 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" - - - - - - - - - - - - - - - - - - - - - - - - - - + WLAN Verbunden: {global_apssid} + Airplainemode + Script: amad_flowset_version = "1.9.60" + Flowsetversion + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SetCommands - AMAD2 Info/Control Flowset v1.9.53 + AMAD2 Info/Control Flowset v1.9.60 true QUEUE 500 @@ -2346,232 +2483,215 @@ FHEMCMD: setreading Expression: param_button == "stop" Expression: param_screen=="off" Expression: setScreenOnOff" - App Task läuft: App5 (neuster) - Expression: App5 - Expression: App4 - App Task läuft: App3 (neuster) - Expression: App3 - App Starten: App3 - App Starten: App4 - App Task läuft: App4 (neuster) - Expression: tuneinradio - App Task läuft: tuneinradio (neuster) - App Starten: tuneinradio - App Starten: App5 - App Task läuft: gplay (neuster) - Expression: gplay - App Starten: PlayMusic - Flow Aktiv: Informations - Expression: ttsMsg" - Schalte Display ein: Hell für 120s - Display automatisch drehen ein-/ausschalten: Aus - Display automatisch drehen ein-/ausschalten: Ein - Expression: setScreenOrientation" - Expression: param_fullscreen == "off" - Expression: param_fullscreen == "on" - Expression: setBluetooth" - Sprachausgabe: {param_message} - Expression: param_bluetooth == "off" - Expression: param_bluetooth == "on" - Bluetooth ein-/ausschalten: Ein - Expression: openApp" - Script: informationFlow_state = "inaktiv" - Bluetooth eingeschaltet - Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdevicetwo} - Pause: 3s (Gerät wach halten) - Bluetooth Gerät verbinden/trennen: Verbinden Advanced Audio Distribution {param_swtobtdevicemac} - Pause: 2s (Gerät wach halten) - Gerät sperren - Expression: setBTDevice" - Expression: openURL" - Audio Player steuern: Medienknopf Play (Google Play Musik) - Audio Player steuern: Medienknopf Weiter (Google Play Musik) - Audio Player steuern: Medienknopf Zurück (Google Play Musik) - Bluetooth ein-/ausschalten: Aus - Audio Player steuern: Medienknopf Stopp (Google Play Musik) - Expression: setVolume" - Expression: param_orientation == "portrait" - Expression: Reboot - Expression: System Command" - Neustart - Expression: Shutdown - Herunterfahren - Sound: /storage/emulated/0/Notifications/{param_notifyfile} als Benachrichtigung - Benachrichtigung aus Statusbar entfernen: Alle - Benachrichtigung aus Statusbar entfernen: Alle (Automagic) - Expression: Automagic - Expression: All - Expression: setNotifiVolume" - Expression: notifysnd" - NotificationLautstärke auf Level 7 - Notification Lautstärke Speichern - Expression: param_notifyfile == "RedAlert.mp3" - Notification Lautstärke Wiederherstellen - Expression: setVoiceCommand" - Flows ausführen: VoiceControl - Expression: setVibrate" - Vibrieren: Pattern 2 (-- --) - Expression: Clear Automagic Meldungen" - Flugmodus ein-/ausschalten: Ein - Setze Display Helligkeit: {param_brightness} - Expression: setScreenlock" - Broadcast senden: {param_action} - Expression: sendIntent" - Setze Flow Status: Aktivieren Informations - Script: informationFlow_state = "aktiv" - Expression: Airplanemode - Pause: 1s (Gerät wach halten) - Airplainemode ON - Expression: param_lockmod == "lock" - Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen - Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin - 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/*" - Setze Timer - Expression: setAlarm" - Expression: setTimer" - - - + Flow Aktiv: Informations + Expression: ttsMsg" + Display automatisch drehen ein-/ausschalten: Aus + Display automatisch drehen ein-/ausschalten: Ein + Expression: setScreenOrientation" + Expression: param_fullscreen == "off" + Expression: param_fullscreen == "on" + Expression: setBluetooth" + Sprachausgabe: {param_message} + Expression: param_bluetooth == "off" + Expression: param_bluetooth == "on" + Bluetooth ein-/ausschalten: Ein + Script: informationFlow_state = "inaktiv" + Bluetooth eingeschaltet + Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdevicetwo} + Pause: 3s (Gerät wach halten) + Bluetooth Gerät verbinden/trennen: Verbinden Advanced Audio Distribution {param_swtobtdevicemac} + Pause: 2s (Gerät wach halten) + Gerät sperren + Expression: setBTDevice" + Expression: openURL" + Audio Player steuern: Medienknopf Play (Google Play Musik) + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + Bluetooth ein-/ausschalten: Aus + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + Expression: setVolume" + Expression: param_orientation == "portrait" + Expression: Reboot + Expression: System Command" + Neustart + Expression: Shutdown + Herunterfahren + Sound: /storage/emulated/0/Notifications/{param_notifyfile} als Benachrichtigung + Benachrichtigung aus Statusbar entfernen: Alle + Benachrichtigung aus Statusbar entfernen: Alle (Automagic) + Expression: Automagic + Expression: All + Expression: setNotifiVolume" + Expression: notifysnd" + NotificationLautstärke auf Level 7 + Notification Lautstärke Speichern + Expression: param_notifyfile == "RedAlert.mp3" + Notification Lautstärke Wiederherstellen + Expression: setVoiceCommand" + Flows ausführen: VoiceControl + Vibrieren: Pattern 2 (-- --) + Expression: Clear Automagic Meldungen" + Flugmodus ein-/ausschalten: Ein + Setze Display Helligkeit: {param_brightness} + Expression: setScreenlock" + Broadcast senden: {param_action} + Expression: sendIntent" + Setze Flow Status: Aktivieren Informations + Script: informationFlow_state = "aktiv" + Expression: Airplanemode + Pause: 1s (Gerät wach halten) + Airplainemode ON + Expression: param_lockmod == "lock" + Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen + Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin + 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 + + + - - + + - - + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + VoiceControl - AMAD2 Info/Control Flowset v1.9.53 + AMAD2 Info/Control Flowset v1.9.60 true QUEUE 60