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

patch-connect_problems #35

Merged
sebastianschwarz merged 18 commits from patch-connect_problems into devel 2021-06-28 16:39:22 +00:00
Conversation 1 Commits 18 Files Changed 2 +16 -10
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97b8a6edab - Show all commits

22
FHEM/73_GardenaSmartBridge.pm
View File

@ -375,6 +375,7 @@ sub Notify {
grep /^ATTR.$name.disable.0$/, grep /^ATTR.$name.disable.0$/,
@{$events} or grep /^DELETEATTR.$name.interval$/, @{$events} or grep /^DELETEATTR.$name.interval$/,
@{$events} or grep /^ATTR.$name.interval.[0-9]+/, @{$events} or grep /^ATTR.$name.interval.[0-9]+/,
@{$events} or grep /^DELETEATTR.$name.disable$/,
@{$events} @{$events}
) )
&& $init_done && $init_done
@ -385,7 +386,7 @@ sub Notify {
&& ( && (
grep /^state:.Connected$/, grep /^state:.Connected$/,
@{$events} or grep /^lastRequestState:.request_error$/, @{$events} or grep /^lastRequestState:.request_error$/,
@{$events} @{$events}
) )
) )
{ {
@ -519,8 +520,8 @@ sub ErrorHandling {
my $dname = $dhash->{NAME}; my $dname = $dhash->{NAME};
Log3 $name, 4, "GardenaSmartBridge ($name) - Request: $data"; Log3 $name, 4, "GardenaSmartBridge ($name) - Request: $data";
my $decode_json = eval { decode_json($data) }; my $decode_json = eval { decode_json($data) } if ( lc $param->{'method'} ne 'put' );
if ($@) { if ($@) {
Log3 $name, 3, "GardenaSmartBridge ($name) - JSON error while request"; Log3 $name, 3, "GardenaSmartBridge ($name) - JSON error while request";
} }
@ -981,8 +982,8 @@ sub getDevices {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
if ( not IsDisabled($name) ) { if ( not IsDisabled($name) ) {
@ -992,12 +993,17 @@ sub getDevices {
for my $gardenaDev (@list){ for my $gardenaDev (@list){
push( @{ $hash->{helper}{deviceList} }, $gardenaDev ); push( @{ $hash->{helper}{deviceList} }, $gardenaDev );
} }
Write( $hash, undef, undef, undef ); if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) ne 'none'
&& (
defined( ReadPassword( $hash, $name ) )
))
{
Write( $hash, undef, undef, undef );
Log3 $name, 4, Log3 $name, 4,
"GardenaSmartBridge ($name) - fetch device list and device states"; "GardenaSmartBridge ($name) - fetch device list and device states";
} # fi gardenaAccountEmail
} }
else { else {
readingsSingleUpdate( $hash, 'state', 'disabled', 1 ); readingsSingleUpdate( $hash, 'state', 'disabled', 1 );
Log3 $name, 3, "GardenaSmartBridge ($name) - device is disabled"; Log3 $name, 3, "GardenaSmartBridge ($name) - device is disabled";
} }
@ -1488,7 +1494,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.4.2", "version": "v2.4.3",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2021-06-05_18:47:30 46871 FHEM/73_GardenaSmartBridge.pm UPD 2021-06-09_13:23:15 47174 FHEM/73_GardenaSmartBridge.pm
UPD 2021-06-05_09:32:03 55505 FHEM/74_GardenaSmartDevice.pm UPD 2021-06-09_09:52:26 55505 FHEM/74_GardenaSmartDevice.pm