7 files changed, 3 insertions, 105 deletions
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/movement/watch_faces/thermistor/thermistor_driver.c
deleted file mode 100644
index 73bdef41..00000000
--- a/movement/watch_faces/thermistor/thermistor_driver.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Joey Castillo
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "thermistor_driver.h"
-#include "watch.h"
-#include "watch_utility.h"
-
-void thermistor_driver_enable(void) {
-    // Enable the ADC peripheral, which we'll use to read the thermistor value.
-    watch_enable_adc();
-    // Enable analog circuitry on the sense pin, which is tied to the thermistor resistor divider.
-    watch_enable_analog_input(THERMISTOR_SENSE_PIN);
-    // Enable digital output on the enable pin, which is the power to the thermistor circuit.
-    watch_enable_digital_output(THERMISTOR_ENABLE_PIN);
-    // and make sure it's off.
-    watch_set_pin_level(THERMISTOR_ENABLE_PIN, !THERMISTOR_ENABLE_VALUE);
-}
-
-void thermistor_driver_disable(void) {
-    // Disable the ADC peripheral.
-    watch_disable_adc();
-    // Disable analog circuitry on the sense pin to save power.
-    watch_disable_analog_input(THERMISTOR_SENSE_PIN);
-    // Disable the enable pin's output circuitry.
-    watch_disable_digital_output(THERMISTOR_ENABLE_PIN);
-}
-
-float thermistor_driver_get_temperature(void) {
-    // set the enable pin to the level that powers the thermistor circuit.
-    watch_set_pin_level(THERMISTOR_ENABLE_PIN, THERMISTOR_ENABLE_VALUE);
-    // get the sense pin level
-    uint16_t value = watch_get_analog_pin_level(THERMISTOR_SENSE_PIN);
-    // and then set the enable pin to the opposite value to power down the thermistor circuit.
-    watch_set_pin_level(THERMISTOR_ENABLE_PIN, !THERMISTOR_ENABLE_VALUE);
-
-    return watch_utility_thermistor_temperature(value, THERMISTOR_HIGH_SIDE, THERMISTOR_B_COEFFICIENT, THERMISTOR_NOMINAL_TEMPERATURE, THERMISTOR_NOMINAL_RESISTANCE, THERMISTOR_SERIES_RESISTANCE);
-}
diff --git a/movement/watch_faces/thermistor/thermistor_driver.h b/movement/watch_faces/thermistor/thermistor_driver.h
deleted file mode 100644
index 66bec6e9..00000000
--- a/movement/watch_faces/thermistor/thermistor_driver.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Joey Castillo
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef THERMISTOR_DRIVER_H_
-#define THERMISTOR_DRIVER_H_
-
-// TODO: Do these belong in movement_config.h? In settings we can set on the watch? In an EEPROM configuration area?
-// Think on this. [joey 11/22]
-#define THERMISTOR_SENSE_PIN (A2)
-#define THERMISTOR_ENABLE_PIN (A0)
-#define THERMISTOR_ENABLE_VALUE (false)
-#define THERMISTOR_HIGH_SIDE (true)
-#define THERMISTOR_B_COEFFICIENT (3380.0)
-#define THERMISTOR_NOMINAL_TEMPERATURE (25.0)
-#define THERMISTOR_NOMINAL_RESISTANCE (10000.0)
-#define THERMISTOR_SERIES_RESISTANCE (10000.0)
-
-void thermistor_driver_enable(void);
-void thermistor_driver_disable(void);
-float thermistor_driver_get_temperature(void);
-
-#endif // THERMISTOR_DRIVER_H_