merge des aktuellen devel in testing #34

Merged
sebastianschwarz merged 15 commits from devel into testing 2021-06-09 11:53:43 +00:00
3 changed files with 34 additions and 8 deletions
Showing only changes of commit 9e20c40b37 - Show all commits

View File

@ -1487,7 +1487,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>"
], ],

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} = '';
@ -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>
@ -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>
@ -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>"
], ],

View File

@ -1,2 +1,2 @@
UPD 2021-05-28_20:35:00 46928 FHEM/73_GardenaSmartBridge.pm UPD 2021-05-28_20:36:47 46928 FHEM/73_GardenaSmartBridge.pm
UPD 2021-05-28_20:35:12 54414 FHEM/74_GardenaSmartDevice.pm UPD 2021-05-28_20:56:13 55505 FHEM/74_GardenaSmartDevice.pm