FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

10_EQ3BT: fix lastChangeBy reading

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13604 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dominikkarall 2017-03-05 10:09:10 +00:00
parent 71ea21ac46
commit 6c1507a424
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 10_EQ3BT: fix lastChangeBy reading
- bugfix: 74_AMAD: 2.6.12 fix empty androidVersion Reading when use Nougat - bugfix: 74_AMAD: 2.6.12 fix empty androidVersion Reading when use Nougat
- feature: 42_SYSMON: added ssh support (thx to PitpatV), minor fixes - feature: 42_SYSMON: added ssh support (thx to PitpatV), minor fixes
- bugfix: 88_HMCCU: Fixed toggle bug - bugfix: 88_HMCCU: Fixed toggle bug

25
fhem/FHEM/10_EQ3BT.pm
View File

@ -6,10 +6,15 @@
# #
# FHEM module to communicate with EQ-3 Bluetooth thermostats # FHEM module to communicate with EQ-3 Bluetooth thermostats
# #
# Version: 2.0.0 # Version: 2.0.1
# #
############################################################# #############################################################
# #
# v2.0.1 - 20170204
# - BUGFIX: fix lastChangeBy
# - BUGFIX: fix retry of updateStatus, updateSystemInformation
# if it BlockingCall timeouts
#
# v2.0.0 - 20170129 # v2.0.0 - 20170129
# - FEATURE: use all available bluetooth interfaces to communicate # - FEATURE: use all available bluetooth interfaces to communicate
# with the bluetooth thermostat # with the bluetooth thermostat
@ -155,7 +160,7 @@ sub EQ3BT_Define($$) {
my $mac; my $mac;
$hash->{STATE} = "initialized"; $hash->{STATE} = "initialized";
$hash->{VERSION} = "2.0.0"; $hash->{VERSION} = "2.0.1";
Log3 $hash, 3, "EQ3BT: EQ-3 Bluetooth Thermostat ".$hash->{VERSION}; Log3 $hash, 3, "EQ3BT: EQ-3 Bluetooth Thermostat ".$hash->{VERSION};
if (int(@a) > 3) { if (int(@a) > 3) {
@ -294,7 +299,7 @@ sub EQ3BT_setResetConsumption {
sub EQ3BT_updateSystemInformation { sub EQ3BT_updateSystemInformation {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$hash->{helper}{RUNNING_PID} = BlockingCall("EQ3BT_execGatttool", $name."|".$hash->{MAC}."|updateSystemInformation|0x0411|00|listen", "EQ3BT_processGatttoolResult", 300, "EQ3BT_killGatttool", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("EQ3BT_execGatttool", $name."|".$hash->{MAC}."|updateSystemInformation|0x0411|00|listen", "EQ3BT_processGatttoolResult", 300, "EQ3BT_updateSystemInformationFailed", $hash);
} }
sub EQ3BT_updateSystemInformationSuccessful { sub EQ3BT_updateSystemInformationSuccessful {
@ -319,7 +324,7 @@ sub EQ3BT_updateSystemInformationFailed {
sub EQ3BT_updateStatus { sub EQ3BT_updateStatus {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$hash->{helper}{RUNNING_PID} = BlockingCall("EQ3BT_execGatttool", $name."|".$hash->{MAC}."|updateStatus|0x0411|03|listen", "EQ3BT_processGatttoolResult", 300, "EQ3BT_killGatttool", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("EQ3BT_execGatttool", $name."|".$hash->{MAC}."|updateStatus|0x0411|03|listen", "EQ3BT_processGatttoolResult", 300, "EQ3BT_updateStatusFailed", $hash);
} }
sub EQ3BT_updateStatusSuccessful { sub EQ3BT_updateStatusSuccessful {
@ -663,12 +668,12 @@ sub EQ3BT_processNotification {
readingsSingleUpdate($hash, "valvePosition", $pct, 1); readingsSingleUpdate($hash, "valvePosition", $pct, 1);
#changes below this line will set lastchangeby #changes below this line will set lastchangeby
readingsSingleUpdate($hash, "windowOpen", $wndOpen, 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "windowOpen", $wndOpen, 1);
readingsSingleUpdate($hash, "ecoMode", $eco, 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "ecoMode", $eco, 1);
readingsSingleUpdate($hash, "battery", $batteryStr, 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "battery", $batteryStr, 1);
readingsSingleUpdate($hash, "boost", $isBoost, 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "boost", $isBoost, 1);
readingsSingleUpdate($hash, "mode", $modeStr, 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "mode", $modeStr, 1);
readingsSingleUpdate($hash, "desiredTemperature", sprintf("%.1f", $temp), 1); EQ3BT_readingsSingleUpdateIfChanged($hash, "desiredTemperature", sprintf("%.1f", $temp), 1);
} }
return undef; return undef;