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

Merge branch 'devel' into patch

Browse Source
This commit is contained in:
Sebastian Schwaz 2021-04-03 11:21:25 +02:00
commit 1fa369ccc2
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
FHEM/73_GardenaSmartBridge.pm
View File

@ -859,9 +859,6 @@ sub WriteReadings {
$v = encode_utf8($v); $v = encode_utf8($v);
readingsBulkUpdateIfChanged( $hash, $t, $v ); readingsBulkUpdateIfChanged( $hash, $t, $v );
} }
readingsBulkUpdateIfChanged( $hash, 'zones',
scalar( @{ $decode_json->{zones} } ) );
} }
elsif ($decode_json->{id} ne $hash->{helper}{locations_id} elsif ($decode_json->{id} ne $hash->{helper}{locations_id}
&& ref( $decode_json->{abilities} ) eq 'ARRAY' && ref( $decode_json->{abilities} ) eq 'ARRAY'
@ -885,11 +882,7 @@ sub WriteReadings {
{name} . '-' . $t, {name} . '-' . $t,
$v $v
) )
if ( if ($decode_json->{abilities}[0]{properties}[$properties]{name} !~ /ethernet_status|wifi_status/ );
$decode_json->{abilities}[0]{properties}[$properties]
{name} ne 'ethernet_status'
|| $decode_json->{abilities}[0]{properties}
[$properties]{name} ne 'wifi_status' );
if ( if (
( (
@ -916,8 +909,10 @@ sub WriteReadings {
elsif ( $decode_json->{abilities}[0]{properties} elsif ( $decode_json->{abilities}[0]{properties}
[$properties]{name} eq 'wifi_status' ) [$properties]{name} eq 'wifi_status' )
{ {
#TODO: read valies if bridge connected to wifi
readingsBulkUpdateIfChanged( $hash, readingsBulkUpdateIfChanged( $hash,
'wifi_status-ssid', $v->{ssid} ); 'wifi_status-ssid', $v->{ssid} )
if (ref($v->{ssid}) ne 'HASH');
readingsBulkUpdateIfChanged( $hash, readingsBulkUpdateIfChanged( $hash,
'wifi_status-mac', $v->{mac} ); 'wifi_status-mac', $v->{mac} );
readingsBulkUpdateIfChanged( $hash, readingsBulkUpdateIfChanged( $hash,
@ -1322,8 +1317,7 @@ sub DeletePassword {
<li>longitude - Längengrad des Grundstücks</li> <li>longitude - Längengrad des Grundstücks</li>
<li>name - Name of your Garden – Default „My Garden“</li> <li>name - Name of your Garden – Default „My Garden“</li>
<li>state - State of the Bridge</li> <li>state - State of the Bridge</li>
<li>token - SessionID</li> <li>token - SessionID</li>
<li>zones - </li>
</ul> </ul>
<br><br> <br><br>
<a name="GardenaSmartBridgeset"></a> <a name="GardenaSmartBridgeset"></a>
@ -1384,8 +1378,7 @@ sub DeletePassword {
<li>longitude - Längengrad des Grundst&uuml;cks</li> <li>longitude - Längengrad des Grundst&uuml;cks</li>
<li>name - Name für das Grundst&uuml;ck – Default „My Garden“</li> <li>name - Name für das Grundst&uuml;ck – Default „My Garden“</li>
<li>state - Status der Bridge</li> <li>state - Status der Bridge</li>
<li>token - SessionID</li> <li>token - SessionID</li>
<li>zones - </li>
</ul> </ul>
<br><br> <br><br>
<a name="GardenaSmartBridgeset"></a> <a name="GardenaSmartBridgeset"></a>
@ -1426,7 +1419,7 @@ sub DeletePassword {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.0", "version": "v2.2.1",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2021-03-28_14:50:43 43697 FHEM/73_GardenaSmartBridge.pm UPD 2021-03-30_13:04:26 43507 FHEM/73_GardenaSmartBridge.pm
UPD 2021-03-27_06:02:14 45622 FHEM/74_GardenaSmartDevice.pm UPD 2021-03-25_09:33:11 45622 FHEM/74_GardenaSmartDevice.pm