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

Übernahme in den Testing Zweig #22

Merged
marko merged 24 commits from devel into testing 2021-05-12 07:27:15 +00:00
Conversation 0 Commits 24 Files Changed 3 +11 -10
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa698b5694 - Show all commits

21
FHEM/74_GardenaSmartDevice.pm
View File

@ -419,7 +419,12 @@ sub Set {
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
$list .= 'refresh:temperature,light,humidity' $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' $list .= 'on:noArg off:noArg on-for-timer:slider,0,1,60'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
@ -666,18 +671,14 @@ sub WriteReadings {
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) { if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ) {
my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown'); my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown');
my $state_string = 'T: ' my $state_string = 'T: ' . ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ). '°C,' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
. ReadingsVal( $name, 'ambient_temperature-temperature', $state_string .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%';
'readingsValError' ) $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
. '°C, H: '
. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' )
. '%, L: '
. ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux';
if ( $online_state eq 'offline') { if ( $online_state eq 'offline') {
readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' );
readingsBulkUpdate( $hash, 'humidity-humidity', '-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' ) readingsBulkUpdate($hash, 'state', ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? $state_string : 'offline' )
} }