hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Refactored text display

Browse Source
This commit is contained in:
David Volovskiy 2025-08-19 06:59:59 -04:00
parent 4fe6a7bbb1
commit eeeb9865ac
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
movement_faces.h
View File

@ -73,4 +73,5 @@
#include "wareki_face.h" #include "wareki_face.h"
#include "deadline_face.h" #include "deadline_face.h"
#include "wordle_face.h" #include "wordle_face.h"
#include "simon_face.h"
// New includes go above this line. // New includes go above this line.

1
watch-faces.mk
View File

@ -48,4 +48,5 @@ SRCS += \
./watch-faces/sensor/lis2dw_monitor_face.c \ ./watch-faces/sensor/lis2dw_monitor_face.c \
./watch-faces/complication/wareki_face.c \ ./watch-faces/complication/wareki_face.c \
./watch-faces/complication/deadline_face.c \ ./watch-faces/complication/deadline_face.c \
./watch-faces/complication/simon_face.c \
# New watch faces go above this line. # New watch faces go above this line.

42
watch-faces/complication/simon_face.c
View File

@ -47,18 +47,19 @@ static inline uint8_t _simon_get_rand_num(uint8_t num_values) {
} }
static void _simon_clear_display(simon_state_t *state) { static void _simon_clear_display(simon_state_t *state) {
if (state->playing_state == SIMON_NOT_PLAYING) { watch_clear_display();
watch_display_string(" ", 0); if (state->playing_state != SIMON_NOT_PLAYING) {
} else { sprintf(_simon_display_buf, "%2d", state->sequence_length);
sprintf(_simon_display_buf, " %2d ", state->sequence_length); watch_display_text(WATCH_POSITION_TOP_RIGHT, _simon_display_buf);
watch_display_string(_simon_display_buf, 0);
} }
} }
static void _simon_not_playing_display(simon_state_t *state) { static void _simon_not_playing_display(simon_state_t *state) {
_simon_clear_display(state); _simon_clear_display(state);
sprintf(_simon_display_buf, "SI %d", state->best_score); watch_display_text(WATCH_POSITION_TOP, "SI");
sprintf(_simon_display_buf, "%d", state->best_score);
watch_display_text(WATCH_POSITION_BOTTOM, _simon_display_buf);
if (!state->soundOff) if (!state->soundOff)
watch_set_indicator(WATCH_INDICATOR_BELL); watch_set_indicator(WATCH_INDICATOR_BELL);
else else
@ -67,14 +68,13 @@ static void _simon_not_playing_display(simon_state_t *state) {
watch_set_indicator(WATCH_INDICATOR_SIGNAL); watch_set_indicator(WATCH_INDICATOR_SIGNAL);
else else
watch_clear_indicator(WATCH_INDICATOR_SIGNAL); watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
watch_display_string(_simon_display_buf, 0);
switch (state->mode) switch (state->mode)
{ {
case SIMON_MODE_EASY: case SIMON_MODE_EASY:
watch_display_string("E", 9); watch_display_text(WATCH_POSITION_SECONDS, " E");
break; break;
case SIMON_MODE_HARD: case SIMON_MODE_HARD:
watch_display_string("H", 9); watch_display_text(WATCH_POSITION_SECONDS, " H");
break; break;
default: default:
break; break;
@ -90,24 +90,27 @@ static void _simon_reset(simon_state_t *state) {
static void _simon_display_note(SimonNote note, simon_state_t *state) { static void _simon_display_note(SimonNote note, simon_state_t *state) {
char *ndtemplate = NULL; watch_clear_display();
if (note == SIMON_WRONG_NOTE) {
watch_display_text(WATCH_POSITION_TOP_LEFT, "OH");
watch_display_text(WATCH_POSITION_BOTTOM, "NOOOOO");
return;
}
sprintf(_simon_display_buf, "%2d", state->sequence_length);
watch_display_text(WATCH_POSITION_TOP_RIGHT, _simon_display_buf);
switch (note) { switch (note) {
case SIMON_LED_NOTE: case SIMON_LED_NOTE:
ndtemplate = "LI%2d "; watch_display_text(WATCH_POSITION_TOP_LEFT, "LI");
break; break;
case SIMON_ALARM_NOTE: case SIMON_ALARM_NOTE:
ndtemplate = " %2d AL"; watch_display_text(WATCH_POSITION_SECONDS, "AL");
break; break;
case SIMON_MODE_NOTE: case SIMON_MODE_NOTE:
ndtemplate = " %2dDE "; watch_display_text(WATCH_POSITION_HOURS, DE");
break;
default:
break; break;
case SIMON_WRONG_NOTE:
ndtemplate = "OH NOOOOO";
} }
sprintf(_simon_display_buf, ndtemplate, state->sequence_length);
watch_display_string(_simon_display_buf, 0);
} }
static void _simon_play_note(SimonNote note, simon_state_t *state, bool skip_rest) { static void _simon_play_note(SimonNote note, simon_state_t *state, bool skip_rest) {
@ -220,7 +223,6 @@ void simon_face_setup(uint8_t watch_face_index,
} }
void simon_face_activate(void *context) { void simon_face_activate(void *context) {
(void) settings;
(void) context; (void) context;
simon_state_t *state = (simon_state_t *)context; simon_state_t *state = (simon_state_t *)context;
_simon_change_speed(state); _simon_change_speed(state);

4
watch-faces/complication/simon_face.h
View File

@ -95,8 +95,8 @@ void simon_face_activate(void *context);
bool simon_face_loop(movement_event_t event, void *context); bool simon_face_loop(movement_event_t event, void *context);
void simon_face_resign(void *context); void simon_face_resign(void *context);
#define simon_face \ #define simon_face \
((const watch_face_t){ \ ((const watch_face_t){ \
simon_face_setup, \ simon_face_setup, \
simon_face_activate, \ simon_face_activate, \
simon_face_loop, \ simon_face_loop, \