From d5ac4cb71b4e328a27e26843cfdc6719b152ac7d Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 13:14:52 -0400 Subject: widgets are now watch faces --- .../watch_faces/complications/pulseometer_face.c | 87 ++++++++++++++++++++++ .../watch_faces/complications/pulseometer_face.h | 24 ++++++ 2 files changed, 111 insertions(+) create mode 100644 movement/watch_faces/complications/pulseometer_face.c create mode 100644 movement/watch_faces/complications/pulseometer_face.h (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c new file mode 100644 index 00000000..e38153d6 --- /dev/null +++ b/movement/watch_faces/complications/pulseometer_face.c @@ -0,0 +1,87 @@ +#include +#include +#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(LauncherSettings *settings, void ** context_ptr) { + (void) settings; + if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState)); +} + +void pulseometer_face_activate(LauncherSettings *settings, void *context) { + (void) settings; + memset(context, 0, sizeof(PulsometerState)); +} + +bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *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(LauncherSettings *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 new file mode 100644 index 00000000..7b96259c --- /dev/null +++ b/movement/watch_faces/complications/pulseometer_face.h @@ -0,0 +1,24 @@ +#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(LauncherSettings *settings, void ** context_ptr); +void pulseometer_face_activate(LauncherSettings *settings, void *context); +bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context); +void pulseometer_face_resign(LauncherSettings *settings, void *context); + +#define pulseometer_face { \ + pulseometer_face_setup, \ + pulseometer_face_activate, \ + pulseometer_face_loop, \ + pulseometer_face_resign, \ +} + +#endif // PULSEOMETER_FACE_H_ \ No newline at end of file -- cgit v1.2.3 From d36331ce4e79d275e0ef09414a1a1a1a8949b0ea Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 13:23:23 -0400 Subject: rename types to be more c-like --- movement/watch_faces/complications/pulseometer_face.c | 8 ++++---- movement/watch_faces/complications/pulseometer_face.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c index e38153d6..7c524b8d 100644 --- a/movement/watch_faces/complications/pulseometer_face.c +++ b/movement/watch_faces/complications/pulseometer_face.c @@ -6,17 +6,17 @@ #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(LauncherSettings *settings, void ** context_ptr) { +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(LauncherSettings *settings, void *context) { +void pulseometer_face_activate(movement_settings_t *settings, void *context) { (void) settings; memset(context, 0, sizeof(PulsometerState)); } -bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context) { +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; @@ -81,7 +81,7 @@ bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void return true; } -void pulseometer_face_resign(LauncherSettings *settings, void *context) { +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 index 7b96259c..f8e69d27 100644 --- a/movement/watch_faces/complications/pulseometer_face.h +++ b/movement/watch_faces/complications/pulseometer_face.h @@ -9,10 +9,10 @@ typedef struct { int16_t ticks; } PulsometerState; -void pulseometer_face_setup(LauncherSettings *settings, void ** context_ptr); -void pulseometer_face_activate(LauncherSettings *settings, void *context); -bool pulseometer_face_loop(LauncherEvent event, LauncherSettings *settings, void *context); -void pulseometer_face_resign(LauncherSettings *settings, void *context); +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); #define pulseometer_face { \ pulseometer_face_setup, \ -- cgit v1.2.3 From 0cfb37c6716326dea78a8dca512d286e6484e509 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 16:03:27 -0400 Subject: early work on background tasks, documentation --- movement/watch_faces/complications/pulseometer_face.h | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h index f8e69d27..5a9c66b0 100644 --- a/movement/watch_faces/complications/pulseometer_face.h +++ b/movement/watch_faces/complications/pulseometer_face.h @@ -19,6 +19,7 @@ void pulseometer_face_resign(movement_settings_t *settings, void *context); pulseometer_face_activate, \ pulseometer_face_loop, \ pulseometer_face_resign, \ + NULL, \ } #endif // PULSEOMETER_FACE_H_ \ No newline at end of file -- cgit v1.2.3 From 05fe055f99b9b950086b1e38a9c795d7e076c5b2 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 16:25:30 -0400 Subject: automatically determine number of watch faces --- movement/watch_faces/complications/pulseometer_face.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulseometer_face.h b/movement/watch_faces/complications/pulseometer_face.h index 5a9c66b0..52bccf24 100644 --- a/movement/watch_faces/complications/pulseometer_face.h +++ b/movement/watch_faces/complications/pulseometer_face.h @@ -14,12 +14,12 @@ 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); -#define pulseometer_face { \ - pulseometer_face_setup, \ - pulseometer_face_activate, \ - pulseometer_face_loop, \ - pulseometer_face_resign, \ - NULL, \ -} +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 -- cgit v1.2.3 From c27dbc779b252c32370e2cd34a22f51d120d0f38 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 16 Oct 2021 16:51:36 -0400 Subject: fix misspelling of pulsometer --- .../watch_faces/complications/pulseometer_face.c | 87 ---------------------- .../watch_faces/complications/pulseometer_face.h | 25 ------- .../watch_faces/complications/pulsometer_face.c | 87 ++++++++++++++++++++++ .../watch_faces/complications/pulsometer_face.h | 25 +++++++ 4 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 movement/watch_faces/complications/pulseometer_face.c delete mode 100644 movement/watch_faces/complications/pulseometer_face.h create mode 100644 movement/watch_faces/complications/pulsometer_face.c create mode 100644 movement/watch_faces/complications/pulsometer_face.h (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulseometer_face.c b/movement/watch_faces/complications/pulseometer_face.c deleted file mode 100644 index 7c524b8d..00000000 --- a/movement/watch_faces/complications/pulseometer_face.c +++ /dev/null @@ -1,87 +0,0 @@ -#include -#include -#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 index 52bccf24..00000000 --- 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 index 00000000..dffdcd35 --- /dev/null +++ b/movement/watch_faces/complications/pulsometer_face.c @@ -0,0 +1,87 @@ +#include +#include +#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 index 00000000..76af8257 --- /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 -- cgit v1.2.3 From b4d4f62ba8ec4f5983a639ddd0e0089cebe380e4 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 18 Oct 2021 11:15:45 -0400 Subject: pulsometer: reset tick in resign function --- movement/watch_faces/complications/pulsometer_face.c | 1 + 1 file changed, 1 insertion(+) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c index dffdcd35..396ac0dd 100644 --- a/movement/watch_faces/complications/pulsometer_face.c +++ b/movement/watch_faces/complications/pulsometer_face.c @@ -84,4 +84,5 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, void pulsometer_face_resign(movement_settings_t *settings, void *context) { (void) settings; (void) context; + movement_request_tick_frequency(1); } -- cgit v1.2.3 From 8dbbe92a9bad950219c4bc1a46871f44dda5fef3 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 18 Oct 2021 11:27:36 -0400 Subject: pulsometer: make type more c-like --- movement/watch_faces/complications/pulsometer_face.c | 6 +++--- movement/watch_faces/complications/pulsometer_face.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c index 396ac0dd..db5c5d0e 100644 --- a/movement/watch_faces/complications/pulsometer_face.c +++ b/movement/watch_faces/complications/pulsometer_face.c @@ -8,18 +8,18 @@ void pulsometer_face_setup(movement_settings_t *settings, void ** context_ptr) { (void) settings; - if (*context_ptr == NULL) *context_ptr = malloc(sizeof(PulsometerState)); + if (*context_ptr == NULL) *context_ptr = malloc(sizeof(pulsometer_state_t)); } void pulsometer_face_activate(movement_settings_t *settings, void *context) { (void) settings; - memset(context, 0, sizeof(PulsometerState)); + memset(context, 0, sizeof(pulsometer_state_t)); } 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; + pulsometer_state_t *pulsometer_state = (pulsometer_state_t *)context; char buf[14]; switch (event.event_type) { case EVENT_TICK: diff --git a/movement/watch_faces/complications/pulsometer_face.h b/movement/watch_faces/complications/pulsometer_face.h index 76af8257..cdb5b977 100644 --- a/movement/watch_faces/complications/pulsometer_face.h +++ b/movement/watch_faces/complications/pulsometer_face.h @@ -7,7 +7,7 @@ typedef struct { bool measuring; int16_t pulse; int16_t ticks; -} PulsometerState; +} pulsometer_state_t; void pulsometer_face_setup(movement_settings_t *settings, void ** context_ptr); void pulsometer_face_activate(movement_settings_t *settings, void *context); -- cgit v1.2.3 From 93624f0b692648eac415a3df5689de6dee06c2db Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 18 Oct 2021 12:15:57 -0400 Subject: add timeout event to give faces a chance to resign --- movement/watch_faces/complications/pulsometer_face.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c index db5c5d0e..e54b4551 100644 --- a/movement/watch_faces/complications/pulsometer_face.c +++ b/movement/watch_faces/complications/pulsometer_face.c @@ -17,7 +17,6 @@ void pulsometer_face_activate(movement_settings_t *settings, void *context) { } bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { - printf("pulsometer_face_loop\n"); (void) settings; pulsometer_state_t *pulsometer_state = (pulsometer_state_t *)context; char buf[14]; @@ -74,6 +73,9 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, pulsometer_state->measuring = false; movement_request_tick_frequency(1); break; + case EVENT_TIMEOUT: + movement_move_to_face(0); + break; default: break; } -- cgit v1.2.3 From 1db9e18b927a45b6f93279ee6b9929679f0a9cc5 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Mon, 18 Oct 2021 12:31:44 -0400 Subject: pulsometer: rearrange switch for clarity --- .../watch_faces/complications/pulsometer_face.c | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'movement/watch_faces/complications') diff --git a/movement/watch_faces/complications/pulsometer_face.c b/movement/watch_faces/complications/pulsometer_face.c index e54b4551..abe002fb 100644 --- a/movement/watch_faces/complications/pulsometer_face.c +++ b/movement/watch_faces/complications/pulsometer_face.c @@ -21,6 +21,23 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, pulsometer_state_t *pulsometer_state = (pulsometer_state_t *)context; char buf[14]; switch (event.event_type) { + case EVENT_MODE_BUTTON_UP: + movement_move_to_next_face(); + break; + case EVENT_LIGHT_BUTTON_UP: + movement_illuminate_led(); + break; + case EVENT_ALARM_BUTTON_DOWN: + pulsometer_state->measuring = true; + pulsometer_state->pulse = 0xFFFF; + pulsometer_state->ticks = 0; + 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; case EVENT_TICK: if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) { switch (pulsometer_state->ticks % 5) { @@ -55,23 +72,6 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings, } 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; case EVENT_TIMEOUT: movement_move_to_face(0); -- cgit v1.2.3