fix misspelling of pulsometer

diff --git a/movement/make/Makefile b/movement/make/Makefile
index 8b29fba441b58692df9db6804e3c1628856578e7..f17fc7e57812e0e25367073018b3a50b7f3494d7 100755 (executable)
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@ -26,7 +26,7 @@ SRCS += \
   ../watch_faces/clock/simple_clock_face.c \
   ../watch_faces/settings/preferences_face.c \
   ../watch_faces/settings/set_time_face.c \
-  ../watch_faces/complications/pulseometer_face.c \
+  ../watch_faces/complications/pulsometer_face.c \
 
 # Leave this line at the bottom of the file; it has all the targets for making your project.
 include $(TOP)/rules.mk

diff --git a/movement/movement_config.h b/movement/movement_config.h
index e95e46c0ab0f6942ed12975596e1dd49d6ce8c5d..6a7aec5a947f1cd7b17383df8b31177b53b8ed7e 100644 (file)
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@ -4,7 +4,7 @@
 #include "simple_clock_face.h"
 #include "preferences_face.h"
 #include "set_time_face.h"
-#include "pulseometer_face.h"
+#include "pulsometer_face.h"
 
 const watch_face_t watch_faces[] = {
     simple_clock_face,

diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c
deleted file mode 100644 (file)
index 7c524b8..0000000
--- a/movement/watch_faces/complications/pulseometer_face.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "pulseometer_face.h"
-#include "watch.h"
-
-#define PULSOMETER_FACE_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
-#define PULSOMETER_FACE_FREQUENCY (1 << PULSOMETER_FACE_FREQUENCY_FACTOR)
-
-void pulseometer_face_setup(movement_settings_t *settings, void ** context_ptr) {
-    (void) settings;
-    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState));
-}
-
-void pulseometer_face_activate(movement_settings_t *settings, void *context) {
-    (void) settings;
-    memset(context, 0, sizeof(PulsometerState));
-}
-
-bool pulseometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
-    printf("pulseometer_face_loop\n");
-    (void) settings;
-    PulsometerState *pulsometer_state = (PulsometerState *)context;
-    char buf[14];
-    switch (event.event_type) {
-        case EVENT_TICK:
-            if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) {
-                switch (pulsometer_state->ticks % 5) {
-                    case 0:
-                        watch_display_string("  Hold  ", 2);
-                        break;
-                    case 1:
-                        watch_display_string(" Alarn", 4);
-                        break;
-                    case 2:
-                        watch_display_string("+   Count ", 0);
-                        break;
-                    case 3:
-                        watch_display_string("  30Beats ", 0);
-                        break;
-                    case 4:
-                        watch_clear_display();
-                        break;
-                }
-                pulsometer_state->ticks = (pulsometer_state->ticks + 1) % 5;
-            } else {
-                if (pulsometer_state->measuring && pulsometer_state->ticks) {
-                    pulsometer_state->pulse = (int16_t)((30.0 * ((float)(60 << PULSOMETER_FACE_FREQUENCY_FACTOR) / (float)pulsometer_state->ticks)) + 0.5);
-                }
-                if (pulsometer_state->pulse > 240) {
-                    watch_display_string("        Hi", 0);
-                } else if (pulsometer_state->pulse < 40) {
-                    watch_display_string("        Lo", 0);
-                } else {
-                    sprintf(buf, "    %-3dbpn", pulsometer_state->pulse);
-                    watch_display_string(buf, 0);
-                }
-                if (pulsometer_state->measuring) pulsometer_state->ticks++;
-            }
-            return false;
-        case EVENT_MODE_BUTTON_UP:
-            movement_move_to_next_face();
-            return false;
-        case EVENT_LIGHT_BUTTON_UP:
-            movement_illuminate_led();
-            break;
-        case EVENT_ALARM_BUTTON_DOWN:
-            pulsometer_state->ticks = 0;
-            pulsometer_state->pulse = 0xFFFF;
-            pulsometer_state->measuring = true;
-            movement_request_tick_frequency(PULSOMETER_FACE_FREQUENCY);
-            break;
-        case EVENT_ALARM_BUTTON_UP:
-        case EVENT_ALARM_LONG_PRESS:
-            pulsometer_state->measuring = false;
-            movement_request_tick_frequency(1);
-            break;
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void pulseometer_face_resign(movement_settings_t *settings, void *context) {
-    (void) settings;
-    (void) context;
-}

diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h
deleted file mode 100644 (file)
index 52bccf2..0000000
--- a/movement/watch_faces/complications/pulseometer_face.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef PULSEOMETER_FACE_H_
-#define PULSEOMETER_FACE_H_
-
-#include "movement.h"
-
-typedef struct {
-    bool measuring;
-    int16_t pulse;
-    int16_t ticks;
-} PulsometerState;
-
-void pulseometer_face_setup(movement_settings_t *settings, void ** context_ptr);
-void pulseometer_face_activate(movement_settings_t *settings, void *context);
-bool pulseometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
-void pulseometer_face_resign(movement_settings_t *settings, void *context);
-
-static const watch_face_t pulseometer_face = {
-    pulseometer_face_setup,
-    pulseometer_face_activate,
-    pulseometer_face_loop,
-    pulseometer_face_resign,
-    NULL
-};
-
-#endif // PULSEOMETER_FACE_H_
\ No newline at end of file

diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c
new file mode 100644 (file)
index 0000000..dffdcd3
--- /dev/null
+++ b/movement/watch_faces/complications/pulsometer_face.c
@@ -0,0 +1,87 @@
+#include <stdlib.h>
+#include <string.h>
+#include "pulsometer_face.h"
+#include "watch.h"
+
+#define PULSOMETER_FACE_FREQUENCY_FACTOR (4ul) // refresh rate will be 2 to this power Hz (0 for 1 Hz, 2 for 4 Hz, etc.)
+#define PULSOMETER_FACE_FREQUENCY (1 << PULSOMETER_FACE_FREQUENCY_FACTOR)
+
+void pulsometer_face_setup(movement_settings_t *settings, void ** context_ptr) {
+    (void) settings;
+    if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState));
+}
+
+void pulsometer_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    memset(context, 0, sizeof(PulsometerState));
+}
+
+bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    printf("pulsometer_face_loop\n");
+    (void) settings;
+    PulsometerState *pulsometer_state = (PulsometerState *)context;
+    char buf[14];
+    switch (event.event_type) {
+        case EVENT_TICK:
+            if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) {
+                switch (pulsometer_state->ticks % 5) {
+                    case 0:
+                        watch_display_string("  Hold  ", 2);
+                        break;
+                    case 1:
+                        watch_display_string(" Alarn", 4);
+                        break;
+                    case 2:
+                        watch_display_string("+   Count ", 0);
+                        break;
+                    case 3:
+                        watch_display_string("  30Beats ", 0);
+                        break;
+                    case 4:
+                        watch_clear_display();
+                        break;
+                }
+                pulsometer_state->ticks = (pulsometer_state->ticks + 1) % 5;
+            } else {
+                if (pulsometer_state->measuring && pulsometer_state->ticks) {
+                    pulsometer_state->pulse = (int16_t)((30.0 * ((float)(60 << PULSOMETER_FACE_FREQUENCY_FACTOR) / (float)pulsometer_state->ticks)) + 0.5);
+                }
+                if (pulsometer_state->pulse > 240) {
+                    watch_display_string("        Hi", 0);
+                } else if (pulsometer_state->pulse < 40) {
+                    watch_display_string("        Lo", 0);
+                } else {
+                    sprintf(buf, "    %-3dbpn", pulsometer_state->pulse);
+                    watch_display_string(buf, 0);
+                }
+                if (pulsometer_state->measuring) pulsometer_state->ticks++;
+            }
+            return false;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            return false;
+        case EVENT_LIGHT_BUTTON_UP:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_DOWN:
+            pulsometer_state->ticks = 0;
+            pulsometer_state->pulse = 0xFFFF;
+            pulsometer_state->measuring = true;
+            movement_request_tick_frequency(PULSOMETER_FACE_FREQUENCY);
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+        case EVENT_ALARM_LONG_PRESS:
+            pulsometer_state->measuring = false;
+            movement_request_tick_frequency(1);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void pulsometer_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}

diff --git a/movement/watch_faces/complications/pulsometer_face.h b/movement/watch_faces/complications/pulsometer_face.h
new file mode 100644 (file)
index 0000000..76af825
--- /dev/null
+++ b/movement/watch_faces/complications/pulsometer_face.h
@@ -0,0 +1,25 @@
+#ifndef PULSOMETER_FACE_H_
+#define PULSOMETER_FACE_H_
+
+#include "movement.h"
+
+typedef struct {
+    bool measuring;
+    int16_t pulse;
+    int16_t ticks;
+} PulsometerState;
+
+void pulsometer_face_setup(movement_settings_t *settings, void ** context_ptr);
+void pulsometer_face_activate(movement_settings_t *settings, void *context);
+bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void pulsometer_face_resign(movement_settings_t *settings, void *context);
+
+static const watch_face_t pulsometer_face = {
+    pulsometer_face_setup,
+    pulsometer_face_activate,
+    pulsometer_face_loop,
+    pulsometer_face_resign,
+    NULL
+};
+
+#endif // PULSOMETER_FACE_H_
\ No newline at end of file