FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Neue Version 2.2.0

Browse Source
This commit is contained in:
Marko Oldenburg 2016-05-31 22:14:15 +02:00
parent 081bbc6bad
commit 3df2bfcb8f
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
74_AMAD.pm
View File

@ -37,8 +37,8 @@ use TcpServerUtils;
use Encode qw(encode); use Encode qw(encode);
my $modulversion = "2.1.5"; my $modulversion = "2.2.0";
my $flowsetversion = "2.1.6"; my $flowsetversion = "2.2.0";
@ -1311,10 +1311,10 @@ sub AMAD_decrypt($) {
<br><br> <br><br>
Example: Example:
<ul><br> <ul><br>
<code>define WandTabletWohnzimmer AMAD 192.168.0.23 TuxNetAP@@OpaZuHause</code><br> <code>define WandTabletWohnzimmer AMAD 192.168.0.23 TuxNetAP,Opa@@Zu@@Hause</code><br>
</ul> </ul>
<br> <br>
With this command two new AMAD devices in a room called AMAD are created. The parameter &lt;IP-ADDRESS&lt; defines the IP address of your Android device, parameter WLANAP-SSID defines the SSID(s) of the WLAN(s) from which the FHEM server can be reached. More than one SSID can be defined which need to be joined by two consequent "@". The second device created is the AMADCommBridge which serves as a communication device from each Android device to FHEM.<br> With this command two new AMAD devices in a room called AMAD are created. The parameter &lt;IP-ADDRESS&lt; defines the IP address of your Android device, parameter WLANAP-SSID defines the SSID(s) of the WLAN(s) from which the FHEM server can be reached. Multiple SSID can be defined. They need to be separated by a comma (,). If a SSID contains spaces replace these spaces by a double at-sign (@@). For Android devices connected by LAN use "usb-ethernet" as SSID. The second device created is the AMADCommBridge which serves as a communication device from each Android device to FHEM.<br>
!!!Coming Soon!!! The communication port of each AMAD device may be set by the definition of the "port" attribute. <b>One needs background knowledge of Automagic and HTTP requests as this port will be set in the HTTP request trigger of both flows, therefore the port also needs to be set there. !!!Coming Soon!!! The communication port of each AMAD device may be set by the definition of the "port" attribute. <b>One needs background knowledge of Automagic and HTTP requests as this port will be set in the HTTP request trigger of both flows, therefore the port also needs to be set there.
<br> <br>
The communication port of the AMADCommBridge device can easily be changed within the attribut "port".</b> The communication port of the AMADCommBridge device can easily be changed within the attribut "port".</b>
@ -1386,7 +1386,7 @@ sub AMAD_decrypt($) {
<li>googleMusic - play/stop/next/back , controlling the google play music media player</li> <li>googleMusic - play/stop/next/back , controlling the google play music media player</li>
<li>installFlowSource - install a Automagic flow on device, <u>XML file must be stored in /tmp/ with extension xml</u>. <b>Example:</b> <i>set TabletWohnzimmer installFlowSource WlanUebwerwachen.xml</i></li> <li>installFlowSource - install a Automagic flow on device, <u>XML file must be stored in /tmp/ with extension xml</u>. <b>Example:</b> <i>set TabletWohnzimmer installFlowSource WlanUebwerwachen.xml</i></li>
<li>nextAlarmTime - sets the alarm time. Only valid for the next 24 hours.</li> <li>nextAlarmTime - sets the alarm time. Only valid for the next 24 hours.</li>
<li>notifySndFile - start playing the defined media file on the Android device <b>The media file must be stored in /storage/emulated/0/Notifications/</b></li> <li>notifySndFile - plays a media-file <b>which by default needs to be stored in the folder "/storage/emulated/0/Notifications/" of the Android device. You may use the attribute setNotifySndFilePath for defining a different folder.</b></li>
<li>screenBrightness - 0-255, set screen brighness</li> <li>screenBrightness - 0-255, set screen brighness</li>
<li>screenMsg - display message on screen of Android device</li> <li>screenMsg - display message on screen of Android device</li>
<li>sendintent - send intent string <u>Example:</u><i> set $AMADDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio</i>, first parameter contains the action, second parameter contains the extra. At most two extras can be used.</li> <li>sendintent - send intent string <u>Example:</u><i> set $AMADDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio</i>, first parameter contains the action, second parameter contains the extra. At most two extras can be used.</li>
@ -1463,7 +1463,7 @@ sub AMAD_decrypt($) {
<br><br> <br><br>
Beispiel: Beispiel:
<ul><br> <ul><br>
<code>define WandTabletWohnzimmer AMAD 192.168.0.23 TuxNetAP@@OpaZuHause</code><br> <code>define WandTabletWohnzimmer AMAD 192.168.0.23 TuxNetAP,Opa@@Zu@@Hause</code><br>
</ul> </ul>
<br> <br>
Diese Anweisung erstellt zwei neues AMAD-Device im Raum AMAD.Der Parameter &lt;IP-ADRESSE&gt; legt die IP Adresse des Android Ger&auml;tes fest und der Parameter WLANAP-SSID die SSID Deines WLAN's. Es k&ouml;nnen mehrere SSID's mit angegeben werden, welche dann durch Komma getrennt sein m&uuml;ssen. Haben die SSID's Leerzeichen im Namen werde die Leerzeichen durch 2 @ aufgef&uuml;llt. Gibt es Androidger&auml;te welche nicht &uuml;ber WLAN sondern USB-Ethernet angeschlossen sind, ist die WLANAP-SSID mit "usb-ethernet" zu benennen<br> Diese Anweisung erstellt zwei neues AMAD-Device im Raum AMAD.Der Parameter &lt;IP-ADRESSE&gt; legt die IP Adresse des Android Ger&auml;tes fest und der Parameter WLANAP-SSID die SSID Deines WLAN's. Es k&ouml;nnen mehrere SSID's mit angegeben werden, welche dann durch Komma getrennt sein m&uuml;ssen. Haben die SSID's Leerzeichen im Namen werde die Leerzeichen durch 2 @ aufgef&uuml;llt. Gibt es Androidger&auml;te welche nicht &uuml;ber WLAN sondern USB-Ethernet angeschlossen sind, ist die WLANAP-SSID mit "usb-ethernet" zu benennen<br>
@ -1540,7 +1540,6 @@ sub AMAD_decrypt($) {
<li>googleMusic - play, stop, next, back ,steuert den Google Play Musik Mediaplayer</li> <li>googleMusic - play, stop, next, back ,steuert den Google Play Musik Mediaplayer</li>
<li>installFlowSource - installiert einen Flow auf dem Device, <u>das XML File muss unter /tmp/ liegen und die Endung xml haben</u>. <b>Bsp:</b> <i>set TabletWohnzimmer installFlowSource WlanUebwerwachen.xml</i></li> <li>installFlowSource - installiert einen Flow auf dem Device, <u>das XML File muss unter /tmp/ liegen und die Endung xml haben</u>. <b>Bsp:</b> <i>set TabletWohnzimmer installFlowSource WlanUebwerwachen.xml</i></li>
<li>nextAlarmTime - setzt die Alarmzeit. gilt aber nur innerhalb der n&auml;chsten 24Std.</li> <li>nextAlarmTime - setzt die Alarmzeit. gilt aber nur innerhalb der n&auml;chsten 24Std.</li>
<li>notifySndFile - spielt die angegebene Mediadatei auf dem Androidger&auml;t ab. <b>Die aufzurufende Mediadatei mu&szlig; sich im Ordner /storage/emulated/0/Notifications/ befinden.</b></li>
<li>screenBrightness - setzt die Bildschirmhelligkeit, von 0-255.</li> <li>screenBrightness - setzt die Bildschirmhelligkeit, von 0-255.</li>
<li>screenMsg - versendet eine Bildschirmnachricht</li> <li>screenMsg - versendet eine Bildschirmnachricht</li>
<li>sendintent - sendet einen Intentstring <u>Bsp:</u><i> set $AMADDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio</i>, der erste Befehl ist die Aktion und der zweite das Extra. Es k&ouml;nnen immer zwei Extras mitgegeben werden.</li> <li>sendintent - sendet einen Intentstring <u>Bsp:</u><i> set $AMADDEVICE sendIntent org.smblott.intentradio.PLAY url http://stream.klassikradio.de/live/mp3-192/stream.klassikradio.de/play.m3u name Klassikradio</i>, der erste Befehl ist die Aktion und der zweite das Extra. Es k&ouml;nnen immer zwei Extras mitgegeben werden.</li>
@ -1556,6 +1555,7 @@ sub AMAD_decrypt($) {
<b>Set abh&auml;ngig von gesetzten Attributen</b> <b>Set abh&auml;ngig von gesetzten Attributen</b>
<ul> <ul>
<li>changetoBtDevice - wechselt zu einem anderen Bluetooth Ger&auml;t. <b>Attribut setBluetoothDevice mu&szlig; gesetzt sein. Siehe Hinweis unten!</b></li> <li>changetoBtDevice - wechselt zu einem anderen Bluetooth Ger&auml;t. <b>Attribut setBluetoothDevice mu&szlig; gesetzt sein. Siehe Hinweis unten!</b></li>
<li>notifySndFile - spielt die angegebene Mediadatei auf dem Androidger&auml;t ab. <b>Die aufzurufende Mediadatei sollte sich im Ordner /storage/emulated/0/Notifications/ befinden. Ist dies nicht der Fall kann man &uuml;ber das Attribut setNotifySndFilePath einen Pfad vorgeben.</b></li>
<li>openApp - &ouml;ffnet eine ausgew&auml;hlte App. <b>Attribut setOpenApp</b></li> <li>openApp - &ouml;ffnet eine ausgew&auml;hlte App. <b>Attribut setOpenApp</b></li>
<li>openURL - &ouml;ffnet eine URL im Standardbrowser, sofern kein anderer Browser &uuml;ber das <b>Attribut setOpenUrlBrowser</b> ausgew&auml;hlt wurde.<b> Bsp:</b><i> attr Tablet setOpenUrlBrowser de.ozerov.fully|de.ozerov.fully.MainActivity, das erste ist der Package Name und das zweite der Class Name</i></li> <li>openURL - &ouml;ffnet eine URL im Standardbrowser, sofern kein anderer Browser &uuml;ber das <b>Attribut setOpenUrlBrowser</b> ausgew&auml;hlt wurde.<b> Bsp:</b><i> attr Tablet setOpenUrlBrowser de.ozerov.fully|de.ozerov.fully.MainActivity, das erste ist der Package Name und das zweite der Class Name</i></li>
<li>screen - on/off/lock/unlock schaltet den Bildschirm ein/aus oder sperrt/entsperrt ihn, in den Automagic Einstellungen muss "Admin Funktion" gesetzt werden sonst funktioniert "Screen off" nicht. <b>Attribut setScreenOnForTimer</b> &auml;ndert die Zeit wie lange das Display an bleiben soll!</li> <li>screen - on/off/lock/unlock schaltet den Bildschirm ein/aus oder sperrt/entsperrt ihn, in den Automagic Einstellungen muss "Admin Funktion" gesetzt werden sonst funktioniert "Screen off" nicht. <b>Attribut setScreenOnForTimer</b> &auml;ndert die Zeit wie lange das Display an bleiben soll!</li>

70
74_AMADautomagicFlowset_2.1.6.xml → 74_AMADautomagicFlowset_2.2.0.xml
View File

@ -2233,8 +2233,8 @@ FHEMCMD: setreading</customHTTPHeaders>
</action> </action>
<action type="script"> <action type="script">
<useDefaultName>true</useDefaultName> <useDefaultName>true</useDefaultName>
<name>Script: amad_flowset_version = "2.1.6"</name> <name>Script: amad_flowset_version = "2.2.0"</name>
<script>amad_flowset_version = "2.1.6"</script> <script>amad_flowset_version = "2.2.0"</script>
</action> </action>
<action type="script"> <action type="script">
<useDefaultName>true</useDefaultName> <useDefaultName>true</useDefaultName>
@ -2672,7 +2672,7 @@ FHEMCMD: setreading</customHTTPHeaders>
</action> </action>
<flow type="flow"> <flow type="flow">
<name>Informations</name> <name>Informations</name>
<group>AMAD2 Info/Control Flowset v2.1.6</group> <group>AMAD2 Info/Control Flowset v2.2.0</group>
<enabled>true</enabled> <enabled>true</enabled>
<executionPolicy>PARALLEL</executionPolicy> <executionPolicy>PARALLEL</executionPolicy>
<emergencyStopCount>900</emergencyStopCount> <emergencyStopCount>900</emergencyStopCount>
@ -2796,11 +2796,11 @@ FHEMCMD: setreading</customHTTPHeaders>
<actioncontainer id="t118" x="840.0" y="-3832.5">Stromversorgung und Akkustand</actioncontainer> <actioncontainer id="t118" x="840.0" y="-3832.5">Stromversorgung und Akkustand</actioncontainer>
<actioncontainer id="t119" x="805.0" y="1417.5">Prüfe und setze globale Variablen</actioncontainer> <actioncontainer id="t119" x="805.0" y="1417.5">Prüfe und setze globale Variablen</actioncontainer>
<conditioncontainer id="t120" x="1015.0" y="-1767.5">WLAN Verbunden: {global_apssid}</conditioncontainer> <conditioncontainer id="t120" x="1015.0" y="-1767.5">WLAN Verbunden: {global_apssid}</conditioncontainer>
<actioncontainer id="t121" x="1015.0" y="-1382.5">Script: amad_flowset_version = "2.1.6"</actioncontainer> <conditioncontainer id="t121" x="-770.0" y="-2782.5">Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" or trigger == "com.amazon.mp3.metachanged"</conditioncontainer>
<conditioncontainer id="t122" x="-770.0" y="-2782.5">Expression: trigger == "com.android.music.playstatechanged" or trigger == "com.android.music.metachanged" or trigger == "com.amazon.mp3.metachanged"</conditioncontainer> <actioncontainer id="t122" x="-770.0" y="-3517.5">Script: global_artist = "no player active"; global_track = "no player active"; global_album = "no player active"; global_musicapp = "no player active";</actioncontainer>
<actioncontainer id="t123" x="-770.0" y="-3517.5">Script: global_artist = "no player active"; global_track = "no player active"; global_album = "no player active"; global_musicapp = "no player active";</actioncontainer> <actioncontainer id="t123" x="-1120.0" y="-3832.5">Airplainemode</actioncontainer>
<actioncontainer id="t124" x="-1120.0" y="-3832.5">Airplainemode</actioncontainer> <actioncontainer id="t124" x="-770.0" y="-3832.5">Reading Music Metachanged.2</actioncontainer>
<actioncontainer id="t125" x="-770.0" y="-3832.5">Reading Music Metachanged.2</actioncontainer> <actioncontainer id="t125" x="-770.0" y="-3097.5">Pause: 3s (Gerät wach halten)</actioncontainer>
<triggercontainer id="t126" x="1015.0" y="-927.5"> <triggercontainer id="t126" x="1015.0" y="-927.5">
<trigger>Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE</trigger> <trigger>Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE</trigger>
<trigger>Stromversorgung: Angeschlossen</trigger> <trigger>Stromversorgung: Angeschlossen</trigger>
@ -2826,7 +2826,6 @@ FHEMCMD: setreading</customHTTPHeaders>
<trigger>Dock Event: Docked</trigger> <trigger>Dock Event: Docked</trigger>
<trigger>Systemeinstellung verändert: System volume_music_bt_a2dp</trigger> <trigger>Systemeinstellung verändert: System volume_music_bt_a2dp</trigger>
<trigger>HTTP Request: /fhem-amad/deviceInfo/</trigger> <trigger>HTTP Request: /fhem-amad/deviceInfo/</trigger>
<trigger>Periodischer Timer: alle 30s</trigger>
<trigger>com.amazon.mp3.metachanged</trigger> <trigger>com.amazon.mp3.metachanged</trigger>
<trigger>Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT</trigger> <trigger>Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT</trigger>
<trigger>Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic</trigger> <trigger>Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic</trigger>
@ -2836,8 +2835,9 @@ FHEMCMD: setreading</customHTTPHeaders>
<trigger>Display Orientierung: Landscape</trigger> <trigger>Display Orientierung: Landscape</trigger>
<trigger>Flugmodus: Aus</trigger> <trigger>Flugmodus: Aus</trigger>
<trigger>Systemeinstellung verändert: System volume_ring_speaker</trigger> <trigger>Systemeinstellung verändert: System volume_ring_speaker</trigger>
<trigger>Periodischer Timer: alle 30s</trigger>
</triggercontainer> </triggercontainer>
<actioncontainer id="t127" x="-770.0" y="-3097.5">Pause: 3s (Gerät wach halten)</actioncontainer> <actioncontainer id="t127" x="1015.0" y="-1382.5">Script: amad_flowset_version = "2.2.0"</actioncontainer>
<connection from="t1" to="t3" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t1" to="t3" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t1" to="t4" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t1" to="t4" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t2" to="t33" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t2" to="t33" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -2858,7 +2858,7 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t13" to="t64" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t13" to="t64" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t14" to="t7" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t14" to="t7" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t15" to="t67" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t15" to="t67" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t16" to="t124" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t16" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t17" to="t75" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t17" to="t75" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t18" to="t37" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t18" to="t37" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t19" to="t61" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t19" to="t61" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -2891,8 +2891,8 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t41" to="t42" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t41" to="t42" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t42" to="t38" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t42" to="t38" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t43" to="t65" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t43" to="t65" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t44" to="t123" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t44" to="t122" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t44" to="t125" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t44" to="t124" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t45" to="t47" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t45" to="t47" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t45" to="t46" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t45" to="t46" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t46" to="t62" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t46" to="t62" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -2920,11 +2920,11 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t79" to="t120" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t120" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t87" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t87" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t32" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t32" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t121" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t127" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t76" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t76" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t74" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t74" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t103" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t103" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t122" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t121" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t88" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t88" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t13" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t13" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t79" to="t43" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t79" to="t43" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -3015,24 +3015,24 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t120" to="t30" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t30" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t50" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t50" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t86" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t86" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t122" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t121" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t110" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t110" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t48" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t48" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t51" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t51" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t121" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t127" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t59" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t59" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t76" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t76" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t58" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t58" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t114" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t114" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t121" to="t72" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t121" to="t125" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t122" to="t127" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t122" to="t124" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t123" to="t125" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t125" to="t44" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t126" to="t105" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t126" to="t105" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t127" to="t44" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t127" to="t72" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
</flow> </flow>
<flow type="flow"> <flow type="flow">
<name>MultimediaControl</name> <name>MultimediaControl</name>
<group>AMAD2 Info/Control Flowset v2.1.6</group> <group>AMAD2 Info/Control Flowset v2.2.0</group>
<enabled>true</enabled> <enabled>true</enabled>
<executionPolicy>PARALLEL</executionPolicy> <executionPolicy>PARALLEL</executionPolicy>
<triggercontainer id="t1" x="0.0" y="-1032.5"> <triggercontainer id="t1" x="0.0" y="-1032.5">
@ -3113,7 +3113,7 @@ FHEMCMD: setreading</customHTTPHeaders>
</flow> </flow>
<flow type="flow"> <flow type="flow">
<name>SetCommands</name> <name>SetCommands</name>
<group>AMAD2 Info/Control Flowset v2.1.6</group> <group>AMAD2 Info/Control Flowset v2.2.0</group>
<enabled>true</enabled> <enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy> <executionPolicy>QUEUE</executionPolicy>
<emergencyStopCount>900</emergencyStopCount> <emergencyStopCount>900</emergencyStopCount>
@ -3243,11 +3243,11 @@ FHEMCMD: setreading</customHTTPHeaders>
<conditioncontainer id="t118" x="3395.0" y="-122.5">Expression: setTimer"</conditioncontainer> <conditioncontainer id="t118" x="3395.0" y="-122.5">Expression: setTimer"</conditioncontainer>
<conditioncontainer id="t119" x="-805.0" y="-2047.5">Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*"</conditioncontainer> <conditioncontainer id="t119" x="-805.0" y="-2047.5">Expression: trigger == "HTTP Request: /fhem-amad/setCommands/*"</conditioncontainer>
<conditioncontainer id="t120" x="3605.0" y="-122.5">Expression: openCall"</conditioncontainer> <conditioncontainer id="t120" x="3605.0" y="-122.5">Expression: openCall"</conditioncontainer>
<actioncontainer id="t121" x="3185.0" y="892.5">Broadcast senden: {param_action} </actioncontainer> <actioncontainer id="t121" x="3605.0" y="367.5">Nummer anrufen: {param_callnumber}</actioncontainer>
<actioncontainer id="t122" x="3605.0" y="367.5">Nummer anrufen: {param_callnumber}</actioncontainer> <conditioncontainer id="t122" x="3605.0" y="577.5">Expression: param_option</conditioncontainer>
<conditioncontainer id="t123" x="3605.0" y="577.5">Expression: param_option</conditioncontainer> <actioncontainer id="t123" x="3605.0" y="752.5">Pause: {param_hanguptime}s (Gerät wach halten)</actioncontainer>
<actioncontainer id="t124" x="3605.0" y="752.5">Pause: {param_hanguptime}s (Gerät wach halten)</actioncontainer> <actioncontainer id="t124" x="3605.0" y="892.5">Anruf beenden</actioncontainer>
<actioncontainer id="t125" x="3605.0" y="892.5">Anruf beenden</actioncontainer> <actioncontainer id="t125" x="3185.0" y="892.5">Broadcast senden: {param_action} </actioncontainer>
<connection from="t1" to="t88" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t1" to="t88" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t2" to="t80" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t2" to="t80" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t3" to="t61" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t3" to="t61" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -3306,7 +3306,7 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t59" to="t50" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t59" to="t50" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t59" to="t49" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t59" to="t49" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t62" to="t69" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t62" to="t69" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t63" to="t121" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t63" to="t125" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t64" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t64" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t65" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t65" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t66" to="t68" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t66" to="t68" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
@ -3379,14 +3379,14 @@ FHEMCMD: setreading</customHTTPHeaders>
<connection from="t119" to="t118" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t119" to="t118" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t119" to="t89" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t119" to="t89" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t119" to="t120" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t119" to="t120" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t120" to="t122" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t120" to="t121" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t122" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t121" to="t122" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t123" to="t124" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t122" to="t123" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
<connection from="t124" to="t125" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" /> <connection from="t123" to="t124" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
</flow> </flow>
<flow type="flow"> <flow type="flow">
<name>Update AMAD Flowset</name> <name>Update AMAD Flowset</name>
<group>AMAD2 Info/Control Flowset v2.1.6</group> <group>AMAD2 Info/Control Flowset v2.2.0</group>
<enabled>true</enabled> <enabled>true</enabled>
<executionPolicy>PARALLEL</executionPolicy> <executionPolicy>PARALLEL</executionPolicy>
<triggercontainer id="t1" x="420.0" y="-682.5"> <triggercontainer id="t1" x="420.0" y="-682.5">
@ -3434,7 +3434,7 @@ FHEMCMD: setreading</customHTTPHeaders>
</flow> </flow>
<flow type="flow"> <flow type="flow">
<name>VoiceControl</name> <name>VoiceControl</name>
<group>AMAD2 Info/Control Flowset v2.1.6</group> <group>AMAD2 Info/Control Flowset v2.2.0</group>
<enabled>true</enabled> <enabled>true</enabled>
<executionPolicy>QUEUE</executionPolicy> <executionPolicy>QUEUE</executionPolicy>
<emergencyStopCount>60</emergencyStopCount> <emergencyStopCount>60</emergencyStopCount>