From 66ebbbb354b1d3ffc059da0f28b92f99bc7c822c Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Mon, 6 Jan 2020 07:44:00 +0000 Subject: [PATCH] 73_AutoShuttersControl: fix adv icon for devStateIcon git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20895 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 3 ++- FHEM/73_AutoShuttersControl.pm | 29 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGED b/CHANGED index 1205e71a3..aaf31313b 100644 --- a/CHANGED +++ b/CHANGED @@ -1,9 +1,10 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 73_AutoShuttersControl: fix adv icon for devStateIcon - feature: 51_MOBILEALERTS.pm: Added batteryState - bugfix: 93_DbLog: fix change off V4.9.4 in default splitting. Forum:#106992 - bugfix: 88_HMCCU: Do not touch state during device definition - - bugfix: 70_VIERA: correction of "Rolling Key" + - bugfix: 70_VIERA: correction of "Rolling Key" - feature: 70_VIERA: add. GetStatus after on_off command - feature: 70_BRAVIA: new attribute wolBroadcast used as address for WOL packet - change: 74_XiaomiBTLESens: add special patch from charlie71 diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index e952d4824..22393bb1b 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/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'; } @@ -4308,6 +4318,9 @@ sub DevStateIcon($) { elsif ( ReadingsVal( $name, 'state', undef ) =~ /.*privacy.*/ ) { return '.*:fts_shutter_50'; } + elsif ( ReadingsVal( $name, 'state', undef ) eq 'adv delay close' ) { + return '.*:christmas_tree'; + } return undef; } @@ -7903,7 +7916,7 @@ sub getblockAscDrivesAfterManual { ], "release_status": "under develop", "license": "GPL_2", - "version": "v0.8.9", + "version": "v0.8.10", "author": [ "Marko Oldenburg " ],