diff --git a/fhem/CHANGED b/fhem/CHANGED index 975a8abe2..065f7a201 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 74:AMAD: add Attribut for TTS speed and notify file path + - bugfix : 74:AMAD: modify informationsflow - feature: 00_ZWDongle: add backupCreate / backupRestore - bugfix: 49_SSCam: module will not load due to Unknown warnings category 'experimental' when using an older perl version diff --git a/fhem/FHEM/74_AMAD.pm b/fhem/FHEM/74_AMAD.pm index 8e0e901b6..8d8e21b9a 100644 --- a/fhem/FHEM/74_AMAD.pm +++ b/fhem/FHEM/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "2.0.2"; -my $flowsetversion = "2.0.4"; +my $modulversion = "2.0.3"; +my $flowsetversion = "2.0.5"; @@ -62,6 +62,8 @@ sub AMAD_Initialize($) { "setScreenlockPIN ". "setScreenOnForTimer ". "setOpenUrlBrowser ". + "setNotifySndFilePath ". + "setTtsMsgSpeed ". "root:0,1 ". "port ". "disable:1 ". @@ -159,7 +161,7 @@ sub AMAD_Undef($$) { sub AMAD_Attr(@) { -my ( $cmd, $name, $attrName, $attrVal ) = @_; + my ( $cmd, $name, $attrName, $attrVal ) = @_; my $hash = $defs{$name}; my $orig = $attrVal; @@ -598,13 +600,14 @@ sub AMAD_SelectSetCmd($$@) { } elsif( lc $cmd eq 'ttsmsg' ) { - - my $msg = join( " ", @data ); + + my $msg = join( " ", @data ); + my $speed = AttrVal( $name, "setTtsMsgSpeed", "1.0" ); $msg =~ s/%/%25/g; $msg =~ s/\s/%20/g; - my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/ttsMsg?message=$msg"; + my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/ttsMsg?message=".$msg."&msgspeed=".$speed; return AMAD_HTTP_POST( $hash,$url ); } @@ -775,8 +778,9 @@ sub AMAD_SelectSetCmd($$@) { elsif( lc $cmd eq 'notifysndfile' ) { my $notify = join( " ", @data ); + my $filepath = AttrVal( $name, "setNotifySndFilePath", "/storage/emulated/0/Notifications/" ); - my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/playnotifysnd?notifyfile=$notify"; + my $url = "http://" . $host . ":" . $port . "/fhem-amad/setCommands/playnotifysnd?notifyfile=".$notify."¬ifypath=".$filepath; return AMAD_HTTP_POST( $hash,$url ); } @@ -1063,7 +1067,8 @@ sub AMAD_CommBridge_Read($) { if ( $data[0] =~ /currentFlowsetUpdate.xml/ ) { - $response = qx(cat /opt/fhem/FHEM/lib/74_AMADautomagicFlowset_$flowsetversion.xml); + my $fhempath = $attr{global}{modpath}; + $response = qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$flowsetversion.xml); $c = $hash->{CD}; print $c "HTTP/1.1 200 OK\r\n", "Content-Type: text/plain\r\n", @@ -1369,6 +1374,8 @@ sub AMAD_decrypt($) {
  • screenLock - Locks screen with request for PIN. attribute setScreenlockPIN - enter PIN here. Only use numbers, 4-16 numbers required.
  • screenOrientation - Auto,Landscape,Portait, set screen orientation (automatic, horizontal, vertical). attribute setScreenOrientation
  • system - issue system command (only with rooted Android devices). reboot,shutdown,airplanemodeON (can only be switched ON) attribute root, in Automagic "Preferences" "Root functions" need to be enabled.
    • +
  • setNotifySndFilePath - set systempath to notifyfile (default /storage/emulated/0/Notifications/
    • +
  • setTtsMsgSpeed - set speaking speed for TTS (Value between 0.5 - 4.0, 0.5 Step) default is 1.0

    • To be able to use "openApp" the corresponding attribute "setOpenApp" needs to contain the app package name.

    @@ -1519,6 +1526,8 @@ sub AMAD_decrypt($) {
  • screenLock - Sperrt den Bildschirm mit Pinabfrage. Attribut setScreenlockPIN - hier die Pin dafür eingeben. Erlaubt sind nur Zahlen. Es müßen mindestens 4, bis max 16 Zeichen verwendet werden.
  • screenOrientation - Auto,Landscape,Portait, aktiviert die Bildschirmausrichtung (Automatisch,Horizontal,Vertikal). Attribut setScreenOrientation
  • system - setzt Systembefehle ab (nur bei gerootetet Geräen). reboot,shutdown,airplanemodeON (kann nur aktiviert werden) Attribut root, in den Automagic Einstellungen muss "Root Funktion" gesetzt werden
    • +
  • setNotifySndFilePath - setzt den korrekten Systempfad zur Notifydatei (default ist /storage/emulated/0/Notifications/
    • +
  • setTtsMsgSpeed - setzt die Sprachgeschwindigkeit bei der Sprachausgabe(Werte zwischen 0.5 bis 4.0 in 0.5er Schritten) default ist 1.0

    • Um openApp verwenden zu können, muss als Attribut der Package Name der App angegeben werden.

    diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.4.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.5.xml similarity index 75% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.4.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.5.xml index 10c2313d1..41c7506c0 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.4.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.0.5.xml @@ -9,6 +9,12 @@ true true + + false + App Task Beendet + true + * + true Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic @@ -511,6 +517,11 @@ or global_deviceport!= {header_dport} Expression: openURL" request_path == "/fhem-amad/setCommands/openURL" + + true + Expression: package_name == {global_activetask} + package_name == {global_activetask} + true Expression: param_bluetooth == "off" @@ -686,6 +697,11 @@ or global_deviceport!= {header_dport} Expression: trigger == "Akku Ladestand: grösser als 0%" trigger == "Akku Ladestand: grösser als 0%" + + true + Expression: trigger == "App Task Beendet" + trigger == "App Task Beendet" + true Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" @@ -1891,6 +1907,13 @@ FHEMCMD: setreading /storage/emulated/0/Download/file.bin false + + false + Schalte Display ein + false + 5s + true + true Schalte Display ein: Hell für {param_screenontime}s @@ -1978,8 +2001,8 @@ FHEMCMD: setreading true - Script: amad_flowset_version = "2.0.4" - + Script: amad_flowset_version = "2.0.5" + true @@ -2335,10 +2358,10 @@ FHEMCMD: voiceinputvalue true - Sound: /storage/emulated/0/Notifications/{param_notifyfile} als Benachrichtigung + Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung FILE Lautlos - /storage/emulated/0/Notifications/{param_notifyfile} + {param_notifypath}{param_notifyfile} NOTIFICATION false true @@ -2354,7 +2377,7 @@ FHEMCMD: voiceinputvalue true 1.0 true - 1.0 + {param_msgspeed} true false false @@ -2416,17 +2439,17 @@ FHEMCMD: setreading Informations - AMAD2 Info/Control Flowset v2.0.4 + AMAD2 Info/Control Flowset v2.0.5 true PARALLEL 900 - + Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE Stromversorgung: Angeschlossen Genereller Broadcast: wenn org.smblott.intentradio.STATE Systemeinstellung verändert: System volume_music_headphone - Stromversorgung: Entfernt Bluetooth Status: Schaltet ein, Ein + Stromversorgung: Entfernt Display Status: Aus Display Orientierung: Portrait Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE @@ -2436,336 +2459,342 @@ FHEMCMD: setreading Daydream Status: Gestoppt Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic Eingehender Anruf. Status: Klingelt, Nummern: Alle - Display Status: Ein - Systemeinstellung verändert: System screen_brightness Systemeinstellung verändert: System volume_music_speaker + Systemeinstellung verändert: System screen_brightness + Display Status: Ein Daydream Status: Gestartet Akku Ladestand: grösser als 0% - com.android.music.playstatechanged Dock Event: Docked + com.android.music.playstatechanged Systemeinstellung verändert: System volume_music_bt_a2dp HTTP Request: /fhem-amad/deviceInfo/ - com.android.music.metachanged Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT - Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic + com.android.music.metachanged Systemeinstellung verändert: System next_alarm + Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic + App Task Beendet Dock Event: Undocked Display Orientierung: Landscape Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker - 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 - Expression: getAndroidSDKVersion() >= "19" - Script: runTask = "1" - Script: runTask = "0" - Script: runTask = "not supported android version" - Script: runTask = "null" - 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" - Script: airplanemode = "off" - Expression: trigger == "Flugmodus: Aus" - Expression: airpcount < 11 - Script: keyguard = "unlocked" - Script: screen_state = "off {keyguard}" - Keyguard mit Sicherheit - 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 - 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: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: Automagic - 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" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" - Check run Task - Screen State - 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 - 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" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Expression: trigger == "Daydream Status: Gestartet" + Script: setCommandFlow_state = "inaktiv" + 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 + Expression: getAndroidSDKVersion() >= "19" + Script: runTask = "1" + Script: runTask = "0" + Script: runTask = "not supported android version" + Script: runTask = "null" + 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" + Script: airplanemode = "off" + Expression: airpcount < 11 + Script: keyguard = "unlocked" + Script: screen_state = "off {keyguard}" + 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%" + 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 + 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: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" + Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Automagic + 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" + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + Check run Task + Screen State + 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 + Dock State + Incoming Call + Incoming WhatsApp Message + IntentRadio Status + Flowsetversion + Flow Status SetCommands + 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} + Dock Status: Docked + 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" + Expression: global_fhemip != null or header_fhemip != null + Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 + Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 + Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) + Script: volume = {volumeBT} + Script: volume = {volumeSP} + Initialisiere Variable Systemeinstellung: screenBrightness + Initialisiere Variable Systemeinstellung: volumeNotification + Stromversorgung: Angeschlossen + 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 + Get Android Version + Script: androidVersion = "not supported funktion" + Android Version + Expression: trigger == "Flugmodus: Aus" + Expression: package_name == {global_activetask} + Expression: trigger == "App Task Beendet" + Script: amad_flowset_version = "2.0.5" + KeyGuard Set + Keyguard mit Sicherheit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SetCommands - AMAD2 Info/Control Flowset v2.0.4 + AMAD2 Info/Control Flowset v2.0.5 true QUEUE 900 @@ -2801,286 +2830,300 @@ FHEMCMD: setreading 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" - Audio Player steuern: Medienknopf Play (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: 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 - Expression: trigger == "Sprachbefehl angefordert" - WLAN Verbunden: {global_apssid} - Lautstärken setzen param_notifivolume - Setze Alarm: um {param_hour}:{param_minute} - Expression: setAlarm" - Expression: setTimer" - Setze Timer - Expression: setVibrate" - Expression: openApp" - App Starten: App - Schalte Display ein: Hell für {param_screenontime}s - Flow Status Informations - App Task läuft: App (neuster) - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - Expression: screenMsg" - Benachrichtigung auf Bildschirm: {param_message} (lange) - Audio Player steuern: Medienknopf Weiter (Google Play Musik) - Expression: openURL" - URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) - Vibrieren: Pattern 2 (-- --) - Expression: global_apssid != "usb-ethernet" - 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} + 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) + Expression: setBTDevice" + Audio Player steuern: Medienknopf Play (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 + 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: 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 + Lautstärken setzen param_volume + Expression: trigger == "Sprachbefehl angefordert" + WLAN Verbunden: {global_apssid} + Lautstärken setzen param_notifivolume + Setze Alarm: um {param_hour}:{param_minute} + Expression: setAlarm" + Expression: setTimer" + Setze Timer + Expression: setVibrate" + Expression: openApp" + App Starten: App + Schalte Display ein: Hell für {param_screenontime}s + Flow Status Informations + App Task läuft: App (neuster) + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + Expression: screenMsg" + Benachrichtigung auf Bildschirm: {param_message} (lange) + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + Expression: openURL" + URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) + Vibrieren: Pattern 2 (-- --) + Expression: global_apssid != "usb-ethernet" + 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} + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard) + Automagic State + Script: notification_text = "Flow install: path for download not exist" + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0) + Sound: {param_notifypath}{param_notifyfile} als Benachrichtigung + Sprachausgabe: {param_message} 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" - - - + Gerät sperren + Script: udef_trigger = "setLockPin" + Flows ausführen: udef_trigger setLockPin + Display eingeschaltet + Gerät sperren + Schalte Display ein + Gerät sperren + + + - - + + - + - - + + - - - - + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - - + + + + + + + + + + + + Update AMAD Flowset AMAD2 Flowset Updater v1.0.13 true PARALLEL - Prüfe und setze Bridgeport Variable - + HTTP Request: /fhem-amad/currentFlowsetUpdate - 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 + Prüfe und setze Bridgeport Variable + 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 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 - - + 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 + Script: notification_text = "Flowset Update: path for download not exist" + Automagic State + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/emulated/0) + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/storage/sdcard0) + Gerätespeicherplatz: Freier Speicherplatz > 1kb (/sdcard) + + - - - - + + - - + - + + + + + + + VoiceControl - AMAD2 Info/Control Flowset v2.0.4 + AMAD2 Info/Control Flowset v2.0.5 true QUEUE 60