From 1fa1d7cb6703ee3c1a57d3824f1aa9eddb727fad Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Tue, 10 Nov 2020 08:46:05 +0100 Subject: [PATCH] Adjusted colors, fixed time freezinh --- clock/api/converter.py | 5 +++-- clock/api/led.py | 2 +- clock_wrapper.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/clock/api/converter.py b/clock/api/converter.py index 0b2ece4..9b4d457 100644 --- a/clock/api/converter.py +++ b/clock/api/converter.py @@ -33,10 +33,11 @@ digits = { ##place of numbers, invariable digit_position = [[2,4], [2,10], [9,4], [9,10]] -def time_converter(time=datetime.datetime.now().strftime("%H%M")): +def time_converter(time=""): """Converts 4-digit time to a pixel-matrix returns: np.array((16, 16))""" - #time = datetime.datetime.now().strftime("%H%M") + if time == "": + time = datetime.datetime.now().strftime("%H%M") pixels = np.zeros((16,16),dtype=np.uint8) time = "0" * (4 - len(str(time))) + str(time) time_split = [int(i) for i in time] diff --git a/clock/api/led.py b/clock/api/led.py index 690fa0c..1e65c63 100644 --- a/clock/api/led.py +++ b/clock/api/led.py @@ -94,7 +94,7 @@ class OutputHandler(): else: face2 = converter.time_converter(int(weather["low"]+weather["high"])) face2 = np.concatenate((face2[:8,...],2*face2[8:,...])) - face2_3d = self.matrix_add_depth(face2,[[10,10,200],[150,150,10]]) + face2_3d = self.matrix_add_depth(face2,[[0, 102, 255],[255, 102, 0]]) face = np.zeros((max(face1_3d.shape[0],face2_3d.shape[0]),face1_3d.shape[1]+face2_3d.shape[1],3)) diff --git a/clock_wrapper.py b/clock_wrapper.py index 01f8f8e..3a69af2 100644 --- a/clock_wrapper.py +++ b/clock_wrapper.py @@ -12,7 +12,7 @@ class ModuleWrapper(): self.bot = bot_module self.time_thread = Thread(target=self.mainloop) self.time_thread.start() - self.weather = {"weather":"", "high":"", "low":"", "show":"weather"} + self.weather = {"weather":"", "high":"", "low":"", "show":"temps"} def mainloop(self):