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

feature request add changeable baseURL #3

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-04 11:42:50 +02:00
parent 92759b81b7
commit 640a2fa8fd
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
73_GardenaSmartBridge.pm
View File

@ -59,7 +59,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = "1.6.4"; my $version = '1.6.4.1';
sub GardenaSmartBridge_Initialize($) { sub GardenaSmartBridge_Initialize($) {
@ -67,25 +67,26 @@ sub GardenaSmartBridge_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
# Provider # Provider
$hash->{WriteFn} = "FHEM::GardenaSmartBridge::Write"; $hash->{WriteFn} = 'FHEM::GardenaSmartBridge::Write';
$hash->{Clients} = ":GardenaSmartDevice:"; $hash->{Clients} = ':GardenaSmartDevice:';
$hash->{MatchList} = { "1:GardenaSmartDevice" => '^{"id":".*' }; $hash->{MatchList} = { '1:GardenaSmartDevice' => '^{"id":".*' };
# Consumer # Consumer
$hash->{SetFn} = "FHEM::GardenaSmartBridge::Set"; $hash->{SetFn} = 'FHEM::GardenaSmartBridge::Set';
$hash->{DefFn} = "FHEM::GardenaSmartBridge::Define"; $hash->{DefFn} = 'FHEM::GardenaSmartBridge::Define';
$hash->{UndefFn} = "FHEM::GardenaSmartBridge::Undef"; $hash->{UndefFn} = 'FHEM::GardenaSmartBridge::Undef';
$hash->{DeleteFn} = "FHEM::GardenaSmartBridge::Delete"; $hash->{DeleteFn} = 'FHEM::GardenaSmartBridge::Delete';
$hash->{RenameFn} = "FHEM::GardenaSmartBridge::Rename"; $hash->{RenameFn} = 'FHEM::GardenaSmartBridge::Rename';
$hash->{NotifyFn} = "FHEM::GardenaSmartBridge::Notify"; $hash->{NotifyFn} = 'FHEM::GardenaSmartBridge::Notify';
$hash->{AttrFn} = "FHEM::GardenaSmartBridge::Attr"; $hash->{AttrFn} = 'FHEM::GardenaSmartBridge::Attr';
$hash->{AttrList} = $hash->{AttrList} =
"debugJSON:0,1 " 'debugJSON:0,1 '
. "disable:1 " . 'disable:1 '
. "interval " . 'interval '
. "disabledForIntervals " . 'disabledForIntervals '
. "gardenaAccountEmail " . 'gardenaAccountEmail '
. 'gardenaBaseURL '
. $readingFnAttributes; . $readingFnAttributes;
foreach my $d ( sort keys %{ $modules{GardenaSmartBridge}{defptr} } ) { foreach my $d ( sort keys %{ $modules{GardenaSmartBridge}{defptr} } ) {
@ -101,7 +102,7 @@ package FHEM::GardenaSmartBridge;
use GPUtils qw(GP_Import) use GPUtils qw(GP_Import)
; # wird für den Import der FHEM Funktionen aus der fhem.pl benötigt ; # wird für den Import der FHEM Funktionen aus der fhem.pl benötigt
my $missingModul = ""; my $missingModul = '';
use strict; use strict;
use warnings; use warnings;
@ -112,8 +113,8 @@ use HttpUtils;
eval "use Encode qw(encode encode_utf8 decode_utf8);1" eval "use Encode qw(encode encode_utf8 decode_utf8);1"
or $missingModul .= "Encode "; or $missingModul .= "Encode ";
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= 'JSON ';
eval "use IO::Socket::SSL;1" or $missingModul .= "IO::Socket::SSL "; eval "use IO::Socket::SSL;1" or $missingModul .= 'IO::Socket::SSL ';
BEGIN { BEGIN {
GP_Import( GP_Import(
@ -147,18 +148,18 @@ sub Define($$) {
my ( $hash, $def ) = @_; my ( $hash, $def ) = @_;
my @a = split( "[ \t][ \t]*", $def ); my @a = split( '[ \t][ \t]*', $def );
return $@ unless ( FHEM::Meta::SetInternals($hash) ); return $@ unless ( FHEM::Meta::SetInternals($hash) );
return "too few parameters: define <NAME> GardenaSmartBridge" return 'too few parameters: define <NAME> GardenaSmartBridge'
if ( @a != 2 ); if ( @a != 2 );
return return
"Cannot define Gardena Bridge device. Perl modul ${missingModul}is missing." 'Cannot define Gardena Bridge device. Perl modul ' . ${missingModul} . ' is missing.'
if ($missingModul); if ($missingModul);
my $name = $a[0]; my $name = $a[0];
$hash->{BRIDGE} = 1; $hash->{BRIDGE} = 1;
$hash->{URL} = 'https://sg-api.dss.husqvarnagroup.net/sg-1'; $hash->{URL} = AttrVal($name,'gardenaBaseURL','https://sg-api.dss.husqvarnagroup.net') . '/sg-1';
$hash->{VERSION} = $version; $hash->{VERSION} = $version;
$hash->{INTERVAL} = 60; $hash->{INTERVAL} = 60;
$hash->{NOTIFYDEV} = "global,$name"; $hash->{NOTIFYDEV} = "global,$name";
@ -191,7 +192,7 @@ sub Delete($$) {
my ( $hash, $name ) = @_; my ( $hash, $name ) = @_;
setKeyValue( $hash->{TYPE} . "_" . $name . "_passwd", undef ); setKeyValue( $hash->{TYPE} . '_' . $name . '_passwd', undef );
return undef; return undef;
} }
@ -200,50 +201,55 @@ sub Attr(@) {
my ( $cmd, $name, $attrName, $attrVal ) = @_; my ( $cmd, $name, $attrName, $attrVal ) = @_;
my $hash = $defs{$name}; my $hash = $defs{$name};
if ( $attrName eq "disable" ) { if ( $attrName eq 'disable' ) {
if ( $cmd eq "set" and $attrVal eq "1" ) { if ( $cmd eq 'set' and $attrVal eq '1' ) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
readingsSingleUpdate( $hash, "state", "inactive", 1 ); readingsSingleUpdate( $hash, 'state', 'inactive', 1 );
Log3 $name, 3, "GardenaSmartBridge ($name) - disabled"; Log3 $name, 3, "GardenaSmartBridge ($name) - disabled";
} }
elsif ( $cmd eq 'del' ) {
elsif ( $cmd eq "del" ) { readingsSingleUpdate( $hash, 'state', 'active', 1 );
readingsSingleUpdate( $hash, "state", "active", 1 );
Log3 $name, 3, "GardenaSmartBridge ($name) - enabled"; Log3 $name, 3, "GardenaSmartBridge ($name) - enabled";
} }
} }
elsif ( $attrName eq 'disabledForIntervals' ) {
elsif ( $attrName eq "disabledForIntervals" ) { if ( $cmd eq 'set' ) {
if ( $cmd eq "set" ) {
return return
"check disabledForIntervals Syntax HH:MM-HH:MM or 'HH:MM-HH:MM HH:MM-HH:MM ...'" "check disabledForIntervals Syntax HH:MM-HH:MM or 'HH:MM-HH:MM HH:MM-HH:MM ...'"
unless ( $attrVal =~ /^((\d{2}:\d{2})-(\d{2}:\d{2})\s?)+$/ ); unless ( $attrVal =~ /^((\d{2}:\d{2})-(\d{2}:\d{2})\s?)+$/ );
Log3 $name, 3, "GardenaSmartBridge ($name) - disabledForIntervals"; Log3 $name, 3, "GardenaSmartBridge ($name) - disabledForIntervals";
} }
elsif ( $cmd eq 'del' ) {
elsif ( $cmd eq "del" ) { readingsSingleUpdate( $hash, 'state', 'active', 1 );
readingsSingleUpdate( $hash, "state", "active", 1 );
Log3 $name, 3, "GardenaSmartBridge ($name) - enabled"; Log3 $name, 3, "GardenaSmartBridge ($name) - enabled";
} }
} }
elsif ( $attrName eq 'interval' ) {
elsif ( $attrName eq "interval" ) { if ( $cmd eq 'set' ) {
if ( $cmd eq "set" ) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
return "Interval must be greater than 0" return 'Interval must be greater than 0'
unless ( $attrVal > 0 ); unless ( $attrVal > 0 );
$hash->{INTERVAL} = $attrVal; $hash->{INTERVAL} = $attrVal;
Log3 $name, 3, Log3 $name, 3,
"GardenaSmartBridge ($name) - set interval: $attrVal"; "GardenaSmartBridge ($name) - set interval: $attrVal";
} }
elsif ( $cmd eq 'del' ) {
elsif ( $cmd eq "del" ) {
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
$hash->{INTERVAL} = 60; $hash->{INTERVAL} = 60;
Log3 $name, 3, Log3 $name, 3,
"GardenaSmartBridge ($name) - delete User interval and set default: 60"; "GardenaSmartBridge ($name) - delete User interval and set default: 60";
} }
} }
elsif ( $attrName eq 'gardenaBaseURL' ) {
if ( $cmd eq 'set' ) {
$hash->{URL} = $attrVal . '/sg-1';
Log3 $name, 3,
"GardenaSmartBridge ($name) - set gardenaBaseURL to: $attrVal";
}
elsif ( $cmd eq 'del' ) {
$hash->{URL} = 'https://sg-api.dss.husqvarnagroup.net/sg-1';
}
}
return undef; return undef;
} }