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

bring in alarm face, rename to 'advanced alarm face'

Browse Source
This commit is contained in:
joeycastillo
2024-09-29 22:40:21 -04:00
parent cfd04be4fb
commit 8269caf49b
5 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
movement_config.h
View File

@@ -29,10 +29,11 @@
const watch_face_t watch_faces[] = { const watch_face_t watch_faces[] = {
clock_face, clock_face,
fast_stopwatch_face,
beats_face,
world_clock_face, world_clock_face,
beats_face,
advanced_alarm_face,
countdown_face, countdown_face,
fast_stopwatch_face,
preferences_face, preferences_face,
set_time_face, set_time_face,
}; };

1
movement_faces.h
View File

@@ -27,6 +27,7 @@
#include "clock_face.h" #include "clock_face.h"
#include "beats_face.h" #include "beats_face.h"
#include "world_clock_face.h" #include "world_clock_face.h"
#include "advanced_alarm_face.h"
#include "countdown_face.h" #include "countdown_face.h"
#include "fast_stopwatch_face.h" #include "fast_stopwatch_face.h"
#include "set_time_face.h" #include "set_time_face.h"

1
watch-faces.mk
View File

@@ -2,6 +2,7 @@ SRCS += \
./watch-faces/clock/clock_face.c \ ./watch-faces/clock/clock_face.c \
./watch-faces/clock/beats_face.c \ ./watch-faces/clock/beats_face.c \
./watch-faces/clock/world_clock_face.c \ ./watch-faces/clock/world_clock_face.c \
./watch-faces/complication/advanced_alarm_face.c \
./watch-faces/complication/countdown_face.c \ ./watch-faces/complication/countdown_face.c \
./watch-faces/complication/fast_stopwatch_face.c \ ./watch-faces/complication/fast_stopwatch_face.c \
./watch-faces/settings/set_time_face.c \ ./watch-faces/settings/set_time_face.c \

40
movement/watch_faces/complication/alarm_face.c → watch-faces/complication/advanced_alarm_face.c
View File

