From: joeycastillo <joeycastillo@utexas.edu>
Date: Sat, 23 Oct 2021 20:36:26 +0000 (-0400)
Subject: Merge pull request #19 from tahnok/beats_watch_face
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=0b4d0de15b487b84dbd9b0dbebc4cd75ca64c93c;p=sensor-watch.git

Merge pull request #19 from tahnok/beats_watch_face

Port beats to movement framework
---

0b4d0de15b487b84dbd9b0dbebc4cd75ca64c93c
diff --cc movement/make/Makefile
index aae21d2,9ff13b5..a937222
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -31,8 -31,8 +31,9 @@@ SRCS += 
    ../watch_faces/complications/pulsometer_face.c \
    ../watch_faces/thermistor/thermistor_driver.c \
    ../watch_faces/thermistor/thermistor_readout_face.c \
 +  ../watch_faces/thermistor/thermistor_logging_face.c \
    ../watch_faces/demos/character_set_face.c \
+   ../watch_faces/complications/beats_face.c \
  
  # Leave this line at the bottom of the file; it has all the targets for making your project.
  include $(TOP)/rules.mk
diff --cc movement/movement_config.h
index 79f4914,22daf2c..3e91147
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@@ -6,8 -6,8 +6,9 @@@
  #include "set_time_face.h"
  #include "pulsometer_face.h"
  #include "thermistor_readout_face.h"
 +#include "thermistor_logging_face.h"
  #include "character_set_face.h"
+ #include "beats_face.h"
  
  const watch_face_t watch_faces[] = {
      simple_clock_face,