From 0600ac7702267f8bba8fdcf0114526b95540a782 Mon Sep 17 00:00:00 2001
From: LeonGaultier <LeonGaultier@users.noreply.github.com>
Date: Fri, 10 Feb 2017 04:42:42 +0000
Subject: [PATCH] 74_XiaomiFlowerSens: 0.6.6 change RegEx for Error Handling

git-svn-id: https://svn.fhem.de/fhem/trunk@13375 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                     |  1 +
 fhem/FHEM/74_XiaomiFlowerSens.pm | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index fccc93c57..26178865e 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 : 74_XiaomiFlowerSens: 0.6.6 change RegEx for Error Handling
   - feature: 93_DBLog: attributes colEvent, colReading, colValue now also
                        valid for SQLite DB
   - update:  98_DOIFtools: two more checks in checkDOIF
diff --git a/fhem/FHEM/74_XiaomiFlowerSens.pm b/fhem/FHEM/74_XiaomiFlowerSens.pm
index 33da8006d..edaff7c4b 100644
--- a/fhem/FHEM/74_XiaomiFlowerSens.pm
+++ b/fhem/FHEM/74_XiaomiFlowerSens.pm
@@ -35,7 +35,7 @@ use POSIX;
 use JSON;
 use Blocking;
 
-my $version = "0.6.5";
+my $version = "0.6.6";
 
 
 
@@ -380,13 +380,13 @@ sub XiaomiFlowerSens_callGatttool($@) {
         $loop++;
         Log3 $name, 4, "Sub XiaomiFlowerSens_callGatttool ($name) - call gatttool charRead loop $loop";
     
-    } while( $loop < 10 and not $readSensData[0] =~ /Characteristic value/ );
+    } while( $loop < 10 and not $readSensData[0] =~ /^Characteristic value\/descriptor$/ );
     
     Log3 $name, 4, "Sub XiaomiFlowerSens_callGatttool ($name) - processing gatttool response. sensData[0]: $readSensData[0]";
     Log3 $name, 4, "Sub XiaomiFlowerSens_callGatttool ($name) - processing gatttool response. sensData: $readSensData[1]";
     
     return ($readSensData[1],undef)
-    unless( $readSensData[0] =~ /Characteristic value/ );
+    unless( $readSensData[0] =~ /^Characteristic value\/descriptor$/ );
     
     
     ### Read Firmware and Battery Data
@@ -397,12 +397,12 @@ sub XiaomiFlowerSens_callGatttool($@) {
         $loop++;
         Log3 $name, 4, "Sub XiaomiFlowerSens ($name) - call gatttool readBatFw loop $loop";
     
-    } while( $loop < 10 and not $readBatFwData[0] =~ /Characteristic value/ );
+    } while( $loop < 10 and not $readBatFwData[0] =~ /^Characteristic value\/descriptor$/ );
     
     Log3 $name, 4, "Sub XiaomiFlowerSens_callGatttool ($name) - processing gatttool response. batFwData: $readBatFwData[1]";
     
     return ($readBatFwData[1],undef)
-    unless( $readBatFwData[0] =~ /Characteristic value/ );
+    unless( $readBatFwData[0] =~ /^Characteristic value\/descriptor$/ );