From 69605891f0fc90338b7a1faf0556ff312a89fe40 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 24 Aug 2015 23:39:49 +0200 Subject: [PATCH] =?UTF-8?q?neuen=20Automagic=20Flowset=20f=C3=BCr=20v0.5.0?= =?UTF-8?q?=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...=> Automagic_FHEM-AMAD_FlowsSet_v0.5.0.xml | 375 +++++++++++++----- 1 file changed, 283 insertions(+), 92 deletions(-) rename Automagic_FHEM-AMAD_Flows_v0.4.1.xml => Automagic_FHEM-AMAD_FlowsSet_v0.5.0.xml (54%) diff --git a/Automagic_FHEM-AMAD_Flows_v0.4.1.xml b/Automagic_FHEM-AMAD_FlowsSet_v0.5.0.xml similarity index 54% rename from Automagic_FHEM-AMAD_Flows_v0.4.1.xml rename to Automagic_FHEM-AMAD_FlowsSet_v0.5.0.xml index 16a62c9..da5d661 100644 --- a/Automagic_FHEM-AMAD_Flows_v0.4.1.xml +++ b/Automagic_FHEM-AMAD_FlowsSet_v0.5.0.xml @@ -49,10 +49,44 @@ album = getString("album"); false false + + true + Display automatisch drehen eingeschaltet + true Display eingeschaltet + + true + Display Orientierung: Portrait + true + + + false + Expression: App1 + param_app == "gplay" + + + false + Expression: App2 + param_app == "tuneinradio" + + + false + Expression: App3 + param_app == "" + + + false + Expression: App4 + param_app == "" + + + false + Expression: App5 + param_app == "" + true Expression: param_button == "back" @@ -73,6 +107,31 @@ album = getString("album"); Expression: param_button == "stop" param_button == "stop" + + true + Expression: param_fullscreen == "off" + param_fullscreen == "off" + + + true + Expression: param_fullscreen == "on" + param_fullscreen == "on" + + + true + Expression: param_orientation == "default" + param_orientation == "default" + + + true + Expression: param_orientation == "landscape" + param_orientation == "landscape" + + + true + Expression: param_orientation == "portrait" + param_orientation == "portrait" + true Expression: param_screen=="off" @@ -88,6 +147,11 @@ album = getString("album"); Expression: request_path == "/fhem-amad/setCommands/mediaPlayer" request_path == "/fhem-amad/setCommands/mediaPlayer" + + true + Expression: request_path == "/fhem-amad/setCommands/openApp" + request_path == "/fhem-amad/setCommands/openApp" + true Expression: request_path == "/fhem-amad/setCommands/openURL" @@ -108,11 +172,21 @@ album = getString("album"); Expression: request_path == "/fhem-amad/setCommands/setBrightness" request_path == "/fhem-amad/setCommands/setBrightness" + + true + Expression: request_path == "/fhem-amad/setCommands/setScreenFullscreen" + request_path == "/fhem-amad/setCommands/setScreenFullscreen" + true Expression: request_path == "/fhem-amad/setCommands/setScreenOnOff" request_path == "/fhem-amad/setCommands/setScreenOnOff" + + true + Expression: request_path == "/fhem-amad/setCommands/setScreenOrientation" + request_path == "/fhem-amad/setCommands/setScreenOrientation" + true Expression: request_path == "/fhem-amad/setCommands/setVolume" @@ -130,10 +204,22 @@ album = getString("album"); true - WLAN Verbunden: + WLAN Verbunden: TuxNet-AP01 false - + TuxNet-AP01 + + true + App Starten: com.google.android.music + com.google.android.music + + + + false + App Starten: tuneinradio + tunein.player + + true Audio Player steuern: Medienknopf Play (Google Play Musik) @@ -200,8 +286,8 @@ album = getString("album"); true - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicAlbum%20{encodeURLForm(album)} speichern in response - http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicAlbum%20{encodeURLForm(album)} + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicAlbum%20{encodeURLForm(album)} speichern in response + http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicAlbum%20{encodeURLForm(album)} true false @@ -219,8 +305,8 @@ album = getString("album"); true - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicArtist%20{encodeURLForm(artist)} speichern in response - http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicArtist%20{encodeURLForm(artist)} + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicArtist%20{encodeURLForm(artist)} speichern in response + http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicArtist%20{encodeURLForm(artist)} true false @@ -238,8 +324,8 @@ album = getString("album"); true - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicTrack%20{encodeURLForm(track)} speichern in response - http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicTrack%20{encodeURLForm(track)} + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicTrack%20{encodeURLForm(track)} speichern in response + http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicTrack%20{encodeURLForm(track)} true false @@ -258,7 +344,7 @@ album = getString("album"); false HTTP Response - powerLevel@@{battery_percentage}@@@@powerPlugged@@{battery_plugged}@@@@volumeMusikBluetooth@@{volumeMusikBluetooth}@@@@volumeMusikSpeaker@@{volumeMusikSpeaker}@@@@screenBrightness@@{screenBrightness}@@@@nextAlarmTime@@{next_alarmtime}@@@@nextAlarmDay@@{next_alarmday}@@@@screen@@{screen_state}@@@@automagicState@@{notification_text} + powerLevel@@{battery_percentage}@@@@powerPlugged@@{battery_plugged}@@@@volumeMusikBluetooth@@{volumeMusikBluetooth}@@@@volumeMusikSpeaker@@{volumeMusikSpeaker}@@@@screenBrightness@@{screenBrightness}@@@@nextAlarmTime@@{next_alarmtime}@@@@nextAlarmDay@@{next_alarmday}@@@@screen@@{screen_state}@@@@automagicState@@{notification_text}@@@@screenOrientation@@{screen_orientation} true text/plain @@ -333,6 +419,21 @@ album = getString("album"); Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + + true + Script: screen_orientation = "default" + + + + true + Script: screen_orientation = "landscape" + + + + true + Script: screen_orientation = "portrait" + + true Script: screen_state = "off" @@ -350,6 +451,24 @@ album = getString("album"); {param_hour} {param_minute} + + true + Setze Display Orientierung: Auf Default zurücksetzen + UNSPECIFIED + false + + + true + Setze Display Orientierung: Landscape + LANDSCAPE + false + + + true + Setze Display Orientierung: Portrait + PORTRAIT + false + true Setze Systemeinstellung: System screen_brightness auf {param_brightness} @@ -358,6 +477,18 @@ album = getString("album"); {param_brightness} true + + true + Setze Vollbild Modus: Auf Default zurücksetzen + UNSPECIFIED + false + + + true + Setze Vollbild Modus: Navigation nicht anzeigen + HIDE_NAVIGATION + false + true Sprachausgabe: {param_message} @@ -368,7 +499,7 @@ album = getString("album"); 1.0 true 1.0 - false + true false false false @@ -389,41 +520,55 @@ album = getString("album"); true QUEUE 120 - + Initialisiere Variable Nächster Alarm: Variable next_alarm + Initialisiere Variable Systemeinstellung: System volume_music_bt_a2dp to volumeMusikBluetooth + Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker + Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Script: next_alarmday = "{next_alarm,dateformat,c}" + Display eingeschaltet + Script: screen_state = "on" + Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic + Script: screen_state = "off" + Display automatisch drehen eingeschaltet + Script: screen_orientation = "default" + Script: screen_orientation = "portrait" + Script: screen_orientation = "landscape" + Display Orientierung: Portrait + HTTP Response + Pause: 2s (Gerät wach halten) + Akku Ladestand: grösser als 0% + HTTP Request: /fhem-amad/deviceInfo/, Port 8090 - Initialisiere Variable Nächster Alarm: Variable next_alarm - Initialisiere Variable Systemeinstellung: System volume_music_bt_a2dp to volumeMusikBluetooth - Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker - Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness - Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" - Script: next_alarmday = "{next_alarm,dateformat,c}" - Display eingeschaltet - Script: screen_state = "on" - Script: screen_state = "off" - Pause: 2s (Gerät wach halten) - Akku Ladestand: grösser als 0% - Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic - HTTP Response - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + SetCommands @@ -443,59 +588,105 @@ album = getString("album"); Gerät sperren Lautstärken setzen Expression: request_path == "/fhem-amad/setCommands/setBrightness" - Setze Alarm: um {param_hour}:{param_minute} - Expression: request_path == "/fhem-amad/setCommands/setAlarm" - Benachrichtigung auf Bildschirm: {param_message} (lange) - Expression: request_path == "/fhem-amad/setCommands/screenMsg" - URL in Browser öffnen: {param_url} (mit Chrome) - Expression: request_path == "/fhem-amad/setCommands/openURL" - Audio Player steuern: Medienknopf Stopp (Google Play Musik) - Expression: param_button == "stop" - Expression: param_button == "play" - Audio Player steuern: Medienknopf Play (Google Play Musik) - Audio Player steuern: Medienknopf Weiter (Google Play Musik) - Expression: param_button == "next" - Audio Player steuern: Medienknopf Zurück (Google Play Musik) - Expression: param_button == "back" - Expression: request_path == "/fhem-amad/setCommands/mediaPlayer" - Expression: trigger == "com.android.music.metachanged" - Sprachausgabe: {param_message} - Expression: request_path == "/fhem-amad/setCommands/ttsMsg" - Setze Systemeinstellung: System screen_brightness auf {param_brightness} - WLAN Verbunden: - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicTrack%20{encodeURLForm(track)} speichern in response - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicAlbum%20{encodeURLForm(album)} speichern in response - HTTP Request: GET http://FHEMSERVERIP:8085/fhem?cmd=setreading%20FHEMDEVICENAME%20currentMusicArtist%20{encodeURLForm(artist)} speichern in response - + Expression: request_path == "/fhem-amad/setCommands/setAlarm" + Benachrichtigung auf Bildschirm: {param_message} (lange) + Expression: request_path == "/fhem-amad/setCommands/screenMsg" + URL in Browser öffnen: {param_url} (mit Chrome) + Expression: request_path == "/fhem-amad/setCommands/openURL" + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + Expression: param_button == "play" + Audio Player steuern: Medienknopf Play (Google Play Musik) + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + Expression: param_button == "next" + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + Sprachausgabe: {param_message} + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + Expression: request_path == "/fhem-amad/setCommands/ttsMsg" + Expression: param_button == "stop" + Expression: request_path == "/fhem-amad/setCommands/mediaPlayer" + Expression: trigger == "com.android.music.metachanged" + Expression: param_button == "back" + Setze Display Orientierung: Landscape + Setze Display Orientierung: Portrait + Setze Display Orientierung: Auf Default zurücksetzen + Expression: param_orientation == "landscape" + Expression: param_orientation == "portrait" + Expression: param_orientation == "default" + Expression: param_fullscreen == "on" + Expression: param_fullscreen == "off" + Setze Vollbild Modus: Navigation nicht anzeigen + Setze Vollbild Modus: Auf Default zurücksetzen + Expression: App1 + Expression: App3 + Expression: App2 + Expression: App4 + Expression: App5 + App Starten: tuneinradio + App Starten: tuneinradio + App Starten: tuneinradio + App Starten: com.google.android.music + App Starten: tuneinradio + WLAN Verbunden: TuxNet-AP01 + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicTrack%20{encodeURLForm(track)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicAlbum%20{encodeURLForm(album)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentMusicArtist%20{encodeURLForm(artist)} speichern in response + Expression: request_path == "/fhem-amad/setCommands/setScreenFullscreen" + Expression: request_path == "/fhem-amad/setCommands/openApp" + Expression: request_path == "/fhem-amad/setCommands/setScreenOrientation" + Setze Alarm: um {param_hour}:{param_minute} + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file