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

patch-fix_div_with_attributes #91

Merged
marko merged 6 commits from patch-fix_div_with_attributes into dev 2023-11-28 07:54:10 +00:00
Conversation 0 Commits 6 Files Changed 2 +180 -69
4 changed files with 180 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 232f82eafe - Show all commits

146
CHANGELOG.md
View File

@@ -1,4 +1,124 @@
### docs: change verson numbers (HEAD -> patch-changeVersion) ### test: smartdevice variable wintermode initializied Bridge consolidiert wifi/ethernet (HEAD -> patch_mucki)
>Sun, 5 Nov 2023 21:52:24 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: fix initial variables (origin/patch_mucki)
>Wed, 1 Nov 2023 21:04:39 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: debug line
>Sat, 28 Oct 2023 18:02:17 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: cleanup initial error handling
>Wed, 25 Oct 2023 22:16:26 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: fix wifi status if is_connected
>Mon, 23 Oct 2023 22:04:31 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: changed published gateway informations
>Sat, 21 Oct 2023 20:21:31 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: gateway readings changed by gardena
>Thu, 12 Oct 2023 21:52:51 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: versions pump
>Tue, 3 Oct 2023 22:40:58 +0200
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### feat: changelog (origin/patch_setExtention, patch_setExtention)
>Thu, 2 Mar 2023 11:58:58 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### feat: add setextention
>Thu, 2 Mar 2023 11:58:29 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### feat: test
>Thu, 2 Mar 2023 11:30:19 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### docs: add changelog file (tag: v2.6.0, origin/patch-changeVersion)
>Tue, 10 Jan 2023 09:51:23 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: change verson numbers
>Tue, 10 Jan 2023 09:50:36 +0100 >Tue, 10 Jan 2023 09:50:36 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@@ -9,7 +129,7 @@ change modul versions
### test: add hooks (origin/patch-changeVersion) ### test: add hooks
>Tue, 10 Jan 2023 09:48:39 +0100 >Tue, 10 Jan 2023 09:48:39 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@@ -20,7 +140,7 @@ hooks for commit test and create changelog
### [translaten] - add commandref translation ### [translaten] - add commandref translation (origin/patch-fix_commandref_spell, patch-fix_commandref_spell)
>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)
@@ -40,7 +160,7 @@ hooks for commit test and create changelog
### [enhancement] - commandref ### [enhancement] - commandref (origin/patch-wc_rest_valve_and_additinal_commandref, patch-wc_rest_valve_and_additinal_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)
@@ -90,7 +210,7 @@ hooks for commit test and create changelog
### [fix] - upper/lower case ### [fix] - upper/lower case (origin/patch-offline_status_startup_undefined, patch-offline_status_startup_undefined)
>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)
@@ -380,7 +500,7 @@ hooks for commit test and create changelog
### readd lost setter webinterface ### readd lost setter webinterface (origin/patch-dev_merge_failed_electronic_pressure_pump, patch-dev_merge_failed_electronic_pressure_pump)
>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)
@@ -401,7 +521,7 @@ hooks for commit test and create changelog
### „FHEM/74_GardenaSmartDevice.pm“ ändern ### „FHEM/74_GardenaSmartDevice.pm“ ändern (origin/patch_electronic_pressure_pump_water_pump_name_mistake)
>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)
@@ -621,7 +741,7 @@ hooks for commit test and create changelog
### [fix] - setter procedure ### [fix] - setter procedure (origin/patch_pressure_pump_setlist, patch_pressure_pump_setlist)
>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)
@@ -771,7 +891,7 @@ hooks for commit test and create changelog
### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed ### patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed (origin/patch_lona, patch_lona)
>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)
@@ -1151,7 +1271,7 @@ hooks for commit test and create changelog
### lona ### lona (origin/patch_waterpump, patch_waterpump)
>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)
@@ -1541,7 +1661,7 @@ hooks for commit test and create changelog
### round minutes in irregation ### round minutes in irregation (origin/patch_water_control)
>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)
@@ -1681,7 +1801,7 @@ hooks for commit test and create changelog
### fix state ### fix state (origin/patch_add_sensor2)
>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)
@@ -1711,7 +1831,7 @@ hooks for commit test and create changelog
### fix ic24 ### fix ic24 (origin/patch_ic24_schedule)
>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)

80
FHEM/73_GardenaSmartBridge.pm
View File

