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

new state format for thermo/Hydro Sens

Browse Source
This commit is contained in:
Marko Oldenburg 2018-06-12 08:28:25 +02:00
parent 655646598f
commit f9f1ff53e1
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
74_XiaomiBTLESens.pm
View File

@ -50,7 +50,7 @@ eval "use Blocking;1" or $missingModul .= "Blocking ";
#use Data::Dumper; only for Debugging
my $version = "2.0.13";
my $version = "2.0.14";
@ -656,8 +656,8 @@ sub XiaomiBTLESens_FlowerSensHandle0x38($$) {
my @dataBatFw = split(" ",$notification);
$readings{'batteryLevel'} = hex("0x".$dataBatFw[0]);
$readings{'battery'} = (hex("0x".$dataBatFw[0]) > 15 ? "ok" : "low");
#$readings{'batteryLevel'} = hex("0x".$dataBatFw[0]);
#$readings{'battery'} = (hex("0x".$dataBatFw[0]) > 15 ? "ok" : "low");
### neue Vereinheitlichung für Batteriereadings Forum #800017
$readings{'batteryPercent'} = hex("0x".$dataBatFw[0]);
$readings{'batteryState'} = (hex("0x".$dataBatFw[0]) > 15 ? "ok" : "low");
@ -711,8 +711,11 @@ sub XiaomiBTLESens_ThermoHygroSensHandle0x18($$) {
chomp($notification);
$readings{'batteryLevel'} = hex("0x".$notification);
$readings{'battery'} = (hex("0x".$notification) > 15 ? "ok" : "low");
#$readings{'batteryLevel'} = hex("0x".$notification);
#$readings{'battery'} = (hex("0x".$notification) > 15 ? "ok" : "low");
### neue Vereinheitlichung für Batteriereadings Forum #800017
$readings{'batteryPercent'} = hex("0x".$notification);
$readings{'batteryState'} = (hex("0x".$notification) > 15 ? "ok" : "low");
$hash->{helper}{CallBattery} = 1;
XiaomiBTLESens_CallBattery_Timestamp($hash);
@ -797,7 +800,9 @@ sub XiaomiBTLESens_WriteReadings($$) {
readingsBulkUpdate($hash,$r,$v);
}
readingsBulkUpdateIfChanged($hash, "state", ($readings->{'lastGattError'}?'error':'active'));
readingsBulkUpdateIfChanged($hash, "state", ($readings->{'lastGattError'}?'error':'active')) if( AttrVal($name,'model','none') eq 'flowerSens' );
readingsBulkUpdateIfChanged($hash, "state", ($readings->{'lastGattError'}?'error':'T: '.ReadingsVal($name,'temperature',0).' H: '.ReadingsVal($name,'humidity',0) ) if( AttrVal($name,'model','none') eq 'thermoHygroSens' );
readingsEndUpdate($hash,1);
@ -959,8 +964,8 @@ sub CometBlueBTLE_CmdlinePreventGrepFalsePositive($) {
<b>Readings</b>
<ul>
<li>state - Status of the flower sensor or error message if any errors.</li>
<li>battery - current battery state dependent on batteryLevel.</li>
<li>batteryLevel - current battery level in percent.</li>
<li>batteryState - current battery state dependent on batteryLevel.</li>
<li>batteryPercent - current battery level in percent.</li>
<li>fertility - Values for the fertilizer content</li>
<li>firmware - current device firmware</li>
<li>lux - current light intensity</li>
@ -1040,8 +1045,8 @@ sub CometBlueBTLE_CmdlinePreventGrepFalsePositive($) {
<b>Readings</b>
<ul>
<li>state - Status des BTLE Sensor oder eine Fehlermeldung falls Fehler beim letzten Kontakt auftraten.</li>
<li>battery - aktueller Batterie-Status in Abhängigkeit vom Wert batteryLevel.</li>
<li>batteryLevel - aktueller Ladestand der Batterie in Prozent.</li>
<li>batteryState - aktueller Batterie-Status in Abhängigkeit vom Wert batteryLevel.</li>
<li>batteryPercent - aktueller Ladestand der Batterie in Prozent.</li>
<li>fertility - Wert des Fruchtbarkeitssensors (Bodenleitf&auml;higkeit)</li>
<li>firmware - aktuelle Firmware-Version des BTLE Sensor</li>
<li>lastGattError - Fehlermeldungen vom gatttool</li>