From 33286a709f2d5c1b3e378a9171bf9a442b453d2a Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 22 Mar 2016 21:54:01 +0100 Subject: [PATCH] =?UTF-8?q?Bugfix=20im=20Informationflow.=20WhatsApp=20Tri?= =?UTF-8?q?gger=20war=20nicht=20bei=20der=20WLAN=20Pr=C3=BCfung=20enthalte?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 8 +- ....xml => 74_AMADautomagicFlowset_1.9.61.xml | 546 +++++++++--------- 2 files changed, 277 insertions(+), 277 deletions(-) rename 74_AMADautomagicFlowset_1.9.60.xml => 74_AMADautomagicFlowset_1.9.61.xml (86%) diff --git a/74_AMAD.pm b/74_AMAD.pm index 0cf072a..0fd8856 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "1.9.60"; -my $flowsetversion = "1.9.60"; +my $modulversion = "1.9.61"; +my $flowsetversion = "1.9.61"; @@ -120,7 +120,7 @@ sub AMAD_Define($$) { $attr{$name}{room} = "AMAD" if( !defined( $attr{$name}{room} ) ); readingsSingleUpdate ( $hash, "state", "initialized", 1 ) if( $hash->{HOST} ); - readingsSingleUpdate ( $hash, "deviceState", "online", 1 ) if( $hash->{HOST} ); + #readingsSingleUpdate ( $hash, "deviceState", "online", 1 ) if( $hash->{HOST} ); RemoveInternalTimer($hash); InternalTimer( gettimeofday()+15, "AMAD_GetUpdate", $hash, 0 ) if( ($hash->{HOST}) && ($hash->{APSSID}) ); @@ -141,7 +141,7 @@ sub AMAD_Undef($$) { } else { - delete $modules{AMAD}{defptr}{$hash->{HOST}}; + delete $modules{AMAD}{defptr}{$hash->{HOST}} if( defined($modules{AMAD}{defptr}{$hash->{HOST}}) ); RemoveInternalTimer( $hash ); foreach my $d(sort keys %{$modules{AMAD}{defptr}}) { diff --git a/74_AMADautomagicFlowset_1.9.60.xml b/74_AMADautomagicFlowset_1.9.61.xml similarity index 86% rename from 74_AMADautomagicFlowset_1.9.60.xml rename to 74_AMADautomagicFlowset_1.9.61.xml index 2393149..ee8cc69 100644 --- a/74_AMADautomagicFlowset_1.9.60.xml +++ b/74_AMADautomagicFlowset_1.9.61.xml @@ -1726,8 +1726,8 @@ FHEMCMD: setreading true - Script: amad_flowset_version = "1.9.60" - + Script: amad_flowset_version = "1.9.61" + true @@ -2143,122 +2143,11 @@ FHEMCMD: setreading Informations - AMAD2 Info/Control Flowset v1.9.60 + AMAD2 Info/Control Flowset v1.9.61 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 @@ -2290,170 +2179,281 @@ FHEMCMD: setreading Flugmodus: Aus Systemeinstellung verändert: System volume_ring_speaker - WLAN Verbunden: {global_apssid} - Airplainemode - Script: amad_flowset_version = "1.9.60" - Flowsetversion - - - - - - - - - - - - - - - - - - - - - - - - - - + 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" + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + SetCommands - AMAD2 Info/Control Flowset v1.9.60 + AMAD2 Info/Control Flowset v1.9.61 true QUEUE 500 @@ -2691,7 +2691,7 @@ FHEMCMD: setreading VoiceControl - AMAD2 Info/Control Flowset v1.9.60 + AMAD2 Info/Control Flowset v1.9.61 true QUEUE 60