From 33ffccbf89886c1971183c7febfe34fe817abda2 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Wed, 7 Jun 2017 21:15:59 +0200 Subject: [PATCH] =?UTF-8?q?erste=20Implementierung=20von=20toGo=20Funktion?= =?UTF-8?q?,=20zus=C3=A4tzlicher=20Bluetooth=20Trigger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 73_AMADCommBridge.pm | 4 +- 74_AMADDevice.pm | 6 +- ....xml => 74_AMADautomagicFlowset_3.9.68.xml | 187 +++++++++++++----- 3 files changed, 146 insertions(+), 51 deletions(-) rename 74_AMADautomagicFlowset_3.9.66.xml => 74_AMADautomagicFlowset_3.9.68.xml (95%) diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index 33cb232..3892f6e 100644 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -68,8 +68,8 @@ use TcpServerUtils; eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "3.9.65"; -my $flowsetversion = "3.9.66"; +my $modulversion = "3.9.68"; +my $flowsetversion = "3.9.68"; diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index 8d45cd0..e23f764 100644 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -54,8 +54,8 @@ use Encode qw(encode); eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "3.9.67"; -my $flowsetversion = "3.9.66"; +my $modulversion = "3.9.68"; +my $flowsetversion = "3.9.68"; @@ -804,7 +804,7 @@ sub AMADDevice_checkDeviceState($) { if( ReadingsAge( $name, ".deviceState", 240 ) > 240 ) { AMADDevice_statusRequest( $hash ) if( $hash->{helper}{deviceStateErrorCounter} == 0 ); - readingsSingleUpdate( $hash, "deviceState", "offline", 1 ) if( ReadingsAge( $name, ".deviceState", 300) > 300 and $hash->{helper}{deviceStateErrorCounter} > 0 ); + readingsSingleUpdate( $hash, "deviceState", "offline", 1 ) if( ReadingsAge( $name, ".deviceState", 300) > 300 and $hash->{helper}{deviceStateErrorCounter} > 0 and ReadingsVal($name,'deviceState','online') ne 'offline' ); $hash->{helper}{deviceStateErrorCounter} = ( $hash->{helper}{deviceStateErrorCounter} + 1 ); } diff --git a/74_AMADautomagicFlowset_3.9.66.xml b/74_AMADautomagicFlowset_3.9.68.xml similarity index 95% rename from 74_AMADautomagicFlowset_3.9.66.xml rename to 74_AMADautomagicFlowset_3.9.68.xml index 4eda8fb..0a8f4c6 100644 --- a/74_AMADautomagicFlowset_3.9.66.xml +++ b/74_AMADautomagicFlowset_3.9.68.xml @@ -1,24 +1,26 @@ - + true Akku Ladestand: grösser als 0% true 0 HIGHER_THAN - false + true true false App Task Beendet true + CLASSIC * true App Task Beendet: ch.gridvision.ppam.androidautomagic false + CLASSIC ch.gridvision.ppam.androidautomagic @@ -65,6 +67,14 @@ false false + + true + Bluetooth Gerät getrennt: Alle Geräte + true + true + + + true Bluetooth Gerät verbunden: Alle Geräte @@ -396,15 +406,31 @@ irname=getString("name") true IMPORTANT_INTERRUPTIONS + + false + WLAN Getrennt: toGo + true + false + {global_apssid} + + + false + WLAN Verbunden: toGo + true + false + {global_apssid} + false App Task läuft: App (neuster) + CLASSIC {param_app} true true App Task läuft: {global_activetask} (neuster) + CLASSIC {global_activetask} true @@ -896,9 +922,10 @@ irname=getString("name") true - Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" + or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" @@ -1031,6 +1058,16 @@ or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/" + + true + Expression: trigger == "WLAN Getrennt: toGo" + trigger == "WLAN Getrennt: toGo" + + + true + Expression: trigger == "WLAN Getrennt: toGo" or trigger == "WLAN Verbunden: toGo" + trigger == "WLAN Getrennt: toGo" or trigger == "WLAN Verbunden: toGo" + false Expression: ttsMsg" @@ -1715,6 +1752,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false false + false + POST GENERAL_TEXT text/plain @@ -1735,6 +1774,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false false + false + POST GENERAL_TEXT text/plain @@ -1755,6 +1796,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false false + false + POST GENERAL_TEXT text/plain @@ -1775,6 +1818,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false false + false + POST GENERAL_TEXT text/plain @@ -1795,6 +1840,8 @@ androidVersion = "4.0 - 4.0.2 Ice Cream Sandwich" false false + false + POST GENERAL_TEXT text/plain @@ -1810,6 +1857,20 @@ Connection: close /storage/emulated/0/Download/file.bin true + + true + In Datei Schreiben: getDate() - Aktiviere Flows in /storage/emulated/0/file.txt (anhängen) + /storage/emulated/0/file.txt + getDate() - Aktiviere Flows + true + + + true + In Datei Schreiben: getDate() - Deaktiviere Flows in /storage/emulated/0/file.txt (anhängen) + /storage/emulated/0/file.txt + getDate() - Deaktiviere Flows + true + false Initialisiere Variable Nächster Alarm: next_alarm @@ -2030,6 +2091,7 @@ Connection: close true Nummer anrufen: {param_callnumber} + {param_callnumber} true @@ -2653,7 +2715,7 @@ fhemcmd = "setreading"; false Script: Set FHEMDATA JSON -