mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 09:16:53 +00:00
73_GardenaSmartBridge: asyncron response processing, no blocking if more then 3-4 devices
git-svn-id: https://svn.fhem.de/fhem/trunk@25661 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier
parent
690a16a0c1
commit
ce8e87fc0e
@ -1,5 +1,7 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
||||||
# Do not insert empty lines here, update check depends on it.
|
# Do not insert empty lines here, update check depends on it.
|
||||||
|
- feature: 73_GardenaSmartBridge: asyncron response processing,
|
||||||
|
no blocking if more then 3-4 devices
|
||||||
- bugfix: 70_ESCVP21net: fix for GetAll in statusCheckCmd
|
- bugfix: 70_ESCVP21net: fix for GetAll in statusCheckCmd
|
||||||
- feature: 93_InfluxDBLogger: strings and original timestamps supported
|
- feature: 93_InfluxDBLogger: strings and original timestamps supported
|
||||||
- feature: 70_ESCVP21net.pm: multiple checkStatusCmds, new GetStatus
|
- feature: 70_ESCVP21net.pm: multiple checkStatusCmds, new GetStatus
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
# Developed with Kate
|
# Developed with VSCodium and richterger perl plugin.
|
||||||
#
|
#
|
||||||
# (c) 2017-2021 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
|
# (c) 2017-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
#
|
||||||
# Special thanks goes to comitters:
|
# Special thanks goes to comitters:
|
||||||
@ -57,22 +57,20 @@
|
|||||||
package FHEM::GardenaSmartBridge;
|
package FHEM::GardenaSmartBridge;
|
||||||
use GPUtils qw(GP_Import GP_Export);
|
use GPUtils qw(GP_Import GP_Export);
|
||||||
|
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
use POSIX;
|
use POSIX;
|
||||||
use FHEM::Meta;
|
use FHEM::Meta;
|
||||||
|
|
||||||
#use Data::Dumper;
|
|
||||||
|
|
||||||
use HttpUtils;
|
use HttpUtils;
|
||||||
|
|
||||||
my $missingModul = '';
|
my $missingModul = '';
|
||||||
eval "use Encode qw(encode encode_utf8 decode_utf8);1"
|
eval { use Encode qw /encode_utf8 decode_utf8/; 1 }
|
||||||
or $missingModul .= "Encode ";
|
or $missingModul .= "Encode ";
|
||||||
|
|
||||||
# eval "use JSON;1" || $missingModul .= 'JSON ';
|
# eval "use JSON;1" || $missingModul .= 'JSON ';
|
||||||
eval "use IO::Socket::SSL;1" or $missingModul .= 'IO::Socket::SSL ';
|
eval { use IO::Socket::SSL; 1 }
|
||||||
|
or $missingModul .= 'IO::Socket::SSL ';
|
||||||
|
|
||||||
# try to use JSON::MaybeXS wrapper
|
# try to use JSON::MaybeXS wrapper
|
||||||
# for chance of better performance + open code
|
# for chance of better performance + open code
|
||||||
@ -80,15 +78,11 @@ eval {
|
|||||||
require JSON::MaybeXS;
|
require JSON::MaybeXS;
|
||||||
import JSON::MaybeXS qw( decode_json encode_json );
|
import JSON::MaybeXS qw( decode_json encode_json );
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# try to use JSON wrapper
|
# try to use JSON wrapper
|
||||||
# for chance of better performance
|
# for chance of better performance
|
||||||
eval {
|
eval {
|
||||||
|
|
||||||
# JSON preference order
|
# JSON preference order
|
||||||
local $ENV{PERL_JSON_BACKEND} =
|
local $ENV{PERL_JSON_BACKEND} =
|
||||||
'Cpanel::JSON::XS,JSON::XS,JSON::PP,JSON::backportPP'
|
'Cpanel::JSON::XS,JSON::XS,JSON::PP,JSON::backportPP'
|
||||||
@ -97,10 +91,7 @@ if ($@) {
|
|||||||
require JSON;
|
require JSON;
|
||||||
import JSON qw( decode_json encode_json );
|
import JSON qw( decode_json encode_json );
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# In rare cases, Cpanel::JSON::XS may
|
# In rare cases, Cpanel::JSON::XS may
|
||||||
# be installed but JSON|JSON::MaybeXS not ...
|
# be installed but JSON|JSON::MaybeXS not ...
|
||||||
@ -108,10 +99,7 @@ if ($@) {
|
|||||||
require Cpanel::JSON::XS;
|
require Cpanel::JSON::XS;
|
||||||
import Cpanel::JSON::XS qw(decode_json encode_json);
|
import Cpanel::JSON::XS qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# In rare cases, JSON::XS may
|
# In rare cases, JSON::XS may
|
||||||
# be installed but JSON not ...
|
# be installed but JSON not ...
|
||||||
@ -119,10 +107,7 @@ if ($@) {
|
|||||||
require JSON::XS;
|
require JSON::XS;
|
||||||
import JSON::XS qw(decode_json encode_json);
|
import JSON::XS qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# Fallback to built-in JSON which SHOULD
|
# Fallback to built-in JSON which SHOULD
|
||||||
# be available since 5.014 ...
|
# be available since 5.014 ...
|
||||||
@ -130,20 +115,17 @@ if ($@) {
|
|||||||
require JSON::PP;
|
require JSON::PP;
|
||||||
import JSON::PP qw(decode_json encode_json);
|
import JSON::PP qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# Fallback to JSON::backportPP in really rare cases
|
# Fallback to JSON::backportPP in really rare cases
|
||||||
require JSON::backportPP;
|
require JSON::backportPP;
|
||||||
import JSON::backportPP qw(decode_json encode_json);
|
import JSON::backportPP qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
## Import der FHEM Funktionen
|
## Import der FHEM Funktionen
|
||||||
#-- Run before package compilation
|
#-- Run before package compilation
|
||||||
@ -183,7 +165,7 @@ BEGIN {
|
|||||||
#-- Export to main context with different name
|
#-- Export to main context with different name
|
||||||
GP_Export(
|
GP_Export(
|
||||||
qw(
|
qw(
|
||||||
Initialize
|
Initialize
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -237,9 +219,7 @@ sub Define {
|
|||||||
my $name = shift @$aArg;
|
my $name = shift @$aArg;
|
||||||
$hash->{BRIDGE} = 1;
|
$hash->{BRIDGE} = 1;
|
||||||
$hash->{URL} =
|
$hash->{URL} =
|
||||||
AttrVal( $name, 'gardenaBaseURL',
|
AttrVal( $name, 'gardenaBaseURL', 'https://smart.gardena.com' ) . '/v1';
|
||||||
'https://smart.gardena.com' )
|
|
||||||
. '/v1';
|
|
||||||
$hash->{VERSION} = version->parse($VERSION)->normal;
|
$hash->{VERSION} = version->parse($VERSION)->normal;
|
||||||
$hash->{INTERVAL} = 60;
|
$hash->{INTERVAL} = 60;
|
||||||
$hash->{NOTIFYDEV} = "global,$name";
|
$hash->{NOTIFYDEV} = "global,$name";
|
||||||
@ -261,7 +241,7 @@ sub Undef {
|
|||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $name = shift;
|
my $name = shift;
|
||||||
|
|
||||||
RemoveInternalTimer($hash, "FHEM::GardenaSmartBridge::getDevices");
|
RemoveInternalTimer( $hash, "FHEM::GardenaSmartBridge::getDevices" );
|
||||||
delete $modules{GardenaSmartBridge}{defptr}{BRIDGE}
|
delete $modules{GardenaSmartBridge}{defptr}{BRIDGE}
|
||||||
if ( defined( $modules{GardenaSmartBridge}{defptr}{BRIDGE} ) );
|
if ( defined( $modules{GardenaSmartBridge}{defptr}{BRIDGE} ) );
|
||||||
|
|
||||||
@ -282,7 +262,8 @@ sub Attr {
|
|||||||
|
|
||||||
if ( $attrName eq 'disable' ) {
|
if ( $attrName eq 'disable' ) {
|
||||||
if ( $cmd eq 'set' && $attrVal eq '1' ) {
|
if ( $cmd eq 'set' && $attrVal eq '1' ) {
|
||||||
RemoveInternalTimer($hash, "FHEM::GardenaSmartBridge::getDevices");
|
RemoveInternalTimer( $hash,
|
||||||
|
"FHEM::GardenaSmartBridge::getDevices" );
|
||||||
readingsSingleUpdate( $hash, 'state', 'inactive', 1 );
|
readingsSingleUpdate( $hash, 'state', 'inactive', 1 );
|
||||||
Log3 $name, 3, "GardenaSmartBridge ($name) - disabled";
|
Log3 $name, 3, "GardenaSmartBridge ($name) - disabled";
|
||||||
}
|
}
|
||||||
@ -307,13 +288,15 @@ sub Attr {
|
|||||||
if ( $cmd eq 'set' ) {
|
if ( $cmd eq 'set' ) {
|
||||||
return 'Interval must be greater than 0'
|
return 'Interval must be greater than 0'
|
||||||
if ( $attrVal == 0 );
|
if ( $attrVal == 0 );
|
||||||
RemoveInternalTimer($hash, "FHEM::GardenaSmartBridge::getDevices");
|
RemoveInternalTimer( $hash,
|
||||||
|
"FHEM::GardenaSmartBridge::getDevices" );
|
||||||
$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, "FHEM::GardenaSmartBridge::getDevices");
|
RemoveInternalTimer( $hash,
|
||||||
|
"FHEM::GardenaSmartBridge::getDevices" );
|
||||||
$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";
|
||||||
@ -360,14 +343,9 @@ sub Notify {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|| (
|
|| ( $devtype eq 'GardenaSmartBridge'
|
||||||
$devtype eq 'GardenaSmartBridge'
|
&& ( grep /^gardenaAccountPassword.+/, @{$events} ) )
|
||||||
&& (
|
&& $init_done
|
||||||
grep /^gardenaAccountPassword.+/,
|
|
||||||
@{$events}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
&& $init_done
|
|
||||||
);
|
);
|
||||||
|
|
||||||
getDevices($hash)
|
getDevices($hash)
|
||||||
@ -399,6 +377,7 @@ sub Notify {
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub Get {
|
sub Get {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
my $aArg = shift // return;
|
my $aArg = shift // return;
|
||||||
@ -410,15 +389,16 @@ sub Get {
|
|||||||
if ( lc $cmd eq 'debug_devices_list' ) {
|
if ( lc $cmd eq 'debug_devices_list' ) {
|
||||||
my $device = shift @$aArg;
|
my $device = shift @$aArg;
|
||||||
$hash->{helper}{debug_device} = $device;
|
$hash->{helper}{debug_device} = $device;
|
||||||
Write($hash, undef, undef, undef, undef);
|
Write( $hash, undef, undef, undef, undef );
|
||||||
return undef;
|
return;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
my $list = "";
|
my $list = "";
|
||||||
$list .= " debug_devices_list:"
|
$list .=
|
||||||
.join( ',', @{ $hash->{helper}{deviceList} })
|
" debug_devices_list:" . join( ',', @{ $hash->{helper}{deviceList} } )
|
||||||
if ( AttrVal( $name, "debugDEVICE", "none") ne "none"
|
if ( AttrVal( $name, "debugDEVICE", "none" ) ne "none"
|
||||||
&& exists($hash->{helper}{deviceList}) );
|
&& exists( $hash->{helper}{deviceList} ) );
|
||||||
return "Unknown argument $cmd,choose one of $list";
|
return "Unknown argument $cmd,choose one of $list";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -427,7 +407,8 @@ sub Set {
|
|||||||
my $aArg = shift // return;
|
my $aArg = shift // return;
|
||||||
|
|
||||||
my $name = shift @$aArg // return;
|
my $name = shift @$aArg // return;
|
||||||
my $cmd = shift @$aArg // return qq{"set $name" needs at least one argument};
|
my $cmd = shift @$aArg
|
||||||
|
// return qq{"set $name" needs at least one argument};
|
||||||
|
|
||||||
# Das Argument für das Passwort, also das Passwort an sich darf keine = enthalten!!!
|
# Das Argument für das Passwort, also das Passwort an sich darf keine = enthalten!!!
|
||||||
|
|
||||||
@ -478,21 +459,22 @@ sub Write {
|
|||||||
my ( $session_id, $header, $uri, $method );
|
my ( $session_id, $header, $uri, $method );
|
||||||
|
|
||||||
( $payload, $session_id, $header, $uri, $method, $deviceId, $service_id ) =
|
( $payload, $session_id, $header, $uri, $method, $deviceId, $service_id ) =
|
||||||
createHttpValueStrings( $hash, $payload, $deviceId, $abilities, $service_id );
|
createHttpValueStrings( $hash, $payload, $deviceId, $abilities,
|
||||||
|
$service_id );
|
||||||
|
|
||||||
HttpUtils_NonblockingGet(
|
HttpUtils_NonblockingGet(
|
||||||
{
|
{
|
||||||
url => $hash->{URL} . $uri,
|
url => $hash->{URL} . $uri,
|
||||||
timeout => 15,
|
timeout => 15,
|
||||||
incrementalTimeout => 1,
|
incrementalTimeout => 1,
|
||||||
hash => $hash,
|
hash => $hash,
|
||||||
device_id => $deviceId,
|
device_id => $deviceId,
|
||||||
data => $payload,
|
data => $payload,
|
||||||
method => $method,
|
method => $method,
|
||||||
header => $header,
|
header => $header,
|
||||||
doTrigger => 1,
|
doTrigger => 1,
|
||||||
cl => $hash->{CL},
|
cl => $hash->{CL},
|
||||||
callback => \&ErrorHandling
|
callback => \&ErrorHandling
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -500,8 +482,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;
|
||||||
}
|
}
|
||||||
@ -702,6 +684,11 @@ sub ErrorHandling {
|
|||||||
. $param->{code};
|
. $param->{code};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !defined( $hash->{helper}{session_id} ) ) {
|
||||||
|
readingsSingleUpdate( $hash, 'token', 'none', 1 );
|
||||||
|
InternalTimer( gettimeofday() + 5,
|
||||||
|
"FHEM::GardenaSmartBridge::getToken", $hash );
|
||||||
|
}
|
||||||
readingsEndUpdate( $dhash, 1 );
|
readingsEndUpdate( $dhash, 1 );
|
||||||
|
|
||||||
Log3 $dname, 5,
|
Log3 $dname, 5,
|
||||||
@ -712,60 +699,70 @@ sub ErrorHandling {
|
|||||||
delete $dhash->{helper}{deviceAction}
|
delete $dhash->{helper}{deviceAction}
|
||||||
if ( defined( $dhash->{helper}{deviceAction} ) );
|
if ( defined( $dhash->{helper}{deviceAction} ) );
|
||||||
|
|
||||||
readingsSingleUpdate( $hash, 'token', 'none', 1 )
|
|
||||||
if ( !defined( $hash->{helper}{session_id} ) );
|
|
||||||
|
|
||||||
getToken($hash)
|
|
||||||
if ( !defined( $hash->{helper}{session_id} ) );
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
elsif (defined ($decode_json->{message})
|
elsif ( defined( $decode_json->{message} )
|
||||||
&& $decode_json->{message} eq 'Unauthorized') {
|
&& $decode_json->{message} eq 'Unauthorized' )
|
||||||
Log3 $name, 3,
|
{
|
||||||
|
Log3 $name, 3,
|
||||||
"GardenaSmartBridge ($name) - Unauthorized -> fetch new token ";
|
"GardenaSmartBridge ($name) - Unauthorized -> fetch new token ";
|
||||||
getToken($hash);
|
|
||||||
return;
|
getToken($hash);
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (defined($hash->{helper}{debug_device})
|
if ( defined( $hash->{helper}{debug_device} )
|
||||||
&& $hash->{helper}{debug_device} ne 'none'
|
&& $hash->{helper}{debug_device} ne 'none' )
|
||||||
){
|
{
|
||||||
Log3 $name, 4, "GardenaSmartBridge DEBUG Device";
|
Log3 $name, 4, "GardenaSmartBridge DEBUG Device";
|
||||||
delete $hash->{helper}{debug_device};
|
delete $hash->{helper}{debug_device};
|
||||||
my @device_spec = ("name", "id", "category");
|
|
||||||
my $devJson=$decode_json->{devices};
|
my @device_spec = ( "name", "id", "category" );
|
||||||
my $output = '.:{ DEBUG OUTPUT for '.$devJson->{name}.' }:. \n';
|
my $devJson = $decode_json->{devices};
|
||||||
for my $spec (@device_spec) {
|
my $output = '.:{ DEBUG OUTPUT for ' . $devJson->{name} . ' }:. \n';
|
||||||
$output .= "$spec : $devJson->{$spec} \n";
|
|
||||||
}
|
for my $spec (@device_spec) {
|
||||||
#settings
|
$output .= "$spec : $devJson->{$spec} \n";
|
||||||
$output .= '\n=== Settings \n';
|
|
||||||
my $i = 0;
|
|
||||||
for my $dev_settings ( @ { $devJson->{settings} } ) {
|
|
||||||
$output .= "[".$i++."]id: $dev_settings->{id} \n";
|
|
||||||
$output .= "name: $dev_settings->{name} ";
|
|
||||||
if (ref ($dev_settings->{value}) eq 'ARRAY'
|
|
||||||
|| ref ($dev_settings->{value}) eq 'HASH'){
|
|
||||||
$output .= 'N/A \n';
|
|
||||||
} else {
|
|
||||||
$output .= "value: $dev_settings->{value} \n";
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
$output .= '\n=== Abilities \n';
|
#settings
|
||||||
$i = 0;
|
$output .= '\n=== Settings \n';
|
||||||
for my $dev_settings ( @ { $devJson->{abilities} } ) {
|
my $i = 0;
|
||||||
$output .= "[".$i++."]id: $dev_settings->{id} \n";
|
for my $dev_settings ( @{ $devJson->{settings} } ) {
|
||||||
$output .= "name: $dev_settings->{name} ";
|
$output .= "[" . $i++ . "]id: $dev_settings->{id} \n";
|
||||||
if (ref ($dev_settings->{value}) eq 'ARRAY'
|
$output .= "name: $dev_settings->{name} ";
|
||||||
|| ref ($dev_settings->{value}) eq 'HASH'){
|
if ( ref( $dev_settings->{value} ) eq 'ARRAY'
|
||||||
$output .= 'N/A \n';
|
|| ref( $dev_settings->{value} ) eq 'HASH' )
|
||||||
} else {
|
{
|
||||||
$output .= "value: $dev_settings->{value} \n";
|
$output .= 'N/A \n';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$output .= "value: $dev_settings->{value} \n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
$hash->{helper}{debug_device_output} = $output;
|
$output .= '\n=== Abilities \n';
|
||||||
asyncOutput($param->{cl}, $hash->{helper}{debug_device_output});
|
$i = 0;
|
||||||
return;
|
|
||||||
|
for my $dev_settings ( @{ $devJson->{abilities} } ) {
|
||||||
|
$output .= "[" . $i++ . "]id: $dev_settings->{id} \n";
|
||||||
|
$output .= "name: $dev_settings->{name} ";
|
||||||
|
|
||||||
|
if ( ref( $dev_settings->{value} ) eq 'ARRAY'
|
||||||
|
|| ref( $dev_settings->{value} ) eq 'HASH' )
|
||||||
|
{
|
||||||
|
$output .= 'N/A \n';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$output .= "value: $dev_settings->{value} \n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$hash->{helper}{debug_device_output} = $output;
|
||||||
|
asyncOutput( $param->{cl}, $hash->{helper}{debug_device_output} );
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
readingsSingleUpdate( $hash, 'state', 'Connected', 1 )
|
readingsSingleUpdate( $hash, 'state', 'Connected', 1 )
|
||||||
if ( defined( $hash->{helper}{locations_id} ) );
|
if ( defined( $hash->{helper}{locations_id} ) );
|
||||||
@ -794,18 +791,20 @@ sub ResponseProcessing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# print Dumper $decode_json;
|
if ( defined( $decode_json->{data} )
|
||||||
|
&& $decode_json->{data}
|
||||||
|
&& ref( $decode_json->{data} ) eq 'HASH'
|
||||||
|
&& !defined( $hash->{helper}->{user_id} ) )
|
||||||
|
{
|
||||||
|
|
||||||
if ( defined( $decode_json->{data} ) && $decode_json->{data}
|
$hash->{helper}{session_id} = $decode_json->{data}{id};
|
||||||
&& ref($decode_json->{data}) eq 'HASH'
|
$hash->{helper}{user_id} = $decode_json->{data}{attributes}->{user_id};
|
||||||
&& !defined( $hash->{helper}->{user_id})) {
|
$hash->{helper}{refresh_token} =
|
||||||
|
$decode_json->{data}{attributes}->{refresh_token};
|
||||||
|
$hash->{helper}{token_expired} =
|
||||||
|
gettimeofday() + $decode_json->{data}{attributes}->{expires_in};
|
||||||
|
|
||||||
$hash->{helper}{session_id} = $decode_json->{data}{id};
|
InternalTimer( $hash->{helper}{token_expired},
|
||||||
$hash->{helper}{user_id} = $decode_json->{data}{attributes}->{user_id};
|
|
||||||
$hash->{helper}{refresh_token} = $decode_json->{data}{attributes}->{refresh_token};
|
|
||||||
$hash->{helper}{token_expired} = gettimeofday() + $decode_json->{data}{attributes}->{expires_in};
|
|
||||||
|
|
||||||
InternalTimer($hash->{helper}{token_expired},
|
|
||||||
"FHEM::GardenaSmartBridge::getToken", $hash );
|
"FHEM::GardenaSmartBridge::getToken", $hash );
|
||||||
|
|
||||||
Write( $hash, undef, undef, undef );
|
Write( $hash, undef, undef, undef );
|
||||||
@ -838,51 +837,36 @@ sub ResponseProcessing {
|
|||||||
&& ref( $decode_json->{devices} ) eq 'ARRAY'
|
&& ref( $decode_json->{devices} ) eq 'ARRAY'
|
||||||
&& scalar( @{ $decode_json->{devices} } ) > 0 )
|
&& scalar( @{ $decode_json->{devices} } ) > 0 )
|
||||||
{
|
{
|
||||||
|
|
||||||
my @buffer = split( '"devices":\[', $json );
|
my @buffer = split( '"devices":\[', $json );
|
||||||
|
|
||||||
my ( $json, $tail ) = ParseJSON( $hash, $buffer[1] );
|
require SubProcess;
|
||||||
|
|
||||||
while ($json) {
|
my $subprocess =
|
||||||
|
SubProcess->new( { onRun => \&ResponseSubprocessing } );
|
||||||
|
$subprocess->{buffer} = $buffer[1];
|
||||||
|
|
||||||
Log3 $name, 5,
|
my $pid = $subprocess->run();
|
||||||
"GardenaSmartBridge ($name) - Decoding JSON message. Length: "
|
|
||||||
. length($json)
|
|
||||||
. " Content: "
|
|
||||||
. $json;
|
|
||||||
Log3 $name, 5,
|
|
||||||
"GardenaSmartBridge ($name) - Vor Sub: Laenge JSON: "
|
|
||||||
. length($json)
|
|
||||||
. " Content: "
|
|
||||||
. $json
|
|
||||||
. " Tail: "
|
|
||||||
. $tail;
|
|
||||||
|
|
||||||
if ( defined($tail) and $tail ) {
|
if ( !defined($pid) ) {
|
||||||
$decode_json = eval { decode_json($json) };
|
Log3( $name, 1,
|
||||||
if ($@) {
|
qq{GardenaSmartBridge ($name) - Cannot execute parse json asynchronously}
|
||||||
Log3 $name, 5,
|
);
|
||||||
"GardenaSmartBridge ($name) - JSON error while request: $@";
|
|
||||||
}
|
|
||||||
|
|
||||||
Dispatch( $hash, $json, undef )
|
CleanSubprocess($hash);
|
||||||
if ( $decode_json->{category} ne 'gateway' );
|
readingsSingleUpdate( $hash, 'state',
|
||||||
WriteReadings( $hash, $decode_json )
|
'Cannot execute parse json asynchronously', 1 );
|
||||||
if ( defined( $decode_json->{category} )
|
return;
|
||||||
&& $decode_json->{category} eq 'gateway' );
|
|
||||||
}
|
|
||||||
|
|
||||||
( $json, $tail ) = ParseJSON( $hash, $tail );
|
|
||||||
|
|
||||||
Log3 $name, 5,
|
|
||||||
"GardenaSmartBridge ($name) - Nach Sub: Laenge JSON: "
|
|
||||||
. length($json)
|
|
||||||
. " Content: "
|
|
||||||
. $json
|
|
||||||
. " Tail: "
|
|
||||||
. $tail;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Log3( $name, 4,
|
||||||
|
qq{GardenaSmartBridge ($name) - execute parse json asynchronously (PID="$pid")}
|
||||||
|
);
|
||||||
|
|
||||||
|
$hash->{".fhem"}{subprocess} = $subprocess;
|
||||||
|
|
||||||
|
InternalTimer( gettimeofday() + 1,
|
||||||
|
"FHEM::GardenaSmartBridge::PollChild", $hash );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -891,12 +875,148 @@ sub ResponseProcessing {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub ResponseProcessingFinalFromSubProcessing {
|
||||||
|
my $hash = shift;
|
||||||
|
my $response = shift;
|
||||||
|
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
my @response = split '\|,', $response;
|
||||||
|
|
||||||
|
Log3( $name, 4,
|
||||||
|
qq{GardenaSmartBridge ($name) - got result from asynchronous parsing} );
|
||||||
|
|
||||||
|
my $decode_json;
|
||||||
|
|
||||||
|
Log3( $name, 4, qq{GardenaSmartBridge ($name) - asynchronous finished.} );
|
||||||
|
|
||||||
|
if ( scalar(@response) > 0 ) {
|
||||||
|
for my $json (@response) {
|
||||||
|
|
||||||
|
#################
|
||||||
|
$decode_json = eval { decode_json($json) };
|
||||||
|
if ($@) {
|
||||||
|
Log3 $name, 5,
|
||||||
|
"GardenaSmartBridge ($name) - JSON error while request: $@";
|
||||||
|
}
|
||||||
|
|
||||||
|
Dispatch( $hash, $json, undef )
|
||||||
|
if ( $decode_json->{category} ne 'gateway' );
|
||||||
|
WriteReadings( $hash, $decode_json )
|
||||||
|
if ( defined( $decode_json->{category} )
|
||||||
|
&& $decode_json->{category} eq 'gateway' );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub PollChild {
|
||||||
|
my $hash = shift;
|
||||||
|
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
if ( defined( $hash->{".fhem"}{subprocess} ) ) {
|
||||||
|
my $subprocess = $hash->{".fhem"}{subprocess};
|
||||||
|
my $response = $subprocess->readFromChild();
|
||||||
|
|
||||||
|
if ( defined($response) ) {
|
||||||
|
ResponseProcessingFinalFromSubProcessing( $hash, $response );
|
||||||
|
$subprocess->wait();
|
||||||
|
CleanSubprocess($hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log3( $name, 4,
|
||||||
|
qq{GardenaSmartBridge ($name) - still waiting ($subprocess->{lasterror}).}
|
||||||
|
);
|
||||||
|
|
||||||
|
InternalTimer( gettimeofday() + 1,
|
||||||
|
"FHEM::GardenaSmartBridge::PollChild", $hash );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
# ResponseSubprocessin muss in eine async ausgelagert werden
|
||||||
|
######################################
|
||||||
|
# Begin Childprozess
|
||||||
|
######################################
|
||||||
|
sub ResponseSubprocessing {
|
||||||
|
my $subprocess = shift;
|
||||||
|
my $buffer = $subprocess->{buffer};
|
||||||
|
my @response = ();
|
||||||
|
|
||||||
|
my ( $json, $tail ) = ParseJSON($buffer);
|
||||||
|
|
||||||
|
while ($json) {
|
||||||
|
if ( defined($tail) and $tail ) {
|
||||||
|
push @response, $json;
|
||||||
|
}
|
||||||
|
|
||||||
|
( $json, $tail ) = ParseJSON($tail);
|
||||||
|
}
|
||||||
|
|
||||||
|
$subprocess->writeToParent( join '|', @response );
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub ParseJSON {
|
||||||
|
my $buffer = shift;
|
||||||
|
|
||||||
|
my $open = 0;
|
||||||
|
my $close = 0;
|
||||||
|
my $msg = '';
|
||||||
|
my $tail = '';
|
||||||
|
|
||||||
|
if ($buffer) {
|
||||||
|
for my $c ( split //, $buffer ) {
|
||||||
|
if ( $open == $close && $open > 0 ) {
|
||||||
|
$tail .= $c;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
if ( $c eq '{' ) {
|
||||||
|
|
||||||
|
$open++;
|
||||||
|
|
||||||
|
}
|
||||||
|
elsif ( $c eq '}' ) {
|
||||||
|
|
||||||
|
$close++;
|
||||||
|
}
|
||||||
|
|
||||||
|
$msg .= $c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $open != $close ) {
|
||||||
|
|
||||||
|
$tail = $msg;
|
||||||
|
$msg = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ( $msg, $tail );
|
||||||
|
}
|
||||||
|
######################################
|
||||||
|
# End Childprozess
|
||||||
|
######################################
|
||||||
|
|
||||||
|
sub CleanSubprocess {
|
||||||
|
my $hash = shift;
|
||||||
|
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
delete( $hash->{".fhem"}{subprocess} );
|
||||||
|
Log3( $name, 4, qq{GardenaSmartBridge ($name) - clean Subprocess} );
|
||||||
|
}
|
||||||
|
|
||||||
sub WriteReadings {
|
sub WriteReadings {
|
||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $decode_json = shift;
|
my $decode_json = shift;
|
||||||
|
|
||||||
# print Dumper $decode_json;
|
|
||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
if ( defined( $decode_json->{id} )
|
if ( defined( $decode_json->{id} )
|
||||||
@ -941,7 +1061,8 @@ sub WriteReadings {
|
|||||||
{name} . '-' . $t,
|
{name} . '-' . $t,
|
||||||
$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}
|
||||||
@ -968,8 +1089,8 @@ sub WriteReadings {
|
|||||||
[$properties]{name} eq 'wifi_status' )
|
[$properties]{name} eq 'wifi_status' )
|
||||||
{
|
{
|
||||||
readingsBulkUpdateIfChanged( $hash,
|
readingsBulkUpdateIfChanged( $hash,
|
||||||
'wifi_status-ssid', $v->{ssid} )
|
'wifi_status-ssid', $v->{ssid} )
|
||||||
if (ref($v->{ssid}) ne 'HASH');
|
if ( ref( $v->{ssid} ) ne 'HASH' );
|
||||||
readingsBulkUpdateIfChanged( $hash,
|
readingsBulkUpdateIfChanged( $hash,
|
||||||
'wifi_status-mac', $v->{mac} );
|
'wifi_status-mac', $v->{mac} );
|
||||||
readingsBulkUpdateIfChanged( $hash,
|
readingsBulkUpdateIfChanged( $hash,
|
||||||
@ -1002,25 +1123,23 @@ sub getDevices {
|
|||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
RemoveInternalTimer($hash, "FHEM::GardenaSmartBridge::getDevices");
|
RemoveInternalTimer( $hash, "FHEM::GardenaSmartBridge::getDevices" );
|
||||||
|
|
||||||
if ( not IsDisabled($name) ) {
|
if ( not IsDisabled($name) ) {
|
||||||
|
|
||||||
delete $hash->{helper}{deviceList};
|
delete $hash->{helper}{deviceList};
|
||||||
my @list;
|
my @list;
|
||||||
@list = devspec2array('TYPE=GardenaSmartDevice');
|
@list = devspec2array('TYPE=GardenaSmartDevice');
|
||||||
for my $gardenaDev (@list){
|
for my $gardenaDev (@list) {
|
||||||
push( @{ $hash->{helper}{deviceList} }, $gardenaDev );
|
push( @{ $hash->{helper}{deviceList} }, $gardenaDev );
|
||||||
}
|
}
|
||||||
if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) ne 'none'
|
if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) ne 'none'
|
||||||
&& (
|
&& ( defined( ReadPassword( $hash, $name ) ) ) )
|
||||||
defined( ReadPassword( $hash, $name ) )
|
|
||||||
))
|
|
||||||
{
|
{
|
||||||
Write( $hash, undef, undef, undef );
|
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
|
} # fi gardenaAccountEmail
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
readingsSingleUpdate( $hash, 'state', 'disabled', 1 );
|
readingsSingleUpdate( $hash, 'state', 'disabled', 1 );
|
||||||
@ -1044,27 +1163,29 @@ sub getToken {
|
|||||||
readingsSingleUpdate( $hash, 'state', 'get token', 1 );
|
readingsSingleUpdate( $hash, 'state', 'get token', 1 );
|
||||||
|
|
||||||
delete $hash->{helper}{session_id}
|
delete $hash->{helper}{session_id}
|
||||||
if ( defined( $hash->{helper}{session_id} )
|
if ( exists( $hash->{helper}{session_id} ) );
|
||||||
&& $hash->{helper}{session_id} );
|
|
||||||
delete $hash->{helper}{user_id}
|
delete $hash->{helper}{user_id}
|
||||||
if ( defined( $hash->{helper}{user_id} ) && $hash->{helper}{user_id} );
|
if ( exists( $hash->{helper}{user_id} ) );
|
||||||
delete $hash->{helper}{locations_id}
|
delete $hash->{helper}{locations_id}
|
||||||
if ( defined( $hash->{helper}{locations_id} )
|
if ( exists( $hash->{helper}{locations_id} ) );
|
||||||
&& $hash->{helper}{locations_id} );
|
|
||||||
|
|
||||||
Write(
|
Write(
|
||||||
$hash,
|
$hash,
|
||||||
'"data": {"type":"token", "attributes":{"username": "'
|
'"data": {"type":"token", "attributes":{"username": "'
|
||||||
. AttrVal( $name, 'gardenaAccountEmail', 'none' )
|
. AttrVal( $name, 'gardenaAccountEmail', 'none' )
|
||||||
. '","password": "'
|
. '","password": "'
|
||||||
. ReadPassword( $hash, $name ) . '", "client_id":"smartgarden-jwt-client"}}',
|
. ReadPassword( $hash, $name )
|
||||||
undef,
|
. '", "client_id":"smartgarden-jwt-client"}}',
|
||||||
undef
|
undef,
|
||||||
);
|
undef
|
||||||
|
);
|
||||||
|
|
||||||
Log3 $name, 4, '"data": {"type":"token", "attributes":{"username": "'
|
Log3 $name, 4,
|
||||||
.AttrVal( $name, 'gardenaAccountEmail', 'none' ) . '","password": "'
|
'"data": {"type":"token", "attributes":{"username": "'
|
||||||
.ReadPassword( $hash, $name ) . '", "client_id":"smartgarden-jwt-client"}}';
|
. AttrVal( $name, 'gardenaAccountEmail', 'none' )
|
||||||
|
. '","password": "'
|
||||||
|
. ReadPassword( $hash, $name )
|
||||||
|
. '", "client_id":"smartgarden-jwt-client"}}';
|
||||||
Log3 $name, 3,
|
Log3 $name, 3,
|
||||||
"GardenaSmartBridge ($name) - send credentials to fetch Token and locationId";
|
"GardenaSmartBridge ($name) - send credentials to fetch Token and locationId";
|
||||||
|
|
||||||
@ -1115,7 +1236,7 @@ sub ReadPassword {
|
|||||||
|
|
||||||
Log3 $name, 3,
|
Log3 $name, 3,
|
||||||
"GardenaSmartBridge ($name) - unable to read password from file: $err";
|
"GardenaSmartBridge ($name) - unable to read password from file: $err";
|
||||||
return undef;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1141,7 +1262,7 @@ sub ReadPassword {
|
|||||||
else {
|
else {
|
||||||
|
|
||||||
Log3 $name, 3, "GardenaSmartBridge ($name) - No password in file";
|
Log3 $name, 3, "GardenaSmartBridge ($name) - No password in file";
|
||||||
return undef;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@ -1159,59 +1280,6 @@ sub Rename {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub ParseJSON {
|
|
||||||
my $hash = shift;
|
|
||||||
my $buffer = shift;
|
|
||||||
|
|
||||||
my $name = $hash->{NAME};
|
|
||||||
my $open = 0;
|
|
||||||
my $close = 0;
|
|
||||||
my $msg = '';
|
|
||||||
my $tail = '';
|
|
||||||
|
|
||||||
if ($buffer) {
|
|
||||||
for my $c ( split //, $buffer ) {
|
|
||||||
if ( $open == $close && $open > 0 ) {
|
|
||||||
$tail .= $c;
|
|
||||||
Log3 $name, 5,
|
|
||||||
"GardenaSmartBridge ($name) - $open == $close and $open > 0";
|
|
||||||
|
|
||||||
}
|
|
||||||
elsif ( ( $open == $close ) && ( $c ne '{' ) ) {
|
|
||||||
|
|
||||||
Log3 $name, 5,
|
|
||||||
"GardenaSmartBridge ($name) - Garbage character before message: "
|
|
||||||
. $c;
|
|
||||||
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
if ( $c eq '{' ) {
|
|
||||||
|
|
||||||
$open++;
|
|
||||||
|
|
||||||
}
|
|
||||||
elsif ( $c eq '}' ) {
|
|
||||||
|
|
||||||
$close++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$msg .= $c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $open != $close ) {
|
|
||||||
|
|
||||||
$tail = $msg;
|
|
||||||
$msg = '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Log3 $name, 5,
|
|
||||||
"GardenaSmartBridge ($name) - return msg: $msg and tail: $tail";
|
|
||||||
return ( $msg, $tail );
|
|
||||||
}
|
|
||||||
|
|
||||||
sub createHttpValueStrings {
|
sub createHttpValueStrings {
|
||||||
my ( $hash, $payload, $deviceId, $abilities, $service_id ) = @_;
|
my ( $hash, $payload, $deviceId, $abilities, $service_id ) = @_;
|
||||||
|
|
||||||
@ -1220,17 +1288,17 @@ sub createHttpValueStrings {
|
|||||||
my $uri = '';
|
my $uri = '';
|
||||||
my $method = 'POST';
|
my $method = 'POST';
|
||||||
$header .= "\r\nAuthorization: Bearer $session_id"
|
$header .= "\r\nAuthorization: Bearer $session_id"
|
||||||
if ( defined($hash->{helper}{session_id}) );
|
if ( defined( $hash->{helper}{session_id} ) );
|
||||||
$header .= "\r\nAuthorization-Provider: husqvarna"
|
$header .= "\r\nAuthorization-Provider: husqvarna"
|
||||||
if ( defined($hash->{helper}{session_id}) );
|
if ( defined( $hash->{helper}{session_id} ) );
|
||||||
|
|
||||||
# $header .= "\r\nx-api-key: $session_id"
|
# $header .= "\r\nx-api-key: $session_id"
|
||||||
# if ( defined( $hash->{helper}{session_id} ) );
|
# if ( defined( $hash->{helper}{session_id} ) );
|
||||||
$payload = '{' . $payload . '}' if ( defined($payload) );
|
$payload = '{' . $payload . '}' if ( defined($payload) );
|
||||||
$payload = '{}' if ( !defined($payload) );
|
$payload = '{}' if ( !defined($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 = '';
|
||||||
$uri .= '/locations?locatioId=null&user_id=' . $hash->{helper}{user_id}
|
$uri .= '/locations?locatioId=null&user_id=' . $hash->{helper}{user_id}
|
||||||
if ( exists( $hash->{helper}{user_id} )
|
if ( exists( $hash->{helper}{user_id} )
|
||||||
@ -1243,8 +1311,10 @@ sub createHttpValueStrings {
|
|||||||
&& defined( $hash->{helper}{locations_id} ) );
|
&& defined( $hash->{helper}{locations_id} ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
$uri = '/devices/'.InternalVal($hash->{helper}{debug_device}, 'DEVICEID', 0 ) if ( defined ($hash->{helper}{debug_device})
|
$uri =
|
||||||
&& defined( $hash->{helper}{locations_id} ) );
|
'/devices/' . InternalVal( $hash->{helper}{debug_device}, 'DEVICEID', 0 )
|
||||||
|
if ( defined( $hash->{helper}{debug_device} )
|
||||||
|
&& defined( $hash->{helper}{locations_id} ) );
|
||||||
$uri = '/auth/token' if ( !defined( $hash->{helper}{session_id} ) );
|
$uri = '/auth/token' if ( !defined( $hash->{helper}{session_id} ) );
|
||||||
|
|
||||||
if ( defined( $hash->{helper}{locations_id} ) ) {
|
if ( defined( $hash->{helper}{locations_id} ) ) {
|
||||||
@ -1253,16 +1323,12 @@ sub createHttpValueStrings {
|
|||||||
$method = 'PUT';
|
$method = 'PUT';
|
||||||
my $dhash = $modules{GardenaSmartDevice}{defptr}{$deviceId};
|
my $dhash = $modules{GardenaSmartDevice}{defptr}{$deviceId};
|
||||||
|
|
||||||
$uri .=
|
$uri .= '/devices/' . $deviceId . '/settings/' . $service_id
|
||||||
'/devices/'
|
|
||||||
. $deviceId
|
|
||||||
. '/settings/'
|
|
||||||
. $service_id
|
|
||||||
if ( defined($abilities)
|
if ( defined($abilities)
|
||||||
&& defined($payload)
|
&& defined($payload)
|
||||||
&& $abilities =~ /.*_settings/ );
|
&& $abilities =~ /.*_settings/ );
|
||||||
|
|
||||||
} # park until next schedules or override
|
} # park until next schedules or override
|
||||||
elsif (defined($abilities)
|
elsif (defined($abilities)
|
||||||
&& defined($payload)
|
&& defined($payload)
|
||||||
&& $abilities eq 'mower_timer' )
|
&& $abilities eq 'mower_timer' )
|
||||||
@ -1285,7 +1351,7 @@ sub createHttpValueStrings {
|
|||||||
my $valve_id;
|
my $valve_id;
|
||||||
|
|
||||||
if ( $payload =~ m#watering_timer_(\d)# ) {
|
if ( $payload =~ m#watering_timer_(\d)# ) {
|
||||||
$method = 'PUT';
|
$method = 'PUT';
|
||||||
$valve_id = $1;
|
$valve_id = $1;
|
||||||
}
|
}
|
||||||
$uri .=
|
$uri .=
|
||||||
@ -1293,7 +1359,11 @@ sub createHttpValueStrings {
|
|||||||
. $deviceId
|
. $deviceId
|
||||||
. '/abilities/'
|
. '/abilities/'
|
||||||
. $abilities
|
. $abilities
|
||||||
. ( defined($valve_id) ? '/properties/watering_timer_'. $valve_id : '/command')
|
. (
|
||||||
|
defined($valve_id)
|
||||||
|
? '/properties/watering_timer_' . $valve_id
|
||||||
|
: '/command'
|
||||||
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
elsif (defined($abilities)
|
elsif (defined($abilities)
|
||||||
@ -1507,9 +1577,9 @@ sub DeletePassword {
|
|||||||
],
|
],
|
||||||
"release_status": "stable",
|
"release_status": "stable",
|
||||||
"license": "GPL_2",
|
"license": "GPL_2",
|
||||||
"version": "v2.4.6",
|
"version": "v2.4.7",
|
||||||
"author": [
|
"author": [
|
||||||
"Marko Oldenburg <leongaultier@gmail.com>"
|
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
|
||||||
],
|
],
|
||||||
"x_fhem_maintainer": [
|
"x_fhem_maintainer": [
|
||||||
"CoolTux"
|
"CoolTux"
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
# Developed with Kate
|
# Developed with VSCodium and richterger perl plugin.
|
||||||
#
|
#
|
||||||
# (c) 2017-2021 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
|
# (c) 2017-2022 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
|
||||||
# All rights reserved
|
# All rights reserved
|
||||||
#
|
#
|
||||||
# Special thanks goes to comitters:
|
# Special thanks goes to comitters:
|
||||||
@ -72,15 +72,11 @@ eval {
|
|||||||
require JSON::MaybeXS;
|
require JSON::MaybeXS;
|
||||||
import JSON::MaybeXS qw( decode_json encode_json );
|
import JSON::MaybeXS qw( decode_json encode_json );
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# try to use JSON wrapper
|
# try to use JSON wrapper
|
||||||
# for chance of better performance
|
# for chance of better performance
|
||||||
eval {
|
eval {
|
||||||
|
|
||||||
# JSON preference order
|
# JSON preference order
|
||||||
local $ENV{PERL_JSON_BACKEND} =
|
local $ENV{PERL_JSON_BACKEND} =
|
||||||
'Cpanel::JSON::XS,JSON::XS,JSON::PP,JSON::backportPP'
|
'Cpanel::JSON::XS,JSON::XS,JSON::PP,JSON::backportPP'
|
||||||
@ -89,10 +85,7 @@ if ($@) {
|
|||||||
require JSON;
|
require JSON;
|
||||||
import JSON qw( decode_json encode_json );
|
import JSON qw( decode_json encode_json );
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# In rare cases, Cpanel::JSON::XS may
|
# In rare cases, Cpanel::JSON::XS may
|
||||||
# be installed but JSON|JSON::MaybeXS not ...
|
# be installed but JSON|JSON::MaybeXS not ...
|
||||||
@ -100,10 +93,7 @@ if ($@) {
|
|||||||
require Cpanel::JSON::XS;
|
require Cpanel::JSON::XS;
|
||||||
import Cpanel::JSON::XS qw(decode_json encode_json);
|
import Cpanel::JSON::XS qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# In rare cases, JSON::XS may
|
# In rare cases, JSON::XS may
|
||||||
# be installed but JSON not ...
|
# be installed but JSON not ...
|
||||||
@ -111,10 +101,7 @@ if ($@) {
|
|||||||
require JSON::XS;
|
require JSON::XS;
|
||||||
import JSON::XS qw(decode_json encode_json);
|
import JSON::XS qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# Fallback to built-in JSON which SHOULD
|
# Fallback to built-in JSON which SHOULD
|
||||||
# be available since 5.014 ...
|
# be available since 5.014 ...
|
||||||
@ -122,20 +109,17 @@ if ($@) {
|
|||||||
require JSON::PP;
|
require JSON::PP;
|
||||||
import JSON::PP qw(decode_json encode_json);
|
import JSON::PP qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
};
|
} or do {
|
||||||
|
|
||||||
if ($@) {
|
|
||||||
$@ = undef;
|
|
||||||
|
|
||||||
# Fallback to JSON::backportPP in really rare cases
|
# Fallback to JSON::backportPP in really rare cases
|
||||||
require JSON::backportPP;
|
require JSON::backportPP;
|
||||||
import JSON::backportPP qw(decode_json encode_json);
|
import JSON::backportPP qw(decode_json encode_json);
|
||||||
1;
|
1;
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
## Import der FHEM Funktionen
|
## Import der FHEM Funktionen
|
||||||
#-- Run before package compilation
|
#-- Run before package compilation
|
||||||
@ -164,7 +148,7 @@ BEGIN {
|
|||||||
#-- Export to main context with different name
|
#-- Export to main context with different name
|
||||||
GP_Export(
|
GP_Export(
|
||||||
qw(
|
qw(
|
||||||
Initialize
|
Initialize
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -204,22 +188,23 @@ sub Define {
|
|||||||
my $deviceId = $aArg->[2];
|
my $deviceId = $aArg->[2];
|
||||||
my $category = $aArg->[3];
|
my $category = $aArg->[3];
|
||||||
|
|
||||||
$hash->{DEVICEID} = $deviceId;
|
$hash->{DEVICEID} = $deviceId;
|
||||||
$hash->{VERSION} = version->parse($VERSION)->normal;
|
$hash->{VERSION} = version->parse($VERSION)->normal;
|
||||||
$hash->{helper}{STARTINGPOINTID} = '';
|
$hash->{helper}{STARTINGPOINTID} = '';
|
||||||
$hash->{helper}{schedules_paused_until_id} = '';
|
$hash->{helper}{schedules_paused_until_id} = '';
|
||||||
$hash->{helper}{eco_mode_id} = '';
|
$hash->{helper}{eco_mode_id} = '';
|
||||||
$hash->{helper}{button_config_time_id} = '';
|
$hash->{helper}{button_config_time_id} = '';
|
||||||
$hash->{helper}{winter_mode_id} = '';
|
$hash->{helper}{winter_mode_id} = '';
|
||||||
|
|
||||||
|
$hash->{helper}{_id} = '';
|
||||||
|
|
||||||
$hash->{helper}{_id} = '';
|
|
||||||
# IrrigationControl valve control max 6
|
# IrrigationControl valve control max 6
|
||||||
$hash->{helper}{schedules_paused_until_1_id} = '';
|
$hash->{helper}{schedules_paused_until_1_id} = '';
|
||||||
$hash->{helper}{schedules_paused_until_2_id} = '';
|
$hash->{helper}{schedules_paused_until_2_id} = '';
|
||||||
$hash->{helper}{schedules_paused_until_3_id} = '';
|
$hash->{helper}{schedules_paused_until_3_id} = '';
|
||||||
$hash->{helper}{schedules_paused_until_4_id} = '';
|
$hash->{helper}{schedules_paused_until_4_id} = '';
|
||||||
$hash->{helper}{schedules_paused_until_5_id} = '';
|
$hash->{helper}{schedules_paused_until_5_id} = '';
|
||||||
$hash->{helper}{schedules_paused_until_6_id} = '';
|
$hash->{helper}{schedules_paused_until_6_id} = '';
|
||||||
|
|
||||||
CommandAttr( undef,
|
CommandAttr( undef,
|
||||||
"$name IODev $modules{GardenaSmartBridge}{defptr}{BRIDGE}->{NAME}" )
|
"$name IODev $modules{GardenaSmartBridge}{defptr}{BRIDGE}->{NAME}" )
|
||||||
@ -283,16 +268,18 @@ sub Attr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sub Set {
|
sub Set {
|
||||||
my $hash = shift // return;
|
my $hash = shift // return;
|
||||||
my $aArg = shift // return;
|
my $aArg = shift // return;
|
||||||
|
|
||||||
my $name = shift @$aArg;
|
my $name = shift @$aArg;
|
||||||
my $cmd = shift @$aArg // return qq{"set $name" needs at least one argument};
|
my $cmd = shift @$aArg
|
||||||
|
// return qq{"set $name" needs at least one argument};
|
||||||
|
|
||||||
my $payload;
|
my $payload;
|
||||||
my $abilities;
|
my $abilities;
|
||||||
my $service_id;
|
my $service_id;
|
||||||
my $mainboard_version = ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 );
|
my $mainboard_version =
|
||||||
|
ReadingsVal( $name, 'mower_type-mainboard_version', 0.0 );
|
||||||
|
|
||||||
#set default abilitie ... overwrite in cmd to change
|
#set default abilitie ... overwrite in cmd to change
|
||||||
$abilities = 'mower'
|
$abilities = 'mower'
|
||||||
@ -310,46 +297,57 @@ sub Set {
|
|||||||
if ( lc $cmd eq 'parkuntilfurthernotice' ) {
|
if ( lc $cmd eq 'parkuntilfurthernotice' ) {
|
||||||
$payload = '"name":"park_until_further_notice"';
|
$payload = '"name":"park_until_further_notice"';
|
||||||
if ( $mainboard_version > 10.30 ) {
|
if ( $mainboard_version > 10.30 ) {
|
||||||
$payload = ' "settings":{"name":"schedules_paused_until","value":"2038-01-18T00:00:00.000Z","device":"'.$hash->{DEVICEID}.'"}';
|
$payload =
|
||||||
$abilities = 'mower_settings' ;
|
' "settings":{"name":"schedules_paused_until","value":"2038-01-18T00:00:00.000Z","device":"'
|
||||||
$service_id = $hash->{helper}{schedules_paused_until_id};
|
. $hash->{DEVICEID} . '"}';
|
||||||
|
$abilities = 'mower_settings';
|
||||||
|
$service_id = $hash->{helper}{schedules_paused_until_id};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'parkuntilnexttimer' ) {
|
elsif ( lc $cmd eq 'parkuntilnexttimer' ) {
|
||||||
$payload = '"name":"park_until_next_timer"';
|
$payload = '"name":"park_until_next_timer"';
|
||||||
if ( $mainboard_version > 10.30 ){
|
if ( $mainboard_version > 10.30 ) {
|
||||||
$payload = '"properties":{"name":"mower_timer","value":0}' ;
|
$payload = '"properties":{"name":"mower_timer","value":0}';
|
||||||
$abilities = 'mower_timer';
|
$abilities = 'mower_timer';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'startresumeschedule' ) {
|
elsif ( lc $cmd eq 'startresumeschedule' ) {
|
||||||
$payload = '"name":"start_resume_schedule"';
|
$payload = '"name":"start_resume_schedule"';
|
||||||
if ( $mainboard_version > 10.30 ) {
|
if ( $mainboard_version > 10.30 ) {
|
||||||
$payload = ' "settings":{"name":"schedules_paused_until","value":"","device":"'.$hash->{DEVICEID}.'"}';
|
$payload =
|
||||||
$abilities = 'mower_settings' ;
|
' "settings":{"name":"schedules_paused_until","value":"","device":"'
|
||||||
$service_id = $hash->{helper}{schedules_paused_until_id};
|
. $hash->{DEVICEID} . '"}';
|
||||||
|
$abilities = 'mower_settings';
|
||||||
|
$service_id = $hash->{helper}{schedules_paused_until_id};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'startoverridetimer' ) {
|
elsif ( lc $cmd eq 'startoverridetimer' ) {
|
||||||
$payload = '"name":"start_override_timer","parameters":{"duration":'
|
$payload = '"name":"start_override_timer","parameters":{"duration":'
|
||||||
. $aArg->[0] * 60 . '}';
|
. $aArg->[0] * 60 . '}';
|
||||||
if ( $mainboard_version > 10.30 ){
|
if ( $mainboard_version > 10.30 ) {
|
||||||
$payload = '"properties":{"name":"mower_timer","value":'.$aArg->[0] * 60 .'}';
|
$payload = '"properties":{"name":"mower_timer","value":'
|
||||||
$abilities = 'mower_timer';
|
. $aArg->[0] * 60 . '}';
|
||||||
|
$abilities = 'mower_timer';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'startpoint' ) {
|
elsif ( lc $cmd eq 'startpoint' ) {
|
||||||
my $err;
|
my $err;
|
||||||
( $err, $payload, $abilities ) = SetPredefinedStartPoints( $hash, $aArg );
|
( $err, $payload, $abilities ) =
|
||||||
|
SetPredefinedStartPoints( $hash, $aArg );
|
||||||
$service_id = $hash->{helper}{STARTINGPOINTID};
|
$service_id = $hash->{helper}{STARTINGPOINTID};
|
||||||
return $err if ( defined($err) );
|
return $err if ( defined($err) );
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'eco' ) {
|
elsif ( lc $cmd eq 'eco' ) {
|
||||||
$payload = '"settings": {"name": "eco_mode", "value": '.$aArg->[0].', "device": "'.$hash->{DEVICEID}.'"}';
|
$payload =
|
||||||
$abilities = 'mower_settings' if ( $mainboard_version > 10.30 );
|
'"settings": {"name": "eco_mode", "value": '
|
||||||
|
. $aArg->[0]
|
||||||
|
. ', "device": "'
|
||||||
|
. $hash->{DEVICEID} . '"}';
|
||||||
|
$abilities = 'mower_settings' if ( $mainboard_version > 10.30 );
|
||||||
$service_id = $hash->{helper}{eco_mode_id};
|
$service_id = $hash->{helper}{eco_mode_id};
|
||||||
#$abilities['service_id'] = $hash->{helper}{SCHEDULESID} if ( $mainboard_version > 10.30 );
|
|
||||||
|
#$abilities['service_id'] = $hash->{helper}{SCHEDULESID} if ( $mainboard_version > 10.30 );
|
||||||
}
|
}
|
||||||
### electronic_pressure_pump
|
### electronic_pressure_pump
|
||||||
elsif ( lc $cmd eq 'pumptimer' ) {
|
elsif ( lc $cmd eq 'pumptimer' ) {
|
||||||
@ -365,16 +363,15 @@ sub Set {
|
|||||||
. $aArg->[0] * 60
|
. $aArg->[0] * 60
|
||||||
. ',"valve_id":1}}';
|
. ',"valve_id":1}}';
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'manualbuttontime'){
|
elsif ( lc $cmd eq 'manualbuttontime' ) {
|
||||||
$service_id = $hash->{helper}{button_config_time_id};
|
$service_id = $hash->{helper}{button_config_time_id};
|
||||||
$payload=
|
$payload =
|
||||||
'"properties":{"name":"button_config_time",'
|
'"properties":{"name":"button_config_time",'
|
||||||
.'"value":'
|
. '"value":'
|
||||||
. $aArg->[0] * 60
|
. $aArg->[0] * 60
|
||||||
. ',"timestamp":"2021-05-26T19:06:23.680Z"'
|
. ',"timestamp":"2021-05-26T19:06:23.680Z"'
|
||||||
. ',"at_bound":null,"unit":"seconds","ability":"'
|
. ',"at_bound":null,"unit":"seconds","ability":"'
|
||||||
. $service_id
|
. $service_id . '"}';
|
||||||
.'"}';
|
|
||||||
$abilities = 'watering_button_config';
|
$abilities = 'watering_button_config';
|
||||||
}
|
}
|
||||||
elsif ( $cmd =~ m{\AcancelOverride}xms ) {
|
elsif ( $cmd =~ m{\AcancelOverride}xms ) {
|
||||||
@ -393,26 +390,40 @@ sub Set {
|
|||||||
. ',"valve_id":'
|
. ',"valve_id":'
|
||||||
. $valve_id . '}}';
|
. $valve_id . '}}';
|
||||||
}
|
}
|
||||||
elsif ( $cmd =~ /.*Schedule/ ){
|
elsif ( $cmd =~ /.*Schedule/ ) {
|
||||||
my $duration = (( defined($aArg->[0]) ? ( ((Time::Piece->new)+(ONE_HOUR * $aArg->[0]) - (Time::Piece->new)->tzoffset )->datetime ).'.000Z' : '2038-01-18T00:00:00.000Z'));
|
my $duration = (
|
||||||
|
(
|
||||||
|
defined( $aArg->[0] )
|
||||||
|
? (
|
||||||
|
(
|
||||||
|
( Time::Piece->new ) +
|
||||||
|
( ONE_HOUR * $aArg->[0] ) -
|
||||||
|
( Time::Piece->new )->tzoffset
|
||||||
|
)->datetime
|
||||||
|
)
|
||||||
|
. '.000Z'
|
||||||
|
: '2038-01-18T00:00:00.000Z'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
$abilities = 'wateringcomputer_settings';
|
$abilities = 'wateringcomputer_settings';
|
||||||
$service_id = $hash->{helper}->{'schedules_paused_until_id'};
|
$service_id = $hash->{helper}->{'schedules_paused_until_id'};
|
||||||
$payload = '"settings":{"name":"schedules_paused_until"'
|
$payload =
|
||||||
. ', "value":"'
|
'"settings":{"name":"schedules_paused_until"'
|
||||||
. ($cmd eq 'resumeSchedule' ? '' : $duration )
|
. ', "value":"'
|
||||||
. '","device":"'
|
. ( $cmd eq 'resumeSchedule' ? '' : $duration )
|
||||||
. $hash->{DEVICEID}
|
. '","device":"'
|
||||||
. '"}';
|
. $hash->{DEVICEID} . '"}';
|
||||||
}
|
}
|
||||||
elsif ( lc $cmd eq 'on' || lc $cmd eq 'off' || lc $cmd eq 'on-for-timer' ) {
|
elsif ( lc $cmd eq 'on' || lc $cmd eq 'off' || lc $cmd eq 'on-for-timer' ) {
|
||||||
my $val = (
|
my $val = (
|
||||||
scalar(!@$aArg == 0) && ref($aArg) eq 'ARRAY'
|
scalar( !@$aArg == 0 ) && ref($aArg) eq 'ARRAY'
|
||||||
? $aArg->[0] * 60
|
? $aArg->[0] * 60
|
||||||
: lc $cmd
|
: lc $cmd
|
||||||
);
|
);
|
||||||
|
|
||||||
$payload = '"properties":{"name":"power_timer", "value":"' . $val . '"}';
|
$payload =
|
||||||
|
'"properties":{"name":"power_timer", "value":"' . $val . '"}';
|
||||||
}
|
}
|
||||||
### Watering ic24
|
### Watering ic24
|
||||||
elsif ( $cmd =~ m{\AmanualDurationValve\d\z}xms ) {
|
elsif ( $cmd =~ m{\AmanualDurationValve\d\z}xms ) {
|
||||||
@ -430,34 +441,51 @@ sub Set {
|
|||||||
. ',"valve_id":'
|
. ',"valve_id":'
|
||||||
. $valve_id . '}}';
|
. $valve_id . '}}';
|
||||||
}
|
}
|
||||||
elsif ( $cmd eq 'closeAllValves' ){
|
elsif ( $cmd eq 'closeAllValves' ) {
|
||||||
$payload = '"name":"close_all_valves","parameters":{}';
|
$payload = '"name":"close_all_valves","parameters":{}';
|
||||||
}
|
}
|
||||||
elsif ( $cmd =~ /.*ScheduleValve/ ){
|
elsif ( $cmd =~ /.*ScheduleValve/ ) {
|
||||||
my $valve_id = $aArg->[0];
|
my $valve_id = $aArg->[0];
|
||||||
my $duration = (( defined($aArg->[1]) ? ( ((Time::Piece->new)+(ONE_HOUR * $aArg->[1]) - (Time::Piece->new)->tzoffset )->datetime ).'.000Z' : '2038-01-18T00:00:00.000Z'));
|
my $duration = (
|
||||||
|
(
|
||||||
|
defined( $aArg->[1] )
|
||||||
|
? (
|
||||||
|
(
|
||||||
|
( Time::Piece->new ) +
|
||||||
|
( ONE_HOUR * $aArg->[1] ) -
|
||||||
|
( Time::Piece->new )->tzoffset
|
||||||
|
)->datetime
|
||||||
|
)
|
||||||
|
. '.000Z'
|
||||||
|
: '2038-01-18T00:00:00.000Z'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
$abilities = 'irrigation_settings';
|
$abilities = 'irrigation_settings';
|
||||||
$service_id = $hash->{helper}->{'schedules_paused_until_'.$valve_id.'_id'};
|
$service_id =
|
||||||
$payload = '"settings":{"name":"schedules_paused_until_'
|
$hash->{helper}->{ 'schedules_paused_until_' . $valve_id . '_id' };
|
||||||
. $valve_id
|
$payload =
|
||||||
. '", "value":"'
|
'"settings":{"name":"schedules_paused_until_'
|
||||||
. ($cmd eq 'resumeScheduleValve' ? '' : $duration )
|
. $valve_id
|
||||||
. '","device":"'
|
. '", "value":"'
|
||||||
. $hash->{DEVICEID}
|
. ( $cmd eq 'resumeScheduleValve' ? '' : $duration )
|
||||||
. '"}';
|
. '","device":"'
|
||||||
|
. $hash->{DEVICEID} . '"}';
|
||||||
}
|
}
|
||||||
### Sensors
|
### Sensors
|
||||||
elsif ( lc $cmd eq 'refresh' ) {
|
elsif ( lc $cmd eq 'refresh' ) {
|
||||||
|
|
||||||
my $sensname = $aArg->[0];
|
my $sensname = $aArg->[0];
|
||||||
if ( lc $sensname eq 'temperature' ) {
|
if ( lc $sensname eq 'temperature' ) {
|
||||||
if ( ReadingsVal( $name, 'device_info-category', 'sensor' ) eq 'sensor') {
|
if ( ReadingsVal( $name, 'device_info-category', 'sensor' ) eq
|
||||||
$payload = '"name":"measure_ambient_temperature"';
|
'sensor' )
|
||||||
$abilities = 'ambient_temperature';
|
{
|
||||||
} else {
|
$payload = '"name":"measure_ambient_temperature"';
|
||||||
$payload = '"name":"measure_soil_temperature"';
|
$abilities = 'ambient_temperature';
|
||||||
$abilities = 'soil_temperature';
|
}
|
||||||
|
else {
|
||||||
|
$payload = '"name":"measure_soil_temperature"';
|
||||||
|
$abilities = 'soil_temperature';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ( lc $sensname eq 'light' ) {
|
elsif ( lc $sensname eq 'light' ) {
|
||||||
@ -471,13 +499,13 @@ sub Set {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
## winter sleep
|
## winter sleep
|
||||||
elsif ( lc $cmd eq 'winter_mode') {
|
elsif ( lc $cmd eq 'winter_mode' ) {
|
||||||
$payload = '"settings":{"name":"winter_mode","value":"'
|
$payload =
|
||||||
. $aArg->[0]
|
'"settings":{"name":"winter_mode","value":"'
|
||||||
.'","device":"'
|
. $aArg->[0]
|
||||||
. $hash->{DEVICEID}
|
. '","device":"'
|
||||||
.'"}';
|
. $hash->{DEVICEID} . '"}';
|
||||||
$abilities = 'winter_settings';
|
$abilities = 'winter_settings';
|
||||||
$service_id = $hash->{helper}->{'winter_mode_id'};
|
$service_id = $hash->{helper}->{'winter_mode_id'};
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -488,7 +516,8 @@ sub Set {
|
|||||||
'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,240 startpoint'
|
'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,240 startpoint'
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
|
||||||
|
|
||||||
$list .= 'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100'
|
$list .=
|
||||||
|
'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100'
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
|
||||||
|
|
||||||
$list .=
|
$list .=
|
||||||
@ -497,13 +526,16 @@ sub Set {
|
|||||||
|
|
||||||
$list .= 'refresh:temperature,humidity'
|
$list .= 'refresh:temperature,humidity'
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' );
|
||||||
|
|
||||||
# add light for old sensors
|
# add light for old sensors
|
||||||
$list .= ',light'
|
$list .= ',light'
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor'
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor'
|
||||||
&& ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor' );
|
&& ReadingsVal( $name, 'device_info-category', 'unknown' ) eq
|
||||||
|
'sensor' );
|
||||||
|
|
||||||
$list .= 'on:noArg off:noArg on-for-timer:slider,0,1,720'
|
$list .= 'on:noArg off:noArg on-for-timer:slider,0,1,720'
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
|
||||||
|
|
||||||
# all devices has abilitie to fall a sleep
|
# all devices has abilitie to fall a sleep
|
||||||
$list .= ' winter_mode:awake,hibernate';
|
$list .= ' winter_mode:awake,hibernate';
|
||||||
return "Unknown argument $cmd, choose one of $list";
|
return "Unknown argument $cmd, choose one of $list";
|
||||||
@ -584,25 +616,30 @@ sub WriteReadings {
|
|||||||
for my $propertie (
|
for my $propertie (
|
||||||
@{ $decode_json->{abilities}[$abilities]{properties} } )
|
@{ $decode_json->{abilities}[$abilities]{properties} } )
|
||||||
{
|
{
|
||||||
if ( exists($decode_json->{abilities}[$abilities]{name})
|
if (
|
||||||
&& (
|
exists( $decode_json->{abilities}[$abilities]{name} )
|
||||||
$decode_json->{abilities}[$abilities]{name} eq 'watering' )
|
&& ( $decode_json->{abilities}[$abilities]{name} eq
|
||||||
) {
|
'watering' )
|
||||||
if ( $propertie->{name} eq 'button_config_time' )
|
)
|
||||||
{
|
{
|
||||||
if ( $hash->{helper}{$propertie->{name}.'_id'} ne
|
if ( $propertie->{name} eq 'button_config_time' ) {
|
||||||
$decode_json->{abilities}[$abilities]{id} )
|
if ( $hash->{helper}{ $propertie->{name} . '_id' } ne
|
||||||
{
|
$decode_json->{abilities}[$abilities]{id} )
|
||||||
$hash->{helper}{$propertie->{name}.'_id'} =
|
{
|
||||||
$decode_json->{abilities}[$abilities]{id};
|
$hash->{helper}{ $propertie->{name} . '_id' } =
|
||||||
}
|
$decode_json->{abilities}[$abilities]{id};
|
||||||
readingsBulkUpdateIfChanged(
|
}
|
||||||
$hash,
|
readingsBulkUpdateIfChanged(
|
||||||
'manualButtonTime',
|
$hash,
|
||||||
(RigReadingsValue( $hash, $propertie->{value} / 60) )
|
'manualButtonTime',
|
||||||
);
|
(
|
||||||
next;
|
RigReadingsValue(
|
||||||
}
|
$hash, $propertie->{value} / 60
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
next;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
readingsBulkUpdateIfChanged(
|
readingsBulkUpdateIfChanged(
|
||||||
@ -659,15 +696,16 @@ sub WriteReadings {
|
|||||||
$decode_json->{abilities}[$abilities]{name} . '-'
|
$decode_json->{abilities}[$abilities]{name} . '-'
|
||||||
. $propertie->{name}
|
. $propertie->{name}
|
||||||
. '_timestamp',
|
. '_timestamp',
|
||||||
Time::Piece->strptime(RigReadingsValue( $hash, $propertie->{timestamp} ), "%Y-%m-%d %H:%M:%S")->strftime('%s')
|
Time::Piece->strptime(
|
||||||
|
RigReadingsValue( $hash, $propertie->{timestamp} ),
|
||||||
|
"%Y-%m-%d %H:%M:%S" )->strftime('%s')
|
||||||
|
|
||||||
)
|
)
|
||||||
if (
|
if (
|
||||||
defined( $propertie->{value} )
|
defined( $propertie->{value} )
|
||||||
&& ( $decode_json->{abilities}[$abilities]{name} . '-'
|
&& ( $decode_json->{abilities}[$abilities]{name} . '-'
|
||||||
. $propertie->{name} eq 'mower_timer-mower_timer'
|
. $propertie->{name} eq 'mower_timer-mower_timer' )
|
||||||
)
|
);
|
||||||
);
|
|
||||||
|
|
||||||
readingsBulkUpdateIfChanged(
|
readingsBulkUpdateIfChanged(
|
||||||
$hash,
|
$hash,
|
||||||
@ -706,30 +744,38 @@ sub WriteReadings {
|
|||||||
$abilities--;
|
$abilities--;
|
||||||
} while ( $abilities >= 0 );
|
} while ( $abilities >= 0 );
|
||||||
|
|
||||||
do {
|
my $winter_mode;
|
||||||
#Log3 $name, 1, "Settings pro Device : ".$decode_json->{settings}[$settings]{name};
|
|
||||||
#Log3 $name, 1, " - KEIN ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) ne "ARRAY");
|
|
||||||
#Log3 $name, 1, " - IST ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY");
|
|
||||||
|
|
||||||
if ( exists($decode_json->{settings}[$settings]{name})
|
do {
|
||||||
&& (
|
#Log3 $name, 1, "Settings pro Device : ".$decode_json->{settings}[$settings]{name};
|
||||||
$decode_json->{settings}[$settings]{name} =~ /schedules_paused_until_?\d?$/
|
#Log3 $name, 1, " - KEIN ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) ne "ARRAY");
|
||||||
|| $decode_json->{settings}[$settings]{name} eq 'eco_mode'
|
#Log3 $name, 1, " - IST ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY");
|
||||||
|| $decode_json->{settings}[$settings]{name} eq 'winter_mode' )
|
|
||||||
)
|
if (
|
||||||
|
exists( $decode_json->{settings}[$settings]{name} )
|
||||||
|
&& ( $decode_json->{settings}[$settings]{name} =~
|
||||||
|
/schedules_paused_until_?\d?$/
|
||||||
|
|| $decode_json->{settings}[$settings]{name} eq 'eco_mode'
|
||||||
|
|| $decode_json->{settings}[$settings]{name} eq 'winter_mode' )
|
||||||
|
)
|
||||||
{
|
{
|
||||||
if ( $hash->{helper}{$decode_json->{settings}[$settings]{name}.'_id'} ne
|
if ( $hash->{helper}
|
||||||
|
{ $decode_json->{settings}[$settings]{name} . '_id' } ne
|
||||||
$decode_json->{settings}[$settings]{id} )
|
$decode_json->{settings}[$settings]{id} )
|
||||||
{
|
{
|
||||||
$hash->{helper}{$decode_json->{settings}[$settings]{name}.'_id'} =
|
$hash->{helper}
|
||||||
|
{ $decode_json->{settings}[$settings]{name} . '_id' } =
|
||||||
$decode_json->{settings}[$settings]{id};
|
$decode_json->{settings}[$settings]{id};
|
||||||
}
|
}
|
||||||
|
|
||||||
# save winter mode as reading
|
# save winter mode as reading
|
||||||
readingsBulkUpdateIfChanged(
|
|
||||||
$hash,
|
if ( $decode_json->{settings}[$settings]{name} eq 'winter_mode' ) {
|
||||||
'winter_mode',
|
readingsBulkUpdateIfChanged( $hash, 'winter_mode',
|
||||||
$decode_json->{settings}[$settings]{value}
|
$decode_json->{settings}[$settings]{value} );
|
||||||
) if ($decode_json->{settings}[$settings]{name} eq 'winter_mode');
|
|
||||||
|
$winter_mode = $decode_json->{settings}[$settings]{value};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY"
|
if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY"
|
||||||
@ -763,36 +809,69 @@ sub WriteReadings {
|
|||||||
$settings--;
|
$settings--;
|
||||||
} while ( $settings >= 0 );
|
} while ( $settings >= 0 );
|
||||||
|
|
||||||
|
if ( $winter_mode ne 'hibernate' ) {
|
||||||
|
setState($hash);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
readingsBulkUpdate( $hash, 'state',
|
||||||
|
RigReadingsValue( $hash, 'hibernate' ) );
|
||||||
|
}
|
||||||
|
|
||||||
my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown');
|
readingsEndUpdate( $hash, 1 );
|
||||||
|
|
||||||
|
Log3 $name, 4, "GardenaSmartDevice ($name) - readings was written";
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub setState {
|
||||||
|
my $hash = shift;
|
||||||
|
my $name = $hash->{NAME};
|
||||||
|
|
||||||
|
my $online_state =
|
||||||
|
ReadingsVal( $name, 'device_info-connection_status', 'unknown' );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, 'state',
|
readingsBulkUpdate( $hash, 'state',
|
||||||
$online_state eq 'online' ?
|
$online_state eq 'online'
|
||||||
ReadingsVal( $name, 'mower-status', 'readingsValError') : 'offline'
|
? ReadingsVal( $name, 'mower-status', 'readingsValError' )
|
||||||
)
|
: 'offline' )
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
|
||||||
readingsBulkUpdate(
|
readingsBulkUpdate(
|
||||||
$hash, 'state',
|
$hash, 'state',
|
||||||
(
|
(
|
||||||
ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )
|
ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ) =~
|
||||||
=~ m{\A[1-9]([0-9]+)?\z}xms
|
m{\A[1-9]([0-9]+)?\z}xms
|
||||||
? RigReadingsValue( $hash, 'open' )
|
? RigReadingsValue( $hash, 'open' )
|
||||||
: RigReadingsValue( $hash, 'closed' )
|
: RigReadingsValue( $hash, 'closed' )
|
||||||
)
|
)
|
||||||
) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
|
) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
|
||||||
|
|
||||||
|
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) {
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) {
|
||||||
my $state_string = ( ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor') ? 'T: ' .ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ) . '°C, ' : 'T: ' .ReadingsVal( $name, 'soil_temperature-temperature', 'readingsValError' ) . '°C, ' ;
|
my $state_string =
|
||||||
$state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%';
|
( ReadingsVal( $name, 'device_info-category', 'unknown' ) eq
|
||||||
$state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
|
'sensor' )
|
||||||
|
? 'T: '
|
||||||
|
. ReadingsVal( $name, 'ambient_temperature-temperature',
|
||||||
|
'readingsValError' )
|
||||||
|
. '°C, '
|
||||||
|
: 'T: '
|
||||||
|
. ReadingsVal( $name, 'soil_temperature-temperature',
|
||||||
|
'readingsValError' )
|
||||||
|
. '°C, ';
|
||||||
|
$state_string .= 'H: '
|
||||||
|
. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) . '%';
|
||||||
|
$state_string .= ', L: '
|
||||||
|
. ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux'
|
||||||
|
if ( ReadingsVal( $name, 'device_info-category', 'unknown' ) eq
|
||||||
|
'sensor' );
|
||||||
|
|
||||||
# if ( $online_state eq 'offline') {
|
# if ( $online_state eq 'offline') {
|
||||||
# readingsBulkUpdate( $hash, 'humidity-humidity', '-1' );
|
# readingsBulkUpdate( $hash, 'humidity-humidity', '-1' );
|
||||||
# readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
|
# readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
|
||||||
# readingsBulkUpdate( $hash, 'light-light', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
|
# readingsBulkUpdate( $hash, 'light-light', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
|
||||||
# }
|
# }
|
||||||
readingsBulkUpdate($hash, 'state', $online_state eq 'online' ? $state_string : 'offline' )
|
readingsBulkUpdate( $hash, 'state',
|
||||||
|
$online_state eq 'online' ? $state_string : 'offline' );
|
||||||
}
|
}
|
||||||
|
|
||||||
readingsBulkUpdate(
|
readingsBulkUpdate(
|
||||||
@ -810,10 +889,6 @@ sub WriteReadings {
|
|||||||
ReadingsVal( $name, 'power-power_timer', 'no info from power-timer' ) )
|
ReadingsVal( $name, 'power-power_timer', 'no info from power-timer' ) )
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
|
||||||
|
|
||||||
readingsEndUpdate( $hash, 1 );
|
|
||||||
|
|
||||||
Log3 $name, 4, "GardenaSmartDevice ($name) - readings was written";
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -923,7 +998,8 @@ sub ReadingLangGerman {
|
|||||||
'closed' => 'geschlossen',
|
'closed' => 'geschlossen',
|
||||||
'included' => 'inbegriffen',
|
'included' => 'inbegriffen',
|
||||||
'active' => 'aktiv',
|
'active' => 'aktiv',
|
||||||
'inactive' => 'nicht aktiv'
|
'inactive' => 'nicht aktiv',
|
||||||
|
'hibernate' => 'Winterschlaf',
|
||||||
);
|
);
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@ -977,7 +1053,7 @@ sub Zulu2LocalString {
|
|||||||
return (
|
return (
|
||||||
sprintf(
|
sprintf(
|
||||||
"%04d-%02d-%02d %02d:%02d:%s",
|
"%04d-%02d-%02d %02d:%02d:%s",
|
||||||
$lyear, $lmonth, $lday,
|
$lyear, $lmonth, $lday,
|
||||||
$lhour, $datemin, substr( $rest, 0, 2 )
|
$lhour, $datemin, substr( $rest, 0, 2 )
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
@ -998,10 +1074,10 @@ sub Zulu2LocalString {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sub SetPredefinedStartPoints {
|
sub SetPredefinedStartPoints {
|
||||||
my $hash = shift;
|
my $hash = shift;
|
||||||
my $aArg = shift;
|
my $aArg = shift;
|
||||||
|
|
||||||
my ($startpoint_state,$startpoint_num,@morestartpoints) = @{$aArg};
|
my ( $startpoint_state, $startpoint_num, @morestartpoints ) = @{$aArg};
|
||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
my $payload;
|
my $payload;
|
||||||
@ -1049,6 +1125,7 @@ sub SetPredefinedStartPoints {
|
|||||||
|
|
||||||
$payload = '"settings": ' . encode_json($decode_json_settings);
|
$payload = '"settings": ' . encode_json($decode_json_settings);
|
||||||
$abilities = 'mower_settings';
|
$abilities = 'mower_settings';
|
||||||
|
|
||||||
#$abilities['service_id'] = $hash->{helper}{STARTINGPOINTID};
|
#$abilities['service_id'] = $hash->{helper}{STARTINGPOINTID};
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -1404,9 +1481,9 @@ sub SetPredefinedStartPoints {
|
|||||||
],
|
],
|
||||||
"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 <fhemdevelopment@cooltux.net>"
|
||||||
],
|
],
|
||||||
"x_fhem_maintainer": [
|
"x_fhem_maintainer": [
|
||||||
"CoolTux"
|
"CoolTux"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user