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

Swapped button mapping and removed fast iteration

Browse Source
This commit is contained in:
David Volovskiy 2024-08-15 08:59:22 -04:00
parent 676f50d194
commit 0c86be4a40
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
movement/watch_faces/complication/wordle_face.c
View File

@ -29,7 +29,6 @@
#include "watch_utility.h" #include "watch_utility.h"
#endif #endif
#define FREQ_FAST 4
#define FREQ 2 #define FREQ 2
/* /*
@ -107,17 +106,6 @@ static uint32_t get_random(uint32_t max) {
#endif #endif
} }
static bool _quick_ticks_running;
static void start_quick_cyc(void){
_quick_ticks_running = true;
movement_request_tick_frequency(FREQ_FAST);
}
static void stop_quick_cyc(void){
_quick_ticks_running = false;
movement_request_tick_frequency(FREQ);
}
static void display_letter(wordle_state_t *state, bool display_dash) { static void display_letter(wordle_state_t *state, bool display_dash) {
char buf[1 + 1]; char buf[1 + 1];
if (state->word_elements[state->position] >= _num_valid_letters) { if (state->word_elements[state->position] >= _num_valid_letters) {
@ -378,19 +366,10 @@ bool wordle_face_loop(movement_event_t event, movement_settings_t *settings, voi
switch (state->curr_screen) switch (state->curr_screen)
{ {
case SCREEN_PLAYING: case SCREEN_PLAYING:
if (_quick_ticks_running) { if (event.subsecond % 2) {
if (watch_get_pin_level(BTN_ALARM)){ display_letter(state, true);
get_next_letter(state->position, state->word_elements); } else {
display_letter(state, true); watch_display_string(" ", state->position + 5);
}
else stop_quick_cyc();
}
else {
if (event.subsecond % 2) {
display_letter(state, true);
} else {
watch_display_string(" ", state->position + 5);
}
} }
break; break;
case SCREEN_RESULT: case SCREEN_RESULT:
@ -406,23 +385,17 @@ bool wordle_face_loop(movement_event_t event, movement_settings_t *settings, voi
break; break;
} }
break; break;
case EVENT_ALARM_BUTTON_UP: case EVENT_LIGHT_BUTTON_UP:
if (act_on_btn(state)) break; if (act_on_btn(state)) break;
get_next_letter(state->position, state->word_elements); get_next_letter(state->position, state->word_elements);
display_letter(state, true); display_letter(state, true);
break; break;
case EVENT_ALARM_LONG_PRESS: case EVENT_LIGHT_LONG_PRESS:
if (state->curr_screen != SCREEN_PLAYING) break; if (state->curr_screen != SCREEN_PLAYING) break;
get_prev_letter(state->position, state->word_elements); get_prev_letter(state->position, state->word_elements);
display_letter(state, true); display_letter(state, true);
break; break;
case EVENT_ALARM_LONGER_PRESS: case EVENT_ALARM_BUTTON_UP:
if (state->curr_screen != SCREEN_PLAYING) break;
get_next_letter(state->position, state->word_elements);
display_letter(state, true);
start_quick_cyc();
break;
case EVENT_LIGHT_BUTTON_UP:
if (act_on_btn(state)) break; if (act_on_btn(state)) break;
display_letter(state, true); display_letter(state, true);
if (state->word_elements[state->position] == _num_valid_letters) break; if (state->word_elements[state->position] == _num_valid_letters) break;
@ -446,7 +419,7 @@ bool wordle_face_loop(movement_event_t event, movement_settings_t *settings, voi
break; break;
} }
break; break;
case EVENT_LIGHT_LONG_PRESS: case EVENT_ALARM_LONG_PRESS:
if (state->curr_screen != SCREEN_PLAYING) break; if (state->curr_screen != SCREEN_PLAYING) break;
display_letter(state, true); display_letter(state, true);
state->position = get_prev_pos(state->position, state->word_elements_result); state->position = get_prev_pos(state->position, state->word_elements_result);