From: Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Date: Tue, 5 Mar 2024 03:49:57 +0000 (-0300)
Subject: Merge branch 'advanced-clock+24h' into advanced
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=4b269c50634e2ff6ce7e5ceb79ca877f4dd7c550;p=sensor-watch.git

Merge branch 'advanced-clock+24h' into advanced

Completely refactors the simple clock face
and lays the foundations for new features.

Also adds a compile time 24 hour mode only feature.

Tested-by: Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Tested-on-hardware-by: Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Signed-off-by: Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
GitHub-Pull-Request: https://github.com/joeycastillo/Sensor-Watch/pull/373
---

4b269c50634e2ff6ce7e5ceb79ca877f4dd7c550
diff --cc movement/make/Makefile
index faeaa6b,8573c58..5d53ff7
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -49,9 -49,7 +49,9 @@@ SRCS += 
    ../../littlefs/lfs_util.c \
    ../movement.c \
    ../filesystem.c \
 +  ../shell.c \
 +  ../shell_cmd_list.c \
-   ../watch_faces/clock/simple_clock_face.c \
+   ../watch_faces/clock/clock_face.c \
    ../watch_faces/clock/world_clock_face.c \
    ../watch_faces/clock/beats_face.c \
    ../watch_faces/clock/weeknumber_clock_face.c \