From 4f29cf24f3db0456b12c89589f3ce0338a6c60cd Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Thu, 17 Feb 2022 14:44:40 -0500 Subject: [PATCH] movement: move thermistor to 'sensor' watch faces --- make.mk | 1 + movement/make/Makefile | 7 +++---- .../{thermistor => sensor}/thermistor_logging_face.c | 0 .../{thermistor => sensor}/thermistor_logging_face.h | 0 .../{thermistor => sensor}/thermistor_readout_face.c | 0 .../{thermistor => sensor}/thermistor_readout_face.h | 0 .../shared/driver}/thermistor_driver.c | 0 .../shared/driver}/thermistor_driver.h | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename movement/watch_faces/{thermistor => sensor}/thermistor_logging_face.c (100%) rename movement/watch_faces/{thermistor => sensor}/thermistor_logging_face.h (100%) rename movement/watch_faces/{thermistor => sensor}/thermistor_readout_face.c (100%) rename movement/watch_faces/{thermistor => sensor}/thermistor_readout_face.h (100%) rename {movement/watch_faces/thermistor => watch-library/shared/driver}/thermistor_driver.c (100%) rename {movement/watch_faces/thermistor => watch-library/shared/driver}/thermistor_driver.h (100%) diff --git a/make.mk b/make.mk index aeada13f..fb54664c 100644 --- a/make.mk +++ b/make.mk @@ -117,6 +117,7 @@ SRCS += \ $(TOP)/watch-library/hardware/hpl/sercom/hpl_sercom.c \ $(TOP)/watch-library/hardware/hpl/slcd/hpl_slcd.c \ $(TOP)/watch-library/hardware/hpl/systick/hpl_systick.c \ + $(TOP)/watch-library/shared/driver/thermistor_driver.c \ $(TOP)/watch-library/shared/driver/lis2dh.c \ $(TOP)/watch-library/shared/driver/lis2dw.c \ $(TOP)/watch-library/shared/driver/spiflash.c \ diff --git a/movement/make/Makefile b/movement/make/Makefile index cc543a93..9231d5ce 100755 --- a/movement/make/Makefile +++ b/movement/make/Makefile @@ -14,7 +14,7 @@ INCLUDES += \ -I../watch_faces/clock/ \ -I../watch_faces/settings/ \ -I../watch_faces/complication/ \ - -I../watch_faces/thermistor/ \ + -I../watch_faces/sensor/ \ -I../watch_faces/demo/ \ -I../lib/TOTP-MCU/ \ -I../lib/sunriset/ \ @@ -35,9 +35,8 @@ SRCS += \ ../watch_faces/clock/beats_face.c \ ../watch_faces/settings/preferences_face.c \ ../watch_faces/settings/set_time_face.c \ - ../watch_faces/thermistor/thermistor_driver.c \ - ../watch_faces/thermistor/thermistor_readout_face.c \ - ../watch_faces/thermistor/thermistor_logging_face.c \ + ../watch_faces/sensor/thermistor_readout_face.c \ + ../watch_faces/sensor/thermistor_logging_face.c \ ../watch_faces/demo/character_set_face.c \ ../watch_faces/demo/voltage_face.c \ ../watch_faces/demo/lis2dh_logging_face.c \ diff --git a/movement/watch_faces/thermistor/thermistor_logging_face.c b/movement/watch_faces/sensor/thermistor_logging_face.c similarity index 100% rename from movement/watch_faces/thermistor/thermistor_logging_face.c rename to movement/watch_faces/sensor/thermistor_logging_face.c diff --git a/movement/watch_faces/thermistor/thermistor_logging_face.h b/movement/watch_faces/sensor/thermistor_logging_face.h similarity index 100% rename from movement/watch_faces/thermistor/thermistor_logging_face.h rename to movement/watch_faces/sensor/thermistor_logging_face.h diff --git a/movement/watch_faces/thermistor/thermistor_readout_face.c b/movement/watch_faces/sensor/thermistor_readout_face.c similarity index 100% rename from movement/watch_faces/thermistor/thermistor_readout_face.c rename to movement/watch_faces/sensor/thermistor_readout_face.c diff --git a/movement/watch_faces/thermistor/thermistor_readout_face.h b/movement/watch_faces/sensor/thermistor_readout_face.h similarity index 100% rename from movement/watch_faces/thermistor/thermistor_readout_face.h rename to movement/watch_faces/sensor/thermistor_readout_face.h diff --git a/movement/watch_faces/thermistor/thermistor_driver.c b/watch-library/shared/driver/thermistor_driver.c similarity index 100% rename from movement/watch_faces/thermistor/thermistor_driver.c rename to watch-library/shared/driver/thermistor_driver.c diff --git a/movement/watch_faces/thermistor/thermistor_driver.h b/watch-library/shared/driver/thermistor_driver.h similarity index 100% rename from movement/watch_faces/thermistor/thermistor_driver.h rename to watch-library/shared/driver/thermistor_driver.h