movement: final list of watch faces for stock firmware

diff --git a/make.mk b/make.mk
index 98e46c10b89f320e4b90f02a8e9da54709704af1..851e7e9b3e86382f6bbc3cacc189da110f3cbd4e 100644 (file)
--- a/make.mk
+++ b/make.mk
@@ -161,6 +161,7 @@ SRCS += \
   $(TOP)/watch-library/simulator/watch/watch_deepsleep.c \
   $(TOP)/watch-library/simulator/watch/watch_private.c \
   $(TOP)/watch-library/simulator/watch/watch.c \
+  $(TOP)/watch-library/shared/driver/thermistor_driver.c \
   $(TOP)/watch-library/shared/watch/watch_private_buzzer.c \
   $(TOP)/watch-library/shared/watch/watch_private_display.c \
   $(TOP)/watch-library/shared/watch/watch_utility.c \

diff --git a/movement/movement_config.h b/movement/movement_config.h
index e68fcc9aa6f80b9b159bd05c6c78905430a739f3..944567764aff8a295d87b6c751526b87b52a3bec 100644 (file)
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@ -29,8 +29,10 @@
 
 const watch_face_t watch_faces[] = {
     simple_clock_face,
-    beats_face,
-    voltage_face,
+    world_clock_face,
+    sunrise_sunset_face,
+    moon_phase_face,
+    thermistor_readout_face,
     preferences_face,
     set_time_face,
 };

diff --git a/watch-library/simulator/watch/watch_adc.c b/watch-library/simulator/watch/watch_adc.c
index 364e2119d8223286f3fc0949da0b7c2a63697f52..b03d68cb7c814abbe7263fd668be940a47cdcf32 100644 (file)
--- a/watch-library/simulator/watch/watch_adc.c
+++ b/watch-library/simulator/watch/watch_adc.c
@@ -29,7 +29,7 @@ void watch_enable_adc(void) {}
 void watch_enable_analog_input(const uint8_t pin) {}
 
 uint16_t watch_get_analog_pin_level(const uint8_t pin) {
-    return 0;
+    return 32767; // pretend it's half of VCC
 }
 
 void watch_set_analog_num_samples(uint16_t samples) {}