diff --git a/fhem/CHANGED b/fhem/CHANGED index 17e016e0a..5ce845077 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,8 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - updated: 74_AMAD: New Minor Release 2.6 new 2 Media Readings, + new trigger for Mediastate MUST INSTALL AUTOMAGIC 1.31.0 + fix fix Issues 480148 - bugfix: 38_netatmo: forecast data check - bugfix: 73_km200.pm: Bugfix for uninitialized values - feature: 73_GasCalculator: New Readings "EnergyXLast" and "EnergyCostXLast" diff --git a/fhem/FHEM/74_AMAD.pm b/fhem/FHEM/74_AMAD.pm index 37d1fb4c8..fdebee56c 100644 --- a/fhem/FHEM/74_AMAD.pm +++ b/fhem/FHEM/74_AMAD.pm @@ -37,8 +37,8 @@ use TcpServerUtils; use Encode qw(encode); -my $modulversion = "2.4.3"; -my $flowsetversion = "2.4.1"; +my $modulversion = "2.6.0"; +my $flowsetversion = "2.6.0"; @@ -1214,7 +1214,7 @@ sub AMAD_CommBridge_Read($) { readingsBulkUpdate( $bhash, "receiveVoiceCommand", $fhemCmd ); readingsBulkUpdate( $bhash, "receiveVoiceDevice", $device ); readingsEndUpdate( $bhash, 1 ); - Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: set reading receive voice command"; + Log3 $bname, 4, "AMAD ($bname) - AMAD_CommBridge: set reading receive voice command: $fhemCmd from Device $device"; $response = "header lines: \r\n AMADCommBridge receive Data complete\r\n FHEM was processes\r\n"; $c = $hash->{CD}; @@ -1553,6 +1553,8 @@ sub AMAD_decrypt($) {
  • currentMusicAlbum - aktuell abgespieltes Musikalbum des verwendeten Mediaplayers
  • currentMusicApp - aktuell verwendeter Mediaplayers
  • currentMusicArtist - aktuell abgespielter Musikinterpret des verwendeten Mediaplayers
    • +
  • currentMusicIcon - Cover vom aktuell abgespielten Album Noch nicht fertig implementiert
    • +
  • currentMusicState - Status des aktuellen/zuletzt verwendeten Mediaplayers
  • currentMusicTrack - aktuell abgespielter Musiktitel des verwendeten Mediaplayers
  • daydream - on/off, Daydream gestartet oder nicht
  • deviceState - Status des Androidgerätes. unknown, online, offline.
    • diff --git a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.4.1.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.6.0.xml similarity index 77% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_2.4.1.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_2.6.0.xml index 03369fda2..eedcb1f71 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_2.4.1.xml +++ b/fhem/FHEM/lib/74_AMADautomagicFlowset_2.6.0.xml @@ -1,5 +1,5 @@ - + true Akku Ladestand: grösser als 0% @@ -66,60 +66,6 @@ false false - - false - com.amazon.mp3.metachanged - true - com.amazon.mp3.metachanged - - - - - - - - artist = getString("com.amazon.mp3.artist"); -track = getString("com.amazon.mp3.track"); -album = getString("com.amazon.mp3.album"); -musicapp = "amazonmusic"; - false - - - false - com.android.music.metachanged - true - com.android.music.metachanged - - - - - - - - artist = getString("artist"); -track = getString("track"); -album = getString("album"); -musicapp = "googlemusic"; - false - - - false - com.android.music.playstatechanged - true - com.android.music.playstatechanged - - - - - - - - artist = getString("artist"); -track = getString("track"); -album = getString("album"); -musicapp = "googlemusic"; - false - true Daydream Status: Gestartet @@ -294,6 +240,12 @@ irname=getString("name") 8090 true + + false + Medien Session verändert + true + com.amazon.mp3,com.google.android.music + false Periodischer Timer: alle 30s @@ -863,14 +815,6 @@ or global_deviceport!= {header_dport} Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Status: Schaltet ein, Ein" - or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - - - true - Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" or trigger == "com.amazon.mp3.metachanged" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - trigger == "com.android.music.playstatechanged" - or trigger == "com.android.music.metachanged" - or trigger == "com.amazon.mp3.metachanged" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -943,6 +887,14 @@ or trigger == "HTTP Request: /fhem-amad/deviceInfo/" Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*" trigger == "HTTP Request: /fhem-amad/setCommands/*" + + true + 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/" + 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/" + true Expression: trigger == "Periodischer Timer: alle 30s" @@ -1699,7 +1651,7 @@ Connection: close POST GENERAL_TEXT text/plain - {fhemdata} + {readingsvalcmd} @@@@readingsNameXYZ@@readingsValueABC 60000 true @@ -1743,7 +1695,7 @@ Connection: close POST GENERAL_TEXT text/plain - {fhemdata} + {voiceinputdata} @@@@readingsNameXYZ@@readingsValueABC 60000 true @@ -1885,6 +1837,7 @@ Connection: close false NotificationLautstärke auf Level 7 NOTIFICATION + ADJUST_SET_ABSOLUTE 7 false false @@ -1998,14 +1951,6 @@ fhemcmd = "setreading"; Script: androidVersion = "not supported funktion" - - true - Script: artist = "no player active"; track = "no player active"; album = "no player active"; musicapp = "no player active"; - - true Script: automagicState = "automagicState@@" + {notification_text}; fhemcmd = "setreading"; @@ -2049,11 +1994,13 @@ connected_devices_addresses = "none" true - Script: currentMusic = "currentMusicTrack@@" + {track} + "@@@@currentMusicAlbum@@" + {album} + "@@@@currentMusicArtist@@" + {artist} + "@@@@currentMusicApp@@" + {musicapp}; fhemcmd = "setreading"; - @@ -2119,18 +2066,6 @@ fhemcmd = "setreading"; Script: doNotDisturb = "doNotDisturb@@" + {dndValue}; fhemcmd = "setreading"; - - - true - Script: fhemdata = value; fhemcmd = "voiceinputvalue"; - - - - true - Script: fhemdata = value; fhemcmd = {left(value, (indexOf(value, " und ")))}; - true @@ -2143,6 +2078,72 @@ fhemcmd = "setreading"; Script: flow_SetCommands = "flow_SetCommands@@" + {setCommandFlow_state}; fhemcmd = "setreading"; + + + true + Script: if(package_name == "com.google.android.music") { musicapp = "googlemusic" } if(package_name == "com.amazon.mp3") { musicapp = "amazonmusic" } if(trigger == "") { musicapp = "" } + + + + true + 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" } + true @@ -2368,7 +2369,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA - + + true + Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active" + + true Script: udef_trigger = "setLockPin" + + true + Script: voiceinputdata = value; fhemcmd = "voiceinputvalue"; + + + + true + Script: voiceinputdata = {left(value, (indexOf(value, " und ")))}; fhemcmd = "voiceinputvalue"; + + true Script: volume = {volumeBT} @@ -2672,41 +2694,79 @@ fhemcmd = "setreading"; Informations - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true QUEUE 900 - Script: daydream_state = "on" - Script: daydream_state = "off" - Script: next_alarmday = "{next_alarm,dateformat,c}" - Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" - Expression: airpcount < 11 - Script: keyguard = "unlocked" - Display Orientierung: Portrait - Script: screen_orientation = "portrait" - Script: screen_orientation = "landscape" - Script: dock_state = "docked" - Script: dock_state = "undocked" - Script: keyguardSet = "0" - Script: screen_orientation_mode = "manual" - Script: scrcount = 0 - Script: keyguard = "locked" - Expression: scrcount < 5 - Script: scrcount = scrcount + 1 - Pause: 2s (Gerät wach halten) - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: Automagic - Expression: getAndroidSDKVersion() >= "19" - Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" - Benachrichtigung in Statusbar angezeigt: WhatsApp - Script: airpcount = airpcount + 1 - Script: airpcount = 0 - Pause: 2s (Gerät wach halten) - Expression: global_apssid != "usb-ethernet" - WLAN Verbunden: {global_apssid} - Dock Status: Docked - Script: notification_text = "not supported from your device" - Pause: 3s (Gerät wach halten) + + Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE + Genereller Broadcast: wenn org.smblott.intentradio.STATE + Systemeinstellung verändert: System volume_music_headphone + Stromversorgung: Angeschlossen + Bluetooth Status: Schaltet ein, Ein + Display Status: Aus + Display Orientierung: Portrait + Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE + Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS + Bluetooth Status: Schaltet aus, Aus + Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen + Benachrichtigung in Statusbar angezeigt: com.whatsapp + Daydream Status: Gestoppt + Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic + Akku Ladestand: grösser als 0% + Eingehender Anruf. Status: Klingelt, Nummern: Alle + Systemeinstellung verändert: System volume_music_speaker + Systemeinstellung verändert: System screen_brightness + Display Status: Ein + Daydream Status: Gestartet + Dock Event: Docked + Systemeinstellung verändert: System volume_music_bt_a2dp + Unterbrechnungen-Modus: Alle / Immer unterbrechen + Periodischer Timer: alle 30s + HTTP Request: /fhem-amad/deviceInfo/ + Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT + Systemeinstellung verändert: System next_alarm + Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic + Stromversorgung: Entfernt + App Task Beendet + Unterbrechnungen-Modus: Keine / Nicht unterbrechen + Dock Event: Undocked + Display Orientierung: Landscape + Unterbrechnungen-Modus: Nur Wecker (Android 6+) + Flugmodus: Aus + Systemeinstellung verändert: System volume_ring_speaker + Medien Session verändert + + Script: daydream_state = "on" + Script: daydream_state = "off" + Script: next_alarmday = "{next_alarm,dateformat,c}" + Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}" + Expression: airpcount < 11 + Script: keyguard = "unlocked" + Display Orientierung: Portrait + Script: screen_orientation = "portrait" + Script: screen_orientation = "landscape" + Script: dock_state = "docked" + Script: dock_state = "undocked" + Script: keyguardSet = "0" + Script: screen_orientation_mode = "manual" + Script: scrcount = 0 + Script: keyguard = "locked" + Expression: scrcount < 5 + Script: scrcount = scrcount + 1 + Pause: 2s (Gerät wach halten) + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: Automagic + Expression: getAndroidSDKVersion() >= "19" + Script: notification_text = "Aktiviere Automagic unter Einstellungen -> Benachrichtigungen -> Benachrichtigungszugriff" + Benachrichtigung in Statusbar angezeigt: WhatsApp + Script: airpcount = airpcount + 1 + Script: airpcount = 0 + Pause: 2s (Gerät wach halten) + Expression: global_apssid != "usb-ethernet" + WLAN Verbunden: {global_apssid} + Dock Status: Docked + Script: notification_text = "not supported from your device" WLAN Reassoziieren WLAN verfügbar: {global_apssid} Display automatisch drehen eingeschaltet @@ -2737,364 +2797,328 @@ fhemcmd = "setreading"; Script: screen_state = "on {keyguard}" Script: screen_state = "off {keyguard}" Script: airplanemode = "off" - Musik Aktiv - Script: bluetooth_state = "on" - Script: artist = "no player active"; track = "no player active"; album = "no player active"; musicapp = "no player active"; - Initialisiere Variable Nächster Alarm: next_alarm - Expression: global_fhemip != null or header_fhemip != null - Script: androidVersion = "not supported funktion" - Expression: package_name == {global_activetask} - App Task läuft: {global_activetask} (neuster) - Script: runTask = "1" - Script: runTask = "0" - Expression: getAndroidSDKVersion() >= "19" - Script: runTask = "not supported android version" - Script: runTask = "null" - Expression: trigger == "Periodischer Timer: alle 30s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Periodischer Timer: alle 30s" - Expression: global_activetask != null - WLAN Verbunden: {global_apssid} - Expression: global_apssid != "usb-ethernet" - Flow Aktiv: SetCommands - Script: setCommandFlow_state = "inaktiv" - Script: setCommandFlow_state = "aktiv" - Setze Flow Status: Aktivieren SetCommands - Expression: trigger == "Periodischer Timer: alle 30s" - Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" - Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - Expression: trigger == "Akku Ladestand: grösser als 0%" - Stromversorgung: Angeschlossen - Script: screen_orientation_mode = "auto" - Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" or trigger == "com.amazon.mp3.metachanged" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" - 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"; - Flows ausführen: Send Data to AMADCommBridge - 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: currentMusic = "currentMusicTrack@@" + {track} + "@@@@currentMusicAlbum@@" + {album} + "@@@@currentMusicArtist@@" + {artist} + "@@@@currentMusicApp@@" + {musicapp}; 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"; - - Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE - Stromversorgung: Angeschlossen - Genereller Broadcast: wenn org.smblott.intentradio.STATE - com.amazon.mp3.metachanged - Systemeinstellung verändert: System volume_music_headphone - Stromversorgung: Entfernt - Bluetooth Status: Schaltet ein, Ein - com.android.music.metachanged - Display Status: Aus - Display Orientierung: Portrait - com.android.music.playstatechanged - Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE - Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS - Bluetooth Status: Schaltet aus, Aus - Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen - Benachrichtigung in Statusbar angezeigt: com.whatsapp - Daydream Status: Gestoppt - Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic - Eingehender Anruf. Status: Klingelt, Nummern: Alle - Display Status: Ein - Systemeinstellung verändert: System screen_brightness - Systemeinstellung verändert: System volume_music_speaker - Daydream Status: Gestartet - Dock Event: Docked - Systemeinstellung verändert: System volume_music_bt_a2dp - Unterbrechnungen-Modus: Alle / Immer unterbrechen - HTTP Request: /fhem-amad/deviceInfo/ - Periodischer Timer: alle 30s - Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT - Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic - Systemeinstellung verändert: System next_alarm - App Task Beendet - Unterbrechnungen-Modus: Keine / Nicht unterbrechen - Dock Event: Undocked - Display Orientierung: Landscape - Unterbrechnungen-Modus: Nur Wecker (Android 6+) - Flugmodus: Aus - Systemeinstellung verändert: System volume_ring_speaker - Akku Ladestand: grösser als 0% - - - - - - - - - - + Script: bluetooth_state = "on" + Initialisiere Variable Nächster Alarm: next_alarm + Expression: global_fhemip != null or header_fhemip != null + Script: androidVersion = "not supported funktion" + Expression: package_name == {global_activetask} + App Task läuft: {global_activetask} (neuster) + Script: runTask = "1" + Script: runTask = "0" + Expression: getAndroidSDKVersion() >= "19" + Script: runTask = "not supported android version" + Script: runTask = "null" + Expression: trigger == "Periodischer Timer: alle 30s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Periodischer Timer: alle 30s" + Expression: global_activetask != null + WLAN Verbunden: {global_apssid} + Flow Aktiv: SetCommands + Script: setCommandFlow_state = "inaktiv" + Script: setCommandFlow_state = "aktiv" + Setze Flow Status: Aktivieren SetCommands + Expression: trigger == "Periodischer Timer: alle 30s" + Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt" + Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Akku Ladestand: grösser als 0%" + 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" + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MultimediaControl - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true QUEUE @@ -3124,22 +3148,22 @@ fhemcmd = "setreading"; 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 Weiter (Google Play Musik) - 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 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) + + + @@ -3152,166 +3176,171 @@ fhemcmd = "setreading"; - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Send Data to AMADCommBridge - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true PARALLEL 900 - Expression: fhemcmd == "set" + Expression: fhemcmd == "voiceinputvalue" Expression: fhemcmd == "readingsval" - Expression: fhemcmd == "voiceinputvalue" + Expression: fhemcmd == "set" HTTP Request: send SET data to AMADCommBridge - HTTP Request: send READINGSVAL data to AMADCommBridge - HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge - HTTP Request: send READINGS data to AMADCommBridge + HTTP Request: send VOICEINPUTVALUE data to AMADCommBridge + HTTP Request: send READINGS data to AMADCommBridge + HTTP Request: send READINGSVAL data to AMADCommBridge Expression: fhemcmd == "setreading" Script: Set FHEMDATA - - - - - + + + + + - + SetCommands - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true QUEUE 900 - Expression: param_screen=="on" - Expression: setBrightness" - Expression: setScreenFullscreen" - Expression: param_orientation == "auto" - Setze Display Orientierung: Portrait - Setze Display Orientierung: Landscape - Expression: param_orientation == "landscape" - Setze Vollbild Modus: Navigation nicht anzeigen - Setze Vollbild Modus: Auf Default zurücksetzen - Setze Display Orientierung: Auf Default zurücksetzen - Expression: param_screen=="off" - Expression: setScreenOnOff" - Flow Aktiv: Informations - Expression: ttsMsg" - Display automatisch drehen ein-/ausschalten: Aus - Display automatisch drehen ein-/ausschalten: Ein - Expression: setScreenOrientation" - Expression: param_fullscreen == "off" - Expression: setBluetooth" - Expression: param_bluetooth == "off" - Expression: param_bluetooth == "on" - Bluetooth ein-/ausschalten: Ein - Script: informationFlow_state = "inaktiv" - Bluetooth eingeschaltet - Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdeviceone} - Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdevicetwo} - Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdevicetwo} - Pause: 3s (Gerät wach halten) - Bluetooth Gerät verbinden/trennen: Verbinden Advanced Audio Distribution {param_swtobtdevicemac} - Pause: 2s (Gerät wach halten) - Expression: setBTDevice" - Bluetooth ein-/ausschalten: Aus - Expression: setVolume" - Expression: param_orientation == "portrait" - Expression: Reboot - Expression: System Command" - Neustart - Expression: Shutdown - Herunterfahren - Benachrichtigung aus Statusbar entfernen: Alle - Benachrichtigung aus Statusbar entfernen: Alle (Automagic) - Expression: Automagic - Expression: All - Expression: setNotifiVolume" - Expression: notifysnd" - NotificationLautstärke auf Level 7 - Notification Lautstärke Speichern - Expression: param_notifyfile == "RedAlert.mp3" - 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 - Sprachausgabe: {param_message} + + Periodischer Timer: alle 30s + HTTP Request: /fhem-amad/deviceInfo/ + Sprachbefehl angefordert + HTTP Request: /fhem-amad/setCommands/* + + Expression: param_screen=="on" + Expression: setBrightness" + Expression: setScreenFullscreen" + Expression: param_orientation == "auto" + Setze Display Orientierung: Portrait + Setze Display Orientierung: Landscape + Expression: param_orientation == "landscape" + Setze Vollbild Modus: Navigation nicht anzeigen + Setze Vollbild Modus: Auf Default zurücksetzen + Setze Display Orientierung: Auf Default zurücksetzen + Expression: param_screen=="off" + Expression: setScreenOnOff" + Flow Aktiv: Informations + Expression: ttsMsg" + Display automatisch drehen ein-/ausschalten: Aus + Display automatisch drehen ein-/ausschalten: Ein + Expression: setScreenOrientation" + Expression: param_fullscreen == "off" + Expression: setBluetooth" + Expression: param_bluetooth == "off" + Expression: param_bluetooth == "on" + Bluetooth ein-/ausschalten: Ein + Script: informationFlow_state = "inaktiv" + Bluetooth eingeschaltet + Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Advanced Audio Distribution {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Eingabegerät {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdeviceone} + Bluetooth Gerät verbinden/trennen: Trennen Headset {param_btdevicetwo} + Bluetooth Gerät verbinden/trennen: Trennen Personal Area Network {param_btdevicetwo} + Pause: 3s (Gerät wach halten) + Bluetooth Gerät verbinden/trennen: Verbinden Advanced Audio Distribution {param_swtobtdevicemac} + Pause: 2s (Gerät wach halten) + Expression: setBTDevice" + Bluetooth ein-/ausschalten: Aus + Expression: setVolume" + Expression: param_orientation == "portrait" + Expression: Reboot + Expression: System Command" + Neustart + Expression: Shutdown + Herunterfahren + Benachrichtigung aus Statusbar entfernen: Alle + Benachrichtigung aus Statusbar entfernen: Alle (Automagic) + Expression: Automagic + Expression: All + Expression: setNotifiVolume" + Expression: notifysnd" + NotificationLautstärke auf Level 7 + Notification Lautstärke Speichern + Expression: param_notifyfile == "RedAlert.mp3" + 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" @@ -3339,149 +3368,145 @@ fhemcmd = "setreading"; 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"; - - Periodischer Timer: alle 30s - HTTP Request: /fhem-amad/deviceInfo/ - Sprachbefehl angefordert - HTTP Request: /fhem-amad/setCommands/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Sprachausgabe: {param_message} + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + - + - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + - + @@ -3490,11 +3515,10 @@ fhemcmd = "setreading"; - Update AMAD Flowset - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true QUEUE @@ -3544,30 +3568,30 @@ fhemcmd = "setreading"; VoiceControl - AMAD2 Info/Control Flowset v2.4.1 + AMAD2 Info/Control Flowset v2.6.0 true QUEUE Expression: value != "" AMAD Voice Control - Expression: contains(value, " und ") - Flows ausführen: Send Data to AMADCommBridge - Benachrichtigung auf Bildschirm: {value} (lange) + Flows ausführen: Send Data to AMADCommBridge + Benachrichtigung auf Bildschirm: {value} (lange) + Spracheingabe wurde nicht erkannt Flows ausführen: Send Data to AMADCommBridge Setze voice Variablen - Spracheingabe wurde nicht erkannt - Script: fhemdata = value; fhemcmd = {left(value, (indexOf(value, " und ")))}; - Script: fhemdata = value; fhemcmd = "voiceinputvalue"; + Script: voiceinputdata = value; fhemcmd = "voiceinputvalue"; + Script: voiceinputdata = {left(value, (indexOf(value, " und ")))}; fhemcmd = "voiceinputvalue"; + Expression: contains(value, " und ") - - + + - - - + - + + - + + \ No newline at end of file