]> git.earman.xyz Git - sensor-watch.git/commitdiff
rename thermistor_logging_face -> temperature_logging_face
authorjoeycastillo <joeycastillo@utexas.edu>
Wed, 9 Oct 2024 00:15:06 +0000 (20:15 -0400)
committerjoeycastillo <joeycastillo@utexas.edu>
Wed, 9 Oct 2024 02:44:08 +0000 (22:44 -0400)
movement/alt_fw/the_backpacker.h
movement/movement_faces.h
movement/watch_faces/sensor/temperature_logging_face.c [new file with mode: 0644]
movement/watch_faces/sensor/temperature_logging_face.h [new file with mode: 0644]
movement/watch_faces/sensor/thermistor_logging_face.c [deleted file]
movement/watch_faces/sensor/thermistor_logging_face.h [deleted file]

index d344204b89413dee49b3534c0d5f1c86eecc17f3..29622ccebf493d9bad28bd5ca369735ed5cbb3a1 100644 (file)
@@ -32,7 +32,7 @@ const watch_face_t watch_faces[] = {
     sunrise_sunset_face,
     moon_phase_face,
     temperature_display_face,
-    thermistor_logging_face,
+    temperature_logging_face,
     blinky_face,
 
     preferences_face,
index 1f827138def31ee25f1a932f01d772351a38f681..b273204d803f56e2ce178497c99311efb831adc1 100644 (file)
@@ -34,7 +34,7 @@
 #include "set_time_hackwatch_face.h"
 #include "pulsometer_face.h"
 #include "temperature_display_face.h"
-#include "thermistor_logging_face.h"
+#include "temperature_logging_face.h"
 #include "thermistor_testing_face.h"
 #include "character_set_face.h"
 #include "beats_face.h"
diff --git a/movement/watch_faces/sensor/temperature_logging_face.c b/movement/watch_faces/sensor/temperature_logging_face.c
new file mode 100644 (file)
index 0000000..f234f96
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * 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 <stdlib.h>
+#include <string.h>
+#include "temperature_logging_face.h"
+#include "thermistor_driver.h"
+#include "watch.h"
+
+static void _temperature_logging_face_log_data(thermistor_logger_state_t *logger_state) {
+    thermistor_driver_enable();
+    watch_date_time_t date_time = watch_rtc_get_date_time();
+    size_t pos = logger_state->data_points % THERMISTOR_LOGGING_NUM_DATA_POINTS;
+
+    logger_state->data[pos].timestamp.reg = date_time.reg;
+    logger_state->data[pos].temperature_c = thermistor_driver_get_temperature();
+    logger_state->data_points++;
+
+    thermistor_driver_disable();
+}
+
+static void _temperature_logging_face_update_display(thermistor_logger_state_t *logger_state, bool in_fahrenheit, bool clock_mode_24h) {
+    int8_t pos = (logger_state->data_points - 1 - logger_state->display_index) % THERMISTOR_LOGGING_NUM_DATA_POINTS;
+    char buf[14];
+
+    watch_clear_indicator(WATCH_INDICATOR_24H);
+    watch_clear_indicator(WATCH_INDICATOR_PM);
+    watch_clear_colon();
+
+    if (pos < 0) {
+        sprintf(buf, "TL%2dno dat", logger_state->display_index);
+    } else if (logger_state->ts_ticks) {
+        watch_date_time_t date_time = logger_state->data[pos].timestamp;
+        watch_set_colon();
+        if (clock_mode_24h) {
+            watch_set_indicator(WATCH_INDICATOR_24H);
+        } else {
+            if (date_time.unit.hour > 11) watch_set_indicator(WATCH_INDICATOR_PM);
+            date_time.unit.hour %= 12;
+            if (date_time.unit.hour == 0) date_time.unit.hour = 12;
+        }
+        sprintf(buf, "AT%2d%2d%02d%02d", date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
+    } else {
+        if (in_fahrenheit) {
+            sprintf(buf, "TL%2d%4.1f#F", logger_state->display_index, logger_state->data[pos].temperature_c * 1.8 + 32.0);
+        } else {
+            sprintf(buf, "TL%2d%4.1f#C", logger_state->display_index, logger_state->data[pos].temperature_c);
+        }
+    }
+
+    watch_display_string(buf, 0);
+}
+
+void temperature_logging_face_setup(uint8_t watch_face_index, void ** context_ptr) {
+    (void) watch_face_index;
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(thermistor_logger_state_t));
+        memset(*context_ptr, 0, sizeof(thermistor_logger_state_t));
+    }
+}
+
+void temperature_logging_face_activate(void *context) {
+    thermistor_logger_state_t *logger_state = (thermistor_logger_state_t *)context;
+    logger_state->display_index = 0;
+    logger_state->ts_ticks = 0;
+}
+
+bool temperature_logging_face_loop(movement_event_t event, void *context) {
+    thermistor_logger_state_t *logger_state = (thermistor_logger_state_t *)context;
+    switch (event.event_type) {
+        case EVENT_TIMEOUT:
+            movement_move_to_face(0);
+            break;
+        case EVENT_LIGHT_LONG_PRESS:
+            // light button shows the timestamp, but if you need the light, long press it.
+            movement_illuminate_led();
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            logger_state->ts_ticks = 2;
+            _temperature_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
+            break;
+        case EVENT_ALARM_BUTTON_DOWN:
+            logger_state->display_index = (logger_state->display_index + 1) % THERMISTOR_LOGGING_NUM_DATA_POINTS;
+            logger_state->ts_ticks = 0;
+            // fall through
+        case EVENT_ACTIVATE:
+            _temperature_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
+            break;
+        case EVENT_TICK:
+            if (logger_state->ts_ticks && --logger_state->ts_ticks == 0) {
+                _temperature_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
+            }
+            break;
+        case EVENT_BACKGROUND_TASK:
+            _temperature_logging_face_log_data(logger_state);
+            break;
+        default:
+            movement_default_loop_handler(event);
+            break;
+    }
+
+    return true;
+}
+
+void temperature_logging_face_resign(void *context) {
+    (void) context;
+}
+
+movement_watch_face_advisory_t temperature_logging_face_advise(void *context) {
+    (void) context;
+    movement_watch_face_advisory_t retval = { 0 };
+
+    // this will get called at the top of each minute, so all we check is if we're at the top of the hour as well.
+    // if we are, we ask for a background task.
+    retval.wants_background_task = watch_rtc_get_date_time().unit.minute == 0;
+
+    return retval;
+}
diff --git a/movement/watch_faces/sensor/temperature_logging_face.h b/movement/watch_faces/sensor/temperature_logging_face.h
new file mode 100644 (file)
index 0000000..ecea625
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ * 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 TEMPERATURE_LOGGING_FACE_H_
+#define TEMPERATURE_LOGGING_FACE_H_
+
+/*
+ * THERMISTOR LOGGING (aka Temperature Log)
+ *
+ * This watch face automatically logs the temperature once an hour, and
+ * maintains a 36-hour log of readings. This watch face is admittedly rather
+ * complex, and bears some explanation.
+ *
+ * The main display shows the letters “TL” in the top left, indicating the
+ * name of the watch face. At the top right, it displays the index of the
+ * reading; 0 represents the most recent reading taken, 1 represents one
+ * hour earlier, etc. The bottom line in this mode displays the logged
+ * temperature.
+ *
+ * A short press of the “Alarm” button advances to the next oldest reading;
+ * you will see the number at the top right advance from 0 to 1 to 2, all
+ * the way to 35, the oldest reading available.
+ *
+ * A short press of the “Light” button will briefly display the timestamp
+ * of the reading. The letters at the top left will display the word “At”,
+ * and the main line will display the timestamp of the currently displayed
+ * data point. The number in the top right will display the day of the month
+ * for the given data point; for example, you can read “At 22 3:00 PM” as
+ * ”At 3:00 PM on the 22nd”.
+ *
+ * If you need to illuminate the LED to read the data point, long press the
+ * Light button and release it.
+ */
+
+#include "movement.h"
+#include "watch.h"
+
+#define THERMISTOR_LOGGING_NUM_DATA_POINTS (36)
+
+typedef struct {
+    watch_date_time_t timestamp;
+    float temperature_c;
+} thermistor_logger_data_point_t;
+
+typedef struct {
+    uint8_t display_index;  // the index we are displaying on screen
+    uint8_t ts_ticks;       // when the user taps the LIGHT button, we show the timestamp for a few ticks.
+    int32_t data_points;    // the absolute number of data points logged
+    thermistor_logger_data_point_t data[THERMISTOR_LOGGING_NUM_DATA_POINTS];
+} thermistor_logger_state_t;
+
+void temperature_logging_face_setup(uint8_t watch_face_index, void ** context_ptr);
+void temperature_logging_face_activate(void *context);
+bool temperature_logging_face_loop(movement_event_t event, void *context);
+void temperature_logging_face_resign(void *context);
+movement_watch_face_advisory_t temperature_logging_face_advise(void *context);
+
+#define temperature_logging_face ((const watch_face_t){ \
+    temperature_logging_face_setup, \
+    temperature_logging_face_activate, \
+    temperature_logging_face_loop, \
+    temperature_logging_face_resign, \
+    temperature_logging_face_advise, \
+})
+
+#endif // TEMPERATURE_LOGGING_FACE_H_
diff --git a/movement/watch_faces/sensor/thermistor_logging_face.c b/movement/watch_faces/sensor/thermistor_logging_face.c
deleted file mode 100644 (file)
index 77bc242..0000000
+++ /dev/null
@@ -1,139 +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 <stdlib.h>
-#include <string.h>
-#include "thermistor_logging_face.h"
-#include "thermistor_driver.h"
-#include "watch.h"
-
-static void _thermistor_logging_face_log_data(thermistor_logger_state_t *logger_state) {
-    thermistor_driver_enable();
-    watch_date_time_t date_time = watch_rtc_get_date_time();
-    size_t pos = logger_state->data_points % THERMISTOR_LOGGING_NUM_DATA_POINTS;
-
-    logger_state->data[pos].timestamp.reg = date_time.reg;
-    logger_state->data[pos].temperature_c = thermistor_driver_get_temperature();
-    logger_state->data_points++;
-
-    thermistor_driver_disable();
-}
-
-static void _thermistor_logging_face_update_display(thermistor_logger_state_t *logger_state, bool in_fahrenheit, bool clock_mode_24h) {
-    int8_t pos = (logger_state->data_points - 1 - logger_state->display_index) % THERMISTOR_LOGGING_NUM_DATA_POINTS;
-    char buf[14];
-
-    watch_clear_indicator(WATCH_INDICATOR_24H);
-    watch_clear_indicator(WATCH_INDICATOR_PM);
-    watch_clear_colon();
-
-    if (pos < 0) {
-        sprintf(buf, "TL%2dno dat", logger_state->display_index);
-    } else if (logger_state->ts_ticks) {
-        watch_date_time_t date_time = logger_state->data[pos].timestamp;
-        watch_set_colon();
-        if (clock_mode_24h) {
-            watch_set_indicator(WATCH_INDICATOR_24H);
-        } else {
-            if (date_time.unit.hour > 11) watch_set_indicator(WATCH_INDICATOR_PM);
-            date_time.unit.hour %= 12;
-            if (date_time.unit.hour == 0) date_time.unit.hour = 12;
-        }
-        sprintf(buf, "AT%2d%2d%02d%02d", date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
-    } else {
-        if (in_fahrenheit) {
-            sprintf(buf, "TL%2d%4.1f#F", logger_state->display_index, logger_state->data[pos].temperature_c * 1.8 + 32.0);
-        } else {
-            sprintf(buf, "TL%2d%4.1f#C", logger_state->display_index, logger_state->data[pos].temperature_c);
-        }
-    }
-
-    watch_display_string(buf, 0);
-}
-
-void thermistor_logging_face_setup(uint8_t watch_face_index, void ** context_ptr) {
-    (void) watch_face_index;
-    if (*context_ptr == NULL) {
-        *context_ptr = malloc(sizeof(thermistor_logger_state_t));
-        memset(*context_ptr, 0, sizeof(thermistor_logger_state_t));
-    }
-}
-
-void thermistor_logging_face_activate(void *context) {
-    thermistor_logger_state_t *logger_state = (thermistor_logger_state_t *)context;
-    logger_state->display_index = 0;
-    logger_state->ts_ticks = 0;
-}
-
-bool thermistor_logging_face_loop(movement_event_t event, void *context) {
-    thermistor_logger_state_t *logger_state = (thermistor_logger_state_t *)context;
-    switch (event.event_type) {
-        case EVENT_TIMEOUT:
-            movement_move_to_face(0);
-            break;
-        case EVENT_LIGHT_LONG_PRESS:
-            // light button shows the timestamp, but if you need the light, long press it.
-            movement_illuminate_led();
-            break;
-        case EVENT_LIGHT_BUTTON_DOWN:
-            logger_state->ts_ticks = 2;
-            _thermistor_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
-            break;
-        case EVENT_ALARM_BUTTON_DOWN:
-            logger_state->display_index = (logger_state->display_index + 1) % THERMISTOR_LOGGING_NUM_DATA_POINTS;
-            logger_state->ts_ticks = 0;
-            // fall through
-        case EVENT_ACTIVATE:
-            _thermistor_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
-            break;
-        case EVENT_TICK:
-            if (logger_state->ts_ticks && --logger_state->ts_ticks == 0) {
-                _thermistor_logging_face_update_display(logger_state, movement_use_imperial_units(), movement_clock_mode_24h());
-            }
-            break;
-        case EVENT_BACKGROUND_TASK:
-            _thermistor_logging_face_log_data(logger_state);
-            break;
-        default:
-            movement_default_loop_handler(event);
-            break;
-    }
-
-    return true;
-}
-
-void thermistor_logging_face_resign(void *context) {
-    (void) context;
-}
-
-movement_watch_face_advisory_t thermistor_logging_face_advise(void *context) {
-    (void) context;
-    movement_watch_face_advisory_t retval = { 0 };
-
-    // this will get called at the top of each minute, so all we check is if we're at the top of the hour as well.
-    // if we are, we ask for a background task.
-    retval.wants_background_task = watch_rtc_get_date_time().unit.minute == 0;
-
-    return retval;
-}
diff --git a/movement/watch_faces/sensor/thermistor_logging_face.h b/movement/watch_faces/sensor/thermistor_logging_face.h
deleted file mode 100644 (file)
index 5175573..0000000
+++ /dev/null
@@ -1,87 +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_LOGGING_FACE_H_
-#define THERMISTOR_LOGGING_FACE_H_
-
-/*
- * THERMISTOR LOGGING (aka Temperature Log)
- *
- * This watch face automatically logs the temperature once an hour, and
- * maintains a 36-hour log of readings. This watch face is admittedly rather
- * complex, and bears some explanation.
- *
- * The main display shows the letters “TL” in the top left, indicating the
- * name of the watch face. At the top right, it displays the index of the
- * reading; 0 represents the most recent reading taken, 1 represents one
- * hour earlier, etc. The bottom line in this mode displays the logged
- * temperature.
- *
- * A short press of the “Alarm” button advances to the next oldest reading;
- * you will see the number at the top right advance from 0 to 1 to 2, all
- * the way to 35, the oldest reading available.
- *
- * A short press of the “Light” button will briefly display the timestamp
- * of the reading. The letters at the top left will display the word “At”,
- * and the main line will display the timestamp of the currently displayed
- * data point. The number in the top right will display the day of the month
- * for the given data point; for example, you can read “At 22 3:00 PM” as
- * ”At 3:00 PM on the 22nd”.
- *
- * If you need to illuminate the LED to read the data point, long press the
- * Light button and release it.
- */
-
-#include "movement.h"
-#include "watch.h"
-
-#define THERMISTOR_LOGGING_NUM_DATA_POINTS (36)
-
-typedef struct {
-    watch_date_time_t timestamp;
-    float temperature_c;
-} thermistor_logger_data_point_t;
-
-typedef struct {
-    uint8_t display_index;  // the index we are displaying on screen
-    uint8_t ts_ticks;       // when the user taps the LIGHT button, we show the timestamp for a few ticks.
-    int32_t data_points;    // the absolute number of data points logged
-    thermistor_logger_data_point_t data[THERMISTOR_LOGGING_NUM_DATA_POINTS];
-} thermistor_logger_state_t;
-
-void thermistor_logging_face_setup(uint8_t watch_face_index, void ** context_ptr);
-void thermistor_logging_face_activate(void *context);
-bool thermistor_logging_face_loop(movement_event_t event, void *context);
-void thermistor_logging_face_resign(void *context);
-movement_watch_face_advisory_t thermistor_logging_face_advise(void *context);
-
-#define thermistor_logging_face ((const watch_face_t){ \
-    thermistor_logging_face_setup, \
-    thermistor_logging_face_activate, \
-    thermistor_logging_face_loop, \
-    thermistor_logging_face_resign, \
-    thermistor_logging_face_advise, \
-})
-
-#endif // THERMISTOR_LOGGING_FACE_H_