diff --git a/74_AMAD.pm b/74_AMAD.pm index 8f47168..b9c83d9 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -22,6 +22,10 @@ # ################################################################ +###### Version 0.2.0 ############ + + + package main; @@ -385,7 +389,7 @@ sub AMAD_SetMediaplayer($@) { my $btn = join(" ", @data); - my $url = "http://" . $host . ":" . $port . "/automagic/mediaPlayer?button=$btn&device=$name"; + my $url = "http://" . $host . ":" . $port . "/automagic/mediaPlayer?button=$btn"; return AMAD_HTTP_POST ($hash,$url); } @@ -422,4 +426,4 @@ sub AMAD_SetMediaplayer($@) { =end html_DE -=cut \ No newline at end of file +=cut diff --git a/[AMAD]_Flows_Handy b/[AMAD]_Flows_Handy new file mode 100644 index 0000000..3f2455f --- /dev/null +++ b/[AMAD]_Flows_Handy @@ -0,0 +1,555 @@ + + + + false + com.android.music.metachanged + true + com.android.music.metachanged + + + + + + + + artist = getString("artist"); +track = getString("track"); +album = getString("album"); + false + + + true + HTTP Request: /automagic/deviceInfo, Port 8089 + true + /automagic/deviceInfo + 8089 + true + + + true + HTTP Request: /automagic/mediaPlayer, Port 8089 + true + /automagic/mediaPlayer + 8089 + true + + + true + HTTP Request: /automagic/openURL, Port 8089 + true + /automagic/openURL + 8089 + true + + + true + HTTP Request: /automagic/screenMsg, Port 8089 + true + /automagic/screenMsg + 8089 + true + + + true + HTTP Request: /automagic/setBrightness, Port 8089 + true + /automagic/setBrightness + 8089 + true + + + true + HTTP Request: /automagic/setScreenOnOff, Port 8089 + true + /automagic/setScreenOnOff + 8089 + true + + + true + HTTP Request: /automagic/setVolume, Port 8089 + true + /automagic/setVolume + 8089 + true + + + true + HTTP Request: /automagic/ttsMsg, Port 8089 + true + /automagic/ttsMsg + 8089 + true + + + true + Akku Ladestand: grösser als 0% + 0 + HIGHER_THAN + + + true + Expression: param_button == "back" + param_button == "back" + + + true + Expression: param_button == "next" + param_button == "next" + + + true + Expression: param_button == "play" + param_button == "play" + + + true + Expression: param_button == "stop" + param_button == "stop" + + + true + Expression: param_screen=="off" + param_screen=="off" + + + true + Expression: param_screen=="on" + param_screen=="on" + + + true + Expression: trigger == "com.android.music.metachanged" + trigger == "com.android.music.metachanged" + + + true + Audio Player steuern: Medienknopf Play (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_PLAY + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_STOP + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_NEXT + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_PREVIOUS + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Benachrichtigung auf Bildschirm: {param_message} (lange) + true + {param_message} + + 200 + 250 + false + 1.0 + true + false + TOP_LEFT + 0 + 0 + + + true + Gerät sperren + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicAlbum%20{encodeURLForm(album)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicAlbum%20{encodeURLForm(album)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicArtist%20{encodeURLForm(artist)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicArtist%20{encodeURLForm(artist)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicTrack%20{encodeURLForm(track)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicTrack%20{encodeURLForm(track)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + false + HTTP Response + powerLevel {battery_percentage}@@powerPlugged {battery_plugged}@@volumeMusikSpeaker {volumeMusikSpeaker}@@networkCountryIso {network_country_iso}@@voiceMailNumber {voice_mail_number}@@screenBrightness {screenBrightness}@@nextAlarmDay {next_alarmday}@@nextAlarmTime {next_alarmtime} + true + text/html + + + true + Initialisiere Variable Nächster Alarm: Variable next_alarm + next_alarm + + + true + Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness + SYSTEM + screen_brightness + screenBrightness + + + true + Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker + SYSTEM + volume_music_speaker + volumeMusikSpeaker + + + true + Initialisiere Variablen Telefoninfo: network_country_iso, voice_mail_number + true + network_country_iso + true + voice_mail_number + + + true + Lautstärke einstellen: Medien auf Level 10 + MUSIC + 10 + true + false + + + false + Lautstärken setzen + false + global_volume_alarm + false + global_volume_dtmf + true + param_volume + false + global_volume_notification + false + global_volume_ring + false + global_volume_system + false + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Lautstärken Speichern + true + global_volume_alarm + true + global_volume_dtmf + true + global_volume_music + true + global_volume_notification + true + global_volume_ring + true + global_volume_system + true + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Lautstärken Wiederherstellen + true + global_volume_alarm + true + global_volume_dtmf + true + global_volume_music + true + global_volume_notification + true + global_volume_ring + true + global_volume_system + true + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Pause: 2s (Gerät wach halten) + 2s + true + + + true + Schalte Display ein: Hell für 60s + true + 60s + true + + + true + Script: next_alarmday = "{next_alarm,dateformat,c}" + + + + true + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + + + + true + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + SYSTEM + screen_brightness + {param_brightness} + true + + + true + Sprachausgabe: {param_message} + MUSIC + {param_message} + de_DE + true + 1.0 + true + 1.0 + false + false + false + false + TRANSIENT + + + true + URL in Browser öffnen: {param_url} (mit Chrome) + {param_url} + true + com.android.chrome + com.google.android.apps.chrome.Main + Chrome + + + Displaymessage + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/screenMsg, Port 8089 + + Benachrichtigung auf Bildschirm: {param_message} (lange) + + + + Informationen + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + Initialisiere Variablen Telefoninfo: network_country_iso, voice_mail_number + Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker + Akku Ladestand: grösser als 0% + Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness + + HTTP Request: /automagic/deviceInfo, Port 8089 + + Pause: 2s (Gerät wach halten) + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Initialisiere Variable Nächster Alarm: Variable next_alarm + HTTP Response + Script: next_alarmday = "{next_alarm,dateformat,c}" + + + + + + + + + + + + + + + + Mediaplayer + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + Audio Player steuern: Medienknopf Play (Google Play Musik) + Expression: param_button == "next" + Expression: param_button == "back" + Expression: param_button == "stop" + Expression: param_button == "play" + WLAN Verbunden: TuxNet-AP01 + Expression: trigger == "com.android.music.metachanged" + + HTTP Request: /automagic/mediaPlayer, Port 8089 + com.android.music.metachanged + + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus5Marko%20currentPlayMusicTrack%20{encodeURLForm(track)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus5Marko%20currentPlayMusicAlbum%20{encodeURLForm(album)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus5Marko%20currentPlayMusicArtist%20{encodeURLForm(artist)} speichern in response + + + + + + + + + + + + + + + + openURL + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/openURL, Port 8089 + + URL in Browser öffnen: {param_url} (mit Chrome) + + + + Set Brightness + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + + HTTP Request: /automagic/setBrightness, Port 8089 + + + + + Set Screen On Off + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + Gerät sperren + Schalte Display ein: Hell für 60s + + HTTP Request: /automagic/setScreenOnOff, Port 8089 + + Expression: param_screen=="off" + Expression: param_screen=="on" + + + + + + + Text to Speech + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/ttsMsg, Port 8089 + + Lautstärken Speichern + Sprachausgabe: {param_message} + Lautstärken Wiederherstellen + Lautstärke einstellen: Medien auf Level 10 + + + + + + + Volume + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/setVolume, Port 8089 + + Lautstärken setzen + + + \ No newline at end of file diff --git a/[AMAD]_Flows_Tablet b/[AMAD]_Flows_Tablet new file mode 100644 index 0000000..2e60051 --- /dev/null +++ b/[AMAD]_Flows_Tablet @@ -0,0 +1,555 @@ + + + + false + com.android.music.metachanged + true + com.android.music.metachanged + + + + + + + + artist = getString("artist"); +track = getString("track"); +album = getString("album"); + false + + + true + HTTP Request: /automagic/deviceInfo, Port 8089 + true + /automagic/deviceInfo + 8089 + true + + + true + HTTP Request: /automagic/mediaPlayer, Port 8089 + true + /automagic/mediaPlayer + 8089 + true + + + true + HTTP Request: /automagic/openURL, Port 8089 + true + /automagic/openURL + 8089 + true + + + true + HTTP Request: /automagic/screenMsg, Port 8089 + true + /automagic/screenMsg + 8089 + true + + + true + HTTP Request: /automagic/setBrightness, Port 8089 + true + /automagic/setBrightness + 8089 + true + + + true + HTTP Request: /automagic/setScreenOnOff, Port 8089 + true + /automagic/setScreenOnOff + 8089 + true + + + true + HTTP Request: /automagic/setVolume, Port 8089 + true + /automagic/setVolume + 8089 + true + + + true + HTTP Request: /automagic/ttsMsg, Port 8089 + true + /automagic/ttsMsg + 8089 + true + + + true + Akku Ladestand: grösser als 0% + 0 + HIGHER_THAN + + + true + Expression: param_button == "back" + param_button == "back" + + + true + Expression: param_button == "next" + param_button == "next" + + + true + Expression: param_button == "play" + param_button == "play" + + + true + Expression: param_button == "stop" + param_button == "stop" + + + true + Expression: param_screen=="off" + param_screen=="off" + + + true + Expression: param_screen=="on" + param_screen=="on" + + + true + Expression: trigger == "com.android.music.metachanged" + trigger == "com.android.music.metachanged" + + + true + Audio Player steuern: Medienknopf Play (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_PLAY + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_STOP + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_NEXT + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + true + LAUNCH + KEYCODE_MEDIA_PREVIOUS + true + com.google.android.music + com.google.android.music.playback.MediaButtonIntentReceiver + Google Play Musik + + + true + Benachrichtigung auf Bildschirm: {param_message} (lange) + true + {param_message} + + 200 + 250 + false + 1.0 + true + false + TOP_LEFT + 0 + 0 + + + true + Gerät sperren + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicAlbum%20{encodeURLForm(album)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicAlbum%20{encodeURLForm(album)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicArtist%20{encodeURLForm(artist)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicArtist%20{encodeURLForm(artist)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + true + HTTP Request: GET http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicTrack%20{encodeURLForm(track)} speichern in response + http://YOUR_FHEM_IP:8085/fhem?cmd=setreading%20YOUR_FHEM_DEVICE_NAME%20currentPlayMusicTrack%20{encodeURLForm(track)} + true + false + + GET + X_WWW_FORM_URLENCODED + text/plain + + Lastname=XYZ,Firstname=ABC + 60000 + false + + true + response + /storage/emulated/0/Download/file.bin + + + false + HTTP Response + powerLevel {battery_percentage}@@powerPlugged {battery_plugged}@@volumeMusikBluetooth {volumeMusikBluetooth}@@volumeMusikSpeaker {volumeMusikSpeaker}@@screenBrightness {screenBrightness}@@nextAlarmTime {next_alarmtime}@@nextAlarmDay {next_alarmday} + true + text/html + + + true + Initialisiere Variable Nächster Alarm: Variable next_alarm + next_alarm + + + true + Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness + SYSTEM + screen_brightness + screenBrightness + + + true + Initialisiere Variable Systemeinstellung: System volume_music_bt_a2dp to volumeMusikBluetooth + SYSTEM + volume_music_bt_a2dp + volumeMusikBluetooth + + + true + Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker + SYSTEM + volume_music_speaker + volumeMusikSpeaker + + + true + Lautstärke einstellen: Medien auf Level 10 + MUSIC + 10 + true + false + + + false + Lautstärken setzen + false + global_volume_alarm + false + global_volume_dtmf + true + param_volume + false + global_volume_notification + false + global_volume_ring + false + global_volume_system + false + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Lautstärken Speichern + true + global_volume_alarm + true + global_volume_dtmf + true + global_volume_music + true + global_volume_notification + true + global_volume_ring + true + global_volume_system + true + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Lautstärken Wiederherstellen + true + global_volume_alarm + true + global_volume_dtmf + true + global_volume_music + true + global_volume_notification + true + global_volume_ring + true + global_volume_system + true + global_volume_voice_call + false + global_ringer_mode + false + global_interruptions_mode + + + true + Pause: 2s (Gerät wach halten) + 2s + true + + + true + Schalte Display ein: Hell für 60s + true + 60s + true + + + true + Script: next_alarmday = "{next_alarm,dateformat,c}" + + + + true + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + + + + true + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + SYSTEM + screen_brightness + {param_brightness} + true + + + true + Sprachausgabe: {param_message} + MUSIC + {param_message} + de_DE + true + 1.0 + true + 1.0 + false + false + false + false + TRANSIENT + + + true + URL in Browser öffnen: {param_url} (mit Chrome) + {param_url} + true + com.android.chrome + com.google.android.apps.chrome.Main + Chrome + + + Displaymessage + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/screenMsg, Port 8089 + + Benachrichtigung auf Bildschirm: {param_message} (lange) + + + + Informationen + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/deviceInfo, Port 8089 + + Akku Ladestand: grösser als 0% + Initialisiere Variable Systemeinstellung: System screen_brightness to screenBrightness + Initialisiere Variable Systemeinstellung: System volume_music_speaker to volumeMusikSpeaker + Initialisiere Variable Systemeinstellung: System volume_music_bt_a2dp to volumeMusikBluetooth + Pause: 2s (Gerät wach halten) + Initialisiere Variable Nächster Alarm: Variable next_alarm + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Script: next_alarmday = "{next_alarm,dateformat,c}" + HTTP Response + + + + + + + + + + + + + + + + Mediaplayer + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/mediaPlayer, Port 8089 + com.android.music.metachanged + + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + Audio Player steuern: Medienknopf Play (Google Play Musik) + Expression: param_button == "play" + Expression: param_button == "next" + Expression: param_button == "back" + Expression: param_button == "stop" + Expression: trigger == "com.android.music.metachanged" + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentPlayMusicAlbum%20{encodeURLForm(album)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentPlayMusicArtist%20{encodeURLForm(artist)} speichern in response + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8085/fhem?cmd=setreading%20Nexus10Wohnzimmer%20currentPlayMusicTrack%20{encodeURLForm(track)} speichern in response + WLAN Verbunden: TuxNet-AP01 + HTTP Request: GET http://fhem-tuxnet.tuxnet.local:8090/Nexus10Wohnzimmer@@currentPlayMusicAlbum@@{encodeURLForm(album)} speichern in response + + + + + + + + + + + + + + + + openURL + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/openURL, Port 8089 + + URL in Browser öffnen: {param_url} (mit Chrome) + + + + Set Brightness + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/setBrightness, Port 8089 + + Setze Systemeinstellung: System screen_brightness auf {param_brightness} + + + + Set Screen On Off + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/setScreenOnOff, Port 8089 + + Schalte Display ein: Hell für 60s + Expression: param_screen=="off" + Expression: param_screen=="on" + Gerät sperren + + + + + + + Text to Speech + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/ttsMsg, Port 8089 + + Lautstärken Speichern + Sprachausgabe: {param_message} + Lautstärken Wiederherstellen + Lautstärke einstellen: Medien auf Level 10 + + + + + + + Volume + FHEM Info / Steuerung über AMAD Modul + true + PARALLEL + + HTTP Request: /automagic/setVolume, Port 8089 + + Lautstärken setzen + + + \ No newline at end of file