From 9be9ccf044002c7bbe93a5ccc675dbc208b55f17 Mon Sep 17 00:00:00 2001
From: uvos <devnull@uvos.xyz>
Date: Thu, 12 Oct 2023 16:02:32 +0200
Subject: [PATCH] renable display at hour mark break out of cal loop

---
 CL56.cpp |  6 ++++++
 main.cpp | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CL56.cpp b/CL56.cpp
index f963897..b048643 100644
--- a/CL56.cpp
+++ b/CL56.cpp
@@ -1,4 +1,5 @@
 #include "CL56.h"
+#include <avr/interrupt.h>
 
 DualCl56::DualCl56(ShiftReg<16>* shiftReg):
 	_shiftReg(shiftReg)
@@ -179,7 +180,12 @@ void DualCl56::setBlank(bool blankIn)
 {
 	_blank = blankIn;
 	if(_blank)
+	{
+		cli();
 		_shiftReg->clear();
+		_shiftReg->clear();
+		sei();
+    }
 }
 
 bool DualCl56::getBlank()
diff --git a/main.cpp b/main.cpp
index 9f7ac94..b625b06 100644
--- a/main.cpp
+++ b/main.cpp
@@ -528,16 +528,21 @@ int main()
 		}
 #endif
 
-		if(time.min == 45)
+		if(time.min == 45 && time.sec == 0)
 			display.setBlank(true);
+		else if(time.min == 0 && time.sec == 0)
+			display.setBlank(false);
 
 		if(time.hour == 0 && time.min == 0 && time.sec == timeOffsetSeconds+10)
 		{
 			DS1302::Timeval timeSet = time;
 			timeSet.sec = 10;
 			clock.setTime(timeSet);
-			display.setString("CAL     ");
-			_delay_ms(500);
+			while(clock.getTime().sec <= timeOffsetSeconds+10)
+			{
+				display.setString("CAL     ");
+				_delay_ms(500);
+			}
 		}
 		++i;
 	}