From 9caee3a95f5ddb8daac84b439d5463fc6fae6c2f Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Wed, 25 Oct 2017 10:26:59 +0200
Subject: [PATCH 1/8] -fix: heartbeat no longer report status again

---
 FHEM/71_XiaomiSmartHome.pm        |  25 ++-
 FHEM/71_XiaomiSmartHome_Device.pm | 266 ++++++++++++++++--------------
 controls_mish.txt                 |   4 +-
 3 files changed, 165 insertions(+), 130 deletions(-)

diff --git a/FHEM/71_XiaomiSmartHome.pm b/FHEM/71_XiaomiSmartHome.pm
index 213adbe..cb6fd0d 100644
--- a/FHEM/71_XiaomiSmartHome.pm
+++ b/FHEM/71_XiaomiSmartHome.pm
@@ -40,6 +40,8 @@ eval "use Crypt::CBC";
 return "\nERROR: Please install Crypt::CBC" if($@);
 eval "use Net::Ping";
 return "\nERROR: Please install Net::Ping" if($@);
+eval "use Math::Round";
+return "\nERROR: Please install libmath-round-perl" if($@);
 
 use Color;
 use SetExtensions;
@@ -49,7 +51,7 @@ use SetExtensions;
 sub XiaomiSmartHome_Notify($$);
 sub XiaomiSmartHome_updateSingleReading($$);
 my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
-my $version = "1.08";
+my $version = "1.12";
 my %XiaomiSmartHome_gets = (
 	"getDevices"	=> ["get_id_list", '^.+get_id_list_ack' ],
 
@@ -64,6 +66,7 @@ my %sets = (
   "volume:slider,1,1,100" => 1,
   "ringtone:0,1,2,3,4,5,6,7,8,13,21,22,23,24,25,26,27,28,29,10000,10001" => 1,
   "ringvol" => 2,
+  "learn" => 0,
 );
 
 
@@ -102,7 +105,8 @@ sub XiaomiSmartHome_Initialize($) {
 						"16:XiaomiSmartHome_Device"     => "^.+natgas",
 						"17:XiaomiSmartHome_Device"     => "^.+smoke",
 						"18:XiaomiSmartHome_Device"     => "^.+weather.v1",
-						"19:XiaomiSmartHome_Device"     => "^.+sensor_motion.aq2"};
+						"19:XiaomiSmartHome_Device"     => "^.+sensor_motion.aq2",
+						"20:XiaomiSmartHome_Device"     => "^.+sensor_wleak.aq1"};					
 	FHEM_colorpickerInit();
 }
 #####################################
@@ -344,7 +348,7 @@ sub XiaomiSmartHome_Define($$) {
 		eval {
 			$GATEWAY_IP = inet_ntoa(inet_aton($hash->{GATEWAY})) ;
 			$hash->{GATEWAY_IP} = $GATEWAY_IP;
-			Log3 $name, 1, "$name: Define> Set GATEWAYs IP: " .  $GATEWAY_IP;
+			Log3 $name, 5, "$name: Define> Set GATEWAYs IP: " .  $GATEWAY_IP;
 			};
 		if ($@) {
 			Log3 $name, 1, "$name: Define> Error $@\n";
@@ -475,6 +479,11 @@ sub XiaomiSmartHome_Write($@)
 				{
 				$msg  = '{"cmd":"write","model":"curtain","sid":"' . $iohash->{SID} . '","data":"{\"curtain_level\":\"' . $val . '\",\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }';
 				}
+			if ($cmd eq 'learn')
+				{
+				my $t = '"yes"';
+				$msg  = '{"cmd":"write","model":"gateway","sid":"' . $hash->{SID} . '","data":"{\"join_permission\":' . $t . ',\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }';
+				}
 			}
 		}
 	return Log3 $name, 4, "$name: Write> - socket not connected" unless($hash->{CD});
@@ -620,6 +629,10 @@ sub XiaomiSmartHome_Set($@)
 			}
 		readingsEndUpdate( $hash, 1 );
 	}
