FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

ready for release #46

Merged
marko merged 55 commits from testing into master 2021-10-27 03:20:14 +00:00
Conversation 0 Commits 55 Files Changed 3 +10 -9
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1dde30c52c - Show all commits

17
FHEM/73_GardenaSmartBridge.pm
View File

@@ -63,6 +63,8 @@ use warnings;
use POSIX; use POSIX;
use FHEM::Meta; use FHEM::Meta;
use Data::Dumper;
use HttpUtils; use HttpUtils;
my $missingModul = ''; my $missingModul = '';
@@ -349,9 +351,10 @@ sub Notify {
&& ( && (
grep /^INITIALIZED$/, grep /^INITIALIZED$/,
@{$events} or grep /^REREADCFG$/, @{$events} or grep /^REREADCFG$/,
@{$events} or grep /^DEFINED.$name$/, @{$events} or grep /^DEFINED.$name.*$/,
@{$events} or grep /^MODIFIED.$name$/, @{$events} or grep /^MODIFIED.$name.*$/,
@{$events} or grep /^ATTR.$name.gardenaAccountEmail.+/, @{$events} or grep /^ATTR.$name.*gardenaAccountEmail.+/,
@{$events} or grep /^DELETEATTR.$name.*disable$/,
@{$events} @{$events}
) )
) )
@@ -369,10 +372,9 @@ sub Notify {
if ( if (
$devtype eq 'Global' $devtype eq 'Global'
&& ( && (
grep /^DELETEATTR.$name.disable$/, grep /^ATTR.$name.*disable.0$/,
@{$events} or grep /^ATTR.$name.disable.0$/, @{$events} or grep /^DELETEATTR.$name.*interval$/,
@{$events} or grep /^DELETEATTR.$name.interval$/, @{$events} or grep /^ATTR.$name.$name.interval.[0-9]+/,
@{$events} or grep /^ATTR.$name.interval.[0-9]+/,
@{$events} @{$events}
) )
&& $init_done && $init_done
@@ -1219,7 +1221,6 @@ sub createHttpValueStrings {
&& !defined( $hash->{helper}{locations_id} ) ); && !defined( $hash->{helper}{locations_id} ) );
readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 ) readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 )
if ( !defined( $hash->{helper}{locations_id} ) ); if ( !defined( $hash->{helper}{locations_id} ) );
$uri .= '/auth/token' if ( !defined( $hash->{helper}{session_id} ) );
$uri .= '/devices' $uri .= '/devices'
if (!defined($abilities) if (!defined($abilities)
&& defined( $hash->{helper}{locations_id} ) ); && defined( $hash->{helper}{locations_id} ) );

2
controls_GardenaSmartDevice.txt
View File

@@ -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 UPD 2021-05-28_20:56:13 55505 FHEM/74_GardenaSmartDevice.pm