From 0585971b6dc0bc49259f92197d43b66fbddf58da Mon Sep 17 00:00:00 2001
From: LeonGaultier <LeonGaultier@users.noreply.github.com>
Date: Fri, 10 May 2019 09:55:32 +0000
Subject: [PATCH] 73_AutoShuttersControl: fix sunset sunrise object values

git-svn-id: https://svn.fhem.de/fhem/trunk@19360 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                        |  1 +
 fhem/FHEM/73_AutoShuttersControl.pm | 18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 6841c35f7..e18ae870d 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # 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 sunset sunrise object values
  - feature: 74_AMADtaskerset_4.4.0.prj: add nfc tag support in taskerset
                74_AMADautomagicflowset: fix bug then use VLC player
  - feature: 73_DoorBird: Images can be stored as JPGs
diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm
index 186b2740b..f32399a3d 100644
--- a/fhem/FHEM/73_AutoShuttersControl.pm
+++ b/fhem/FHEM/73_AutoShuttersControl.pm
@@ -44,7 +44,7 @@ use strict;
 use warnings;
 use FHEM::Meta;
 
-my $version = '0.6.7';
+my $version = '0.6.8';
 
 sub AutoShuttersControl_Initialize($) {
     my ($hash) = @_;
@@ -261,14 +261,6 @@ sub Define($$) {
     CommandAttr( undef, $name . ' icon fts_shutter_automatic' )
       if ( AttrVal( $name, 'icon', 'none' ) eq 'none' );
 
-    #     CommandAttr( undef, $name . ' ASC_autoAstroModeEvening REAL' )
-    #       if ( $ascDev->getAutoAstroModeEvening eq 'none' );
-    #     CommandAttr( undef, $name . ' ASC_autoAstroModeMorning REAL' )
-    #       if ( $ascDev->getAutoAstroModeMorning eq 'none' );
-    #     CommandAttr( undef, $name . ' ASC_autoShuttersControlMorning on' )
-    #       if ( $ascDev->getAutoShuttersControlMorning eq 'none' );
-    #     CommandAttr( undef, $name . ' ASC_autoShuttersControlEvening on' )
-    #       if ( $ascDev->getAutoShuttersControlEvening eq 'none' );
     CommandAttr( undef,
         $name
           . ' devStateIcon selfeDefense.terrace:fts_door_tilt created.new.drive.timer:clock .*asleep:scene_sleeping roommate.(awoken|home):user_available residents.(home|awoken):status_available manual:fts_shutter_manual selfeDefense.active:status_locked selfeDefense.inactive:status_open day.open:scene_day night.close:scene_night shading.in:weather_sun shading.out:weather_cloudy'
@@ -2337,6 +2329,9 @@ sub SunSetShuttersAfterTimerFn($) {
     my $shuttersDev = $funcHash->{shuttersdevice};
     $shutters->setShuttersDev($shuttersDev);
 
+    $shutters->setSunset(1);
+    $shutters->setSunrise(0);
+    
     my $posValue;
     if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 0
         or $shutters->getVentilateOpen eq 'off' )
@@ -2372,7 +2367,6 @@ sub SunSetShuttersAfterTimerFn($) {
                 $shutters->getPrivacyDownPos );
         }
         elsif ( $funcHash->{privacyMode} == 0 ) {
-            $shutters->setSunset(1);
             $shutters->setLastDrive('night close');
             ShuttersCommandSet( $hash, $shuttersDev, $posValue );
         }
@@ -2387,6 +2381,9 @@ sub SunRiseShuttersAfterTimerFn($) {
     my $hash        = $funcHash->{hash};
     my $shuttersDev = $funcHash->{shuttersdevice};
     $shutters->setShuttersDev($shuttersDev);
+    
+    $shutters->setSunset(0);
+    $shutters->setSunrise(1);
 
     my $homemode = $shutters->getRoommatesStatus;
     $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
@@ -2414,7 +2411,6 @@ sub SunRiseShuttersAfterTimerFn($) {
           )
         {
             $shutters->setLastDrive('day open');
-            $shutters->setSunrise(1);
             ShuttersCommandSet( $hash, $shuttersDev, $shutters->getOpenPos );
         }
     }