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

removed unused code

Browse Source
This commit is contained in:
Philipp Wo 2019-11-23 13:22:13 +01:00
parent 0051426f7f
commit 773da536ca
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
98_TadoAPI.pm
View File

@ -44,7 +44,7 @@ my $TokenData = {};
my $apiStatus = 1; my $apiStatus = 1;
my %sets = ( my %sets = (
"getTemperature" => "", "zoneUpdate" => "",
"refreshToken" => "noArg", "refreshToken" => "noArg",
"password" => "", "password" => "",
"update" => "noArg", "update" => "noArg",
@ -57,7 +57,7 @@ my %gets = (
"getZoneDevices" => "noArg", "getZoneDevices" => "noArg",
"getZoneInfo" => "noArg", "getZoneInfo" => "noArg",
"getGeo" => "", "getGeo" => "",
"getXTest" => "", #"getXTest" => "",
"getMobileDevices" => "noArg" "getMobileDevices" => "noArg"
); );
@ -199,7 +199,7 @@ sub TadoAPI_Set(@) {
TadoAPI_UpdateFn($hash); TadoAPI_UpdateFn($hash);
Log3 $name, 3, "TadoAPI $name" . ": " . "$cmd finished\n"; Log3 $name, 3, "TadoAPI $name" . ": " . "$cmd finished\n";
} elsif( $cmd eq 'getTemperature' ) { } elsif( $cmd eq 'zoneUpdate' ) {
Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)"; Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)";
return "ZoneID as parameter needed" if (!$value); return "ZoneID as parameter needed" if (!$value);
if( $value >= 1 ) { if( $value >= 1 ) {
@ -269,7 +269,7 @@ sub TadoAPI_Get(@) {
Log3 $name, 3, "TadoAPI $name" . ": " . "$cmd finished\n"; Log3 $name, 3, "TadoAPI $name" . ": " . "$cmd finished\n";
last; last;
}; };
# only for testing
$cmd eq "getXTest" and do { $cmd eq "getXTest" and do {
Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)"; Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)";
my $zoneName = TadoAPI_GetZoneNameById($hash, $value); my $zoneName = TadoAPI_GetZoneNameById($hash, $value);
@ -1185,6 +1185,7 @@ sub TadoAPI_GetZoneNameById(@) {
return $zoneName; return $zoneName;
} }
} }
Log3 $name, 3, "TadoAPI $name" . ": " . "Error GetZoneNameById: Wrong zone ID ($zoneID)";
return undef; return undef;
} }
@ -1223,6 +1224,9 @@ sub TadoAPI_GetZoneReadingsById(@){
if ($@){ if ($@){
Log3 $name, 3, "TadoAPI $name" . ": " . "GetZoneReadingsById: Zone $zoneID decode_json failed, invalid json. error:$@\n"; Log3 $name, 3, "TadoAPI $name" . ": " . "GetZoneReadingsById: Zone $zoneID decode_json failed, invalid json. error:$@\n";
}else{ }else{
my $zoneName = TadoAPI_GetZoneNameById($hash, $zoneID);
if (defined($zoneName)){
$temperature = $decoded_data->{'sensorDataPoints'}->{'insideTemperature'}->{'celsius'}; $temperature = $decoded_data->{'sensorDataPoints'}->{'insideTemperature'}->{'celsius'};
$humidity = $decoded_data->{'sensorDataPoints'}->{'humidity'}->{'percentage'}; $humidity = $decoded_data->{'sensorDataPoints'}->{'humidity'}->{'percentage'};
$desiredTemp = $decoded_data->{'setting'}->{'temperature'}->{'celsius'}; $desiredTemp = $decoded_data->{'setting'}->{'temperature'}->{'celsius'};
@ -1230,9 +1234,6 @@ sub TadoAPI_GetZoneReadingsById(@){
$overlay = $decoded_data->{'overlayType'}; $overlay = $decoded_data->{'overlayType'};
if (!defined $overlay) {$overlay = "no overlay"}; if (!defined $overlay) {$overlay = "no overlay"};
my $zoneName = TadoAPI_GetZoneNameById($hash, $zoneID);
if (defined($zoneName)){
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "Temperatur_" . $zoneName, $temperature); readingsBulkUpdate($hash, "Temperatur_" . $zoneName, $temperature);
readingsBulkUpdate($hash, "Luftfeuchtigkeit_" . $zoneName, $humidity); readingsBulkUpdate($hash, "Luftfeuchtigkeit_" . $zoneName, $humidity);