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

testing #29

Merged
marko merged 38 commits from testing into master 2021-05-22 03:01:10 +00:00
Conversation 0 Commits 38 Files Changed 3 +14 -11
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba4fbc44a7 - Show all commits

25
FHEM/74_GardenaSmartDevice.pm
View File

@@ -426,7 +426,7 @@ sub Set {
$list .= 'refresh:temperature,humidity' $list .= 'refresh:temperature,humidity'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' );
# add light for old sensors # add light for old sensors
$list .= 'light' $list .= ',light'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor' if ( AttrVal( $name, 'model', 'unknown' ) eq 'sensor'
&& ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor' ); && ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor' );
@@ -545,7 +545,7 @@ sub WriteReadings {
. $propertie->{name} ne 'light-light' . $propertie->{name} ne 'light-light'
&& ref( $propertie->{value} ) ne "HASH" ); && ref( $propertie->{value} ) ne "HASH" );
readingsBulkUpdate( readingsBulkUpdateIfChanged(
$hash, $hash,
$decode_json->{abilities}[$abilities]{name} . '-' $decode_json->{abilities}[$abilities]{name} . '-'
. $propertie->{name}, . $propertie->{name},
@@ -657,8 +657,11 @@ sub WriteReadings {
$settings--; $settings--;
} while ( $settings >= 0 ); } while ( $settings >= 0 );
my $online_state = ReadingsVal($name , 'device_info-connection_status', 'unknown');
readingsBulkUpdate( $hash, 'state', readingsBulkUpdate( $hash, 'state',
ReadingsVal($name , 'device_info-connection_status', 'unknown') eq 'online' ? $online_state eq 'online' ?
ReadingsVal( $name, 'mower-status', 'readingsValError') : 'offline' ReadingsVal( $name, 'mower-status', 'readingsValError') : 'offline'
) )
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
@@ -674,17 +677,17 @@ 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 $state_string = '';
my $state_string = 'T: ' . ReadingsVal( $name, 'ambient_temperature-temperature', 'readingsValError' ). '°C,' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); $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 .= 'H: '. ReadingsVal( $name, 'humidity-humidity', 'readingsValError' ). '%';
$state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); $state_string .= ', L: ' . ReadingsVal( $name, 'light-light', 'readingsValError' ) . 'lux' if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor');
if ( $online_state eq 'offline') { # if ( $online_state eq 'offline') {
readingsBulkUpdate( $hash, 'humidity-humidity', '-1' ); # readingsBulkUpdate( $hash, 'humidity-humidity', '-1' );
readingsBulkUpdate( $hash, 'ambient_temperature-temperature', '-1' ) if (ReadingsVal($name, 'device_info-category', 'unknown') eq 'sensor'); # 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' ) 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', $online_state eq 'online' ? $state_string : 'offline' )
} }
readingsBulkUpdate( readingsBulkUpdate(