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

ready for release #46

Merged
marko merged 55 commits from testing into master 2021-10-27 03:20:14 +00:00
Conversation 0 Commits 55 Files Changed 3 +46 -19
3 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7d374596d - Show all commits

11
FHEM/73_GardenaSmartBridge.pm
View File

@@ -63,6 +63,8 @@ use warnings;
use POSIX; use POSIX;
use FHEM::Meta; use FHEM::Meta;
#use Data::Dumper;
use HttpUtils; use HttpUtils;
my $missingModul = ''; my $missingModul = '';
@@ -352,6 +354,7 @@ sub Notify {
@{$events} or grep /^DEFINED.$name$/, @{$events} or grep /^DEFINED.$name$/,
@{$events} or grep /^MODIFIED.$name$/, @{$events} or grep /^MODIFIED.$name$/,
@{$events} or grep /^ATTR.$name.gardenaAccountEmail.+/, @{$events} or grep /^ATTR.$name.gardenaAccountEmail.+/,
@{$events} or grep /^DELETEATTR.$name.disable$/,
@{$events} @{$events}
) )
) )
@@ -369,8 +372,7 @@ sub Notify {
if ( if (
$devtype eq 'Global' $devtype eq 'Global'
&& ( && (
grep /^DELETEATTR.$name.disable$/, grep /^ATTR.$name.disable.0$/,
@{$events} or grep /^ATTR.$name.disable.0$/,
@{$events} or grep /^DELETEATTR.$name.interval$/, @{$events} or grep /^DELETEATTR.$name.interval$/,
@{$events} or grep /^ATTR.$name.interval.[0-9]+/, @{$events} or grep /^ATTR.$name.interval.[0-9]+/,
@{$events} @{$events}
@@ -732,7 +734,7 @@ sub ErrorHandling {
} }
} }
$output .= '\n=== Abilities \n'; $output .= '\n=== Abilities \n';
my $i = 0; $i = 0;
for my $dev_settings ( @ { $devJson->{abilities} } ) { for my $dev_settings ( @ { $devJson->{abilities} } ) {
$output .= "[".$i++."]id: $dev_settings->{id} \n"; $output .= "[".$i++."]id: $dev_settings->{id} \n";
$output .= "name: $dev_settings->{name} "; $output .= "name: $dev_settings->{name} ";
@@ -1219,7 +1221,6 @@ sub createHttpValueStrings {
&& !defined( $hash->{helper}{locations_id} ) ); && !defined( $hash->{helper}{locations_id} ) );
readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 ) readingsSingleUpdate( $hash, 'state', 'fetch locationId', 1 )
if ( !defined( $hash->{helper}{locations_id} ) ); if ( !defined( $hash->{helper}{locations_id} ) );
$uri .= '/auth/token' if ( !defined( $hash->{helper}{session_id} ) );
$uri .= '/devices' $uri .= '/devices'
if (!defined($abilities) if (!defined($abilities)
&& defined( $hash->{helper}{locations_id} ) ); && defined( $hash->{helper}{locations_id} ) );
@@ -1487,7 +1488,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.4.1", "version": "v2.4.2",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

50
FHEM/74_GardenaSmartDevice.pm
View File

@@ -209,6 +209,10 @@ 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} = '';
$hash->{helper}{button_config_time_id} = '';
$hash->{helper}{winter_mode_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} = '';
@@ -306,7 +310,7 @@ 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":"2040-12-31T22:00:00.000Z","device":"'.$hash->{DEVICEID}.'"}'; $payload = ' "settings":{"name":"schedules_paused_until","value":"2038-01-18T00:00:00.000Z","device":"'.$hash->{DEVICEID}.'"}';
$abilities = 'mower_settings' ; $abilities = 'mower_settings' ;
$service_id = $hash->{helper}{schedules_paused_until_id}; $service_id = $hash->{helper}{schedules_paused_until_id};
} }
@@ -390,7 +394,7 @@ sub Set {
. $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' : '2040-12-31T22: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'};
@@ -431,7 +435,7 @@ sub Set {
} }
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' : '2040-12-31T22: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 = $hash->{helper}->{'schedules_paused_until_'.$valve_id.'_id'};
@@ -465,8 +469,16 @@ sub Set {
$payload = '"name":"measure_soil_humidity"'; $payload = '"name":"measure_soil_humidity"';
$abilities = 'humidity'; $abilities = 'humidity';
} }
}
## winter sleep
elsif ( lc $cmd eq 'winter_mode') {
$payload = '"settings":{"name":"winter_mode","value":"'
. $aArg->[0]
.'","device":"'
. $hash->{DEVICEID}
.'"}';
$abilities = 'winter_settings';
$service_id = $hash->{helper}->{'winter_mode_id'};
} }
else { else {
@@ -492,7 +504,8 @@ sub Set {
$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' );
# all devices has abilitie to fall a sleep
$list .= ' winter_mode:awake,hibernate';
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
@@ -686,7 +699,8 @@ sub WriteReadings {
if ( exists($decode_json->{settings}[$settings]{name}) if ( exists($decode_json->{settings}[$settings]{name})
&& ( && (
$decode_json->{settings}[$settings]{name} =~ /schedules_paused_until_?\d?$/ $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'
|| $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
@@ -695,6 +709,12 @@ sub WriteReadings {
$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
readingsBulkUpdateIfChanged(
$hash,
'winter_mode',
$decode_json->{settings}[$settings]{value}
) if ($decode_json->{settings}[$settings]{name} eq 'winter_mode');
} }
if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY" if ( ref( $decode_json->{settings}[$settings]{value} ) eq "ARRAY"
@@ -1169,6 +1189,9 @@ sub SetPredefinedStartPoints {
<br><br> <br><br>
<a name="GardenaSmartDeviceset"></a> <a name="GardenaSmartDeviceset"></a>
<b>set</b> <b>set</b>
<ul>
<li>winter_mode - awake | hibernate</li>
</ul>
<ul> <ul>
<h3>mower</h3> <h3>mower</h3>
<li>parkUntilFurtherNotice</li> <li>parkUntilFurtherNotice</li>
@@ -1182,11 +1205,11 @@ sub SetPredefinedStartPoints {
</ul> </ul>
<h3>irrigation control</h3> <h3>irrigation control</h3>
<li>resumeScheduleValve - start schedule irrigation on valve n</li> <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>stopScheduleValve - stop schedule irrigation on valve n (Default: 2038-01-18T00:00:00.000Z) | optional params hours (now + hours)</li>
<li>closeAllValves - close all valves</li> <li>closeAllValves - close all valves</li>
<h3>water control</h3> <h3>water control</h3>
<li>manualButtonTime - set manual time for button press (in minutes) 0 disable button</li> <li>manualButtonTime - set manual time for button press (in minutes) 0 disable button</li>
<li>stopSchedule - stop schedule for now + n hours (Default: 2040-12-31T22:00:00.000Z)</li> <li>stopSchedule - stop schedule for now + n hours (Default: 2038-01-18T00:00:00.000Z)</li>
<li>resumeSchedule - resume schedule</li> <li>resumeSchedule - resume schedule</li>
</ul> </ul>
</ul> </ul>
@@ -1322,6 +1345,9 @@ sub SetPredefinedStartPoints {
</ul> </ul>
<a name="GardenaSmartDeviceset"></a> <a name="GardenaSmartDeviceset"></a>
<b>set</b> <b>set</b>
<ul>
<li>winter_mode - aufw&auml;cken (awake)| winterschlaf (hibernate)</li>
</ul>
<ul> <ul>
<h3>m&auml;her</h3> <h3>m&auml;her</h3>
<li>parkUntilFurtherNotice - Parken des M&auml;hers unter Umgehung des Zeitplans</li> <li>parkUntilFurtherNotice - Parken des M&auml;hers unter Umgehung des Zeitplans</li>
@@ -1335,11 +1361,11 @@ sub SetPredefinedStartPoints {
</ul> </ul>
<h3>irrigation control</h3> <h3>irrigation control</h3>
<li>resumeScheduleValve - Startet Bew&aauml;sserung am Ventil n nach Zeitplan</li> <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>stopScheduleValve - Setzt Bew&aauml;sserung am Ventil n aus (Default: 2038-01-18T00:00:00.000Z) | Optionaler Parameter Stunden (Jetzt + Stunden)</li>
<li>closeAllValves - Stopt Bew&aauml;sserung an allen Ventilen </li> <li>closeAllValves - Stopt Bew&aauml;sserung an allen Ventilen </li>
<h3>water control</h3> <h3>water control</h3>
<li>manualButtonTime - setzt die Dauer f&uuml;r den manuellen Knopf (in Minuten) 0 Schaltet den Knopf aus</li> <li>manualButtonTime - setzt die Dauer f&uuml;r den manuellen Knopf (in Minuten) 0 Schaltet den Knopf aus</li>
<li>stopSchedule - Halte Zeitplan an für x Stunden - (Default: 2040-12-31T22:00:00.000Z)</li> <li>stopSchedule - Halte Zeitplan an für x Stunden - (Default: 2038-01-18T00:00:00.000Z)</li>
<li>resumeSchedule - Weiterf&uuml;hrung des Zeitplans</li> <li>resumeSchedule - Weiterf&uuml;hrung des Zeitplans</li>
</ul> </ul>
</ul> </ul>
@@ -1363,7 +1389,7 @@ sub SetPredefinedStartPoints {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.4.1", "version": "v2.4.2",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2021-05-28_20:35:00 46928 FHEM/73_GardenaSmartBridge.pm UPD 2021-06-05_18:47:30 46871 FHEM/73_GardenaSmartBridge.pm
UPD 2021-05-28_20:35:12 54414 FHEM/74_GardenaSmartDevice.pm UPD 2021-06-05_09:32:03 55505 FHEM/74_GardenaSmartDevice.pm