From 47115e07598684d4599da76da2053de2f107b81b Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Fri, 8 Feb 2019 09:37:41 +0100 Subject: [PATCH] Flowsetversion 4.2.5 add Androidversion 9.0 Pie, AMADDevice bugfix then no Port given --- 73_AMADCommBridge.pm | 2 +- 74_AMADDevice.pm | 6 +- ...4.xml => 74_AMADautomagicFlowset_4.2.5.xml | 587 +++++++++--------- 3 files changed, 305 insertions(+), 290 deletions(-) rename 74_AMADautomagicFlowset_4.2.4.xml => 74_AMADautomagicFlowset_4.2.5.xml (93%) diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index cc26833..9b858b0 100755 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -77,7 +77,7 @@ eval "use JSON;1" or $missingModul .= "JSON "; my $modulversion = "4.2.3"; -my $flowsetversion = "4.2.4"; +my $flowsetversion = "4.2.5"; diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index 36c54b7..a433d15 100755 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -60,8 +60,8 @@ eval "use JSON;1" or $missingModul .= "JSON "; -my $modulversion = "4.2.6"; -my $flowsetversion = "4.2.4"; +my $modulversion = "4.2.7"; +my $flowsetversion = "4.2.5"; @@ -163,6 +163,8 @@ sub AMADDevice_Define($$) { $hash->{PORT} = 1817 if($remoteServer eq 'Autoremote'); $hash->{PORT} = 8765 if($remoteServer eq 'TNES'); $hash->{PORT} = 1111 if($remoteServer eq 'other'); # Dummy Port for other + return 'typo in field. please use Automagic, Autoremote, TNES or other' + unless ( defined($hash->{PORT}) and $hash->{PORT} ); $hash->{helper}{infoErrorCounter} = 0; $hash->{helper}{setCmdErrorCounter} = 0; diff --git a/74_AMADautomagicFlowset_4.2.4.xml b/74_AMADautomagicFlowset_4.2.5.xml similarity index 93% rename from 74_AMADautomagicFlowset_4.2.4.xml rename to 74_AMADautomagicFlowset_4.2.5.xml index c144eaa..b369469 100644 --- a/74_AMADautomagicFlowset_4.2.4.xml +++ b/74_AMADautomagicFlowset_4.2.5.xml @@ -1,5 +1,5 @@ - + true Akku Ladestand: grösser als 0% @@ -265,6 +265,7 @@ irname=getString("name") true /fhem-amad/deviceInfo/ 8090 + false true false @@ -274,6 +275,7 @@ irname=getString("name") true /fhem-amad/setCommands/* 8090 + false true false @@ -2153,7 +2155,12 @@ putString("{param_exkey2}", "{param_exval2}"); false Get Android Version - false Script: Set FHEMDATA JSON -