From 4643b6fc0f205020b9803c2d74d27ea1c62800e4 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 6 Sep 2015 22:47:19 +0200 Subject: [PATCH] =?UTF-8?q?Flowanpassung=20wegen=20Problemen=20mit=20doppe?= =?UTF-8?q?lten=20ausl=C3=B6sen=20des=20Triggers=20Genereller=20Broadcast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5.9.xml => 74_AMADautomagicFlows0.5.10.xml | 242 +++++++++--------- 1 file changed, 126 insertions(+), 116 deletions(-) rename 74_AMADautomagicFlows0.5.9.xml => 74_AMADautomagicFlows0.5.10.xml (79%) diff --git a/74_AMADautomagicFlows0.5.9.xml b/74_AMADautomagicFlows0.5.10.xml similarity index 79% rename from 74_AMADautomagicFlows0.5.9.xml rename to 74_AMADautomagicFlows0.5.10.xml index d2cdf83..5d29210 100644 --- a/74_AMADautomagicFlows0.5.9.xml +++ b/74_AMADautomagicFlows0.5.10.xml @@ -282,6 +282,12 @@ global_album = getString("album"); true Musik Aktiv + + true + WLAN Verbunden: Alle SSIDs + true + + false App Starten: App3 @@ -388,8 +394,8 @@ global_album = getString("album"); true - HTTP Request: GET http://{global_fhemip}:8085/fhem?cmd=set%20{global_fhemdevice}%20statusRequest speichern in response - http://{global_fhemip}:8085/fhem?cmd=set%20{global_fhemdevice}%20statusRequest + HTTP Request: GET http://{global_fhemip}:8085/fhem?cmd=sleep%202%3Bset%20{global_fhemdevice}%20statusRequest speichern in response + http://{global_fhemip}:8085/fhem?cmd=sleep%202%3Bset%20{global_fhemdevice}%20statusRequest true false @@ -656,97 +662,99 @@ global_fhemdevice = {header_fhemdevice} Informations FHEM Info / Steuerung über AMAD Modul v0.6 true - STOP + SKIP 120 - Benachrichtigung in Statusbar angezeigt: Automagic - Script: notification_text = "no supported from your device" - Script: screen_orientation = "auto" - Display automatisch drehen eingeschaltet - Script: screen_orientation = "portrait" - Display Orientierung: Portrait - Script: screen_orientation = "landscape" - Bluetooth eingeschaltet - Script: bluetooth_state = "on" - Bluetooth Gerät verbunden: Beliebiges Geräte - Script: bluetooth_state = "off" - Script: screen_state = "off" - Script: screen_state = "on" - Display eingeschaltet - Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" - Initialisiere Variable Nächster Alarm: next_alarm - Script: next_alarmday = "{next_alarm,dateformat,c}" - Initialisiere Variable Systemeinstellung: screenBrightness - Initialisiere Variable Systemeinstellung: volumeMusikSpeaker - Initialisiere Variable Systemeinstellung: volumeMusikBluetooth - HTTP Request: GET http://{global_fhemip}:8085/fhem?cmd=set%20{global_fhemdevice}%20statusRequest speichern in response - Expression: global_fhemip == "null" - Expression: global_fhemdevice == "null" - Script: global_fhemip = {header_fhemip} global_fhemdevice = {header_fhemdevice} - Pause: 2s (Gerät wach halten) - Musik Aktiv - Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ"; - Akku Ladestand: grösser als 0% - Flow Aktiv: SetCommands - Script: setCommandFlow_state = "aktiv" - Expression: trigger == "com.android.music.metachanged" - + Script: notification_text = "no supported from your device" + Script: screen_orientation = "auto" + Display automatisch drehen eingeschaltet + Script: screen_orientation = "portrait" + Display Orientierung: Portrait + Script: screen_orientation = "landscape" + Bluetooth eingeschaltet + Script: bluetooth_state = "on" + Bluetooth Gerät verbunden: Beliebiges Geräte + Script: bluetooth_state = "off" + Script: screen_state = "off" + Script: screen_state = "on" + Display eingeschaltet + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Initialisiere Variable Nächster Alarm: next_alarm + Script: next_alarmday = "{next_alarm,dateformat,c}" + Initialisiere Variable Systemeinstellung: screenBrightness + Initialisiere Variable Systemeinstellung: volumeMusikSpeaker + Initialisiere Variable Systemeinstellung: volumeMusikBluetooth + Expression: global_fhemip == "null" + Expression: global_fhemdevice == "null" + Script: global_fhemip = {header_fhemip} global_fhemdevice = {header_fhemdevice} + Flow Aktiv: SetCommands + Script: setCommandFlow_state = "aktiv" + Script: setCommandFlow_state = "inaktiv" + Setze Flow Status: Aktivieren SetCommands + Benachrichtigung in Statusbar angezeigt: Automagic + HTTP Response Information + Akku Ladestand: grösser als 0% + Script: global_artist = "no soundplayer activ"; global_track = "no soundplayer activ"; global_album = "no soundplayer activ"; + Musik Aktiv + Pause: 2s (Gerät wach halten) + com.android.music.metachanged HTTP Request: /fhem-amad/deviceInfo/ - Script: setCommandFlow_state = "inaktiv" - Setze Flow Status: Aktivieren SetCommands - HTTP Response Information - - - - - - - - - - - - - - - - - - - - - - - - - - - + Expression: trigger == "com.android.music.metachanged" + WLAN Verbunden: Alle SSIDs + HTTP Request: GET http://{global_fhemip}:8085/fhem?cmd=sleep%202%3Bset%20{global_fhemdevice}%20statusRequest speichern in response + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + SetCommands @@ -765,11 +773,11 @@ global_fhemdevice = {header_fhemdevice} URL in Browser öffnen: {param_url} (mit Chrome) Benachrichtigung auf Bildschirm: {param_message} (lange) Schalte Display ein: Hell für 120s - Expression: setScreenFullscreen" + Expression: setScreenFullscreen" Expression: param_orientation == "auto" Setze Display Orientierung: Portrait - Setze Display Orientierung: Landscape - Expression: param_orientation == "landscape" + Setze Display Orientierung: Landscape + Expression: param_orientation == "landscape" Expression: param_orientation == "portrait" Expression: param_fullscreen == "off" Setze Vollbild Modus: Navigation nicht anzeigen @@ -777,55 +785,56 @@ global_fhemdevice = {header_fhemdevice} Setze Vollbild Modus: Auf Default zurücksetzen Audio Player steuern: Medienknopf Zurück (Google Play Musik) Expression: param_button == "back" - Display automatisch drehen ein-/ausschalten: Aus + Display automatisch drehen ein-/ausschalten: Aus Expression: param_button == "next" Setze Display Orientierung: Auf Default zurücksetzen - Display automatisch drehen ein-/ausschalten: Ein + Display automatisch drehen ein-/ausschalten: Ein Audio Player steuern: Medienknopf Play (Google Play Musik) Expression: param_button == "play" - Expression: mediaPlayer" + Expression: mediaPlayer" Audio Player steuern: Medienknopf Weiter (Google Play Musik) Audio Player steuern: Medienknopf Stopp (Google Play Musik) Expression: param_button == "stop" Expression: param_screen=="off" Gerät sperren - Expression: setScreenOnOff" - Expression: setVolume" + Expression: setScreenOnOff" + Expression: setVolume" Lautstärken setzen - App Task läuft: App5 (neuster) + App Task läuft: App5 (neuster) Expression: App5 Expression: App4 - App Task läuft: App3 (neuster) + App Task läuft: App3 (neuster) Expression: App3 App Starten: App3 App Starten: App4 - App Task läuft: App4 (neuster) + App Task läuft: App4 (neuster) Expression: tuneinradio - App Task läuft: tuneinradio (neuster) + App Task läuft: tuneinradio (neuster) App Starten: tuneinradio App Starten: App5 App Task läuft: gplay (neuster) Expression: gplay App Starten: PlayMusic Expression: openApp" - Expression: System Command" - Expression: setScreenOrientation" + Expression: System Command" + Expression: setScreenOrientation" Expression: Reboot Neustart - Flow Aktiv: Informations - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - Script: informationFlow_state = "aktiv" - Script: informationFlow_state = "inaktiv" - + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + HTTP Request: /fhem-amad/deviceInfo/ HTTP Request: /fhem-amad/setCommands/* - Setze Flow Status: Aktivieren Informations - Setze Systemeinstellung: System screen_brightness auf {param_brightness} - HTTP Response SetCommand + Setze Flow Status: Aktivieren Informations + Script: informationFlow_state = "inaktiv" + Script: informationFlow_state = "aktiv" + Flow Aktiv: Informations + WLAN Verbunden: Alle SSIDs + HTTP Response SetCommand - + @@ -871,8 +880,6 @@ global_fhemdevice = {header_fhemdevice} - - @@ -885,10 +892,13 @@ global_fhemdevice = {header_fhemdevice} - - - - - + + + + + + + + \ No newline at end of file