FHEM/mod-XiaomiBTLESens
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix humidity reading

Browse Source
This commit is contained in:
Marko Oldenburg 2018-11-22 12:24:13 +01:00
parent b19fd0eea4
commit 2d6ce58145
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
74_XiaomiBTLESens.pm
View File

@ -35,7 +35,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = "2.4.4"; my $version = "2.4.5";
sub XiaomiBTLESens_Initialize($) { sub XiaomiBTLESens_Initialize($) {
@ -80,7 +80,7 @@ use strict;
use warnings; use warnings;
use POSIX; use POSIX;
use GPUtils qw(:all) use GPUtils qw(GP_Import)
; # wird für den Import der FHEM Funktionen aus der fhem.pl benötigt ; # wird für den Import der FHEM Funktionen aus der fhem.pl benötigt
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= "JSON ";
@ -100,7 +100,6 @@ BEGIN {
modules modules
Log3 Log3
CommandAttr CommandAttr
# attr
AttrVal AttrVal
ReadingsVal ReadingsVal
IsDisabled IsDisabled
@ -426,10 +425,11 @@ sub Set($$@) {
} }
else { else {
my $list = "resetBatteryTimestamp:noArg"; my $list = "";
$list .= "resetBatteryTimestamp:noArg" unless ( AttrVal( $name, 'model', 'none' ) eq 'none' );
$list .= " devicename" $list .= " devicename"
if ( if (
AttrVal( $name, 'model', 'thermoHygroSens' ) eq 'thermoHygroSens' ); AttrVal( $name, 'model', 'thermoHygroSens' ) eq 'thermoHygroSens' and AttrVal( $name, 'model', 'none' ) ne 'none' );
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
@ -468,10 +468,11 @@ sub Get($$@) {
} }
else { else {
my $list = "sensorData:noArg firmware:noArg"; my $list = "";
$list .= "sensorData:noArg firmware:noArg" unless ( AttrVal( $name, 'model', 'none' ) eq 'none' );
$list .= " devicename:noArg" $list .= " devicename:noArg"
if ( if (
AttrVal( $name, 'model', 'thermoHygroSens' ) eq 'thermoHygroSens' ); AttrVal( $name, 'model', 'thermoHygroSens' ) eq 'thermoHygroSens' and AttrVal( $name, 'model', 'none' ) ne 'none' );
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
@ -887,8 +888,17 @@ sub ThermoHygroSensHandle0x10($$) {
my @numberOfHex = split( ' ', $notification ); my @numberOfHex = split( ' ', $notification );
$notification =~ s/\s+//g; $notification =~ s/\s+//g;
# print "Temperatur: " . pack( 'H*', substr( $notification, 4, 8 ) ) . "\n";
#
#
# print "Luftfeuchte: " . pack( 'H*', substr( $notification, 16, 8 ) ) . "\n" if ( scalar(@numberOfHex) == 13 and pack( 'H*', substr( $notification, 4, 8 ) ) < 10);
#
# print "Luftfeuchte: " . pack( 'H*', substr( $notification, 18, 8 ) ) . "\n" if ( scalar(@numberOfHex) == 14 or (scalar(@numberOfHex) == 13 and pack( 'H*', substr( $notification, 4, 8 ) )) > 9);
$readings{'temperature'} = pack( 'H*', substr( $notification, 4, 8 ) ); $readings{'temperature'} = pack( 'H*', substr( $notification, 4, 8 ) );
$readings{'humidity'} = pack( 'H*', substr( $notification, 18, 8 ) ); $readings{'humidity'} = pack( 'H*', substr( $notification, (scalar(@numberOfHex) == 14 or (scalar(@numberOfHex) == 13 and $readings{'temperature'} > 9) ? 18 : 16), 8 ) );
#$readings{'humidity'} = pack( 'H*', substr( $notification, 18, 8 ) );
$hash->{helper}{CallBattery} = 0; $hash->{helper}{CallBattery} = 0;
return \%readings; return \%readings;
@ -1227,7 +1237,7 @@ sub CometBlueBTLE_CmdlinePreventGrepFalsePositive($) {
<code>define Weihnachtskaktus XiaomiBTLESens C4:7C:8D:62:42:6F</code><br /> <code>define Weihnachtskaktus XiaomiBTLESens C4:7C:8D:62:42:6F</code><br />
</ul> </ul>
<br /> <br />
Der Befehl legt ein Device vom Typ XiaomiBTLESens an mit dem Namen Weihnachtskaktus und der Bluetooth MAC C4:7C:8D:62:42:6F.<br /> Der Befehl legt ein Device vom Typ XiaomiBTLESens mit dem Namen Weihnachtskaktus und der Bluetooth MAC C4:7C:8D:62:42:6F an.<br />
Nach dem Anlegen des Device und setzen des korrekten model Attributes werden umgehend und automatisch die aktuellen Daten vom betroffenen Xiaomi BTLE Sensor gelesen. Nach dem Anlegen des Device und setzen des korrekten model Attributes werden umgehend und automatisch die aktuellen Daten vom betroffenen Xiaomi BTLE Sensor gelesen.
</ul> </ul>
<br /><br /> <br /><br />