From 0509e0fb4f10f22bcd8e2d8e4ccddba0ca597010 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 28 May 2019 09:23:10 +0200 Subject: [PATCH] fix bug then add or delete Timer attribut and create new Sunrise/Sunset Timer --- 73_AutoShuttersControl.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm index c473a90..0004504 100644 --- a/73_AutoShuttersControl.pm +++ b/73_AutoShuttersControl.pm @@ -473,18 +473,18 @@ m#^DELETEATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rai DeleteNotifyDev( $hash, $1, $2 ); } elsif ( $events =~ -m#^ATTR\s(.*)\s(ASC_Time_Up_WE_Holiday|ASC_Up|ASC_Down|ASC_AutoAstroModeMorning|ASC_AutoAstroModeMorningHorizon|ASC_PrivacyDownTime_beforNightClose|ASC_AutoAstroModeEvening|ASC_AutoAstroModeEveningHorizon|ASC_Time_Up_Early|ASC_Time_Up_Late|ASC_Time_Down_Early|ASC_Time_Down_Late)\s(.*)$# +m#^(DELETEATTR|ATTR)\s(.*)\s(ASC_Time_Up_WE_Holiday|ASC_Up|ASC_Down|ASC_AutoAstroModeMorning|ASC_AutoAstroModeMorningHorizon|ASC_PrivacyDownTime_beforNightClose|ASC_AutoAstroModeEvening|ASC_AutoAstroModeEveningHorizon|ASC_Time_Up_Early|ASC_Time_Up_Late|ASC_Time_Down_Early|ASC_Time_Down_Late)(.*)?# ) { - CreateSunRiseSetShuttersTimer( $hash, $1 ) + CreateSunRiseSetShuttersTimer( $hash, $2 ) if ( - $2 ne 'ASC_Time_Up_WE_Holiday' - or ( $2 eq 'ASC_Time_Up_WE_Holiday' + $3 ne 'ASC_Time_Up_WE_Holiday' + or ( $3 eq 'ASC_Time_Up_WE_Holiday' and $ascDev->getSunriseTimeWeHoliday eq 'on' ) ); } elsif ( $events =~ -m#^ATTR\s(.*)\s(ASC_autoAstroModeMorning|ASC_autoAstroModeMorningHorizon|ASC_autoAstroModeEvening|ASC_autoAstroModeEveningHorizon)\s(.*)$# +m#^(DELETEATTR|ATTR)\s(.*)\s(ASC_autoAstroModeMorning|ASC_autoAstroModeMorningHorizon|ASC_autoAstroModeEvening|ASC_autoAstroModeEveningHorizon)(.*)?# ) { RenewSunRiseSetShuttersTimer($hash);