From e7814b889432eb2b30a8ae83bbaafce84b21f9f2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 4 May 2021 18:18:14 +0200 Subject: [PATCH 1/3] change state to 'offline' if device is offline. Sensor changed values to -1 --- FHEM/74_GardenaSmartDevice.pm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index c3195e4..38a0676 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -649,7 +649,9 @@ sub WriteReadings { } while ( $settings >= 0 ); readingsBulkUpdate( $hash, 'state', - ReadingsVal( $name, 'mower-status', 'readingsValError' ) ) + ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? + ReadingsVal( $name, 'mower-status', 'readingsValError') : 'offline' + ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); readingsBulkUpdate( $hash, 'state', @@ -661,16 +663,24 @@ sub WriteReadings { ) ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); - readingsBulkUpdate( - $hash, 'state', - 'T: ' + + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) { + my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown'); + my $state_string = 'T: ' . ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ) . '°C, H: ' . ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) . '%, L: ' - . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' - ) if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); + . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux'; + + if ( $online_state eq 'offline') { + readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ); + readingsBulkUpdate( $hash, 'humidity-humidity', '-1' ); + readingsBulkUpdate( $hash, 'light-light', '-1' ); + } + readingsBulkUpdate($hash, 'state', ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? $state_string : 'offline' ) + } readingsBulkUpdate( $hash, 'state', -- 2.49.0 From fa698b56946e9699d4706284be6625d56fcd4f14 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 9 May 2021 16:42:36 +0200 Subject: [PATCH 2/3] add Sensor2 --- FHEM/74_GardenaSmartDevice.pm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index 38a0676..18a16fc 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -419,7 +419,12 @@ sub Set { if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); $list .= 'refresh:temperature,light,humidity' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' + && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + + $list .= 'refresh:humidity' + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' + && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor2' ); $list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60' if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); @@ -666,18 +671,14 @@ sub WriteReadings { if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) { my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown'); - my $state_string = 'T: ' - . ReadingsVal( $name, 'ambient_temperature-temperature', - 'readingsValError' ) - . '°C, H: ' - . ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) - . '%, L: ' - . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux'; + my $state_string = 'T: ' . ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ). '°C,' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + $state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%'; + $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); if ( $online_state eq 'offline') { - readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ); readingsBulkUpdate( $hash, 'humidity-humidity', '-1' ); - readingsBulkUpdate( $hash, 'light-light', '-1' ); + readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + readingsBulkUpdate( $hash, 'light-light', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); } readingsBulkUpdate($hash, 'state', ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? $state_string : 'offline' ) } -- 2.49.0 From d0a17413cdd27d2cc260f0648bbbf8affa550515 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 9 May 2021 16:49:25 +0200 Subject: [PATCH 3/3] fix push --- FHEM/74_GardenaSmartDevice.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index 18a16fc..38a0676 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -419,12 +419,7 @@ sub Set { if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); $list .= 'refresh:temperature,light,humidity' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' - && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); - - $list .= 'refresh:humidity' - if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' - && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor2' ); + if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); $list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60' if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); @@ -671,14 +666,18 @@ sub WriteReadings { if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) { my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown'); - my $state_string = 'T: ' . ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ). '°C,' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); - $state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%'; - $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + my $state_string = 'T: ' + . ReadingsVal( $name, 'ambient_temperature-temperature', + 'readingsValError' ) + . '°C, H: ' + . ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ) + . '%, L: ' + . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux'; if ( $online_state eq 'offline') { + readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ); readingsBulkUpdate( $hash, 'humidity-humidity', '-1' ); - readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); - readingsBulkUpdate( $hash, 'light-light', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); + readingsBulkUpdate( $hash, 'light-light', '-1' ); } readingsBulkUpdate($hash, 'state', ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? $state_string : 'offline' ) } -- 2.49.0