From 7c16db862e9e394f0f80c178d5ae1f77e244820b Mon Sep 17 00:00:00 2001 From: polypies73 <112163783+polypies73@users.noreply.github.com> Date: Thu, 10 Oct 2024 23:19:31 +1000 Subject: [PATCH] Display messages shorter display messages, that should actually be on new lines --- client/drivers/data_structures.py | 18 ++++++++++++++++++ client/drivers/login_system.py | 12 ++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/client/drivers/data_structures.py b/client/drivers/data_structures.py index cbb020a..12cca77 100644 --- a/client/drivers/data_structures.py +++ b/client/drivers/data_structures.py @@ -201,6 +201,24 @@ def set_last_plant_time(self, time: datetime) -> None: """ self._last_plant_time = time + def accept_new_posture_data( + self, posture_data: List[float] + ) -> None: # TODO: Refine type signature + """ + Update the internal store of posture data for the OLED display. + + Args: + posture_data : List[float] + New posture data to accept and merge with the current state of this object. + + TODO: Implement me! + """ + # DEBUG: + print(" accept_new_posture_data()") + # :DEBUG + for datum in posture_data: + self._posture_data.put_nowait(datum) + ## SECTION: Hardware packaged together diff --git a/client/drivers/login_system.py b/client/drivers/login_system.py index 0ce37fa..15ed2ce 100644 --- a/client/drivers/login_system.py +++ b/client/drivers/login_system.py @@ -25,7 +25,7 @@ Status.TOO_MANY_FACES.value: "Too many faces detected", Status.NO_MATCH.value: "Could not match face", } -QUIT_INSTRUCTIONS = "Right button to quit" +QUIT_INSTRUCTIONS = "Right: quit" Action = Callable[[HardwareComponents], int] @@ -44,9 +44,9 @@ def handle_authentication(hardware: HardwareComponents) -> int: while True: _log_and_send( hardware, - ["Left button to login", - "Right button to register", - "Double press right button to reset data"] + ["Left: login", + "Right: register", + "Double press right: reset data"] ) button = hardware.wait_for_button_press() @@ -82,7 +82,7 @@ def _loop_action(hardware: HardwareComponents, action: Action) -> int: def _attempt_login(hardware: HardwareComponents) -> int: capturer = RaspCapturer() - messages = ["Press left button to take photo", f"{QUIT_INSTRUCTIONS}"] + messages = ["Left: take photo", f"{QUIT_INSTRUCTIONS}"] _log_and_send(hardware, messages, message_time=0) button_pressed = hardware.wait_for_button_press() @@ -106,7 +106,7 @@ def _attempt_register(hardware: HardwareComponents) -> int: faces: list[np.ndarray] = [] for i in range(NUM_FACES): messages = [ - f"Press left button to take photo {i + 1}/{NUM_FACES}", + f"Left: take photo {i + 1}/{NUM_FACES}", f"{QUIT_INSTRUCTIONS}" ] _log_and_send(hardware, messages, message_time=0)