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

Merge pull request 'dev' (#97) from dev into testing

Browse Source 
Reviewed-on: #97
This commit is contained in:
Marko Oldenburg 2024-03-28 08:16:03 +01:00
commit 89bc35b1bd
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
FHEM/73_GardenaSmartBridge.pm
View File

@ -1059,6 +1059,14 @@ sub WriteReadings {
if ( ref($v) eq 'ARRAY' );
#$v = encode_utf8($v);
$v = ' ' if (!defined $v);
Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 1 ".$decode_json->{abilities}[0]{properties}[$properties]{name} if ( $decode_json->{abilities}[0]{properties}[$properties]
{name} !~ /ethernet_status|wifi_status/ );
Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 2".$t if ( $decode_json->{abilities}[0]{properties}[$properties]
{name} !~ /ethernet_status|wifi_status/ );
Log3 $name, 4, "Gardena DEBUG DEBUG DEBUG stage 3".$v if ( $decode_json->{abilities}[0]{properties}[$properties]
{name} !~ /ethernet_status|wifi_status/ );
readingsBulkUpdateIfChanged(
$hash,
$decode_json->{abilities}[0]{properties}[$properties]
@ -1315,17 +1323,16 @@ sub createHttpValueStrings {
} # park until next schedules or override
elsif (defined($abilities)
&& defined($payload)
&& $abilities eq 'mower_timer' )
&& $abilities eq 'mower' )
{
my $valve_id;
$method = 'PUT';
$uri .=
'/devices/'
. $deviceId
. '/abilities/'
. $abilities
. '/properties/mower_timer';
. '/commands/manual_start';
}
elsif (defined($abilities)
@ -1561,7 +1568,7 @@ sub DeletePassword {
],
"release_status": "stable",
"license": "GPL_2",
"version": "v2.6.1",
"version": "v2.6.2",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],

25
FHEM/74_GardenaSmartDevice.pm
View File

@ -324,8 +324,8 @@ sub Set {
elsif ( lc $cmd eq 'parkuntilnexttimer' ) {
$payload = '"name":"park_until_next_timer"';
if ( $mainboard_version > 10.30 ) {
$payload = '"properties":{"name":"mower_timer","value":0}';
$abilities = 'mower_timer';
$payload = '"mowerTimer":0,"startingPointDistance":null,"areaId":null';
$abilities = 'mower';
}
}
elsif ( lc $cmd eq 'startresumeschedule' ) {
@ -339,13 +339,13 @@ sub Set {
}
}
elsif ( lc $cmd eq 'startoverridetimer' ) {
$payload = '"name":"start_override_timer","parameters":{"duration":'
. $aArg->[0] * 60 . '}';
if ( $mainboard_version > 10.30 ) {
$payload = '"properties":{"name":"mower_timer","value":'
. $aArg->[0] * 60 . '}';
$abilities = 'mower_timer';
}
# $payload = '"name":"start_override_timer","parameters":{"duration":'
# . $aArg->[0] * 60 . '}';
# if ( $mainboard_version > 10.30 ) {
$payload = '"startingPointDistance":null,"areaId":null, "mowerTimer": '
. $aArg->[0] * 60;
$abilities = 'mower';
# } removed code < 10.30 api changes March 2024
}
elsif ( lc $cmd eq 'startpoint' ) {
@ -618,6 +618,7 @@ sub Set {
# all devices has abilitie to fall a sleep
$list .= ' winter_mode:awake,hibernate';
return SetExtensions( $hash, $list, $name, $cmd, @$aArg );
# return "Unknown argument $cmd, choose one of $list";
}
@ -1688,7 +1689,7 @@ sub SetPredefinedStartPoints {
pump. Schedules can be disabled/enabled via fhem, defining or deleting them must be done via Gardena App or its web interface.<br>
</ul>
<br>
<div style="display: none">
<div>
<a id="GardenaSmartDevice-set"></a>
<li><a id="GardenaSmartDevice-set-parkUntilFurtherNotice">parkUntilFurtherNotice</a> - park mower and disable schedule</li>
<li><a id="GardenaSmartDevice-set-parkUntilNextTimer">parkUntilNextTimer</a> - park mower until next schedule</li>
@ -2154,7 +2155,7 @@ sub SetPredefinedStartPoints {
Steckdosen-Adapter und Pumpe. Zeitpl&auml;ne k&ouml;nnen &uuml;ber fhem pausiert/aktiviert werden, das Anlegen oder L&ouml;schen erfolgt
derzeit nur &uuml;ber die App oder deren Web-Frontend.
</ul>
<div style="display: none">
<div>
<a id="GardenaSmartDevice-set"></a>
<li><a id="GardenaSmartDevice-set-parkUntilFurtherNotice">parkUntilFurtherNotice</a> - Parken des M&auml;hers und Aussetzen des Zeitplans</li>
<li><a id="GardenaSmartDevice-set-parkUntilNextTimer">parkUntilNextTimer</a> - Parken bis zum n&auml;chsten Start nach Zeitplan</li>
@ -2683,7 +2684,7 @@ sub SetPredefinedStartPoints {
],
"release_status": "stable",
"license": "GPL_2",
"version": "v2.6.1",
"version": "v2.6.2",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2023-11-12_19:47:27 48890 FHEM/73_GardenaSmartBridge.pm
UPD 2023-11-05_21:51:38 126419 FHEM/74_GardenaSmartDevice.pm
UPD 2024-03-18_10:15:10 48866 FHEM/73_GardenaSmartBridge.pm
UPD 2024-03-17_20:57:32 126450 FHEM/74_GardenaSmartDevice.pm