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

cleanup ...

Browse Source
This commit is contained in:
Sebastian 2021-04-06 21:03:46 +02:00
parent 1fa369ccc2
commit a07f380df6
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
FHEM/73_GardenaSmartBridge.pm
View File

@ -57,7 +57,7 @@
package FHEM::GardenaSmartBridge; package FHEM::GardenaSmartBridge;
use GPUtils qw(GP_Import GP_Export); use GPUtils qw(GP_Import GP_Export);
# use Data::Dumper; #only for Debugging #use Data::Dumper; #only for Debugging
use strict; use strict;
use warnings; use warnings;
@ -194,6 +194,7 @@ sub Initialize {
# Consumer # Consumer
$hash->{SetFn} = \&Set; $hash->{SetFn} = \&Set;
$hash->{GetFn} = \&Get;
$hash->{DefFn} = \&Define; $hash->{DefFn} = \&Define;
$hash->{UndefFn} = \&Undef; $hash->{UndefFn} = \&Undef;
$hash->{DeleteFn} = \&Delete; $hash->{DeleteFn} = \&Delete;
@ -394,6 +395,29 @@ sub Notify {
return; return;
} }
sub Get {
my $hash = shift // return;
my $aArg = shift // return;
my $name = shift @$aArg // return;
my $cmd = shift @$aArg
// return qq{"get $name" needs at least one argument};
if ( lc $cmd eq 'debug_devices_list' ) {
$hash->{helper}{debug_device_list} = 'get';
/*Log3 $name, 2, Dumper($hash->{helper});
Write($hash, undef, undef, undef, undef);
*/
return 'coming soon';
} else {
my $list = "";
$list .= " debug_devices_list:noArg"
if ( AttrVal( $name, "debugJSON", "none") ne "none" );
return "Unknown argument $cmd,choose one of $list";
}
}
sub Set { sub Set {
my $hash = shift // return; my $hash = shift // return;
@ -425,11 +449,6 @@ sub Set {
StorePassword( $hash, $name, $aArg->[0] ); StorePassword( $hash, $name, $aArg->[0] );
} }
elsif ( lc $cmd eq 'debug_devices_list' ) {
$hash->{helper}{debug_device_list} = 'set';
Log3 $name, 2, Dumper($hash->{helper});
Write($hash, undef, undef, undef, undef);
}
elsif ( lc $cmd eq 'deleteaccountpassword' ) { elsif ( lc $cmd eq 'deleteaccountpassword' ) {
return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 ); return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
@ -443,8 +462,6 @@ sub Set {
if ( not defined( ReadPassword( $hash, $name ) ) ); if ( not defined( ReadPassword( $hash, $name ) ) );
$list .= " deleteAccountPassword:noArg" $list .= " deleteAccountPassword:noArg"
if ( defined( ReadPassword( $hash, $name ) ) ); if ( defined( ReadPassword( $hash, $name ) ) );
#$list .= " debug_devices_list:noArg"
# if ( AttrVal( $name, "debugJSON", "none") ne "none" );
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
@ -498,7 +515,7 @@ sub ErrorHandling {
my $dname = $dhash->{NAME}; my $dname = $dhash->{NAME};
Log3 $name, 2, "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 ($@) { if ($@) {
@ -756,9 +773,9 @@ sub ResponseProcessing {
return; return;
} }
elsif ( defined($hash->{helper}{debug_device_list} ) ) elsif ( exists($hash->{helper}{debug_device_list} ) )
{ {
Log3 $name, 4, "Debug Devices List"; Log3 $name, 4, 'Debug Devices List';
my $msg; my $msg;
$msg = "test krams"; $msg = "test krams";
@ -772,7 +789,7 @@ sub ResponseProcessing {
} }
undef($hash->{helper}{debug_device_list}); delete $hash->{helper}{debug_device_list};
return $msg; return $msg;
} }
elsif (defined( $decode_json->{devices} ) elsif (defined( $decode_json->{devices} )
@ -883,7 +900,6 @@ sub WriteReadings {
$v $v
) )
if ($decode_json->{abilities}[0]{properties}[$properties]{name} !~ /ethernet_status|wifi_status/ ); if ($decode_json->{abilities}[0]{properties}[$properties]{name} !~ /ethernet_status|wifi_status/ );
if ( if (
( (
$decode_json->{abilities}[0]{properties} $decode_json->{abilities}[0]{properties}
@ -1419,7 +1435,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.1", "version": "v2.2.2",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],