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

patch_mucki #87

Merged
sebastianschwarz merged 9 commits from patch_mucki into dev 2023-11-20 19:43:36 +00:00
Conversation 1 Commits 9 Files Changed 4 +26 -41
4 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit de58578a2d - Show all commits

14
CHANGELOG.md
View File

@ -1,4 +1,14 @@
### test: debug line (HEAD -> patch_mucki) ### test: fix initial variables (HEAD -> patch_mucki)
>Wed, 1 Nov 2023 21:04:39 +0100
>Author: Sebastian (em@ail.tld)
>Commiter: Sebastian (em@ail.tld)
### test: debug line (origin/patch_mucki)
>Sat, 28 Oct 2023 18:02:17 +0200 >Sat, 28 Oct 2023 18:02:17 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)
@ -8,7 +18,7 @@
### test: cleanup initial error handling (origin/patch_mucki) ### test: cleanup initial error handling
>Wed, 25 Oct 2023 22:16:26 +0200 >Wed, 25 Oct 2023 22:16:26 +0200
>Author: Sebastian (em@ail.tld) >Author: Sebastian (em@ail.tld)

45
FHEM/73_GardenaSmartBridge.pm
View File

@ -1076,41 +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,
{ [$properties]{name}.'-ip', $v->{ip} )
readingsBulkUpdateIfChanged( $hash, if ( ref( $v->{ip} ) ne 'HASH' );
'ethernet_status-ip', $v->{ip} ) readingsBulkUpdateIfChanged( $hash,
if ( ref( $v->{ip} ) ne 'HASH' ); [$properties]{name}.'-isconnected', $v->{is_connected} )
readingsBulkUpdateIfChanged( $hash, if ( $v->{is_connected} );
'ethernet_status-isconnected',
$v->{is_connected} );
# obsolet, not published anymore
# readingsBulkUpdateIfChanged( $hash,
# 'ethernet_status-mac', $v->{mac} );
} }
elsif ( $decode_json->{abilities}[0]{properties} } # fi ethernet and wifi
[$properties]{name} eq 'wifi_status' )
{
# obsolet, not published anymore TODO: ask user using wifi
readingsBulkUpdateIfChanged( $hash,
'wifi_status-ssid', $v->{ssid} )
if (( ref( $v->{ssid} ) ne 'HASH' )
&& ( $v->{is_connected} )) ;
# readingsBulkUpdateIfChanged( $hash,
# 'wifi_status-mac', $v->{mac} );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-isconnected', $v->{is_connected} );
readingsBulkUpdateIfChanged( $hash,
'wifi_status-ip', $v->{ip} )
if (( ref( $v->{ip} ) ne 'HASH' )
&& ( $v->{is_connected} )) ;
readingsBulkUpdateIfChanged( $hash,
'wifi_status-signal', $v->{signal} )
if ( $v->{is_connected} ) ;
}
}
} }
$properties--; $properties--;
@ -1586,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>"
], ],

4
FHEM/74_GardenaSmartDevice.pm
View File

@ -992,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};
@ -2683,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-11-01_20:57:32 50330 FHEM/73_GardenaSmartBridge.pm UPD 2023-11-05_21:43:22 48810 FHEM/73_GardenaSmartBridge.pm
UPD 2023-10-03_22:40:44 126409 FHEM/74_GardenaSmartDevice.pm UPD 2023-11-05_21:51:38 126419 FHEM/74_GardenaSmartDevice.pm