Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

73_AutoShuttersControl: change Shading reading message

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22248 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-06-24 06:16:35 +00:00
parent a13527bb85
commit cba95614b5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 73_AutoShuttersControl: change shading reading message
- feature: 76_SMAPortal: upgrade to V3. This version is not compatible to - feature: 76_SMAPortal: upgrade to V3. This version is not compatible to
prior V2. Attributes and Readings are changed. prior V2. Attributes and Readings are changed.
!!! Please read new commandref !!! !!! Please read new commandref !!!

2
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1272,7 +1272,7 @@ sub Initialize {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10", "version": "v0.10.1",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

13
fhem/lib/FHEM/Automation/ShuttersControl.pm
View File

@ -4963,12 +4963,6 @@ sub _CheckShuttersConditionsForShadingFn {
my $warnMessage; my $warnMessage;
my $infoMessage; my $infoMessage;
$infoMessage .= (
$shutters->getShadingMode eq 'off'
&& $ascDev->getAutoShuttersControlShading eq 'on'
? ' global shading active but ASC_Shading_Mode attribut is not set or off'
: ''
);
$infoMessage .= ( $infoMessage .= (
$shutters->getShadingMode ne 'off' $shutters->getShadingMode ne 'off'
@ -4978,6 +4972,13 @@ sub _CheckShuttersConditionsForShadingFn {
: '' : ''
); );
$warnMessage .= (
$shutters->getShadingMode eq 'off'
&& $ascDev->getAutoShuttersControlShading eq 'on'
? ' global shading active but ASC_Shading_Mode attribut is not set or off'
: ''
);
$errorMessage .= ( $errorMessage .= (
$shutters->getShadingMode ne 'off' $shutters->getShadingMode ne 'off'
&& $ascDev->getAutoShuttersControlShading ne 'on' && $ascDev->getAutoShuttersControlShading ne 'on'