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 +6 -11
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 71ef5799c2 - Show all commits

15
FHEM/73_GardenaSmartBridge.pm
View File

@@ -63,7 +63,7 @@ use warnings;
use POSIX; use POSIX;
use FHEM::Meta; use FHEM::Meta;
use Data::Dumper; #use Data::Dumper;
use HttpUtils; use HttpUtils;
@@ -344,8 +344,6 @@ sub Notify {
my $events = deviceEvents( $dev, 1 ); my $events = deviceEvents( $dev, 1 );
return if ( !$events ); return if ( !$events );
# Log3 $name, 1, "[DEBUG - Teufelchen] : ".Dumper($hash). " -> ".Dumper($dev). " $devname , $devtype , event: ".Dumper($events);
getToken($hash) getToken($hash)
if ( if (
( (
@@ -485,7 +483,7 @@ sub Write {
HttpUtils_NonblockingGet( HttpUtils_NonblockingGet(
{ {
url => $hash->{URL} . $uri, url => $hash->{URL} . $uri,
timeout => 45, timeout => 15,
incrementalTimeout => 1, incrementalTimeout => 1,
hash => $hash, hash => $hash,
device_id => $deviceId, device_id => $deviceId,
@@ -502,8 +500,8 @@ sub Write {
"GardenaSmartBridge ($name) - Send with URL: $hash->{URL}$uri, HEADER: secret!, DATA: secret!, METHOD: $method" "GardenaSmartBridge ($name) - Send with URL: $hash->{URL}$uri, HEADER: secret!, DATA: secret!, METHOD: $method"
); );
Log3($name, 3, # Log3($name, 3,
"GardenaSmartBridge ($name) - Send with URL: $hash->{URL}$uri, HEADER: $header, DATA: $payload, METHOD: $method"); # "GardenaSmartBridge ($name) - Send with URL: $hash->{URL}$uri, HEADER: $header, DATA: $payload, METHOD: $method");
return; return;
} }
@@ -517,7 +515,7 @@ sub ErrorHandling {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $dhash = $hash; my $dhash = $hash;
$dhash = $modules{GardenaSmartDevice}{defptr}{ $param->{'device_id'} } $dhash = $modules{GardenaSmartDevice}{defptr}{ $param->{'device_id'} } if ( length($data) > 0 );
if ( defined( $param->{'device_id'} ) ); if ( defined( $param->{'device_id'} ) );
my $dname = $dhash->{NAME}; my $dname = $dhash->{NAME};
@@ -1021,7 +1019,6 @@ sub getToken {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
Log3 $name, 1, "[DEBUG] - Teufelchen 4: done ($init_done)";
return readingsSingleUpdate( $hash, 'state', return readingsSingleUpdate( $hash, 'state',
'please set Attribut gardenaAccountEmail first', 1 ) 'please set Attribut gardenaAccountEmail first', 1 )
if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) eq 'none' ); if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) eq 'none' );
@@ -1216,8 +1213,6 @@ sub createHttpValueStrings {
$payload = '{' . $payload . '}' if ( defined($payload) ); $payload = '{' . $payload . '}' if ( defined($payload) );
$payload = '{}' if ( !defined($payload) ); $payload = '{}' if ( !defined($payload) );
my $name = $hash->{NAME};
Log3 $name, 1, "[DEBUG] Teufelnchen 3: ".$payload;
if ( $payload eq '{}' ) { if ( $payload eq '{}' ) {
$method = 'GET' if (defined( $hash->{helper}{session_id} ) ); $method = 'GET' if (defined( $hash->{helper}{session_id} ) );
$payload = ''; $payload = '';

2
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2021-06-21_22:44:30 47349 FHEM/73_GardenaSmartBridge.pm UPD 2021-06-28_10:14:08 47099 FHEM/73_GardenaSmartBridge.pm
UPD 2021-06-09_09:52:26 55505 FHEM/74_GardenaSmartDevice.pm UPD 2021-06-09_09:52:26 55505 FHEM/74_GardenaSmartDevice.pm