Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into pr/24

8 files changed, 216 insertions, 57 deletions

diff --git a/movement/make/Makefile b/movement/make/Makefile
index 7a3e85ec..b7a0e6e2 100755
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@ -39,6 +39,7 @@ SRCS += \
   ../watch_faces/demos/character_set_face.c \
   ../watch_faces/demos/voltage_face.c \
   ../watch_faces/demos/lis2dh_logging_face.c \
+  ../watch_faces/demos/demo_face.c \
   ../watch_faces/complications/beats_face.c \
   ../watch_faces/complications/day_one_face.c \
   ../watch_faces/complications/stopwatch_face.c \
diff --git a/movement/movement.c b/movement/movement.c
index 9f98fe4d..cdd4ff06 100644
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -104,7 +104,7 @@ void movement_request_tick_frequency(uint8_t freq) {
     RTC->MODE2.INTENCLR.reg = 0xFE; // disable all callbacks except the 128 Hz one
     movement_state.subsecond = 0;
     movement_state.tick_frequency = freq;
-    watch_rtc_register_periodic_callback(cb_tick, freq);
+    if (freq) watch_rtc_register_periodic_callback(cb_tick, freq);
 }
 
 void movement_illuminate_led(void) {
diff --git a/movement/movement_config.h b/movement/movement_config.h
index 2ef43ef0..6aeb0b83 100644
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@ -15,6 +15,7 @@
 #include "stopwatch_face.h"
 #include "totp_face.h"
 #include "lis2dh_logging_face.h"
+#include "demo_face.h"
 
 const watch_face_t watch_faces[] = {
     simple_clock_face,
diff --git a/movement/watch_faces/demos/character_set_face.c b/movement/watch_faces/demos/character_set_face.c
index 7daea5a9..eabb133f 100644
--- a/movement/watch_faces/demos/character_set_face.c
+++ b/movement/watch_faces/demos/character_set_face.c
@@ -12,6 +12,7 @@ void character_set_face_activate(movement_settings_t *settings, void *context) {
     (void) settings;
     char *c = (char *)context;
     *c = '@';
+    movement_request_tick_frequency(0);
 }
 
 bool character_set_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
@@ -33,8 +34,6 @@ bool character_set_face_loop(movement_event_t event, movement_settings_t *settin
             sprintf(buf, "%c%c%c%c%c%c%c%c%c%c", *c, *c, *c, *c, *c, *c, *c, *c, *c, *c);
             watch_display_string(buf, 0);
             break;
-        case EVENT_TICK:
-            break;
         case EVENT_TIMEOUT:
             movement_move_to_face(0);
             break;
@@ -48,4 +47,5 @@ bool character_set_face_loop(movement_event_t event, movement_settings_t *settin
 void character_set_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
     (void) context;
+    movement_request_tick_frequency(1);
 }
diff --git a/movement/watch_faces/demos/demo_face.c b/movement/watch_faces/demos/demo_face.c
new file mode 100644
index 00000000..82256767
--- /dev/null
+++ b/movement/watch_faces/demos/demo_face.c
@@ -0,0 +1,91 @@
+#include <stdlib.h>
+#include <string.h>
+#include "demo_face.h"
+#include "watch.h"
+
+typedef enum {
+    DEMO_FACE_HELLO = 0,
+    DEMO_FACE_TIME,
+    DEMO_FACE_WORLD_TIME,
+    DEMO_FACE_BEATS,
+    DEMO_FACE_TEMP_F,
+    DEMO_FACE_TEMP_C,
+    DEMO_FACE_BATTERY_VOLTAGE,
+    DEMO_FACE_NUM_FACES
+} demo_face_index_t;
+
+void demo_face_setup(movement_settings_t *settings, void ** context_ptr) {
+    (void) settings;
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(demo_face_index_t));
+        memset(*context_ptr, 0, sizeof(demo_face_index_t));
+    }
+}
+
+void demo_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+    movement_request_tick_frequency(0);
+    // ensure the watch never enters low energy mode
+    settings->bit.le_interval = 0;
+}
+
+bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    (void) settings;
+    demo_face_index_t *screen = (demo_face_index_t *)context;
+    switch (event.event_type) {
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            *screen = ((*screen) + 1) % DEMO_FACE_NUM_FACES;
+            // fall through
+        case EVENT_ACTIVATE:
+            switch (*screen) {
+                case DEMO_FACE_HELLO:
+                    watch_display_string("    Hello ", 0);
+                    watch_clear_colon();
+                    break;
+                case DEMO_FACE_TIME:
+                    watch_display_string("TH 6101036", 0);
+                    watch_set_colon();
+                    break;
+                case DEMO_FACE_WORLD_TIME:
+                    watch_display_string("MT 6 81036", 0);
+                    break;
+                case DEMO_FACE_BEATS:
+                    watch_display_string("bt   64125", 0);
+                    watch_clear_colon();
+                    break;
+                case DEMO_FACE_TEMP_F:
+                    watch_display_string("TE  72.1#F", 0);
+                    break;
+                case DEMO_FACE_TEMP_C:
+                    watch_display_string("TE  22.3#C", 0);
+                    break;
+                case DEMO_FACE_BATTERY_VOLTAGE:
+                    watch_display_string("BA  2.97 V", 0);
+                    break;
+                case DEMO_FACE_NUM_FACES:
+                    // we won't get here, but silence the warning
+                    break;
+            }
+            break;
+        case EVENT_TIMEOUT:
+            // ignore timeout
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void demo_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+    movement_request_tick_frequency(1);
+}
diff --git a/movement/watch_faces/demos/demo_face.h b/movement/watch_faces/demos/demo_face.h
new file mode 100644
index 00000000..b9e36ffc
--- /dev/null
+++ b/movement/watch_faces/demos/demo_face.h
@@ -0,0 +1,19 @@
+#ifndef DEMO_FACE_H_
+#define DEMO_FACE_H_
+
+#include "movement.h"
+
+void demo_face_setup(movement_settings_t *settings, void ** context_ptr);
+void demo_face_activate(movement_settings_t *settings, void *context);
+bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void demo_face_resign(movement_settings_t *settings, void *context);
+
+static const watch_face_t demo_face = {
+    demo_face_setup,
+    demo_face_activate,
+    demo_face_loop,
+    demo_face_resign,
+    NULL
+};
+
+#endif // DEMO_FACE_H_
\ No newline at end of file
diff --git a/movement/watch_faces/demos/lis2dh_logging_face.c b/movement/watch_faces/demos/lis2dh_logging_face.c
index ef71cc6a..9f5783fe 100644
--- a/movement/watch_faces/demos/lis2dh_logging_face.c
+++ b/movement/watch_faces/demos/lis2dh_logging_face.c
@@ -12,14 +12,78 @@
 // Pressing the alarm button enters the log mode, where the main display shows the number of interrupts detected in each of the last
 // 24 hours (the hour is shown in the top right digit and AM/PM indicator, if the clock is set to 12 hour mode)
 
