diff options
| author | Joey Castillo <joeycastillo@utexas.edu> | 2022-02-17 14:44:40 -0500 |
|---|---|---|
| committer | Joey Castillo <joeycastillo@utexas.edu> | 2022-02-17 14:47:47 -0500 |
| commit | 4f29cf24f3db0456b12c89589f3ce0338a6c60cd (patch) | |
| tree | 9e75ede60f78f49e833016a940a282fbf9480c6d | |
| parent | 0337d198ffe20062678a7900a7666f312c229475 (diff) | |
| download | Sensor-Watch-4f29cf24f3db0456b12c89589f3ce0338a6c60cd.tar.gz Sensor-Watch-4f29cf24f3db0456b12c89589f3ce0338a6c60cd.tar.bz2 Sensor-Watch-4f29cf24f3db0456b12c89589f3ce0338a6c60cd.zip | |
movement: move thermistor to 'sensor' watch faces
| -rw-r--r-- | make.mk | 1 | ||||
| -rwxr-xr-x | movement/make/Makefile | 7 | ||||
| -rw-r--r-- | movement/watch_faces/sensor/thermistor_logging_face.c (renamed from movement/watch_faces/thermistor/thermistor_logging_face.c) | 0 | ||||
| -rw-r--r-- | movement/watch_faces/sensor/thermistor_logging_face.h (renamed from movement/watch_faces/thermistor/thermistor_logging_face.h) | 0 | ||||
| -rw-r--r-- | movement/watch_faces/sensor/thermistor_readout_face.c (renamed from movement/watch_faces/thermistor/thermistor_readout_face.c) | 0 | ||||
| -rw-r--r-- | movement/watch_faces/sensor/thermistor_readout_face.h (renamed from movement/watch_faces/thermistor/thermistor_readout_face.h) | 0 | ||||
| -rw-r--r-- | watch-library/shared/driver/thermistor_driver.c (renamed from movement/watch_faces/thermistor/thermistor_driver.c) | 0 | ||||
| -rw-r--r-- | watch-library/shared/driver/thermistor_driver.h (renamed from movement/watch_faces/thermistor/thermistor_driver.h) | 0 |
8 files changed, 4 insertions, 4 deletions
@@ -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 index 40c40027..40c40027 100644 --- a/movement/watch_faces/thermistor/thermistor_logging_face.c +++ b/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 index 4ba593ec..4ba593ec 100644 --- a/movement/watch_faces/thermistor/thermistor_logging_face.h +++ b/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 index b97c8432..b97c8432 100644 --- a/movement/watch_faces/thermistor/thermistor_readout_face.c +++ b/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 index 7361164e..7361164e 100644 --- a/movement/watch_faces/thermistor/thermistor_readout_face.h +++ b/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 index 73bdef41..73bdef41 100644 --- a/movement/watch_faces/thermistor/thermistor_driver.c +++ b/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 index 66bec6e9..66bec6e9 100644 --- a/movement/watch_faces/thermistor/thermistor_driver.h +++ b/watch-library/shared/driver/thermistor_driver.h |