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

define check improved - homeID in define removed

Browse Source
This commit is contained in:
Philipp Wo 2025-04-07 09:24:50 +02:00
parent f0697c82f7
commit 265f0d4ffa
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
98_TadoAPI.pm
View File

@ -1,5 +1,5 @@
#=============================================================================== #===============================================================================
# $Id: 98_TadoAPI.pm 107 2025-03-10 06:15:20Z psycho160 $ # $Id: 98_TadoAPI.pm 107 2025-04-07 06:15:20Z psycho160 $
# #
# FILE: 98_TadoAPI.pm # FILE: 98_TadoAPI.pm
# - for oauth2 (2025) # - for oauth2 (2025)
@ -87,9 +87,8 @@ sub TadoAPI_Init {
my $def = shift; my $def = shift;
my @args = split( "[ \t][ \t]*", $def ); my @args = split( "[ \t][ \t]*", $def );
my $u = my $u = "wrong syntax: define <name> TadoAPI <device_code>";
"wrong syntax: define <name> TadoAPI <device_code>";
return $u if ( int(@args) < 2 ); return $u if ( int(@args) < 2 );
return; return;
} }
@ -103,18 +102,19 @@ sub TadoAPI_Define {
my $type = shift @a; my $type = shift @a;
my $tokenFileName = $tokenFile . "_" . $name; my $tokenFileName = $tokenFile . "_" . $name;
my ( $user, $homeID ) = @a; my ( $dev_code ) = @a;
Log3 $name, 3, "TadoAPI_Define $name: called "; Log3 $name, 3, "TadoAPI_Define $name: called ";
defined $user ? ($hash->{STATE} = "defined") : ($hash->{DEF} = "no_device_code_set"); my $u = "wrong define syntax: define <name> TadoAPI";
return $u if ( int(@a) > 1 );
defined $dev_code ? ($hash->{STATE} = "defined") : ($hash->{DEF} = "no_device_code_set");
# Initialize the device # Initialize the device
return $@ unless ( FHEM::Meta::SetInternals($hash) ); return $@ unless ( FHEM::Meta::SetInternals($hash) );
$hash->{TOKEN_FILE} = $tokenFileName; $hash->{TOKEN_FILE} = $tokenFileName;
$hash->{TADO_USER} = $user; $hash->{TADO_DEV_CODE} = $dev_code;
my @args = ($homeID);
if ($main::init_done) { if ($main::init_done) {
@ -122,7 +122,7 @@ sub TadoAPI_Define {
return TadoAPI_Catch($@) if $@; return TadoAPI_Catch($@) if $@;
} }
if ( defined($user) && $user ne "no_device_code_set" ) { if ( defined($dev_code) && $dev_code ne "no_device_code_set" ) {
TadoAPI_CheckStatus($hash); TadoAPI_CheckStatus($hash);
TadoAPI_NewTokenRequest($hash); TadoAPI_NewTokenRequest($hash);
@ -130,15 +130,11 @@ sub TadoAPI_Define {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
InternalTimer( gettimeofday() + 15, "TadoAPI_Update", $hash, 0 ); InternalTimer( gettimeofday() + 15, "TadoAPI_Update", $hash, 0 );
if ( defined($homeID) && $homeID ne "" ) { my $id = TadoAPI_GetHomeId($hash);
$attr{$name}{homeID} = $homeID; if ( defined($id) && $id ne "" ) {
} $attr{$name}{homeID} = $id;
else {
my $id = TadoAPI_GetHomeId($hash);
if ( defined($id) && $id ne "" ) {
$attr{$name}{homeID} = $id;
}
} }
} }
else { else {
$hash->{STATE} = "no_device_code_set"; $hash->{STATE} = "no_device_code_set";
@ -517,7 +513,7 @@ sub TadoAPI_RegisterNewDevice {
sub TadoAPI_NewTokenRequest { sub TadoAPI_NewTokenRequest {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $device_code = $hash->{TADO_USER}; my $device_code = $hash->{TADO_DEV_CODE};
my $tokenFileName = $tokenFile . "_" . $name; my $tokenFileName = $tokenFile . "_" . $name;
my $Token = undef; my $Token = undef;