From e361bc037e46cded9bf0e14c5acd16eb6e686f6a Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 5 Jan 2020 12:59:12 +0100 Subject: [PATCH] make beautiful code --- 73_AutoShuttersControl.pm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm index 3e8420b..22393bb 100644 --- a/73_AutoShuttersControl.pm +++ b/73_AutoShuttersControl.pm @@ -443,12 +443,21 @@ sub Notify($$) { if ( $ascDev->getAutoShuttersControlShading eq 'none' ); readingsSingleUpdate( $hash, 'ascEnable', 'on', 0 ) if ( $ascDev->getASCenable eq 'none' ); - CommandAttr(undef,$name . ' devStateIcon { AutoShuttersControl_DevStateIcon($name) }') - unless( AttrVal($name,'devStateIcon','{ AutoShuttersControl_DevStateIcon($name) }') eq '{ AutoShuttersControl_DevStateIcon($name) }' ); - CommandDeleteAttr(undef,$name . ' event-on-change-reading') - unless( AttrVal($name,'event-on-change-reading','none') eq 'none' ); - CommandDeleteAttr(undef,$name . ' event-on-update-reading') - unless( AttrVal($name,'event-on-update-reading','none') eq 'none' ); + CommandAttr( undef, + $name + . ' devStateIcon { AutoShuttersControl_DevStateIcon($name) }' ) + unless ( + AttrVal( + $name, 'devStateIcon', + '{ AutoShuttersControl_DevStateIcon($name) }' + ) eq '{ AutoShuttersControl_DevStateIcon($name) }' + ); + CommandDeleteAttr( undef, $name . ' event-on-change-reading' ) + unless ( + AttrVal( $name, 'event-on-change-reading', 'none' ) eq 'none' ); + CommandDeleteAttr( undef, $name . ' event-on-update-reading' ) + unless ( + AttrVal( $name, 'event-on-update-reading', 'none' ) eq 'none' ); # Ist der Event ein globaler und passt zum Rest der Abfrage oben wird nach neuen Rolläden Devices gescannt und eine Liste im Rolladenmodul sortiert nach Raum generiert ShuttersDeviceScan($hash) @@ -4272,7 +4281,8 @@ sub DevStateIcon($) { elsif ( ReadingsVal( $name, 'state', undef ) =~ /.*asleep$/ ) { return '.*:scene_sleeping'; } - elsif ( ReadingsVal( $name, 'state', undef ) =~ /^roommate(.come)?.(awoken|home)$/ ) + elsif ( ReadingsVal( $name, 'state', undef ) =~ + /^roommate(.come)?.(awoken|home)$/ ) { return '.*:user_available'; }