Adds a rate meter watchface (#101)

diff --git a/movement/make/Makefile b/movement/make/Makefile
index fe652154bd8f56307f1cdf01b64f1df8f9691fc4..064d289b88d792eb06b8ee3202eea1350ff5baeb 100755 (executable)
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@ -68,6 +68,7 @@ SRCS += \
   ../watch_faces/complication/probability_face.c \
   ../watch_faces/complication/wake_face.c \
   ../watch_faces/demo/frequency_correction_face.c \
+  ../watch_faces/complication/ratemeter_face.c \
 # New watch faces go above this line.
 
 # Leave this line at the bottom of the file; it has all the targets for making your project.

diff --git a/movement/movement_faces.h b/movement/movement_faces.h
index 1f36e966c8acf8eafe1b2ee7a952672d1bd288fc..35931028010cec2ff1089084c604cba95b04622b 100644 (file)
--- a/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@ -55,6 +55,7 @@
 #include "probability_face.h"
 #include "wake_face.h"
 #include "frequency_correction_face.h"
+#include "ratemeter_face.h"
 // New includes go above this line.
 
 #endif // MOVEMENT_FACES_H_

diff --git a/movement/watch_faces/complication/ratemeter_face.c b/movement/watch_faces/complication/ratemeter_face.c
new file mode 100644 (file)
index 0000000..38423eb
--- /dev/null
+++ b/movement/watch_faces/complication/ratemeter_face.c
@@ -0,0 +1,97 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 David Singleton
+ *
+ * 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 "ratemeter_face.h"
+#include "watch.h"
+
+#define RATEMETER_FACE_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
+#define RATEMETER_FACE_FREQUENCY (1 << RATEMETER_FACE_FREQUENCY_FACTOR)
+
+void ratemeter_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) settings;
+    (void) watch_face_index;
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(ratemeter_state_t));
+}
+
+void ratemeter_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    memset(context, 0, sizeof(ratemeter_state_t));
+}
+
+bool ratemeter_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    (void) settings;
+    ratemeter_state_t *ratemeter_state = (ratemeter_state_t *)context;
+    char buf[14];
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+            watch_display_string("ra          ", 0);
+            break;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_DOWN:
+            if (ratemeter_state->ticks != 0) {
+                ratemeter_state->rate = (int16_t)(60.0 / ((float)ratemeter_state->ticks / (float)RATEMETER_FACE_FREQUENCY));
+            }
+            ratemeter_state->ticks = 0;
+            movement_request_tick_frequency(RATEMETER_FACE_FREQUENCY);
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            break;
+        case EVENT_TICK:
+            if (ratemeter_state->rate == 0) {
+                watch_display_string("ra          ", 0);
+            } else {
+                if (ratemeter_state->rate > 500) {
+                    watch_display_string("ra      Hi", 0);
+                } else if (ratemeter_state->rate < 1) {
+                    watch_display_string("ra      Lo", 0);
+                } else {
+                    sprintf(buf, "ra  %-3d pn", ratemeter_state->rate);
+                    watch_display_string(buf, 0);
+                }
+            }
+            ratemeter_state->ticks++;
+            break;
+        case EVENT_TIMEOUT:
+            movement_move_to_face(0);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void ratemeter_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}

diff --git a/movement/watch_faces/complication/ratemeter_face.h b/movement/watch_faces/complication/ratemeter_face.h
new file mode 100644 (file)
index 0000000..a1f1849
--- /dev/null
+++ b/movement/watch_faces/complication/ratemeter_face.h
@@ -0,0 +1,48 @@
+/*
+ * 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 RATEMETER_FACE_H_
+#define RATEMETER_FACE_H_
+
+#include "movement.h"
+
+typedef struct {
+    int16_t rate;
+    int16_t ticks;
+} ratemeter_state_t;
+
+void ratemeter_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void ratemeter_face_activate(movement_settings_t *settings, void *context);
+bool ratemeter_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void ratemeter_face_resign(movement_settings_t *settings, void *context);
+
+#define ratemeter_face ((const watch_face_t){ \
+    ratemeter_face_setup, \
+    ratemeter_face_activate, \
+    ratemeter_face_loop, \
+    ratemeter_face_resign, \
+    NULL, \
+})
+
+#endif // RATEMETER_FACE_H_