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

Merge pull request 'patch_newstart_command' (#94) from patch_newstart_command into dev

Browse Source 
Reviewed-on: #94
This commit is contained in:
Marko Oldenburg
2024-03-27 20:03:15 +01:00
parent 274cb067cf 72daa71daf
commit bbb4be939c
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/73_GardenaSmartBridge.pm
View File

@@ -1315,17 +1315,16 @@ sub createHttpValueStrings {
} # 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' )
{ {
my $valve_id; my $valve_id;
$method = 'PUT';
$uri .= $uri .=
'/devices/' '/devices/'
. $deviceId . $deviceId
. '/abilities/' . '/abilities/'
. $abilities . $abilities
. '/properties/mower_timer'; . '/commands/manual_start';
} }
elsif (defined($abilities) elsif (defined($abilities)
@@ -1561,7 +1560,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.6.1", "version": "v2.6.2",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

20
FHEM/74_GardenaSmartDevice.pm
View File

@@ -324,8 +324,8 @@ sub Set {
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 = '"mowerTimer":0,"startingPointDistance":null,"areaId":null';
$abilities = 'mower_timer'; $abilities = 'mower';
} }
} }
elsif ( lc $cmd eq 'startresumeschedule' ) { elsif ( lc $cmd eq 'startresumeschedule' ) {
@@ -339,13 +339,13 @@ sub Set {
} }
} }
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":' $payload = '"startingPointDistance":null,"areaId":null, "mowerTimer": '
. $aArg->[0] * 60 . '}'; . $aArg->[0] * 60;
$abilities = 'mower_timer'; $abilities = 'mower';
} # } removed code < 10.30 api changes March 2024
} }
elsif ( lc $cmd eq 'startpoint' ) { elsif ( lc $cmd eq 'startpoint' ) {
@@ -2684,7 +2684,7 @@ sub SetPredefinedStartPoints {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.6.1", "version": "v2.6.2",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2023-11-28_08:37:01 48890 FHEM/73_GardenaSmartBridge.pm UPD 2024-03-18_10:15:10 48866 FHEM/73_GardenaSmartBridge.pm
UPD 2023-11-28_08:49:14 126386 FHEM/74_GardenaSmartDevice.pm UPD 2024-03-17_20:57:32 126450 FHEM/74_GardenaSmartDevice.pm