+static void _lis2dh_logging_face_update_display(movement_settings_t *settings, lis2dh_logger_state_t *logger_state, lis2dh_interrupt_state interrupt_state, watch_date_time date_time) {
+    char buf[14];
+    char time_indication_character;
+    int8_t pos;
+
+    if (logger_state->log_ticks) {
+        pos = (logger_state->data_points - 1 - logger_state->display_index) % LIS2DH_LOGGING_NUM_DATA_POINTS;
+        if (pos < 0) {
+            watch_clear_colon();
+            sprintf(buf, "NO   data ");
+        } else {
+            date_time = logger_state->data[pos].timestamp;
+            watch_set_colon();
+            if (settings->bit.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;
+            }
+            switch (logger_state->axis_index) {
+                case 0:
+                    sprintf(buf, "3A%2d%02d%4ld", date_time.unit.hour, date_time.unit.minute, logger_state->data[pos].x_interrupts + logger_state->data[pos].y_interrupts + logger_state->data[pos].z_interrupts);
+                    break;
+                case 1:
+                    sprintf(buf, "XA%2d%02d%4ld", date_time.unit.hour, date_time.unit.minute, logger_state->data[pos].x_interrupts);
+                    break;
+                case 2:
+                    sprintf(buf, "YA%2d%02d%4ld", date_time.unit.hour, date_time.unit.minute, logger_state->data[pos].y_interrupts);
+                    break;
+                case 3:
+                    sprintf(buf, "ZA%2d%02d%4ld", date_time.unit.hour, date_time.unit.minute, logger_state->data[pos].z_interrupts);
+                    break;
+            }
+        }
+    } else {
+        date_time = watch_rtc_get_date_time();
+        watch_clear_colon();
+        watch_clear_indicator(WATCH_INDICATOR_PM);
+        watch_clear_indicator(WATCH_INDICATOR_24H);
+        if ((59 - date_time.unit.second) < 10) time_indication_character = '0' + (59 - date_time.unit.second);
+        else time_indication_character = (date_time.unit.second % 2) ? 'i' : '_';
+        sprintf(buf, "%c%c%c%c%2d%2d%2d",
+            (interrupt_state & LIS2DH_INTERRUPT_STATE_Y_HIGH) ? 'Y' : ' ',
+            (interrupt_state & LIS2DH_INTERRUPT_STATE_X_HIGH) ? 'X' : ' ',
+            (interrupt_state & LIS2DH_INTERRUPT_STATE_Z_HIGH) ? 'Z' : ' ',
+            time_indication_character,
+            logger_state->interrupts[0],
+            logger_state->interrupts[1],
+            logger_state->interrupts[2]);
+    }
+    watch_display_string(buf, 0);
+}
+
 static void _lis2dh_logging_face_log_data(lis2dh_logger_state_t *logger_state) {
     watch_date_time date_time = watch_rtc_get_date_time();
-    date_time.unit.hour = (date_time.unit.hour + 23) % 24; // log this as the number of events in the previous hour
+    // we get this call 15 minutes late; i.e. at 6:15 we're logging events for 6:00.
+    // so: if we're at the top of the hour, roll the hour back too (7:00 task logs data for 6:45)
+    if (date_time.unit.minute == 0) date_time.unit.hour = (date_time.unit.hour + 23) % 24;
+
+    // // then roll the minute back.
+    date_time.unit.minute = (date_time.unit.minute + 45) % 60;
+
     size_t pos = logger_state->data_points % LIS2DH_LOGGING_NUM_DATA_POINTS;
     logger_state->data[pos].timestamp.reg = date_time.reg;
-    logger_state->data[pos].interrupts = logger_state->interrupts_this_hour;
+    logger_state->data[pos].x_interrupts = logger_state->x_interrupts_this_hour;
+    logger_state->data[pos].y_interrupts = logger_state->y_interrupts_this_hour;
+    logger_state->data[pos].z_interrupts = logger_state->z_interrupts_this_hour;
     logger_state->data_points++;
-    logger_state->interrupts_this_hour = 0;
+    logger_state->x_interrupts_this_hour = 0;
+    logger_state->y_interrupts_this_hour = 0;
+    logger_state->z_interrupts_this_hour = 0;
 }
 
 void lis2dh_logging_face_setup(movement_settings_t *settings, void ** context_ptr) {
@@ -42,81 +106,58 @@ void lis2dh_logging_face_setup(movement_settings_t *settings, void ** context_pt
 }
 
 void lis2dh_logging_face_activate(movement_settings_t *settings, void *context) {
-    (void) settings;
     lis2dh_logger_state_t *logger_state = (lis2dh_logger_state_t *)context;
+    // force two settings: never enter low energy mode, and always snap back to screen 0.
+    // this assumes the accelerometer face is first in the watch_faces list.
+    settings->bit.le_interval = 0;
+    settings->bit.to_always = true;
+
     logger_state->display_index = 0;
     logger_state->log_ticks = 0;
     watch_enable_digital_input(A1);
 }
 
-bool tick = false;
-
 bool lis2dh_logging_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
     lis2dh_logger_state_t *logger_state = (lis2dh_logger_state_t *)context;
     lis2dh_interrupt_state interrupt_state = 0;
     watch_date_time date_time;
-    char buf[14];
-    char time_indication_character;
-    int8_t pos;
 
     switch (event.event_type) {
         case EVENT_MODE_BUTTON_UP:
             movement_move_to_next_face();
             break;
         case EVENT_LIGHT_LONG_PRESS:
+            movement_illuminate_led();
             break;
         case EVENT_LIGHT_BUTTON_DOWN:
+            logger_state->axis_index = (logger_state->axis_index + 1) % 4;
+            logger_state->log_ticks = 255;
+            _lis2dh_logging_face_update_display(settings, logger_state, interrupt_state, date_time);
             break;
         case EVENT_ALARM_BUTTON_UP:
-            if (logger_state->log_ticks) {
-                logger_state->display_index = (logger_state->display_index + 1) % LIS2DH_LOGGING_NUM_DATA_POINTS;
-            }
-            logger_state->log_ticks = 60;
-            // fall through
+            if (logger_state->log_ticks) logger_state->display_index = (logger_state->display_index + 1) % LIS2DH_LOGGING_NUM_DATA_POINTS;
+            logger_state->log_ticks = 255;
+            logger_state->axis_index = 0;
+            _lis2dh_logging_face_update_display(settings, logger_state, interrupt_state, date_time);
+            break;
         case EVENT_ACTIVATE:
         case EVENT_TICK:
-            tick = !tick;
+            if (logger_state->log_ticks > 0) {
+                logger_state->log_ticks--;
+            } else {
+                logger_state->display_index = 0;
+            }
             if (watch_get_pin_level(A1)) {
                 watch_set_indicator(WATCH_INDICATOR_SIGNAL);
                 interrupt_state = lis2dh_get_int1_state();
                 logger_state->interrupts[0]++;
-                logger_state->interrupts_this_hour++;
+                if (interrupt_state & LIS2DH_INTERRUPT_STATE_X_HIGH) logger_state->x_interrupts_this_hour++;
+                if (interrupt_state & LIS2DH_INTERRUPT_STATE_Y_HIGH) logger_state->y_interrupts_this_hour++;
+                if (interrupt_state & LIS2DH_INTERRUPT_STATE_Z_HIGH) logger_state->z_interrupts_this_hour++;
             } else {
                 watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
             }
-            if (logger_state->log_ticks) {
-                pos = (logger_state->data_points - 1 - logger_state->display_index) % LIS2DH_LOGGING_NUM_DATA_POINTS;
-                if (pos < 0) {
-                    watch_clear_colon();
-                    sprintf(buf, "NO   data ");
-                } else {
-                    date_time = logger_state->data[pos].timestamp;
-                    watch_set_colon();
-                    if (settings->bit.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%2d1n%4ld", date_time.unit.hour, logger_state->data[pos].interrupts);
-                }
-            } else {
-                date_time = watch_rtc_get_date_time();
-                watch_clear_colon();
-                if ((59 - date_time.unit.second) < 10) time_indication_character = '0' + (59 - date_time.unit.second);
-                else time_indication_character = (date_time.unit.second % 2) ? 'i' : '_';
-                sprintf(buf, "%c%c%c%c%2d%2d%2d",
-                    (interrupt_state & LIS2DH_INTERRUPT_STATE_Y_HIGH) ? 'Y' : ' ',
-                    (interrupt_state & LIS2DH_INTERRUPT_STATE_X_HIGH) ? 'X' : ' ',
-                    (interrupt_state & LIS2DH_INTERRUPT_STATE_Z_HIGH) ? '2' : ' ',
-                    time_indication_character,
-                    logger_state->interrupts[0],
-                    logger_state->interrupts[1],
-                    logger_state->interrupts[2]);
-            }
-
-            watch_display_string(buf, 0);
+            _lis2dh_logging_face_update_display(settings, logger_state, interrupt_state, date_time);
             break;
         case EVENT_BACKGROUND_TASK:
             _lis2dh_logging_face_log_data(logger_state);
@@ -137,12 +178,13 @@ void lis2dh_logging_face_resign(movement_settings_t *settings, void *context) {
 bool lis2dh_logging_face_wants_background_task(movement_settings_t *settings, void *context) {
     (void) settings;
     lis2dh_logger_state_t *logger_state = (lis2dh_logger_state_t *)context;
+    watch_date_time date_time = watch_rtc_get_date_time();
 
     // this is kind of an abuse of the API, but, let's use the 1 minute tick to shift all our data over.
     logger_state->interrupts[2] = logger_state->interrupts[1];
     logger_state->interrupts[1] = logger_state->interrupts[0];
     logger_state->interrupts[0] = 0;
 
-    // and do our logging task at the top of the hour
-    return watch_rtc_get_date_time().unit.minute == 0;
+    // and do our logging task every 15 minutes
+    return (date_time.unit.minute % 15) == 0;
 }
diff --git a/movement/watch_faces/demos/lis2dh_logging_face.h b/movement/watch_faces/demos/lis2dh_logging_face.h
index d8ab0e24..b0faeca5 100644
--- a/movement/watch_faces/demos/lis2dh_logging_face.h
+++ b/movement/watch_faces/demos/lis2dh_logging_face.h
@@ -4,19 +4,24 @@
 #include "movement.h"
 #include "watch.h"
 
-#define LIS2DH_LOGGING_NUM_DATA_POINTS (24)
+#define LIS2DH_LOGGING_NUM_DATA_POINTS (96)
 
 typedef struct {
     watch_date_time timestamp;
-    uint32_t interrupts;
+    uint32_t x_interrupts;
+    uint32_t y_interrupts;
+    uint32_t z_interrupts;
 } lis2dh_logger_data_point_t;
 
 typedef struct {
     uint8_t display_index;  // the index we are displaying on screen
+    uint8_t axis_index;     // the index we are displaying on screen
     uint8_t log_ticks;      // when the user taps the ALARM button, we enter log mode
     int32_t data_points;    // the absolute number of data points logged
     uint8_t interrupts[3];  // the number of interrupts we have logged in each of the last 3 minutes
-    uint32_t interrupts_this_hour;  // the number of interrupts we have logged in the last hour
+    uint32_t x_interrupts_this_hour;  // the number of interrupts we have logged in the last hour
+    uint32_t y_interrupts_this_hour;  // the number of interrupts we have logged in the last hour
+    uint32_t z_interrupts_this_hour;  // the number of interrupts we have logged in the last hour
     lis2dh_logger_data_point_t data[LIS2DH_LOGGING_NUM_DATA_POINTS];
 } lis2dh_logger_state_t;