From e94ce46065a13a90b98ece398fc490cc2c84ba5b Mon Sep 17 00:00:00 2001 From: zap <> Date: Sun, 28 Oct 2018 09:49:59 +0000 Subject: [PATCH] FULLY: Fixed version check bug git-svn-id: https://svn.fhem.de/fhem/trunk@17632 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/89_FULLY.pm | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index eeecfdb53..31b0bcfff 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. + - bugfix: 89_FULLY: fixed version check bug - feature: 74_AMADtaskerset: import with share link - change: 42_AptToDate: change to package methode - bugfix: 74_XiaomiBTLESens: fix humidity code diff --git a/fhem/FHEM/89_FULLY.pm b/fhem/FHEM/89_FULLY.pm index bd66af879..8500439f7 100755 --- a/fhem/FHEM/89_FULLY.pm +++ b/fhem/FHEM/89_FULLY.pm @@ -1,6 +1,6 @@ ############################################################################## # -# 89_FULLY.pm 0.9 +# 89_FULLY.pm 0.9.001 # # $Id$ # @@ -35,7 +35,7 @@ sub FULLY_Abort ($); sub FULLY_UpdateReadings ($$); sub FULLY_Ping ($$); -my $FULLY_VERSION = "0.9"; +my $FULLY_VERSION = "0.9.001"; my $FULLY_TIMEOUT = 4; my $FULLY_POLL_INTERVAL = 3600; my $FULLY_REQUIRED_VERSION = 1.27; @@ -532,8 +532,14 @@ sub FULLY_ProcessDeviceInfo ($$) $parameters .= "|state=$rv"; } elsif ($rn eq 'fully_version') { - Log3 $name, 1, "FULLY: [$name] Version of fully browser is $rv. Version $FULLY_REQUIRED_VERSION is required." - if ($rv < $FULLY_REQUIRED_VERSION); + if ($rv =~ /^([0-9]\.[0-9]+).*/) { + my $cv = $1; + Log3 $name, 1, "FULLY: [$name] Version of fully browser is $rv. Version $FULLY_REQUIRED_VERSION is required." + if ($cv < $FULLY_REQUIRED_VERSION); + } + else { + Log3 $name, 2, "FULLY: [$name] Cannot detect version of fully browser."; + } } $parameters .= "|$rn=$rv"; }