diff --git a/FHEM/73_GardenaSmartBridge.pm b/FHEM/73_GardenaSmartBridge.pm index a55d10d..78b93c1 100644 --- a/FHEM/73_GardenaSmartBridge.pm +++ b/FHEM/73_GardenaSmartBridge.pm @@ -63,6 +63,8 @@ use warnings; use POSIX; use FHEM::Meta; +use Data::Dumper; + use HttpUtils; my $missingModul = ''; @@ -349,9 +351,10 @@ sub Notify { && ( grep /^INITIALIZED$/, @{$events} or grep /^REREADCFG$/, - @{$events} or grep /^DEFINED.$name$/, - @{$events} or grep /^MODIFIED.$name$/, - @{$events} or grep /^ATTR.$name.gardenaAccountEmail.+/, + @{$events} or grep /^DEFINED.$name.*$/, + @{$events} or grep /^MODIFIED.$name.*$/, + @{$events} or grep /^ATTR.$name.*gardenaAccountEmail.+/, + @{$events} or grep /^DELETEATTR.$name.*disable$/, @{$events} ) ) @@ -369,10 +372,9 @@ sub Notify { if ( $devtype eq 'Global' && ( - grep /^DELETEATTR.$name.disable$/, - @{$events} or grep /^ATTR.$name.disable.0$/, - @{$events} or grep /^DELETEATTR.$name.interval$/, - @{$events} or grep /^ATTR.$name.interval.[0-9]+/, + grep /^ATTR.$name.*disable.0$/, + @{$events} or grep /^DELETEATTR.$name.*interval$/, + @{$events} or grep /^ATTR.$name.$name.interval.[0-9]+/, @{$events} ) && $init_done @@ -1219,7 +1221,6 @@ sub createHttpValueStrings { && !defined( $hash->{helper}{locations_id} ) ); readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 ) if ( !defined( $hash->{helper}{locations_id} ) ); - $uri .= '/auth/token' if ( !defined( $hash->{helper}{session_id} ) ); $uri .= '/devices' if (!defined($abilities) && defined( $hash->{helper}{locations_id} ) ); diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index e046b7e..37d0c2a 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2021-05-29_22:07:33 46925 FHEM/73_GardenaSmartBridge.pm +UPD 2021-06-04_15:29:42 46884 FHEM/73_GardenaSmartBridge.pm UPD 2021-05-28_20:56:13 55505 FHEM/74_GardenaSmartDevice.pm