+	elsif($cmd eq "learn")
+	{
+		XiaomiSmartHome_Write($hash,'learn', 1);
+	}
 	elsif($cmd eq "pct")
 	{
 		my $ownName = $hash->{NAME};
@@ -710,7 +723,7 @@ sub XiaomiSmartHome_connect($)
 	$sock->setsockopt(SOL_SOCKET, SO_RCVTIMEO, pack('l!l!', 30, 0))   or die "setsockopt: $!";
 	if ($sock)
 	{
-		Log3 $name, 3, "$name: connect> Connected";
+		Log3 $name, 4, "$name: connect> Connected";
 		$sock->mcast_add('224.0.0.50', $hash->{fhemIP} ) || die "Couldn't set group: $!\n"; #$hash->{fhemIP}
 		$sock->mcast_ttl(32);
 		$sock->mcast_loopback(1);
@@ -748,7 +761,7 @@ sub XiaomiSmartHome_disconnect($)
     }
 
     return if (!$hash->{CD});
-    Log3 $name, 3, "$name: disconnect> disconnecting";
+    Log3 $name, 1, "$name: disconnect> disconnecting";
 	
 	close($hash->{CD}) if($hash->{CD});
     delete($hash->{FD});
@@ -872,6 +885,7 @@ sub XiaomiSmartHome_updateAllReadings($)
 		<li>ctrl_neutral2: Double bond ignition switch</li>
 		<li>rgbw_light: Smart lights (report only)</li>
 		<li>curtain: Curtain (Control only if device has reporte curtain_level)</li>
+		<li>water: water detector</li>
 		<li>smoke: smoke alarm detector</li>
 		<ul>
 			<li>0: disarm</li>
@@ -970,6 +984,7 @@ sub XiaomiSmartHome_updateAllReadings($)
 		<li>ctrl_neutral2: Doppelter Wandschalter schaltbar</li>
 		<li>rgbw_light: RBGW Lampe (nur Anzeige)</li>
 		<li>curtain: Vorhangmotor (ohne das das device den curtain_level gemeldet hat ist ein steuern nicht möglich)</li>
+		<li>water: Wasser Sensor</li>
 		<li>smoke: Rauchmelder</li>
 		<ul>
 			<li>0: disarm</li>
diff --git a/FHEM/71_XiaomiSmartHome_Device.pm b/FHEM/71_XiaomiSmartHome_Device.pm
index 427b00a..60f73d9 100644
--- a/FHEM/71_XiaomiSmartHome_Device.pm
+++ b/FHEM/71_XiaomiSmartHome_Device.pm
@@ -24,8 +24,9 @@ package main;
 
 use strict;
 use warnings;
+use Math::Round qw/nearest/;
 
-my $version = "1.08";
+my $version = "1.13";
 sub XiaomiSmartHome_Device_updateSReading($);
 
 
@@ -35,7 +36,7 @@ sub XiaomiSmartHome_Device_Initialize($)
 {
   my ($hash) = @_;
   
-  $hash->{Match}     = ".*magnet.*|.*motion.*|sensor_ht|.*switch.*|plug|cube|86sw1|86sw2|ctrl_neutral1|ctrl_neutral2|rgbw_light|curtain|ctrl_ln1|ctrl_ln2|86plug|natgas|smoke|weather.v1";
+  $hash->{Match}     = ".*magnet.*|.*motion.*|sensor_ht|.*switch.*|plug|cube|86sw1|86sw2|ctrl_neutral1|ctrl_neutral2|rgbw_light|curtain|ctrl_ln1|ctrl_ln2|86plug|natgas|smoke|weather.v1|sensor_wleak.aq1";
   $hash->{DefFn}     = "XiaomiSmartHome_Device_Define";
   $hash->{SetFn}     = "XiaomiSmartHome_Device_Set";
   $hash->{UndefFn}   = "XiaomiSmartHome_Device_Undef";
@@ -43,6 +44,7 @@ sub XiaomiSmartHome_Device_Initialize($)
 
   $hash->{AttrList}  = "IODev follow-on-for-timer:1,0 follow-on-timer ".
                        "do_not_notify:1,0 ignore:1,0 dummy:1,0 showtime:1,0 valueFn:textField-long ".
+					   "round:1,2,3 ".
                        $readingFnAttributes ;				
 }
 #####################################
@@ -190,6 +192,8 @@ sub XiaomiSmartHome_Device_on_timeout($){
 #####################################
 sub XiaomiSmartHome_Device_Read($$$){
 	my ($hash, $msg, $name) = @_;
+	my @arround = ("0.1","0.01","0.001");
+	my $round = AttrVal( $hash->{NAME}, "round", "2" );	
 	my $decoded = eval{decode_json($msg)};
 	if ($@) {
 		Log3 $name, 1, "$name: DEV_Read> Error while request: $@";
@@ -204,128 +208,143 @@ sub XiaomiSmartHome_Device_Read($$$){
 		return;
 	}
 	readingsBeginUpdate( $hash );
-	if (defined $data->{status}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Status: " . $data->{status};
-		readingsBulkUpdate($hash, "state", "$data->{status}", 1 );
-		if ($data->{status} eq 'motion' && $hash->{MODEL} =~ /motion/){
-			readingsBulkUpdate($hash, "no_motion", "0", 1 );
-			}		
-		if ($data->{status} eq 'close' && $hash->{MODEL} =~ /magnet/){
-			readingsBulkUpdate($hash, "no_close", "0", 1 );
+	if ($data->{cmd} ne 'heartbeat'){
+		if (defined $data->{status}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Status: " . $data->{status};
+			readingsBulkUpdate($hash, "state", "$data->{status}", 1 );
+			if ($data->{status} eq 'motion' && $hash->{MODEL} =~ /motion/){
+				readingsBulkUpdate($hash, "no_motion", "0", 1 );
+				}		
+			if ($data->{status} eq 'close' && $hash->{MODEL} =~ /magnet/){
+				readingsBulkUpdate($hash, "no_close", "0", 1 );
+				}
 			}
+		if (defined $data->{no_motion}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " NO_motion: " . $data->{no_motion};
+			readingsBulkUpdate($hash, "no_motion", "$data->{no_motion}", 1 );
+			}
+		if (defined $data->{no_close}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " NO_close: " . $data->{no_close};
+			readingsBulkUpdate($hash, "no_close", "$data->{no_close}", 1 );
+			}
+		if (defined $data->{voltage}){
+			my $bat = ($data->{voltage}/1000);
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Voltage: " . $data->{voltage};
+			readingsBulkUpdate($hash, "battery", $bat, 1 );
+			if ($bat < 2.2) {
+				readingsBulkUpdate($hash, "batterystate", "low", 1 );
+				}
+				else {
+					readingsBulkUpdate($hash, "batterystate", "ok", 1 )
+				}
+			}
+		if (defined $data->{temperature}){
+			my $temp = $data->{temperature};
+			$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
+			$temp = nearest(@arround[$round-1] ,$temp );
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp . " Round: " . $round;
+			readingsBulkUpdate($hash, "temperature", "$temp", 1 );
+			}
+		if (defined $data->{humidity}){
+			my $hum = $data->{humidity};
+			$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
+			$hum = nearest(@arround[$round-1] ,$hum );
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum;
+			readingsBulkUpdate($hash, "humidity", "$hum", 1 );
+			}
+		if (defined $data->{pressure}){
+			my $pres = $data->{pressure};
+			$pres =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Pressure: " . $pres;
+			readingsBulkUpdate($hash, "pressure", "$pres", 1 );
+			}
+		if (defined $data->{lux}){
+			my $lux = $data->{lux};
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Illuminance: " . $lux;
+			readingsBulkUpdate($hash, "lux", "$lux", 1 );
+			}
+		#86sw1 + 86sw2 + ctrl_neutral1 + ctrl_neutral2 start
+		if (defined $data->{channel_0}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Channel_0: " . $data->{channel_0};
+			readingsBulkUpdate($hash, "channel_0", "$data->{channel_0}", 1 );
+			}
+		if (defined $data->{channel_1}){
+			Log3 $name, 3, "$name: DEV_Read>" . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Channel_1: " . $data->{channel_1};
+			readingsBulkUpdate($hash, "channel_1", "$data->{channel_1}", 1 );
+			}
+		#86sw1 + 86sw2 + ctrl_neutral1 + ctrl_neutral2 end
+		#plug & 86plug start
+		if (defined $data->{load_voltage}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " LOAD_Voltage: " . $data->{load_voltage};
+			readingsBulkUpdate($hash, "LOAD_Voltage", "$data->{load_voltage}", 1 );
+			}
+		if (defined $data->{load_power}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " LOAD_Power: " . $data->{load_power};
+			readingsBulkUpdate($hash, "LOAD_Power", "$data->{load_power}", 1 );
+			}
+		if (defined $data->{power_consumed}){
+			Log3 $name, 4, "$name:" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " POWER_Consumed: " . $data->{power_consumed};
+			readingsBulkUpdate($hash, "POWER_Consumed", "$data->{power_consumed}", 1 );
+			}
+		if (defined $data->{inuse}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " InUse: " . $data->{inuse};
+			readingsBulkUpdate($hash, "inuse", "$data->{inuse}", 1 );
+			}
+		#plug & 86plug end
+		#rgbw_light start
+		if (defined $data->{level}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Level: " . $data->{level};
+			readingsBulkUpdate($hash, "level", "$data->{level}", 1 );
+			}
+		if (defined $data->{hue}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Hue: " . $data->{hue};
+			readingsBulkUpdate($hash, "hue", "$data->{hue}", 1 );
+			}
+		if (defined $data->{saturation}){
+			Log3 $name, 4, "$name:" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Saturation: " . $data->{saturation};
+			readingsBulkUpdate($hash, "saturation", "$data->{saturation}", 1 );
+			}
+		if (defined $data->{color_temperature}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Color_temperature: " . $data->{color_temperature};
+			readingsBulkUpdate($hash, "color_temperature", "$data->{color_temperature}", 1 );
+			}
+		if (defined $data->{x}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " X: " . $data->{x};
+			readingsBulkUpdate($hash, "x", "$data->{x}", 1 );
+			}
+		if (defined $data->{y}){
+			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Y: " . $data->{y};
+			readingsBulkUpdate($hash, "y", "$data->{y}", 1 );
+			}
+		#rgbw_light end
+		#cube start
+		if (defined $data->{rotate}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Rotate: " . $data->{rotate};
+			readingsBulkUpdate($hash, "rotate", "$data->{rotate}", 1 );
+			readingsBulkUpdate($hash, "state", "rotate", 1 );
+			}
+		#cube end	
+		#smoke & natgast start
+		if (defined $data->{alarm}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Alarm: " . $data->{alarm};
+			readingsBulkUpdate($hash, "alarm", "$data->{alarm}", 1 );
+			}
+		if (defined $data->{density}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Density: " . $data->{density};
+			readingsBulkUpdate($hash, "density", "$data->{density}", 1 );
+			}
+		#smoke & natgast end
+		#curtain start
+		if (defined $data->{curtain_level}){
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Curtain: " . $data->{curtain_level};
+			readingsBulkUpdate($hash, "arlarm", "$data->{curtain_level}", 1 );
+			}
+		#curtain end
 		}
-	if (defined $data->{no_motion}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " NO_motion: " . $data->{no_motion};
-		readingsBulkUpdate($hash, "no_motion", "$data->{no_motion}", 1 );
-		}
-	if (defined $data->{no_close}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " NO_close: " . $data->{no_close};
-		readingsBulkUpdate($hash, "no_close", "$data->{no_close}", 1 );
-		}
-	if (defined $data->{voltage}){
-		my $bat = ($data->{voltage}/1000);
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Voltage: " . $data->{voltage};
-		readingsBulkUpdate($hash, "battery", $bat, 1 );
-		}
-	if (defined $data->{temperature}){
-		my $temp = $data->{temperature};
-		$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp;
-		readingsBulkUpdate($hash, "temperature", "$temp", 1 );
-		}
-	if (defined $data->{humidity}){
-		my $hum = $data->{humidity};
-		$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum;
-		readingsBulkUpdate($hash, "humidity", "$hum", 1 );
-		}
-    if (defined $data->{pressure}){
-		my $pres = $data->{pressure};
-		$pres =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Pressure: " . $pres;
-		readingsBulkUpdate($hash, "pressure", "$pres", 1 );
-		}
-	if (defined $data->{lux}){
-		my $lux = $data->{lux};
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Illuminance: " . $lux;
-		readingsBulkUpdate($hash, "lux", "$lux", 1 );
-		}
-	#86sw1 + 86sw2 + ctrl_neutral1 + ctrl_neutral2 start
-	if (defined $data->{channel_0}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Channel_0: " . $data->{channel_0};
-		readingsBulkUpdate($hash, "channel_0", "$data->{channel_0}", 1 );
-		}
-	if (defined $data->{channel_1}){
-		Log3 $name, 3, "$name: DEV_Read>" . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Channel_1: " . $data->{channel_1};
-		readingsBulkUpdate($hash, "channel_1", "$data->{channel_1}", 1 );
-		}
-	#86sw1 + 86sw2 + ctrl_neutral1 + ctrl_neutral2 end
-	#plug & 86plug start
-	if (defined $data->{load_voltage}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " LOAD_Voltage: " . $data->{load_voltage};
-		readingsBulkUpdate($hash, "LOAD_Voltage", "$data->{load_voltage}", 1 );
-		}
-	if (defined $data->{load_power}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " LOAD_Power: " . $data->{load_power};
-		readingsBulkUpdate($hash, "LOAD_Power", "$data->{load_power}", 1 );
-		}
-	if (defined $data->{power_consumed}){
-		Log3 $name, 3, "$name:" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " POWER_Consumed: " . $data->{power_consumed};
-		readingsBulkUpdate($hash, "POWER_Consumed", "$data->{power_consumed}", 1 );
-		}
-	if (defined $data->{inuse}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " InUse: " . $data->{inuse};
-		readingsBulkUpdate($hash, "inuse", "$data->{inuse}", 1 );
-		}
-	#plug & 86plug end
-	#rgbw_light start
-	if (defined $data->{level}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Level: " . $data->{level};
-		readingsBulkUpdate($hash, "level", "$data->{level}", 1 );
-		}
-	if (defined $data->{hue}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Hue: " . $data->{hue};
-		readingsBulkUpdate($hash, "hue", "$data->{hue}", 1 );
-		}
-	if (defined $data->{saturation}){
-		Log3 $name, 3, "$name:" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Saturation: " . $data->{saturation};
-		readingsBulkUpdate($hash, "saturation", "$data->{saturation}", 1 );
-		}
-	if (defined $data->{color_temperature}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Color_temperature: " . $data->{color_temperature};
-		readingsBulkUpdate($hash, "color_temperature", "$data->{color_temperature}", 1 );
-		}
-	if (defined $data->{x}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " X: " . $data->{x};
-		readingsBulkUpdate($hash, "x", "$data->{x}", 1 );
-		}
-	if (defined $data->{y}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Y: " . $data->{y};
-		readingsBulkUpdate($hash, "y", "$data->{y}", 1 );
-		}
-	#rgbw_light end
-	#cube start
-	if (defined $data->{rotate}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Rotate: " . $data->{rotate};
-		readingsBulkUpdate($hash, "rotate", "$data->{rotate}", 1 );
-		readingsBulkUpdate($hash, "state", "rotate", 1 );
-		}
-	#cube end	
-	#smoke & natgast start
-	if (defined $data->{alarm}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Rotate: " . $data->{arlarm};
-		readingsBulkUpdate($hash, "arlarm", "$data->{arlarm}", 1 );
-		}
-	#smoke & natgast end
-	#curtain start
-	if (defined $data->{curtain_level}){
-		Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Rotate: " . $data->{curtain_level};
-		readingsBulkUpdate($hash, "arlarm", "$data->{curtain_level}", 1 );
-		}
-	#curtain end
 	if ($decoded->{'cmd'} eq 'heartbeat'){
 		readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
 		}
+
 	readingsEndUpdate( $hash, 1 );
 	XiaomiSmartHome_Device_update($hash);
 	return $hash->{NAME};
@@ -369,7 +388,7 @@ sub XiaomiSmartHome_Device_update($){
     my $LASTCMD = ReadingsVal($name,"lastCmd",undef);
 
     my $value_fn = eval $value_fn;
-    Log3 $name, 3, $name .": DEV_Update valueFn: ". $@ if($@);
+    Log3 $name, 4, $name .": DEV_Update valueFn: ". $@ if($@);
     return undef if( !defined($value_fn) );
   }
   if( $model =~ /motion/) {
@@ -392,6 +411,7 @@ sub XiaomiSmartHome_Device_Define($$) {
 	$hash->{STATE} = 'initialized';
 	$modules{XiaomiSmartHome_Device}{defptr}{$sid} = $hash;
 	AssignIoPort($hash,$iodev);
+	my $room = $attr{$iodev}{room};
 	
 	if(defined($hash->{IODev}->{NAME})) {
         my $IOname = $hash->{IODev}->{NAME};
@@ -406,7 +426,7 @@ sub XiaomiSmartHome_Device_Define($$) {
     return "XiaomiSmartHome device $hash->{SID} on XiaomiSmartHome $iodev already defined as $d->{NAME}." if( defined($d) && $d->{IODev} == $hash->{IODev} && $d->{NAME} ne $name );
 
     Log3 $name, 4, $iodev . ": DEV_Define> " . $name . ": defined as ". $hash->{MODEL};
-    $attr{$name}{room} = "MiSmartHome" if( !defined( $attr{$name}{room} ) );
+    $attr{$name}{room} = $room if( !defined( $attr{$name}{room} ) );
     if( $type =~ /motion/) {
 		$attr{$name}{devStateIcon}  = 'motion:motion_detector@red off:motion_detector@green no_motion:motion_detector@green' if( !defined( $attr{$name}{devStateIcon} ) );
 	}
@@ -431,7 +451,7 @@ sub XiaomiSmartHome_Device_updateSReading($) {
 
     my $hash        = shift;
 	my $name = $hash->{NAME};
-	Log3 $name, 3, "$name: DEV_updateSReading> for $hash->{SID}";
+	Log3 $name, 4, "$name: DEV_updateSReading> for $hash->{SID}";
 	RemoveInternalTimer($hash,'XiaomiSmartHome_Device_updateSReading');
     IOWrite($hash,'read',"$hash->{SID}");
 }
@@ -445,7 +465,7 @@ sub XiaomiSmartHome_Device_Undef($)
 	my $iodev = $hash->{IODev}->{NAME};
 	RemoveInternalTimer($hash);
 	delete($modules{XiaomiSmartHome_Device}{defptr}{$hash->{SID}});
-    Log3 $name, 3, "$iodev: DEV_Undef> $name - device deleted";
+    Log3 $name, 4, "$iodev: DEV_Undef> $name - device deleted";
     return undef;
 
 }
diff --git a/controls_mish.txt b/controls_mish.txt
index 68e1752..91a4a2b 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
-UPD 2017-08-13_17:46:25 36385 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-08-13_17:46:25 24517 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-10-24_08:55:31 36922 FHEM/71_XiaomiSmartHome.pm
+UPD 2017-10-24_08:44:58 25216 FHEM/71_XiaomiSmartHome_Device.pm

From d19108559b237f7012de44e3179ddc9f6d81d4ac Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Mon, 30 Oct 2017 07:35:20 +0100
Subject: [PATCH 2/8] -fix: check 'cmd' wrong, must define befor

---
 FHEM/71_XiaomiSmartHome.pm        | 2 +-
 FHEM/71_XiaomiSmartHome_Device.pm | 7 ++++---
 controls_mish.txt                 | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/FHEM/71_XiaomiSmartHome.pm b/FHEM/71_XiaomiSmartHome.pm
index cb6fd0d..f97ae19 100644
--- a/FHEM/71_XiaomiSmartHome.pm
+++ b/FHEM/71_XiaomiSmartHome.pm
@@ -51,7 +51,7 @@ use SetExtensions;
 sub XiaomiSmartHome_Notify($$);
 sub XiaomiSmartHome_updateSingleReading($$);
 my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
-my $version = "1.12";
+my $version = "1.14";
 my %XiaomiSmartHome_gets = (
 	"getDevices"	=> ["get_id_list", '^.+get_id_list_ack' ],
 
diff --git a/FHEM/71_XiaomiSmartHome_Device.pm b/FHEM/71_XiaomiSmartHome_Device.pm
index 60f73d9..106da02 100644
--- a/FHEM/71_XiaomiSmartHome_Device.pm
+++ b/FHEM/71_XiaomiSmartHome_Device.pm
@@ -26,7 +26,7 @@ use strict;
 use warnings;
 use Math::Round qw/nearest/;
 
-my $version = "1.13";
+my $version = "1.14";
 sub XiaomiSmartHome_Device_updateSReading($);
 
 
@@ -201,6 +201,7 @@ sub XiaomiSmartHome_Device_Read($$$){
 	}
 	my $sid = $decoded->{'sid'};
 	my $model = $decoded->{'model'};
+	my $cmd = $decoded->{'cmd'};
 	Log3 $name, 5, "$name: DEV_Read> SID: " . $hash->{SID} . " " . $hash->{TYPE};
 	my $data = eval{decode_json($decoded->{data})};
 	if ($@) {
@@ -208,7 +209,7 @@ sub XiaomiSmartHome_Device_Read($$$){
 		return;
 	}
 	readingsBeginUpdate( $hash );
-	if ($data->{cmd} ne 'heartbeat'){
+	if ($cmd ne 'heartbeat'){
 		if (defined $data->{status}){
 			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Status: " . $data->{status};
 			readingsBulkUpdate($hash, "state", "$data->{status}", 1 );
@@ -341,7 +342,7 @@ sub XiaomiSmartHome_Device_Read($$$){
 			}
 		#curtain end
 		}
-	if ($decoded->{'cmd'} eq 'heartbeat'){
+	if ($cmd eq 'heartbeat'){
 		readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
 		}
 
diff --git a/controls_mish.txt b/controls_mish.txt
index 91a4a2b..99bcc76 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
-UPD 2017-10-24_08:55:31 36922 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-10-24_08:44:58 25216 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-10-30_07:30:44 36922 FHEM/71_XiaomiSmartHome.pm
+UPD 2017-10-30_07:30:27 25216 FHEM/71_XiaomiSmartHome_Device.pm

From 0a1c2b47325036f560d6dccc4ab3b04280e3c299 Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Mon, 30 Oct 2017 07:40:27 +0100
Subject: [PATCH 3/8] -fix: check 'cmd' wrong, must define befor

---
 controls_mish.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controls_mish.txt b/controls_mish.txt
index 99bcc76..9e394f4 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
 UPD 2017-10-30_07:30:44 36922 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-10-30_07:30:27 25216 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-10-30_07:30:27 25393 FHEM/71_XiaomiSmartHome_Device.pm

From 24d7fc4e87ab8d3354ca5fc02987910c0a51814c Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Mon, 30 Oct 2017 11:18:14 +0100
Subject: [PATCH 4/8] -fix: rollback, no error

---
 FHEM/71_XiaomiSmartHome.pm        | 2 +-
 FHEM/71_XiaomiSmartHome_Device.pm | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/FHEM/71_XiaomiSmartHome.pm b/FHEM/71_XiaomiSmartHome.pm
index f97ae19..b571a82 100644
--- a/FHEM/71_XiaomiSmartHome.pm
+++ b/FHEM/71_XiaomiSmartHome.pm
@@ -51,7 +51,7 @@ use SetExtensions;
 sub XiaomiSmartHome_Notify($$);
 sub XiaomiSmartHome_updateSingleReading($$);
 my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
-my $version = "1.14";
+my $version = "1.15";
 my %XiaomiSmartHome_gets = (
 	"getDevices"	=> ["get_id_list", '^.+get_id_list_ack' ],
 
diff --git a/FHEM/71_XiaomiSmartHome_Device.pm b/FHEM/71_XiaomiSmartHome_Device.pm
index 106da02..036155c 100644
--- a/FHEM/71_XiaomiSmartHome_Device.pm
+++ b/FHEM/71_XiaomiSmartHome_Device.pm
@@ -26,7 +26,7 @@ use strict;
 use warnings;
 use Math::Round qw/nearest/;
 
-my $version = "1.14";
+my $version = "1.15";
 sub XiaomiSmartHome_Device_updateSReading($);
 
 
@@ -209,7 +209,6 @@ sub XiaomiSmartHome_Device_Read($$$){
 		return;
 	}
 	readingsBeginUpdate( $hash );
-	if ($cmd ne 'heartbeat'){
 		if (defined $data->{status}){
 			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Status: " . $data->{status};
 			readingsBulkUpdate($hash, "state", "$data->{status}", 1 );
@@ -341,10 +340,7 @@ sub XiaomiSmartHome_Device_Read($$$){
 			readingsBulkUpdate($hash, "arlarm", "$data->{curtain_level}", 1 );
 			}
 		#curtain end
-		}
-	if ($cmd eq 'heartbeat'){
-		readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
-		}
+
 
 	readingsEndUpdate( $hash, 1 );
 	XiaomiSmartHome_Device_update($hash);

From 9c3fc38dc786d697681ca9c8aebc83aa72909367 Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Mon, 30 Oct 2017 11:21:19 +0100
Subject: [PATCH 5/8] -fix: rollback, no error

---
 controls_mish.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controls_mish.txt b/controls_mish.txt
index 9e394f4..1eb0c9d 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
-UPD 2017-10-30_07:30:44 36922 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-10-30_07:30:27 25393 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-10-30_11:17:13 36922 FHEM/71_XiaomiSmartHome.pm
+UPD 2017-10-30_11:17:14 25393 FHEM/71_XiaomiSmartHome_Device.pm

From 5e4194c5c1bd2b6af477e6d276fe41569cfcb627 Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Mon, 30 Oct 2017 11:25:07 +0100
Subject: [PATCH 6/8] -fix: rollback, no error

---
 controls_mish.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controls_mish.txt b/controls_mish.txt
index 1eb0c9d..8ce8ef5 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
 UPD 2017-10-30_11:17:13 36922 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-10-30_11:17:14 25393 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-10-30_11:17:14 25266 FHEM/71_XiaomiSmartHome_Device.pm

From 0a9738f543058e12341ab2ce6be3be46a1462038 Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Fri, 8 Dec 2017 13:44:47 +0100
Subject: [PATCH 7/8] some changes and fixes

- change: Perl modul math::round no longer necessary
- change: reading round is now rnd_tmp, rnd_hum, rnd_bat
- change: reading battery is now batterystate
- change: reading battery is now battery_level
- fix: if GW has no SID reading stop
- fix: if temperature is [1][0].xx or -[1][0].xx now the leading number
is display
- added: support switch 86sw2 dual_channel click
---
 FHEM/71_XiaomiSmartHome.pm        | 12 ++++---
 FHEM/71_XiaomiSmartHome_Device.pm | 56 +++++++++++++++++++++++--------
 controls_mish.txt                 |  4 +--
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/FHEM/71_XiaomiSmartHome.pm b/FHEM/71_XiaomiSmartHome.pm
index b571a82..e1d0561 100644
--- a/FHEM/71_XiaomiSmartHome.pm
+++ b/FHEM/71_XiaomiSmartHome.pm
@@ -40,8 +40,7 @@ eval "use Crypt::CBC";
 return "\nERROR: Please install Crypt::CBC" if($@);
 eval "use Net::Ping";
 return "\nERROR: Please install Net::Ping" if($@);
-eval "use Math::Round";
-return "\nERROR: Please install libmath-round-perl" if($@);
+
 
 use Color;
 use SetExtensions;
@@ -51,7 +50,7 @@ use SetExtensions;
 sub XiaomiSmartHome_Notify($$);
 sub XiaomiSmartHome_updateSingleReading($$);
 my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
-my $version = "1.15";
+my $version = "1.18";
 my %XiaomiSmartHome_gets = (
 	"getDevices"	=> ["get_id_list", '^.+get_id_list_ack' ],
 
@@ -114,10 +113,13 @@ sub XiaomiSmartHome_Read($) {
     my ($hash) = @_;
     my $name = $hash->{NAME};
 	my $self = {}; # my new hash
-	my $new_hash = {};
 	
 	Log3 $name, 5, "$name: Read> Read start";
-    my $buf = "";
+    if ( ! $hash->{SID} ){
+		Log3 $name, 3, "$name: Read> No SID, Stop Read";
+		return;
+	}
+	my $buf = "";
     my $ret = sysread($hash->{CD}, $buf, 1024);
     if (!defined($ret) || $ret <= 0)
     {
diff --git a/FHEM/71_XiaomiSmartHome_Device.pm b/FHEM/71_XiaomiSmartHome_Device.pm
index 036155c..818cf46 100644
--- a/FHEM/71_XiaomiSmartHome_Device.pm
+++ b/FHEM/71_XiaomiSmartHome_Device.pm
@@ -24,9 +24,9 @@ package main;
 
 use strict;
 use warnings;
-use Math::Round qw/nearest/;
 
-my $version = "1.15";
+
+my $version = "1.18";
 sub XiaomiSmartHome_Device_updateSReading($);
 
 
@@ -44,7 +44,9 @@ sub XiaomiSmartHome_Device_Initialize($)
 
   $hash->{AttrList}  = "IODev follow-on-for-timer:1,0 follow-on-timer ".
                        "do_not_notify:1,0 ignore:1,0 dummy:1,0 showtime:1,0 valueFn:textField-long ".
-					   "round:1,2,3 ".
+					   "rnd_tmp:1,2,3 ".
+					   "rnd_hum:1,2,3 ".
+					   "rnd_bat:1,2,3 ".
                        $readingFnAttributes ;				
 }
 #####################################
@@ -192,8 +194,9 @@ sub XiaomiSmartHome_Device_on_timeout($){
 #####################################
 sub XiaomiSmartHome_Device_Read($$$){
 	my ($hash, $msg, $name) = @_;
-	my @arround = ("0.1","0.01","0.001");
-	my $round = AttrVal( $hash->{NAME}, "round", "2" );	
+	my $XMIround_tmp = AttrVal( $hash->{NAME}, "rnd_tmp", "2" );
+	my $XMIround_hum = AttrVal( $hash->{NAME}, "rnd_hum", "2" );
+	my $XMIround_bat = AttrVal( $hash->{NAME}, "rnd_bat", "1" );	
 	my $decoded = eval{decode_json($msg)};
 	if ($@) {
 		Log3 $name, 1, "$name: DEV_Read> Error while request: $@";
@@ -230,26 +233,27 @@ sub XiaomiSmartHome_Device_Read($$$){
 		if (defined $data->{voltage}){
 			my $bat = ($data->{voltage}/1000);
 			Log3 $name, 4, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Voltage: " . $data->{voltage};
-			readingsBulkUpdate($hash, "battery", $bat, 1 );
 			if ($bat < 2.2) {
-				readingsBulkUpdate($hash, "batterystate", "low", 1 );
+				readingsBulkUpdate($hash, "battery", "low", 1 );
 				}
 				else {
-					readingsBulkUpdate($hash, "batterystate", "ok", 1 )
+					readingsBulkUpdate($hash, "battery", "ok", 1 )
 				}
+			$bat = XiaomiSmartHome_round($bat, $XMIround_bat, $name );
+			readingsBulkUpdate($hash, "battery_level", $bat, 1 );
 			}
 		if (defined $data->{temperature}){
-			my $temp = $data->{temperature};
+			my $temp = sprintf( "%#.4d", $data->{temperature});
 			$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
-			$temp = nearest(@arround[$round-1] ,$temp );
-			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp . " Round: " . $round;
+			$temp = XiaomiSmartHome_round($temp, $XMIround_tmp, $name );
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp . " Round: " . $XMIround_tmp;
 			readingsBulkUpdate($hash, "temperature", "$temp", 1 );
 			}
 		if (defined $data->{humidity}){
 			my $hum = $data->{humidity};
 			$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
-			$hum = nearest(@arround[$round-1] ,$hum );
-			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum;
+			$hum = XiaomiSmartHome_round($hum, $XMIround_hum, $name );
+			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum . " Round: " . $XMIround_hum;
 			readingsBulkUpdate($hash, "humidity", "$hum", 1 );
 			}
 		if (defined $data->{pressure}){
@@ -272,6 +276,10 @@ sub XiaomiSmartHome_Device_Read($$$){
 			Log3 $name, 3, "$name: DEV_Read>" . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Channel_1: " . $data->{channel_1};
 			readingsBulkUpdate($hash, "channel_1", "$data->{channel_1}", 1 );
 			}
+		if (defined $data->{dual_channel}){
+			Log3 $name, 3, "$name: DEV_Read>" . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Dual_Channel: " . $data->{dual_channel};
+			readingsBulkUpdate($hash, "dual_channel", "$data->{dual_channel}", 1 );
+			}
 		#86sw1 + 86sw2 + ctrl_neutral1 + ctrl_neutral2 end
 		#plug & 86plug start
 		if (defined $data->{load_voltage}){
@@ -340,6 +348,9 @@ sub XiaomiSmartHome_Device_Read($$$){
 			readingsBulkUpdate($hash, "arlarm", "$data->{curtain_level}", 1 );
 			}
 		#curtain end
+		if ($decoded->{'cmd'} eq 'heartbeat'){
+		readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
+		}
 
 
 	readingsEndUpdate( $hash, 1 );
@@ -391,8 +402,10 @@ sub XiaomiSmartHome_Device_update($){
   if( $model =~ /motion/) {
 	XiaomiSmartHome_Device_mot($hash, $hash->{READINGS}{motionOffTimer}{VAL}) if( $hash->{READINGS}{motionOffTimer});
 	}
-  # Update delete old reading Voltage
+  # Update delete old reading voltage & batterystate
   CommandDeleteReading( undef, "$name voltage" ) if(defined(ReadingsVal($name,"voltage",undef)));
+  CommandDeleteReading( undef, "$name batterystate" ) if(defined(ReadingsVal($name,"batterystate",undef)));
+    CommandDeleteReading( undef, "$name round" ) if(defined(ReadingsVal($name,"round",undef)));
 }
 #####################################
  
@@ -466,6 +479,21 @@ sub XiaomiSmartHome_Device_Undef($)
     return undef;
 
 }
+#####################################
+
+sub XiaomiSmartHome_round {
+  my ($n, $p, $name) = @_;
+  Log3 $name, 5, "$name: DEV_Round>" . " Value: " . $n . " points: " . $p;
+  my $sign = ($n > 0) ? 1 : -1;
+
+  $p ||= 0;
+  $n *= 10 ** $p;
+  $n = int($n + .5 * $sign);
+  Log3 $name, 5, "$name: DEV_Round>" . " Result_value: " . $n / 10**$p;
+  return $n / 10**$p;
+}
+
+
 1;
 
 =pod
diff --git a/controls_mish.txt b/controls_mish.txt
index 8ce8ef5..16c3bf5 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
-UPD 2017-10-30_11:17:13 36922 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-10-30_11:17:14 25266 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-12_08_13:29:11 36907 FHEM/71_XiaomiSmartHome.pm
+UPD 2017-12-08_13:28:54 26468 FHEM/71_XiaomiSmartHome_Device.pm

From ff574769358a35ea3c5ef6bf5852f8da0d4332f2 Mon Sep 17 00:00:00 2001
From: T0RST3N <torsten.rywelski@gmail.com>
Date: Wed, 13 Dec 2017 08:17:19 +0100
Subject: [PATCH 8/8] some changes and fixes

- change: Perl modul math::round no longer necessary
- change: reading round is now rnd_tmp, rnd_hum, rnd_bat
- change: reading battery is now batterystate
closes #8
- change: reading battery is now battery_level
- fix: if GW has no SID reading stop
- fix: if temperature is [1][0].xx or -[1][0].xx now the leading number
is display
-fix: if no or wrong data is reached data will be skipped
- added: support switch 86sw2 dual_channel click
---
 FHEM/71_XiaomiSmartHome.pm        |  2 +-
 FHEM/71_XiaomiSmartHome_Device.pm | 36 ++++++++++++++++++-------------
 controls_mish.txt                 |  4 ++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/FHEM/71_XiaomiSmartHome.pm b/FHEM/71_XiaomiSmartHome.pm
index e1d0561..98ccaaa 100644
--- a/FHEM/71_XiaomiSmartHome.pm
+++ b/FHEM/71_XiaomiSmartHome.pm
@@ -50,7 +50,7 @@ use SetExtensions;
 sub XiaomiSmartHome_Notify($$);
 sub XiaomiSmartHome_updateSingleReading($$);
 my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
-my $version = "1.18";
+my $version = "1.19";
 my %XiaomiSmartHome_gets = (
 	"getDevices"	=> ["get_id_list", '^.+get_id_list_ack' ],
 
diff --git a/FHEM/71_XiaomiSmartHome_Device.pm b/FHEM/71_XiaomiSmartHome_Device.pm
index 818cf46..dd36e59 100644
--- a/FHEM/71_XiaomiSmartHome_Device.pm
+++ b/FHEM/71_XiaomiSmartHome_Device.pm
@@ -26,7 +26,7 @@ use strict;
 use warnings;
 
 
-my $version = "1.18";
+my $version = "1.19";
 sub XiaomiSmartHome_Device_updateSReading($);
 
 
@@ -243,24 +243,30 @@ sub XiaomiSmartHome_Device_Read($$$){
 			readingsBulkUpdate($hash, "battery_level", $bat, 1 );
 			}
 		if (defined $data->{temperature}){
-			my $temp = sprintf( "%#.4d", $data->{temperature});
-			$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
-			$temp = XiaomiSmartHome_round($temp, $XMIround_tmp, $name );
-			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp . " Round: " . $XMIround_tmp;
-			readingsBulkUpdate($hash, "temperature", "$temp", 1 );
+			if ($data->{temperature} ne "10000"){
+				my $temp = sprintf( "%#.4d", $data->{temperature});
+				$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
+				$temp = XiaomiSmartHome_round($temp, $XMIround_tmp, $name );
+				Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Temperature: " . $temp . " Round: " . $XMIround_tmp;
+				readingsBulkUpdate($hash, "temperature", "$temp", 1 );
+				}
 			}
 		if (defined $data->{humidity}){
-			my $hum = $data->{humidity};
-			$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
-			$hum = XiaomiSmartHome_round($hum, $XMIround_hum, $name );
-			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum . " Round: " . $XMIround_hum;
-			readingsBulkUpdate($hash, "humidity", "$hum", 1 );
+			if ($data->{humidity} ne "0"){
+				my $hum = $data->{humidity};
+				$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
+				$hum = XiaomiSmartHome_round($hum, $XMIround_hum, $name );
+				Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Humidity: " . $hum . " Round: " . $XMIround_hum;
+				readingsBulkUpdate($hash, "humidity", "$hum", 1 );
+				}
 			}
 		if (defined $data->{pressure}){
-			my $pres = $data->{pressure};
-			$pres =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
-			Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Pressure: " . $pres;
-			readingsBulkUpdate($hash, "pressure", "$pres", 1 );
+			if ($data->{pressure} ne "0"){
+				my $pres = $data->{pressure};
+				$pres =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1./g;
+				Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL}  . " Pressure: " . $pres;
+				readingsBulkUpdate($hash, "pressure", "$pres", 1 );
+				}
 			}
 		if (defined $data->{lux}){
 			my $lux = $data->{lux};
diff --git a/controls_mish.txt b/controls_mish.txt
index 16c3bf5..9d2ed06 100644
--- a/controls_mish.txt
+++ b/controls_mish.txt
@@ -1,2 +1,2 @@
-UPD 2017-12_08_13:29:11 36907 FHEM/71_XiaomiSmartHome.pm
-UPD 2017-12-08_13:28:54 26468 FHEM/71_XiaomiSmartHome_Device.pm
+UPD 2017-12_08_08:06:18 36907 FHEM/71_XiaomiSmartHome.pm
+UPD 2017-12-13_08:02:11 26609 FHEM/71_XiaomiSmartHome_Device.pm