@@ -25,10 +25,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "alarm_face.h" #include "advanced_alarm_face.h"
#include "watch.h" #include "watch.h"
#include "watch_utility.h" #include "watch_utility.h"
#include "watch_private_display.h" #include "watch_common_display.h"
#include "delay.h"
typedef enum { typedef enum {
alarm_setting_idx_alarm, alarm_setting_idx_alarm,
@@ -43,7 +44,13 @@ static const char _dow_strings[ALARM_DAY_STATES + 1][2] ={"AL", "MO", "TU", "WE"
static const uint8_t _blink_idx[ALARM_SETTING_STATES] = {2, 0, 4, 6, 8, 9}; static const uint8_t _blink_idx[ALARM_SETTING_STATES] = {2, 0, 4, 6, 8, 9};
static const uint8_t _blink_idx2[ALARM_SETTING_STATES] = {3, 1, 5, 7, 8, 9}; static const uint8_t _blink_idx2[ALARM_SETTING_STATES] = {3, 1, 5, 7, 8, 9};
static const watch_buzzer_note_t _buzzer_notes[3] = {BUZZER_NOTE_B6, BUZZER_NOTE_C8, BUZZER_NOTE_A8}; static const watch_buzzer_note_t _buzzer_notes[3] = {BUZZER_NOTE_B6, BUZZER_NOTE_C8, BUZZER_NOTE_A8};
// Volume is indicated by the three segments 5D, 5G and 5A
#ifdef USE_CUSTOM_LCD
static const uint8_t _buzzer_segdata[3][2] = {{1, 5}, {2, 5}, {3, 10}};
#else
static const uint8_t _buzzer_segdata[3][2] = {{0, 3}, {1, 3}, {2, 2}}; static const uint8_t _buzzer_segdata[3][2] = {{0, 3}, {1, 3}, {2, 2}};
#endif
static int8_t _wait_ticks; static int8_t _wait_ticks;
@@ -63,8 +70,9 @@ static void _alarm_set_signal(alarm_state_t *state) {
watch_clear_indicator(WATCH_INDICATOR_SIGNAL); watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
} }
static void _alarm_face_draw(alarm_state_t *state, uint8_t subsecond) { static void _advanced_alarm_face_draw(alarm_state_t *state, uint8_t subsecond) {
char buf[12]; char buf[12];
bool set_leading_zero = movement_clock_mode_24h() == MOVEMENT_CLOCK_MODE_024H;
uint8_t i = 0; uint8_t i = 0;
if (state->is_setting) { if (state->is_setting) {
@@ -94,14 +102,14 @@ static void _alarm_face_draw(alarm_state_t *state, uint8_t subsecond) {
if (state->is_setting && subsecond % 2 && state->setting_state < alarm_setting_idx_pitch && !state->alarm_quick_ticks) { if (state->is_setting && subsecond % 2 && state->setting_state < alarm_setting_idx_pitch && !state->alarm_quick_ticks) {
buf[_blink_idx[state->setting_state]] = buf[_blink_idx2[state->setting_state]] = ' '; buf[_blink_idx[state->setting_state]] = buf[_blink_idx2[state->setting_state]] = ' ';
} }
watch_display_string(buf, 0); watch_display_text(WATCH_POSITION_FULL, buf);
if (state->is_setting) { if (state->is_setting) {
// draw pitch level indicator // draw pitch level indicator
if ((subsecond % 2) == 0 || (state->setting_state != alarm_setting_idx_pitch)) { if ((subsecond % 2) == 0 || (state->setting_state != alarm_setting_idx_pitch)) {
for (i = 0; i <= state->alarm[state->alarm_idx].pitch && i < 3; i++) for (i = 0; i <= state->alarm[state->alarm_idx].pitch && i < 3; i++)
watch_set_pixel(_buzzer_segdata[i][0], _buzzer_segdata[i][1]); watch_set_pixel(_buzzer_segdata[i][0], _buzzer_segdata[i][1]);
} }
// draw beep rounds indicator // draw beep rounds indicator
if ((subsecond % 2) == 0 || (state->setting_state != alarm_setting_idx_beeps)) { if ((subsecond % 2) == 0 || (state->setting_state != alarm_setting_idx_beeps)) {
if (state->alarm[state->alarm_idx].beeps == ALARM_MAX_BEEP_ROUNDS - 1) if (state->alarm[state->alarm_idx].beeps == ALARM_MAX_BEEP_ROUNDS - 1)
@@ -123,13 +131,13 @@ static void _alarm_initiate_setting(alarm_state_t *state, uint8_t subsecond) {
state->is_setting = true; state->is_setting = true;
state->setting_state = 0; state->setting_state = 0;
movement_request_tick_frequency(4); movement_request_tick_frequency(4);
_alarm_face_draw(state, subsecond); _advanced_alarm_face_draw(state, subsecond);
} }
static void _alarm_resume_setting(alarm_state_t *state, uint8_t subsecond) { static void _alarm_resume_setting(alarm_state_t *state, uint8_t subsecond) {
state->is_setting = false; state->is_setting = false;
movement_request_tick_frequency(1); movement_request_tick_frequency(1);
_alarm_face_draw(state, subsecond); _advanced_alarm_face_draw(state, subsecond);
} }
static void _alarm_update_alarm_enabled(alarm_state_t *state) { static void _alarm_update_alarm_enabled(alarm_state_t *state) {
@@ -199,7 +207,7 @@ static void _abort_quick_ticks(alarm_state_t *state) {
} }
} }
void alarm_face_setup(uint8_t watch_face_index, void **context_ptr) { void advanced_alarm_face_setup(uint8_t watch_face_index, void **context_ptr) {
(void) watch_face_index; (void) watch_face_index;
if (*context_ptr == NULL) { if (*context_ptr == NULL) {
@@ -217,12 +225,12 @@ void alarm_face_setup(uint8_t watch_face_index, void **context_ptr) {
} }
} }
void alarm_face_activate(void *context) { void advanced_alarm_face_activate(void *context) {
(void) context; (void) context;
watch_set_colon(); watch_set_colon();
} }
void alarm_face_resign(void *context) { void advanced_alarm_face_resign(void *context) {
alarm_state_t *state = (alarm_state_t *)context; alarm_state_t *state = (alarm_state_t *)context;
state->is_setting = false; state->is_setting = false;
_alarm_update_alarm_enabled(state); _alarm_update_alarm_enabled(state);
@@ -232,7 +240,7 @@ void alarm_face_resign(void *context) {
movement_request_tick_frequency(1); movement_request_tick_frequency(1);
} }
movement_watch_face_advisory_t alarm_face_advise(void *context) { movement_watch_face_advisory_t advanced_alarm_face_advise(void *context) {
alarm_state_t *state = (alarm_state_t *)context; alarm_state_t *state = (alarm_state_t *)context;
movement_watch_face_advisory_t retval = { 0 }; movement_watch_face_advisory_t retval = { 0 };
@@ -246,7 +254,7 @@ movement_watch_face_advisory_t alarm_face_advise(void *context) {
if (state->alarm[i].minute == now.unit.minute) { if (state->alarm[i].minute == now.unit.minute) {
if (state->alarm[i].hour == now.unit.hour) { if (state->alarm[i].hour == now.unit.hour) {
state->alarm_playing_idx = i; state->alarm_playing_idx = i;
if (state->alarm[i].day == ALARM_DAY_EACH_DAY || state->alarm[i].day == ALARM_DAY_ONE_TIME) return true; if (state->alarm[i].day == ALARM_DAY_EACH_DAY || state->alarm[i].day == ALARM_DAY_ONE_TIME) retval.wants_background_task = true;
uint8_t weekday_idx = _get_weekday_idx(now); uint8_t weekday_idx = _get_weekday_idx(now);
if (state->alarm[i].day == weekday_idx) retval.wants_background_task = true; if (state->alarm[i].day == weekday_idx) retval.wants_background_task = true;
if (state->alarm[i].day == ALARM_DAY_WORKDAY && weekday_idx < 5) retval.wants_background_task = true; if (state->alarm[i].day == ALARM_DAY_WORKDAY && weekday_idx < 5) retval.wants_background_task = true;
@@ -268,7 +276,7 @@ movement_watch_face_advisory_t alarm_face_advise(void *context) {
return retval; return retval;
} }
bool alarm_face_loop(movement_event_t event, void *context) { bool advanced_alarm_face_loop(movement_event_t event, void *context) {
alarm_state_t *state = (alarm_state_t *)context; alarm_state_t *state = (alarm_state_t *)context;
switch (event.event_type) { switch (event.event_type) {
@@ -296,7 +304,7 @@ bool alarm_face_loop(movement_event_t event, void *context) {
} }
// fall through // fall through
case EVENT_ACTIVATE: case EVENT_ACTIVATE:
_alarm_face_draw(state, event.subsecond); _advanced_alarm_face_draw(state, event.subsecond);
break; break;
case EVENT_LIGHT_BUTTON_UP: case EVENT_LIGHT_BUTTON_UP:
if (!state->is_setting) { if (!state->is_setting) {
@@ -362,7 +370,7 @@ bool alarm_face_loop(movement_event_t event, void *context) {
// auto enable an alarm if user sets anything // auto enable an alarm if user sets anything
if (state->setting_state > alarm_setting_idx_alarm) state->alarm[state->alarm_idx].enabled = true; if (state->setting_state > alarm_setting_idx_alarm) state->alarm[state->alarm_idx].enabled = true;
} }
_alarm_face_draw(state, event.subsecond); _advanced_alarm_face_draw(state, event.subsecond);
break; break;
case EVENT_ALARM_LONG_PRESS: case EVENT_ALARM_LONG_PRESS:
if (!state->is_setting) { if (!state->is_setting) {
@@ -387,7 +395,7 @@ bool alarm_face_loop(movement_event_t event, void *context) {
break; break;
} }
} }
_alarm_face_draw(state, event.subsecond); _advanced_alarm_face_draw(state, event.subsecond);
break; break;
case EVENT_ALARM_LONG_UP: case EVENT_ALARM_LONG_UP:
if (state->is_setting) { if (state->is_setting) {

30
movement/watch_faces/complication/alarm_face.h → watch-faces/complication/advanced_alarm_face.h
View File

@@ -24,11 +24,11 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef ALARM_FACE_H_ #ifndef ADVANCED_ALARM_FACE_H_
#define ALARM_FACE_H_ #define ADVANCED_ALARM_FACE_H_
/* /*
* ALARM face * Advanced Alarm face
* *
* Implements up to 16 alarm slots on the sensor watch * Implements up to 16 alarm slots on the sensor watch
* *
@@ -85,18 +85,18 @@ typedef struct {
} alarm_state_t; } alarm_state_t;
void alarm_face_setup(uint8_t watch_face_index, void ** context_ptr); void advanced_alarm_face_setup(uint8_t watch_face_index, void ** context_ptr);
void alarm_face_activate(void *context); void advanced_alarm_face_activate(void *context);
bool alarm_face_loop(movement_event_t event, void *context); bool advanced_alarm_face_loop(movement_event_t event, void *context);
void alarm_face_resign(void *context); void advanced_alarm_face_resign(void *context);
movement_watch_face_advisory_t alarm_face_advise(void *context); movement_watch_face_advisory_t advanced_alarm_face_advise(void *context);
#define alarm_face ((const watch_face_t){ \ #define advanced_alarm_face ((const watch_face_t){ \
alarm_face_setup, \ advanced_alarm_face_setup, \
alarm_face_activate, \ advanced_alarm_face_activate, \
alarm_face_loop, \ advanced_alarm_face_loop, \
alarm_face_resign, \ advanced_alarm_face_resign, \
alarm_face_advise, \ advanced_alarm_face_advise, \
}) })
#endif // ALARM_FACE_H_ #endif // ADVANCED_ALARM_FACE_H_