]> git.earman.xyz Git - sensor-watch.git/commitdiff
Merge branch 'advanced-clock+24h' into advanced
authorMatheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Tue, 5 Mar 2024 03:49:57 +0000 (00:49 -0300)
committerMatheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Fri, 8 Mar 2024 09:54:22 +0000 (06:54 -0300)
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

1  2 
make.mk
movement/make/Makefile
movement/movement_config.h

diff --cc make.mk
Simple merge
index faeaa6b88778494442319d00896ca37d3ac73794,8573c585d3af62bbf86c0d51895d53cfc77961a4..5d53ff7b3846f4a5b326adb582ff3e83872de570
@@@ -49,9 -49,7 +49,9 @@@ SRCS += 
    ../../littlefs/lfs_util.c \
    ../movement.c \
    ../filesystem.c \
-   ../watch_faces/clock/simple_clock_face.c \
 +  ../shell.c \
 +  ../shell_cmd_list.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 \
Simple merge