diff --git a/74_AMAD.pm b/74_AMAD.pm index fdebee5..db034de 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "2.6.0"; -my $flowsetversion = "2.6.0"; +my $modulversion = "2.6.1"; +my $flowsetversion = "2.6.1"; @@ -1166,6 +1166,15 @@ sub AMAD_CommBridge_Read($) { elsif( !defined($device) ) { readingsSingleUpdate( $bhash, "transmitterERROR", $name." has no device name sends", 1 ) if( ReadingsVal( $bname, "expertMode", 0 ) eq "1" ); Log3 $name, 4, "AMAD ($name) - ERROR - no device name given. please check your global variable in automagic"; + + $response = "header lines: \r\n AMADCommBridge receive no device name. please check your global variable in automagic\r\n FHEM to do nothing\r\n"; + $c = $hash->{CD}; + print $c "HTTP/1.1 200 OK\r\n", + "Content-Type: text/plain\r\n", + "Connection: close\r\n", + "Content-Length: ".length($response)."\r\n\r\n", + $response; + return; } @@ -1395,6 +1404,8 @@ sub AMAD_decrypt($) {
  • currentMusicAlbum - currently playing album of mediaplayer
  • currentMusicApp - currently playing player app
  • currentMusicArtist - currently playing artist of mediaplayer
    • +
  • currentMusicIcon - cover of currently play albumNoch nicht fertig implementiert
    • +
  • currentMusicState - state of currently/last used mediaplayer
  • currentMusicTrack - currently playing song title of mediaplayer
  • daydream - on/off, daydream currently active
  • deviceState - state of Android devices. unknown, online, offline.
    • @@ -1651,4 +1662,4 @@ sub AMAD_decrypt($) { =end html_DE -=cut \ No newline at end of file +=cut diff --git a/74_AMADautomagicFlowset_2.6.0.xml b/74_AMADautomagicFlowset_2.6.1.xml similarity index 83% rename from 74_AMADautomagicFlowset_2.6.0.xml rename to 74_AMADautomagicFlowset_2.6.1.xml index eedcb1f..6345b02 100644 --- a/74_AMADautomagicFlowset_2.6.0.xml +++ b/74_AMADautomagicFlowset_2.6.1.xml @@ -48,6 +48,17 @@ false false + + false + Benachrichtigung in Statusbar, Text enthält -- Fehler: failed to connect to - zum debuggen deaktivieren + true + ch.gridvision.ppam.androidautomagic + TEXT + CONTAINS_TEXT + Fehler: failed to connect to + false + false + true Bluetooth Status: Schaltet aus, Aus @@ -244,7 +255,7 @@ irname=getString("name") false Medien Session verändert true - com.amazon.mp3,com.google.android.music + com.amazon.mp3,com.amazon.avod.thirdpartyclient,com.google.android.videos,com.google.android.music,com.spotify.music,tunein.player,com.google.android.youtube,com.rhapsody.alditalk false @@ -810,6 +821,11 @@ or global_deviceport!= {header_dport} Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + + true + Expression: trigger == "Benachrichtigung in Statusbar, Text enthält -- Fehler: failed to connect to - zum debuggen deaktivieren" + trigger == "Benachrichtigung in Statusbar, Text enthält -- Fehler: failed to connect to - zum debuggen deaktivieren" + true Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1048,27 +1064,6 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" WLAN verfügbar: {global_apssid} {global_apssid} - - false - Airplainemode ON - http://{global_fhemip}:8090 - false - false - - POST - GENERAL_TEXT - text/plain - airplanemode@@on@@@@ - @@@@readingsNameXYZ@@readingsValueABC - 60000 - true - FHEMDEVICE: {global_fhemdevice} -FHEMCMD: setreading - true - response - /storage/emulated/0/Download/file.bin - false - false AMAD Voice Control @@ -1509,6 +1504,15 @@ putString("{param_exkey2}", "{param_exval2}"); false false + + false + Flows ausführen: Send Data to AMADCommBridge mit warten + Send Data to AMADCommBridge + + false + true + false + false Flows ausführen: udef_trigger setLockPin @@ -1848,13 +1852,6 @@ Connection: close {param_callnumber} true - - true - Pause: 1s (Gerät wach halten) - 1s - true - false - true Pause: 2s (Gerät wach halten) @@ -1933,6 +1930,12 @@ if (header_dport != null or header_dport != {global_deviceport}) { true Script: airplanemode = "airplanemode@@" + {airplanemode}; fhemcmd = "setreading"; + + + true + Script: airplanemode = "airplanemode@@on"; fhemcmd = "setreading"; + @@ -2081,17 +2084,37 @@ fhemcmd = "setreading"; true - Script: if(package_name == "com.google.android.music") { musicapp = "googlemusic" } if(package_name == "com.amazon.mp3") { musicapp = "amazonmusic" } if(trigger == "") { musicapp = "" } + Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } if(trigger == "com.amazon.avod.thirdpartyclient") { musicapp = "Amazon Video" } if(package_name == "com.google.android.videos") { musicapp = "Google Video" } if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } if(package_name == "tunein.player") { musicapp = "TuneIn Player" } if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } @@ -2369,7 +2392,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA - Informations - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true QUEUE 900 @@ -2828,90 +2851,90 @@ fhemcmd = "setreading"; Stromversorgung: Angeschlossen Script: screen_orientation_mode = "auto" Script: screen = "screen@@" + {screen_state}; fhemcmd = "setreading"; - Script: airplanemode = "airplanemode@@" + {airplanemode}; fhemcmd = "setreading"; - Script: bluetooth = "bluetooth@@" + {bluetooth_state}; fhemcmd = "setreading"; - Script: doNotDisturb = "doNotDisturb@@" + {dndValue}; fhemcmd = "setreading"; - Script: daydream = "daydream@@" + {daydream_state}; fhemcmd = "setreading"; - Script: automagicState = "automagicState@@" + {notification_text}; fhemcmd = "setreading"; - Script: dockingState = "dockingState@@" + {dock_state}; fhemcmd = "setreading"; - Script: incomingCaller = "incomingCallerName@@" + {contact_name} + "@@@@incomingCallerNumber@@" + {incoming_number}; fhemcmd = "setreading"; - Script: intentRadioState = "intentRadioState@@" + {irstate} + "@@@@intentRadioName@@" + {irname}; fhemcmd = "setreading"; - Script: androidVersion = "androidVersion@@" + {androidVersion}; fhemcmd = "setreading"; - Script: flow_SetCommands = "flow_SetCommands@@" + {setCommandFlow_state}; fhemcmd = "setreading"; - Script: checkActiveTask = "checkActiveTask@@" + {runTask}; fhemcmd = "setreading"; - Script: deviceState = "deviceState@@online"; fhemcmd = "setreading"; - Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Get Android Version - Script: bluetooth_state = "off" - 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" } - Bluetooth Gerät verbunden: Beliebiges Geräte - Script: btdeviceinfo = "connectedBTdevices@@" + {connected_devices_names} + "@@@@connectedBTdevicesMAC@@" + {connected_devices_addresses}; fhemcmd = "setreading"; - Script: connected_devices_names = "none"; connected_devices_addresses = "none" - Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Keyguard mit Sicherheit - Script: keyguardSet = "1" - Script: keyguardSet = "keyguardSet@@" + {keyguardSet}; fhemcmd = "setreading"; - Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" - Script: incommingWhatsAppMessage = "incommingWhatsAppMessageFrom@@" + {notification_text}; fhemcmd = "setreading"; - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" - Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" - Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Initialisiere Variable Systemeinstellung: screenBrightness - Script: screenBrightness = "screenBrightness@@" + {screenBrightness}; fhemcmd = "setreading"; - Expression: trigger == "Systemeinstellung verändert: System screen_brightness" - Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" - Initialisiere Variable Systemeinstellung: volumeNotification - Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 - Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 - Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) - 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" - Script: volumevalue = "volume@@" + {volume}; fhemcmd = "setreading"; - Script: volume = {volumeBT} - Script: volume = {volumeSP} - Script: nextAlarmState = "nextAlarmState@@" + {nextalarmstate}; fhemcmd = "setreading"; - Script: volumeNotification = "volumeNotification@@" + {volumeNotification}; fhemcmd = "setreading"; - Script: nextAlarm = "nextAlarmTime@@" + {next_alarmtime} + "@@@@nextAlarmDay@@" + {next_alarmday}; fhemcmd = "setreading"; - Script: screenOrientation = "screenOrientation@@" + {screen_orientation} + "@@@@screenOrientationMode@@" + {screen_orientation_mode}; fhemcmd = "setreading"; - Script: powerinfo = "powerLevel@@" + "{battery_percentage,numberformat,0}" + "@@@@powerPlugged@@" + {battery_plugged} + "@@@@batteryTemperature@@" + "{battery_temperature/10.0,numberformat.0.0}" + "@@@@batteryHealth@@" + {battery_health}; fhemcmd = "setreading"; - Flows ausführen: Send Data to AMADCommBridge - Expression: trigger == "Medien Session verändert" // or trigger == "Medien Session verändert: com.amazon.mp3" // or trigger == "com.amazon.mp3.metachanged" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Script: currentMusic = "currentMusicTrack@@" + {title} + "@@@@currentMusicAlbum@@" + {description} + "@@@@currentMusicArtist@@" + {subtitle} + "@@@@currentMusicApp@@" + {musicapp} + "@@@@currentMusicIcon@@" + {icon} + "@@@@currentMusicState@@" + {playback_state}; fhemcmd = "setreading"; - Pause: 2s (Gerät wach halten) - Script: if(package_name == "com.google.android.music") { musicapp = "googlemusic" } if(package_name == "com.amazon.mp3") { musicapp = "amazonmusic" } if(trigger == "") { musicapp = "" } - Musik Aktiv - Script: if(playback_state == 0) { playback_state = "keiner" } if(playback_state == 1) { playback_state = "gestoppt" } if(playback_state == 2) { playback_state = "pausiert" } if(playback_state == 3) { playback_state = "spielt ab" } if(playback_state == 4) { playback_state = "spult vorwärts" } if(playback_state == 5) { playback_state = "spült rückwärts" } if(playback_state == 6) { playback_state = "buffert" } if(playback_state == 7) { playback_state = "Fehler" } if(playback_state == 8) { playback_state = "verbindet" } if(playback_state == 9) { playback_state = "springt zum vorherigen" } if(playback_state == 10) { playback_state = "springt zum nächsten" } if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } - Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" - Expression: global_apssid != "usb-ethernet" + Script: bluetooth = "bluetooth@@" + {bluetooth_state}; fhemcmd = "setreading"; + Script: doNotDisturb = "doNotDisturb@@" + {dndValue}; fhemcmd = "setreading"; + Script: daydream = "daydream@@" + {daydream_state}; fhemcmd = "setreading"; + Script: automagicState = "automagicState@@" + {notification_text}; fhemcmd = "setreading"; + Script: dockingState = "dockingState@@" + {dock_state}; fhemcmd = "setreading"; + Script: incomingCaller = "incomingCallerName@@" + {contact_name} + "@@@@incomingCallerNumber@@" + {incoming_number}; fhemcmd = "setreading"; + Script: intentRadioState = "intentRadioState@@" + {irstate} + "@@@@intentRadioName@@" + {irname}; fhemcmd = "setreading"; + Script: androidVersion = "androidVersion@@" + {androidVersion}; fhemcmd = "setreading"; + Script: flow_SetCommands = "flow_SetCommands@@" + {setCommandFlow_state}; fhemcmd = "setreading"; + Script: checkActiveTask = "checkActiveTask@@" + {runTask}; fhemcmd = "setreading"; + Script: deviceState = "deviceState@@online"; fhemcmd = "setreading"; + Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Get Android Version + Script: bluetooth_state = "off" + 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" } + Bluetooth Gerät verbunden: Beliebiges Geräte + Script: btdeviceinfo = "connectedBTdevices@@" + {connected_devices_names} + "@@@@connectedBTdevicesMAC@@" + {connected_devices_addresses}; fhemcmd = "setreading"; + Script: connected_devices_names = "none"; connected_devices_addresses = "none" + Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Keyguard mit Sicherheit + Script: keyguardSet = "1" + Script: keyguardSet = "keyguardSet@@" + {keyguardSet}; fhemcmd = "setreading"; + Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle" + Script: incommingWhatsAppMessage = "incommingWhatsAppMessageFrom@@" + {notification_text}; fhemcmd = "setreading"; + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp" + Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE" + Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Initialisiere Variable Systemeinstellung: screenBrightness + Script: screenBrightness = "screenBrightness@@" + {screenBrightness}; fhemcmd = "setreading"; + Expression: trigger == "Systemeinstellung verändert: System screen_brightness" + Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker" + Initialisiere Variable Systemeinstellung: volumeNotification + Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2 + Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2 + Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution) + 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" + Script: volumevalue = "volume@@" + {volume}; fhemcmd = "setreading"; + Script: volume = {volumeBT} + Script: volume = {volumeSP} + Script: nextAlarmState = "nextAlarmState@@" + {nextalarmstate}; fhemcmd = "setreading"; + Script: volumeNotification = "volumeNotification@@" + {volumeNotification}; fhemcmd = "setreading"; + Script: nextAlarm = "nextAlarmTime@@" + {next_alarmtime} + "@@@@nextAlarmDay@@" + {next_alarmday}; fhemcmd = "setreading"; + Script: screenOrientation = "screenOrientation@@" + {screen_orientation} + "@@@@screenOrientationMode@@" + {screen_orientation_mode}; fhemcmd = "setreading"; + Script: powerinfo = "powerLevel@@" + "{battery_percentage,numberformat,0}" + "@@@@powerPlugged@@" + {battery_plugged} + "@@@@batteryTemperature@@" + "{battery_temperature/10.0,numberformat.0.0}" + "@@@@batteryHealth@@" + {battery_health}; fhemcmd = "setreading"; + Expression: trigger == "Medien Session verändert" // or trigger == "Medien Session verändert: com.amazon.mp3" // or trigger == "com.amazon.mp3.metachanged" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Pause: 2s (Gerät wach halten) + Musik Aktiv + Script: if(playback_state == 0) { playback_state = "keiner" } if(playback_state == 1) { playback_state = "gestoppt" } if(playback_state == 2) { playback_state = "pausiert" } if(playback_state == 3) { playback_state = "spielt ab" } if(playback_state == 4) { playback_state = "spult vorwärts" } if(playback_state == 5) { playback_state = "spült rückwärts" } if(playback_state == 6) { playback_state = "buffert" } if(playback_state == 7) { playback_state = "Fehler" } if(playback_state == 8) { playback_state = "verbindet" } if(playback_state == 9) { playback_state = "springt zum vorherigen" } if(playback_state == 10) { playback_state = "springt zum nächsten" } if(playback_state == 11) { playback_state = "springt zu Position in Wiedergabeliste" } + Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" + Expression: global_apssid != "usb-ethernet" + Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } if(trigger == "com.amazon.avod.thirdpartyclient") { musicapp = "Amazon Video" } if(package_name == "com.google.android.videos") { musicapp = "Google Video" } if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } if(package_name == "tunein.player") { musicapp = "TuneIn Player" } if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } + Script: currentMusic = "currentMusicTrack@@" + {title} + "@@@@currentMusicAlbum@@" + {description} + "@@@@currentMusicArtist@@" + {subtitle} + "@@@@currentMusicApp@@" + {musicapp} + "@@@@currentMusicIcon@@" + {icon} + "@@@@currentMusicState@@" + {playback_state}; fhemcmd = "setreading"; + Flows ausführen: Send Data to AMADCommBridge + Script: airplanemode = "airplanemode@@" + {airplanemode}; fhemcmd = "setreading"; - - - - + + + + - - - - + + + + - + - + - + - + @@ -2921,16 +2944,16 @@ fhemcmd = "setreading"; - + - + - + @@ -2939,10 +2962,10 @@ fhemcmd = "setreading"; - - + + - + @@ -2954,52 +2977,52 @@ fhemcmd = "setreading"; - - - - + + + + - - + + - - - + + + - - + + - - - + + + - - + + + - - + - + + - - + - + @@ -3008,202 +3031,204 @@ fhemcmd = "setreading"; - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MultimediaControl - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true QUEUE - + Expression: param_button == "play" + Expression: param_button == "back" + Expression: param_button == "next" + Expression: param_button == "stop" + Expression: param_button == "play" + Expression: param_button == "back" + Expression: param_button == "next" + Expression: param_button == "stop" + Expression: param_button == "play" + Expression: param_button == "back" + Expression: param_button == "next" + Expression: param_button == "stop" + Audio Player steuern: Medienknopf Play (Amazon Music) + Audio Player steuern: Medienknopf Weiter (Amazon Music) + Audio Player steuern: Medienknopf Zurück (Amazon Music) + Audio Player steuern: Medienknopf Play (Spotify) + Audio Player steuern: Medienknopf Weiter (Spotify) + Audio Player steuern: Medienknopf Play (TuneIn Radio) + Audio Player steuern: Medienknopf Weiter (TuneIn Radio) + Audio Player steuern: Medienknopf Zurück (TuneIn Radio) + Expression: param_button == "stop" + Expression: param_button == "play" + Expression: param_button == "next" + Expression: param_button == "back" + Audio Player steuern: Medienknopf Zurück (Google Play Musik) + Expression: Google Music Player + Expression: Spotify Music Player + Expression: TuneIn Radio + Audio Player steuern: Medienknopf Weiter (Google Play Musik) + HTTP Request: /fhem-amad/multimediaControl - Expression: param_button == "play" - Expression: param_button == "back" - Expression: param_button == "next" - Expression: param_button == "stop" - Expression: param_button == "play" - Expression: param_button == "back" - Expression: param_button == "next" - Expression: param_button == "stop" - Expression: param_button == "play" - Expression: param_button == "back" - Expression: param_button == "next" - Expression: param_button == "stop" - Audio Player steuern: Medienknopf Stopp (Amazon Music) - Audio Player steuern: Medienknopf Play (Amazon Music) - Audio Player steuern: Medienknopf Weiter (Amazon Music) - Audio Player steuern: Medienknopf Zurück (Amazon Music) - Audio Player steuern: Medienknopf Stopp (Spotify) - Audio Player steuern: Medienknopf Play (Spotify) - Audio Player steuern: Medienknopf Weiter (Spotify) - Audio Player steuern: Medienknopf Zurück (Spotify) - Audio Player steuern: Medienknopf Stopp (TuneIn Radio) - Audio Player steuern: Medienknopf Play (TuneIn Radio) - Audio Player steuern: Medienknopf Weiter (TuneIn Radio) - Audio Player steuern: Medienknopf Zurück (TuneIn Radio) - Audio Player steuern: Medienknopf Play (Google Play Musik) - Audio Player steuern: Medienknopf Stopp (Google Play Musik) - Expression: param_button == "stop" - Expression: param_button == "play" - Expression: param_button == "next" - Expression: param_button == "back" - Audio Player steuern: Medienknopf Zurück (Google Play Musik) - Expression: Google Music Player - Expression: Spotify Music Player - Expression: TuneIn Radio - Expression: Amazon Music Player - Audio Player steuern: Medienknopf Weiter (Google Play Musik) - - - - + Expression: Amazon Music Player + Audio Player steuern: Medienknopf Stopp (Google Play Musik) + Audio Player steuern: Medienknopf Play (Google Play Musik) + Audio Player steuern: Medienknopf Stopp (Amazon Music) + Audio Player steuern: Medienknopf Stopp (Spotify) + Audio Player steuern: Medienknopf Zurück (Spotify) + Audio Player steuern: Medienknopf Stopp (TuneIn Radio) + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Send Data to AMADCommBridge - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true PARALLEL 900 - + + Benachrichtigung in Statusbar, Text enthält -- Fehler: failed to connect to - zum debuggen deaktivieren + Expression: fhemcmd == "voiceinputvalue" Expression: fhemcmd == "readingsval" Expression: fhemcmd == "set" @@ -3212,20 +3237,26 @@ fhemcmd = "setreading"; HTTP Request: send READINGS data to AMADCommBridge HTTP Request: send READINGSVAL data to AMADCommBridge Expression: fhemcmd == "setreading" - Script: Set FHEMDATA - - - - + WLAN Verbunden: {global_apssid} + Expression: trigger == "Benachrichtigung in Statusbar, Text enthält -- Fehler: failed to connect to - zum debuggen deaktivieren" + Benachrichtigung aus Statusbar entfernen: Alle (Automagic) + Script: Set FHEMDATA + + - - + + + + + + + SetCommands - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true QUEUE 900 @@ -3291,100 +3322,100 @@ fhemcmd = "setreading"; Notification Lautstärke Wiederherstellen Expression: setVoiceCommand" Expression: Clear Automagic Meldungen" - Flugmodus ein-/ausschalten: Ein - Setze Display Helligkeit: {param_brightness} - Expression: setScreenlock" - 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 - Expression: trigger == "Sprachbefehl angefordert" - WLAN Verbunden: {global_apssid} - Setze Alarm: um {param_hour}:{param_minute} - Expression: setAlarm" - Setze Timer - Expression: setVibrate" - Expression: openApp" - App Starten: App - App Task läuft: App (neuster) - Expression: screenMsg" - Benachrichtigung auf Bildschirm: {param_message} (lange) - 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) - 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 - Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname} - Gerät sperren - Script: udef_trigger = "setLockPin" - Flows ausführen: udef_trigger setLockPin - Display eingeschaltet - Gerät sperren - Schalte Display ein - Gerät sperren - Lautstärken setzen param_volume - Lautstärken setzen param_notifivolume - Expression: setTimer" - Expression: openCall" - Nummer anrufen: {param_callnumber} - Expression: param_option - Pause: {param_hanguptime}s (Gerät wach halten) - Anruf beenden - Broadcast senden: {param_action} - URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) - Setze Unterbrechnungen-Modus: Alle / Immer unterbrechen - Setze Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen - Setze Unterbrechnungen-Modus: Keine / Nicht unterbrechen - Setze Unterbrechnungen-Modus: Nur Wecker (Android 6+) - Expression: openURL" - Expression: param_fullscreen == "on" - Expression: do not Disturb" - Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" - Expression: param_disturbmod == "always" - Expression: param_disturbmod == "onlyImportant" - Expression: param_disturbmod == "never" - Expression: param_disturbmod == "alarmClockOnly" - Flows ausführen: VoiceControl - Flows ausführen: Send Data to AMADCommBridge - Script: automagicState = "automagicState@@" + {notification_text}; fhemcmd = "setreading"; - Schalte Display ein: Hell für {param_screenontime}s - Script: flow_informations = "flow_informations@@" + {informationFlow_state}; fhemcmd = "setreading"; - Sprachausgabe: {param_message} - - - - + Setze Display Helligkeit: {param_brightness} + Expression: setScreenlock" + Expression: sendIntent" + Setze Flow Status: Aktivieren Informations + Script: informationFlow_state = "aktiv" + Expression: Airplanemode + Expression: param_lockmod == "lock" + Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen + Setze Lock PIN/Passwort: Setze PIN von Variable param_lockpin + Expression: trigger == "Sprachbefehl angefordert" + WLAN Verbunden: {global_apssid} + Setze Alarm: um {param_hour}:{param_minute} + Expression: setAlarm" + Setze Timer + Expression: setVibrate" + Expression: openApp" + App Starten: App + App Task läuft: App (neuster) + Expression: screenMsg" + Benachrichtigung auf Bildschirm: {param_message} (lange) + 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) + 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 + Dateien löschen: /storage/emulated/0/Download/installFlow_{param_flowname} + Gerät sperren + Script: udef_trigger = "setLockPin" + Flows ausführen: udef_trigger setLockPin + Display eingeschaltet + Gerät sperren + Schalte Display ein + Gerät sperren + Lautstärken setzen param_volume + Lautstärken setzen param_notifivolume + Expression: setTimer" + Expression: openCall" + Nummer anrufen: {param_callnumber} + Expression: param_option + Pause: {param_hanguptime}s (Gerät wach halten) + Anruf beenden + Broadcast senden: {param_action} + URL in Browser öffnen: {param_url} (mit {param_browserapp}/{param_browserappclass}) + Setze Unterbrechnungen-Modus: Alle / Immer unterbrechen + Setze Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen + Setze Unterbrechnungen-Modus: Keine / Nicht unterbrechen + Setze Unterbrechnungen-Modus: Nur Wecker (Android 6+) + Expression: openURL" + Expression: param_fullscreen == "on" + Expression: do not Disturb" + Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" + Expression: param_disturbmod == "always" + Expression: param_disturbmod == "onlyImportant" + Expression: param_disturbmod == "never" + Expression: param_disturbmod == "alarmClockOnly" + Flows ausführen: VoiceControl + Flows ausführen: Send Data to AMADCommBridge + Script: automagicState = "automagicState@@" + {notification_text}; fhemcmd = "setreading"; + Schalte Display ein: Hell für {param_screenontime}s + Script: flow_informations = "flow_informations@@" + {informationFlow_state}; fhemcmd = "setreading"; + Sprachausgabe: {param_message} + Flugmodus ein-/ausschalten: Ein + Script: airplanemode = "airplanemode@@on"; fhemcmd = "setreading"; + Flows ausführen: Send Data to AMADCommBridge mit warten + + + + - + - - + + @@ -3393,7 +3424,7 @@ fhemcmd = "setreading"; - + @@ -3407,118 +3438,117 @@ fhemcmd = "setreading"; - + - + - + - + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + Update AMAD Flowset - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true QUEUE @@ -3568,7 +3598,7 @@ fhemcmd = "setreading"; VoiceControl - AMAD2 Info/Control Flowset v2.6.0 + AMAD2 Info/Control Flowset v2.6.1 true QUEUE