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

testing #29

Merged
marko merged 38 commits from testing into master 2021-05-22 03:01:10 +00:00
Conversation 0 Commits 38 Files Changed 3 +95 -48
3 changed files with 95 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
FHEM/73_GardenaSmartBridge.pm
View File

@@ -2,7 +2,7 @@
# #
# Developed with Kate # Developed with Kate
# #
# (c) 2017-2011 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2017-2021 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,7 +57,6 @@
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 strict; use strict;
use warnings; use warnings;
@@ -147,7 +146,6 @@ if ($@) {
## Import der FHEM Funktionen ## Import der FHEM Funktionen
#-- Run before package compilation #-- Run before package compilation
BEGIN { BEGIN {
# Import from main context # Import from main context
GP_Import( GP_Import(
qw(readingsSingleUpdate qw(readingsSingleUpdate
@@ -1219,7 +1217,7 @@ sub createHttpValueStrings {
$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} ) ) {
if ( defined($abilities) && $abilities eq 'mower_settings' ) { if ( defined($abilities) && $abilities =~ /.*_settings/ ) {
$method = 'PUT'; $method = 'PUT';
my $dhash = $modules{GardenaSmartDevice}{defptr}{$deviceId}; my $dhash = $modules{GardenaSmartDevice}{defptr}{$deviceId};
@@ -1231,7 +1229,7 @@ sub createHttpValueStrings {
. $service_id . $service_id
if ( defined($abilities) if ( defined($abilities)
&& defined($payload) && defined($payload)
&& $abilities eq 'mower_settings' ); && $abilities =~ /.*_settings/ );
} # park until next schedules or override } # park until next schedules or override
elsif (defined($abilities) elsif (defined($abilities)
@@ -1254,9 +1252,9 @@ sub createHttpValueStrings {
&& $abilities eq 'watering' ) && $abilities eq 'watering' )
{ {
my $valve_id; my $valve_id;
$method = 'PUT';
if ( $payload =~ m#watering_timer_(\d)# ) { if ( $payload =~ m#watering_timer_(\d)# ) {
$method = 'PUT';
$valve_id = $1; $valve_id = $1;
} }
$uri .= $uri .=
@@ -1264,8 +1262,7 @@ sub createHttpValueStrings {
. $deviceId . $deviceId
. '/abilities/' . '/abilities/'
. $abilities . $abilities
. '/properties/watering_timer_' . ( defined($valve_id) ? '/properties/watering_timer_'. $valve_id : '/command')
. $valve_id;
} }
elsif (defined($abilities) elsif (defined($abilities)
@@ -1442,7 +1439,7 @@ sub DeletePassword {
<ul> <ul>
<li>debugJSON - JSON Fehlermeldungen</li> <li>debugJSON - JSON Fehlermeldungen</li>
<li>disable - Schaltet die Datenübertragung der Bridge ab</li> <li>disable - Schaltet die Datenübertragung der Bridge ab</li>
<li>interval - Abfrageinterval in Sekunden (default: 300)</li> <li>interval - Abfrageinterval in Sekunden (default: 60)</li>
<li>gardenaAccountEmail - Email Adresse, die auch in der GardenaApp verwendet wurde</li> <li>gardenaAccountEmail - Email Adresse, die auch in der GardenaApp verwendet wurde</li>
</ul> </ul>
</ul> </ul>
@@ -1466,7 +1463,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.2", "version": "v2.4.0",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

112
FHEM/74_GardenaSmartDevice.pm
View File

@@ -63,8 +63,8 @@ use warnings;
use POSIX; use POSIX;
use FHEM::Meta; use FHEM::Meta;
use Time::Local; use Time::Local;
use Time::Piece;
#use Data::Dumper; # only for debugging use Time::Seconds;
# 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
@@ -209,6 +209,13 @@ sub Define {
$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} = '';
# IrrigationControl valve control max 6
$hash->{helper}{schedules_paused_until_1_id} = '';
$hash->{helper}{schedules_paused_until_2_id} = '';
$hash->{helper}{schedules_paused_until_3_id} = '';
$hash->{helper}{schedules_paused_until_4_id} = '';
$hash->{helper}{schedules_paused_until_5_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}" )
@@ -282,6 +289,18 @@ sub Set {
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
$abilities = 'mower'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
$abilities = 'watering'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24'
|| AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
$abilities = 'power'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
$abilities = 'manual_watering'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
### mower ### mower
# service_id (eco, parkuntilfurhternotice, startpoints) # service_id (eco, parkuntilfurhternotice, startpoints)
if ( lc $cmd eq 'parkuntilfurthernotice' ) { if ( lc $cmd eq 'parkuntilfurthernotice' ) {
@@ -383,14 +402,35 @@ sub Set {
. ',"valve_id":' . ',"valve_id":'
. $valve_id . '}}'; . $valve_id . '}}';
} }
elsif ( $cmd eq 'closeAllValves' ){
$payload = '"name":"close_all_valves","parameters":{}';
}
elsif ( $cmd =~ /.*ScheduleValve/ ){
my $valve_id = $aArg->[0];
my $duration = (( defined($aArg->[1]) ? ( ((Time::Piece->new)+(ONE_HOUR * $aArg->[1]) - (Time::Piece->new)->tzoffset )->datetime ).'.000Z' : '2040-12-31T22:00:00.000Z'));
$abilities = 'irrigation_settings';
$service_id = $hash->{helper}->{'schedules_paused_until_'.$valve_id.'_id'};
$payload = '"settings":{"name":"schedules_paused_until_'
. $valve_id
. '", "value":"'
. ($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') {
$payload = '"name":"measure_ambient_temperature"'; $payload = '"name":"measure_ambient_temperature"';
$abilities = 'ambient_temperature'; $abilities = 'ambient_temperature';
} else {
$payload = '"name":"measure_soil_temperature"';
$abilities = 'soil_temperature';
}
} }
elsif ( lc $sensname eq 'light' ) { elsif ( lc $sensname eq 'light' ) {
$payload = '"name":"measure_light"'; $payload = '"name":"measure_light"';
@@ -402,24 +442,29 @@ sub Set {
$abilities = 'humidity'; $abilities = 'humidity';
} }
} }
else { else {
my $list = ''; my $list = '';
$list .= $list .=
'parkUntilFurtherNotice:noArg parkUntilNextTimer:noArg startResumeSchedule:noArg startOverrideTimer:slider,0,1,60 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' $list .= 'manualOverride:slider,1,1,59 cancelOverride:noArg'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
$list .= $list .=
'manualDurationValve1:slider,1,1,59 manualDurationValve2:slider,1,1,59 manualDurationValve3:slider,1,1,59 manualDurationValve4:slider,1,1,59 manualDurationValve5:slider,1,1,59 manualDurationValve6:slider,1,1,59 cancelOverrideValve1:noArg cancelOverrideValve2:noArg cancelOverrideValve3:noArg cancelOverrideValve4:noArg cancelOverrideValve5:noArg cancelOverrideValve6:noArg' 'closeAllValves:noArg stopScheduleValve:selectnumbers,1,1,6,0,lin resumeScheduleValve:selectnumbers,1,1,6,0,lin manualDurationValve1:slider,1,1,90 manualDurationValve2:slider,1,1,90 manualDurationValve3:slider,1,1,90 manualDurationValve4:slider,1,1,90 manualDurationValve5:slider,1,1,90 manualDurationValve6:slider,1,1,90 cancelOverrideValve1:noArg cancelOverrideValve2:noArg cancelOverrideValve3:noArg cancelOverrideValve4:noArg cancelOverrideValve5:noArg cancelOverrideValve6:noArg'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
$list .= 'refresh:temperature,light,humidity' $list .= 'refresh:temperature,humidity'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' );
# add light for old sensors
$list .= ',light'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor'
&& ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor' );
$list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60' $list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
@@ -427,17 +472,6 @@ sub Set {
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
$abilities = 'mower'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' )
&& ($abilities !~ /mower_settings|mower_timer/);
$abilities = 'watering'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24'
|| AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
$abilities = 'power'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
$abilities = 'manual_watering'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
$hash->{helper}{deviceAction} = $payload; $hash->{helper}{deviceAction} = $payload;
readingsSingleUpdate( $hash, "state", "send command to gardena cloud", 1 ); readingsSingleUpdate( $hash, "state", "send command to gardena cloud", 1 );
@@ -536,7 +570,7 @@ sub WriteReadings {
. $propertie->{name} ne 'light-light' . $propertie->{name} ne 'light-light'
&& ref( $propertie->{value} ) ne "HASH" ); && ref( $propertie->{value} ) ne "HASH" );
readingsBulkUpdate( readingsBulkUpdateIfChanged(
$hash, $hash,
$decode_json->{abilities}[$abilities]{name} . '-' $decode_json->{abilities}[$abilities]{name} . '-'
. $propertie->{name}, . $propertie->{name},
@@ -605,7 +639,8 @@ sub WriteReadings {
#Log3 $name, 1, " - IST ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY"); #Log3 $name, 1, " - IST ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY");
if ( exists($decode_json->{settings}[$settings]{name}) if ( exists($decode_json->{settings}[$settings]{name})
&& ( $decode_json->{settings}[$settings]{name} eq 'schedules_paused_until' && (
$decode_json->{settings}[$settings]{name} =~ /schedules_paused_until_?\d?$/
|| $decode_json->{settings}[$settings]{name} eq 'eco_mode' ) || $decode_json->{settings}[$settings]{name} eq 'eco_mode' )
) )
{ {
@@ -648,8 +683,13 @@ sub WriteReadings {
$settings--; $settings--;
} while ( $settings >= 0 ); } while ( $settings >= 0 );
my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown');
readingsBulkUpdate( $hash, 'state', readingsBulkUpdate( $hash, 'state',
ReadingsVal( $name, 'mower-status', 'readingsValError' ) ) $online_state eq 'online' ?
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',
@@ -661,16 +701,19 @@ sub WriteReadings {
) )
) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
readingsBulkUpdate(
$hash, 'state', if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) {
'T: ' 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, ' ;
. ReadingsVal( $name, 'ambient_temperature-temperature', $state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%';
'readingsValError' ) $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
. '°C, H: '
. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) # if ( $online_state eq 'offline') {
. '%, L: ' # readingsBulkUpdate( $hash, 'humidity-humidity', '-1' );
. ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' # readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
) if ( AttrVal( $name, 'model', '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( readingsBulkUpdate(
$hash, 'state', $hash, 'state',
@@ -1091,6 +1134,10 @@ sub SetPredefinedStartPoints {
<li>set NAME startpoint enable 1</li> <li>set NAME startpoint enable 1</li>
<li>set NAME startpoint disable 3 enable 1</li> <li>set NAME startpoint disable 3 enable 1</li>
</ul> </ul>
<li>resumeScheduleValve - start schedule irrigation on valve n</li>
<li>stopScheduleValve - stop schedule irrigation on valve n (Default: 2040-12-31T22:00:00.000Z) | optional params hours (now + hours)</li>
<li>closeAllValves - close all valves</li>
</ul> </ul>
</ul> </ul>
@@ -1235,6 +1282,9 @@ sub SetPredefinedStartPoints {
<li>set NAME startpoint enable 1</li> <li>set NAME startpoint enable 1</li>
<li>set NAME startpoint disable 3 enable 1</li> <li>set NAME startpoint disable 3 enable 1</li>
</ul> </ul>
<li>resumeScheduleValve - Startet Bew&aauml;sserung am Ventil n nach Zeitplan</li>
<li>stopScheduleValve - Setzt Bew&aauml;sserung am Ventil n aus (Default: 2040-12-31T22:00:00.000Z) | Optionaler Parameter Stunden (Jetzt + Stunden)</li>
<li>closeAllValves - Stopt Bew&aauml;sserung an allen Ventilen </li>
</ul> </ul>
</ul> </ul>
@@ -1257,7 +1307,7 @@ sub SetPredefinedStartPoints {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.3", "version": "v2.4.0",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2021-04-22_18:29:35 46169 FHEM/73_GardenaSmartBridge.pm UPD 2021-05-22_04:53:56 46135 FHEM/73_GardenaSmartBridge.pm
UPD 2021-04-26_21:37:06 48421 FHEM/74_GardenaSmartDevice.pm UPD 2021-05-22_04:54:14 51644 FHEM/74_GardenaSmartDevice.pm