From 23e34fecb5a1b2ad8efdf76f36801fe7f9c28fa7 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Mon, 11 Feb 2019 11:54:01 +0000 Subject: [PATCH] 74_AMADautomagicFlowset: support for Android 9.0 Pie git-svn-id: https://svn.fhem.de/fhem/trunk@18561 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AMADCommBridge.pm | 4 +- fhem/FHEM/74_AMADDevice.pm | 8 +- ....xml => 74_AMADautomagicFlowset_4.2.5.xml} | 587 +++++++++--------- ...prj.xml => 74_AMADtaskerset_4.2.5.prj.xml} | 10 +- 5 files changed, 313 insertions(+), 297 deletions(-) rename fhem/FHEM/lib/{74_AMADautomagicFlowset_4.2.4.xml => 74_AMADautomagicFlowset_4.2.5.xml} (93%) rename fhem/FHEM/lib/{74_AMADtaskerset_4.2.4.prj.xml => 74_AMADtaskerset_4.2.5.prj.xml} (99%) diff --git a/fhem/CHANGED b/fhem/CHANGED index 5ab49343a..feb2187a2 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - feature: 74_AMADautomagicflowset: add support for Android 9 Pie - feature: 88_HMCCU: New commands and bug fixes - changed: 93_DbLog: CommandRef revised - feature: 98_HTTPMOD: starting with featurelevel >5.9 enableCookies, diff --git a/fhem/FHEM/73_AMADCommBridge.pm b/fhem/FHEM/73_AMADCommBridge.pm index cc26833bd..d47564621 100644 --- a/fhem/FHEM/73_AMADCommBridge.pm +++ b/fhem/FHEM/73_AMADCommBridge.pm @@ -2,7 +2,7 @@ # # Developed with Kate # -# (c) 2015-2018 Copyright: Marko Oldenburg (leongaultier at gmail dot com) +# (c) 2015-2019 Copyright: Marko Oldenburg (leongaultier at gmail dot com) # All rights reserved # # Special thanks goes to comitters: @@ -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/fhem/FHEM/74_AMADDevice.pm b/fhem/FHEM/74_AMADDevice.pm index 36c54b7b3..baf56a75f 100644 --- a/fhem/FHEM/74_AMADDevice.pm +++ b/fhem/FHEM/74_AMADDevice.pm @@ -2,7 +2,7 @@ # # Developed with Kate # -# (c) 2015-2018 Copyright: Marko Oldenburg (leongaultier at gmail dot com) +# (c) 2015-2019 Copyright: Marko Oldenburg (leongaultier at gmail dot com) # All rights reserved # # Special thanks goes to comitters: @@ -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/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.4.xml b/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.5.xml similarity index 93% rename from fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.4.xml rename to fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.5.xml index c144eaa12..b369469c4 100644 --- a/fhem/FHEM/lib/74_AMADautomagicFlowset_4.2.4.xml +++ b/fhem/FHEM/lib/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 -