Adding feature to ComboBlock to allow syncing of clocks to be disabled in time set mode.

Removing 9:30pm time setting, using what is left in RTC now.
Switching to ticks_ms() for ZIP flashing in time set mode.

Author: Kevin J Walters

zhhclock/zc_comboclock.py

@@ -25,13 +25,13 @@ def __init__(self, rtc, *,
             self._rtc.time = current_time
 
         self._rtc.start()
-        if not self.sync_clocks():
-            raise RuntimeError("Cannot synchronise RTC with MP MB clock")
-
         self._mp_clock_drift_ppm = mp_clock_drift_ppm
         self._conv_ticks_ms = 1.0 - mp_clock_drift_ppm / 1e6 if mp_clock_drift_ppm else 1
         self._last_frac_ms = None
         self._lost_sync = 0
+        self.resync_enabled = True
+        if not self.sync_clocks():
+            raise RuntimeError("Cannot synchronise RTC with MP MB clock")
 
         self.stopwatch_running = False
         self._stopwatch_start = self._stopwatch_stop = self._stopwatch_last = utime.ticks_ms()
@@ -58,14 +58,16 @@ def sync_clocks(self, attempts=10_000, current_time=None):
 
     @property
     def time_with_ms_and_ticks(self):
-        if self._lost_sync != 0:
-            #print("RESYNC ATTEMPT")
+        if self.resync_enabled and self._lost_sync != 0:
             if self.sync_clocks(20, self._rtc.time):
                 pass
-                #print("RESYNCED!")
 
         rtc_time = self._rtc.time
         now_t_ms = utime.ticks_ms()
+        if not self.resync_enabled:
+            self._last_frac_ms = 0
+            return (rtc_time, self._last_frac_ms, now_t_ms)
+
         since_ms = utime.ticks_diff(now_t_ms, self._sync_time_tms)
         cor_since_ms = round(since_ms * self._conv_ticks_ms)
 

zhhclock/zhhclock.py

@@ -118,7 +118,6 @@ def writeto_mem(self, addr, memaddr, buf, *, addrsize=8):
 zip_px.fill(BLACK)
 zip_px.show()
 
-
 display_image = [0] * (5 * 5)
 
 microbit_bri_conv = 9.0 / 255.0
@@ -134,12 +133,10 @@ def show_display_image():
 show_display_image()
 gc.collect()
 
-### Remove the current_time setting
 clock = ComboClock(mcp,
                    rtc_clock_drift_ppm=THIS_ZHH_RTC_PPM,
                    rtc_trim_conv=PPM_TO_TRIM_CONV,
-                   mp_clock_drift_ppm=THIS_MICROBIT_CLOCK_PPM,
-                   current_time=(2025, 2, 26,  9, 30, 0,  2, 57))
+                   mp_clock_drift_ppm=THIS_MICROBIT_CLOCK_PPM)
 
 stopwatch_hmsms = [0, 0, 0, 0.0]
 
@@ -204,7 +201,7 @@ def show_display_image():
         if not (bg_displayed & (1 << SECOND)):
             s_idx = rtc_time[SECOND] * ZIPCOUNT // 60
     elif mode_idx == MODE_TIME_SET:
-        flash_on = ss_ms > 500.0
+        flash_on = (utime.ticks_ms() % 1000) > 300.0
         if time_set_change != HOUR or flash_on:
             h_idx = rtc_time[HOUR] * ZIPCOUNT // 12 % ZIPCOUNT
         display_char = ("p" if rtc_time[HOUR] >= 12 else "a")
@@ -291,6 +288,8 @@ def show_display_image():
             threshold = threshold * 0.9 + 0.1 * int(pin_logo.is_touched())
 
         if mode_idx == MODE_TIME_SET:
+            ### Exit time set mode
+            clock.resync_enabled = True
             clock.sync_clocks()
             mode_idx = MODE_CLOCK
         elif utime.ticks_diff(t2_ms, t1_ms) < LONG_PRESS_DURATION_MS:
@@ -306,3 +305,4 @@ def show_display_image():
         else:
             mode_idx = MODE_TIME_SET
             time_set_change = HOUR
+            clock.resync_enabled = False