@@ -75,9 +75,9 @@ eval { use IO::Socket::SSL; 1 }
# try to use JSON::MaybeXS wrapper # try to use JSON::MaybeXS wrapper
# for chance of better performance + open code # for chance of better performance + open code
eval { eval {
require JSON::MaybeXS; require JSON::MaybeXS;
import JSON::MaybeXS qw( decode_json encode_json ); import JSON::MaybeXS qw( decode_json encode_json );
1; 1;
} or do { } or do {
# try to use JSON wrapper # try to use JSON wrapper
@@ -628,26 +628,32 @@ sub ErrorHandling {
if ( $param->{code} == 400 ) { if ( $param->{code} == 400 ) {
if ($decode_json) { if ($decode_json) {
if ( ref( $decode_json->{errors} ) eq "ARRAY" if ( ref( $decode_json->{errors} ) eq "ARRAY"
&& defined( $decode_json->{errors} ) ) && exists( $decode_json->{errors} ) )
# replace defined with exists
# && defined( $decode_json->{errors} ) )
{ {
readingsBulkUpdate( # $decode_json->{errors} -> ARRAY
# $decode_json->{errors}[0] -> HASH
if (exists ($decode_json->{errors}[0]{error}) ) {
readingsBulkUpdate(
$dhash, $dhash,
"state", "state",
$decode_json->{errors}[0]{error} . ' ' $decode_json->{errors}[0]{error} . ' '
. $decode_json->{errors}[0]{attribute}, . $decode_json->{errors}[0]{attribute},
1 1
); );
readingsBulkUpdate( readingsBulkUpdate(
$dhash, $dhash,
"lastRequestState", "lastRequestState",
$decode_json->{errors}[0]{error} . ' ' $decode_json->{errors}[0]{error} . ' '
. $decode_json->{errors}[0]{attribute}, . $decode_json->{errors}[0]{attribute},
1 1
); );
Log3 $dname, 5, Log3 $dname, 5,
"GardenaSmartBridge ($dname) - RequestERROR: " "GardenaSmartBridge ($dname) - RequestERROR: "
. $decode_json->{errors}[0]{error} . " " . $decode_json->{errors}[0]{error} . " "
. $decode_json->{errors}[0]{attribute}; . $decode_json->{errors}[0]{attribute};
} # fi exists error
} }
} }
else { else {
@@ -1070,36 +1076,16 @@ sub WriteReadings {
) )
&& ref($v) eq 'HASH' && ref($v) eq 'HASH'
) )
{ {
if ( $decode_json->{abilities}[0]{properties} if ($v->{is_connected} ) {
[$properties]{name} eq 'ethernet_status' ) readingsBulkUpdateIfChanged( $hash,
{ $decode_json->{abilities}[0]{properties}[$properties]{name}.'-ip', $v->{ip} )
readingsBulkUpdateIfChanged( $hash, if ( ref( $v->{ip} ) ne 'HASH' );
'ethernet_status-mac', $v->{mac} ); readingsBulkUpdateIfChanged( $hash,
readingsBulkUpdateIfChanged( $hash, $decode_json->{abilities}[0]{properties}[$properties]{name}.'-isconnected', $v->{is_connected} )
'ethernet_status-ip', $v->{ip} ) if ( $v->{is_connected} );
if ( ref( $v->{ip} ) ne 'HASH' );
readingsBulkUpdateIfChanged( $hash,
'ethernet_status-isconnected',
$v->{isConnected} );
} }
elsif ( $decode_json->{abilities}[0]{properties} } # fi ethernet and wifi
[$properties]{name} eq 'wifi_status' )
{
readingsBulkUpdateIfChanged( $hash,
'wifi_status-ssid', $v->{ssid} )
if ( ref( $v->{ssid} ) ne 'HASH' );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-mac', $v->{mac} );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-ip', $v->{ip} )
if ( ref( $v->{ip} ) ne 'HASH' );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-isconnected', $v->{isConnected} );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-signal', $v->{signal} );
}
}
} }
$properties--; $properties--;
@@ -1575,7 +1561,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.6.0", "version": "v2.6.1",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

19
FHEM/74_GardenaSmartDevice.pm
View File

@@ -67,12 +67,14 @@ use Time::Local;
use Time::Piece; use Time::Piece;
use Time::Seconds; use Time::Seconds;
use SetExtensions;
# try to use JSON::MaybeXS wrapper # try to use JSON::MaybeXS wrapper
# for chance of better performance + open code # for chance of better performance + open code
eval { eval {
require JSON::MaybeXS; require JSON::MaybeXS;
import JSON::MaybeXS qw( decode_json encode_json ); import JSON::MaybeXS qw( decode_json encode_json );
1; 1;
} or do { } or do {
# try to use JSON wrapper # try to use JSON wrapper
@@ -142,7 +144,8 @@ BEGIN {
modules modules
IOWrite IOWrite
defs defs
makeDeviceName) makeDeviceName
SetExtensions)
); );
} }
@@ -561,6 +564,7 @@ sub Set {
$abilities = 'winter_settings'; $abilities = 'winter_settings';
$service_id = $hash->{helper}->{'winter_mode_id'}; $service_id = $hash->{helper}->{'winter_mode_id'};
} }
else { else {
my $list = ''; my $list = '';
@@ -613,7 +617,8 @@ sub Set {
# all devices has abilitie to fall a sleep # all devices has abilitie to fall a sleep
$list .= ' winter_mode:awake,hibernate'; $list .= ' winter_mode:awake,hibernate';
return "Unknown argument $cmd, choose one of $list"; return SetExtensions($hash, $list, $name, $cmd, @$aArg);
# return "Unknown argument $cmd, choose one of $list";
} }
$hash->{helper}{deviceAction} = $payload; $hash->{helper}{deviceAction} = $payload;
@@ -987,7 +992,7 @@ sub WriteReadings {
} }
; # fi scheduled_events ; # fi scheduled_events
my $winter_mode; my $winter_mode = 'awake';
do { do {
#Log3 $name, 1, "Settings pro Device : ".$decode_json->{settings}[$settings]{name}; #Log3 $name, 1, "Settings pro Device : ".$decode_json->{settings}[$settings]{name};
@@ -2678,7 +2683,7 @@ sub SetPredefinedStartPoints {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.6.0", "version": "v2.6.1",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2023-01-10_09:49:28 49646 FHEM/73_GardenaSmartBridge.pm UPD 2023-11-12_19:47:27 48890 FHEM/73_GardenaSmartBridge.pm
UPD 2023-01-10_09:49:45 126305 FHEM/74_GardenaSmartDevice.pm UPD 2023-11-05_21:51:38 126419 FHEM/74_GardenaSmartDevice.pm