Public/FHEM-Tado
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

reduced redundant api querys

Browse Source
This commit is contained in:
Philipp Wo 2019-12-10 16:20:57 +01:00
parent 1f82ad7824
commit fe13d672e7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
98_TadoAPI.pm
View File

@ -704,7 +704,6 @@ sub TadoAPI_UpdateFn(@){
hash => $hash, hash => $hash,
callback => \&TadoAPI_UpdateAllZoneReadingsCallback callback => \&TadoAPI_UpdateAllZoneReadingsCallback
}; };
HttpUtils_NonblockingGet($request); HttpUtils_NonblockingGet($request);
# mobile devices # mobile devices
@ -719,7 +718,6 @@ sub TadoAPI_UpdateFn(@){
hash => $hash hash => $hash
}; };
HttpUtils_NonblockingGet($request); HttpUtils_NonblockingGet($request);
} }
} }
@ -771,18 +769,22 @@ sub TadoAPI_UpdateAllZoneReadingsCallback($){
foreach my $zone ( @$decoded_data ){ foreach my $zone ( @$decoded_data ){
my $zoneid = $zone->{'id'}; my $zoneid = $zone->{'id'};
Log3 $name, 5, "TadoAPI $name" . ": " . "Set Reading Update for Zone $zoneid "; Log3 $name, 5, "TadoAPI $name" . ": " . "Set Reading Update for Zone $zoneid ";
my ($temperature, $humidity, $desiredTemp, $currentHeatingPower, $overlay ) = TadoAPI_GetZoneReadingsById($hash, $zoneid);
my $zoneName = TadoAPI_GetZoneNameById($hash, $zoneid);
if(defined($zoneName)){ # updates zone readings
readingsBeginUpdate($hash); TadoAPI_GetZoneReadingsById($hash, $zoneid);
readingsBulkUpdate($hash, "Temperatur_" . $zoneName, $temperature);
readingsBulkUpdate($hash, "Luftfeuchtigkeit_" . $zoneName, $humidity); # my ($temperature, $humidity, $desiredTemp, $currentHeatingPower, $overlay ) = TadoAPI_GetZoneReadingsById($hash, $zoneid);
readingsBulkUpdate($hash, "Heizleistung_" . $zoneName, $currentHeatingPower); # my $zoneName = TadoAPI_GetZoneNameById($hash, $zoneid);
readingsBulkUpdate($hash, "OverlayType_" . $zoneName, $overlay);
readingsBulkUpdate($hash, "DesiredTemp_" . $zoneName, $desiredTemp); # if(defined($zoneName)){
readingsEndUpdate( $hash, 0 ); # readingsBeginUpdate($hash);
} # readingsBulkUpdate($hash, "Temperatur_" . $zoneName, $temperature);
# readingsBulkUpdate($hash, "Luftfeuchtigkeit_" . $zoneName, $humidity);
# readingsBulkUpdate($hash, "Heizleistung_" . $zoneName, $currentHeatingPower);
# readingsBulkUpdate($hash, "OverlayType_" . $zoneName, $overlay);
# readingsBulkUpdate($hash, "DesiredTemp_" . $zoneName, $desiredTemp);
# readingsEndUpdate( $hash, 1 );
# }
# iterate through all devices in zone # iterate through all devices in zone
my $devices = $zone->{'devices'}; my $devices = $zone->{'devices'};
foreach my $device ( @$devices ){ foreach my $device ( @$devices ){
@ -1233,7 +1235,7 @@ sub TadoAPI_GetZoneReadingsById(@){
url => $URL, url => $URL,
header => {"Content-Type"=>"application/json;charset=UTF-8","Authorization" => "$TokenData->{'token_type'} $TokenData->{'access_token'}"}, header => {"Content-Type"=>"application/json;charset=UTF-8","Authorization" => "$TokenData->{'token_type'} $TokenData->{'access_token'}"},
method => 'GET', method => 'GET',
timeout => 5, timeout => 4,
hash => $hash hash => $hash
}; };