From 0365f365ced5bdc6fddcdc226c45f1710613963c Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 7 Apr 2016 22:13:54 +0200 Subject: [PATCH] verbesserte Abfrage ob fhemServerIP vorhanden ist, wenn nicht wird gestoppt --- 74_AMAD.pm | 2 +- 74_AMADautomagicFlowset_2.0.0.xml | 156 +++++++++++++++++------------- 2 files changed, 92 insertions(+), 66 deletions(-) diff --git a/74_AMAD.pm b/74_AMAD.pm index 8739885..a0e5510 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -280,7 +280,7 @@ sub AMAD_statusRequest($) { timeout => 30, hash => $hash, method => "GET", - header => "fhemIP: $fhemip\r\nfhemDevice: $name\r\nactiveTask: $activetask\r\napSSID: $apssid\r\nbport: $bport", + header => "fhemip: $fhemip\r\nfhemdevice: $name\r\nactivetask: $activetask\r\napssid: $apssid\r\nbport: $bport", doTrigger => 1, callback => \&AMAD_statusRequestErrorHandling, } diff --git a/74_AMADautomagicFlowset_2.0.0.xml b/74_AMADautomagicFlowset_2.0.0.xml index ad2ae25..3922007 100644 --- a/74_AMADautomagicFlowset_2.0.0.xml +++ b/74_AMADautomagicFlowset_2.0.0.xml @@ -462,6 +462,20 @@ irname=getString("name") Expression: global_activetask != "none" global_activetask != "none" + + true + Expression: global_bridgeport == null or global_fhemip == null or global_fhemdevice == null or global_activetask == null or global_apssid == null + global_bridgeport == null +or global_fhemip == null +or global_fhemdevice == null +or global_activetask == null +or global_apssid == null + + + true + Expression: global_fhemip != null + global_fhemip != null + false Expression: installFlow" @@ -1730,6 +1744,26 @@ FHEMCMD: setreading + + false + Prüfe und setze globale Variablen + + false Reading Music Metachanged.2 @@ -2143,15 +2177,6 @@ FHEMCMD: voiceinputvalue {imported_flow_names,listformat,comma} - - false - Setze Globale Variablen - - true Setze Lock PIN/Passwort: PIN/Passwort zurücksetzen @@ -2385,19 +2410,18 @@ FHEMCMD: setreading Flow Status SetCommands Android Version Script: androidVersion = "not supported funktion" - Setze Globale Variablen - Get Android Version - Script: notification_text = "not supported from your device" - Expression: getAndroidSDKVersion() >= "19" - Prüfe und setze Bridgeport Variable - Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" - Airplainemode - Script: airpcount = airpcount + 1 - Next Alarm State - 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" - 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" } - WLAN Verbunden: {global_apssid} - + Get Android Version + Script: notification_text = "not supported from your device" + Expression: getAndroidSDKVersion() >= "19" + Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" + Airplainemode + Script: airpcount = airpcount + 1 + 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" + 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" } + WLAN Verbunden: {global_apssid} + Next Alarm State + Script: amad_flowset_version = "2.0.0" + Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE Stromversorgung: Angeschlossen Genereller Broadcast: wenn org.smblott.intentradio.STATE @@ -2433,7 +2457,9 @@ FHEMCMD: setreading Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE Benachrichtigung in Statusbar angezeigt: com.whatsapp - Script: amad_flowset_version = "2.0.0" + Expression: global_fhemip != null + Expression: global_bridgeport == null or global_fhemip == null or global_fhemdevice == null or global_activetask == null or global_apssid == null + Prüfe und setze globale Variablen @@ -2469,10 +2495,10 @@ FHEMCMD: setreading - + - + @@ -2528,7 +2554,6 @@ FHEMCMD: setreading - @@ -2536,7 +2561,7 @@ FHEMCMD: setreading - + @@ -2546,7 +2571,7 @@ FHEMCMD: setreading - + @@ -2559,42 +2584,43 @@ FHEMCMD: setreading - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SetCommands @@ -2848,7 +2874,7 @@ FHEMCMD: setreading Flows/Widgets importieren: /storage/emulated/0/Download/currentFlowsetUpdate.xml Dateien löschen: /storage/emulated/0/Download/currentFlowsetUpdate.xml Download URL: http://{global_fhemip}:{global_bridgeport}/currentFlowsetUpdate.xml to /storage/emulated/0/Download - Prüfe und setze Bridgeport Variable + Prüfe und setze Bridgeport Variable