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

patch-merge2 #105

Merged
marko merged 6 commits from patch-merge2 into dev 2024-04-15 13:58:25 +00:00
Conversation 0 Commits 6 Files Changed 2 +59 -32
4 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d756e4aaa - Show all commits

50
CHANGELOG.md
View File

@ -1,4 +1,24 @@
### test: smartdevice variable wintermode initializied Bridge consolidiert wifi/ethernet (HEAD -> patch_mucki) ### fix: closes #90 (HEAD -> patch-fix_div_with_attributes)
>Tue, 28 Nov 2023 08:52:33 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix: missing tree (origin/patch_mucki)
>Sun, 12 Nov 2023 19:47:49 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: smartdevice variable wintermode initializied Bridge consolidiert wifi/ethernet
>Sun, 5 Nov 2023 21:52:24 +0100 >Sun, 5 Nov 2023 21:52:24 +0100
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -8,7 +28,7 @@
### test: fix initial variables (origin/patch_mucki) ### test: fix initial variables
>Wed, 1 Nov 2023 21:04:39 +0100 >Wed, 1 Nov 2023 21:04:39 +0100
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -78,7 +98,7 @@
### feat: changelog (origin/patch_setExtention, patch_setExtention) ### feat: changelog
>Thu, 2 Mar 2023 11:58:58 +0100 >Thu, 2 Mar 2023 11:58:58 +0100
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -108,7 +128,7 @@
### docs: add changelog file (tag: v2.6.0, origin/patch-changeVersion) ### docs: add changelog file (tag: v2.6.0, origin/patch-changeVersion, patch-changeVersion)
>Tue, 10 Jan 2023 09:51:23 +0100 >Tue, 10 Jan 2023 09:51:23 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@ -140,7 +160,7 @@ hooks for commit test and create changelog
### [translaten] - add commandref translation (origin/patch-fix_commandref_spell, patch-fix_commandref_spell) ### [translaten] - add commandref translation
>Sun, 18 Sep 2022 08:52:43 +0200 >Sun, 18 Sep 2022 08:52:43 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -160,7 +180,7 @@ hooks for commit test and create changelog
### [enhancement] - commandref (origin/patch-wc_rest_valve_and_additinal_commandref, patch-wc_rest_valve_and_additinal_commandref) ### [enhancement] - commandref
>Tue, 6 Sep 2022 12:32:40 +0200 >Tue, 6 Sep 2022 12:32:40 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -210,7 +230,7 @@ hooks for commit test and create changelog
### [fix] - upper/lower case (origin/patch-offline_status_startup_undefined, patch-offline_status_startup_undefined) ### [fix] - upper/lower case
>Thu, 11 Aug 2022 14:25:19 +0200 >Thu, 11 Aug 2022 14:25:19 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -500,7 +520,7 @@ hooks for commit test and create changelog
### readd lost setter webinterface (origin/patch-dev_merge_failed_electronic_pressure_pump, patch-dev_merge_failed_electronic_pressure_pump) ### readd lost setter webinterface
>Wed, 13 Jul 2022 20:56:47 +0200 >Wed, 13 Jul 2022 20:56:47 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -521,7 +541,7 @@ hooks for commit test and create changelog
### „FHEM/74_GardenaSmartDevice.pm“ ändern (origin/patch_electronic_pressure_pump_water_pump_name_mistake) ### „FHEM/74_GardenaSmartDevice.pm“ ändern
>Tue, 12 Jul 2022 20:09:33 +0200 >Tue, 12 Jul 2022 20:09:33 +0200
>Author: Sebastian Schwaz (sebastianschwarz@noreply@cooltux.net) >Author: Sebastian Schwaz (sebastianschwarz@noreply@cooltux.net)
@ -741,7 +761,7 @@ hooks for commit test and create changelog
### [fix] - setter procedure (origin/patch_pressure_pump_setlist, patch_pressure_pump_setlist) ### [fix] - setter procedure
>Wed, 29 Jun 2022 20:32:00 +0200 >Wed, 29 Jun 2022 20:32:00 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -891,7 +911,7 @@ hooks for commit test and create changelog
### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed (origin/patch_lona, patch_lona) ### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed
>Sat, 25 Jun 2022 12:58:59 +0200 >Sat, 25 Jun 2022 12:58:59 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -1271,7 +1291,7 @@ hooks for commit test and create changelog
### lona (origin/patch_waterpump, patch_waterpump) ### lona
>Tue, 17 May 2022 20:53:37 +0200 >Tue, 17 May 2022 20:53:37 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -1661,7 +1681,7 @@ hooks for commit test and create changelog
### round minutes in irregation (origin/patch_water_control) ### round minutes in irregation
>Tue, 12 Apr 2022 08:40:40 +0200 >Tue, 12 Apr 2022 08:40:40 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -1801,7 +1821,7 @@ hooks for commit test and create changelog
### fix state (origin/patch_add_sensor2) ### fix state
>Tue, 5 Apr 2022 09:23:34 +0200 >Tue, 5 Apr 2022 09:23:34 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -1831,7 +1851,7 @@ hooks for commit test and create changelog
### fix ic24 (origin/patch_ic24_schedule) ### fix ic24
>Tue, 29 Mar 2022 16:35:58 +0200 >Tue, 29 Mar 2022 16:35:58 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)

15
FHEM/73_GardenaSmartBridge.pm
View File

@ -1059,6 +1059,14 @@ sub WriteReadings {
if ( ref($v) eq 'ARRAY' ); if ( ref($v) eq 'ARRAY' );
#$v = encode_utf8($v); #$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( readingsBulkUpdateIfChanged(
$hash, $hash,
$decode_json->{abilities}[0]{properties}[$properties] $decode_json->{abilities}[0]{properties}[$properties]
@ -1315,17 +1323,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 +1568,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-28_12:39:18 49572 FHEM/73_GardenaSmartBridge.pm
UPD 2023-11-28_08:49:14 126386 FHEM/74_GardenaSmartDevice.pm UPD 2024-03-28_12:39:18 126450 FHEM/74_GardenaSmartDevice.pm