Compare commits
3 Commits
48399312be
...
legacy_fix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aeeb62eefd | ||
|
|
0b58ac750e | ||
|
|
45583b3120 |
@@ -55,9 +55,9 @@ static const int hour_switch_index = 8;
|
|||||||
static void _update_alarm_indicator(bool settings_alarm_enabled, close_enough_clock_state_t *state) {
|
static void _update_alarm_indicator(bool settings_alarm_enabled, close_enough_clock_state_t *state) {
|
||||||
state->alarm_enabled = settings_alarm_enabled;
|
state->alarm_enabled = settings_alarm_enabled;
|
||||||
if (state->alarm_enabled) {
|
if (state->alarm_enabled) {
|
||||||
watch_set_indicator(WATCH_INDICATOR_BELL);
|
watch_set_indicator(WATCH_INDICATOR_SIGNAL);
|
||||||
} else {
|
} else {
|
||||||
watch_clear_indicator(WATCH_INDICATOR_BELL);
|
watch_clear_indicator(WATCH_INDICATOR_SIGNAL);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ static void _alarm_update_alarm_enabled(movement_settings_t *settings, alarm_sta
|
|||||||
uint16_t now_minutes_of_day;
|
uint16_t now_minutes_of_day;
|
||||||
uint16_t alarm_minutes_of_day;
|
uint16_t alarm_minutes_of_day;
|
||||||
for (uint8_t i = 0; i < ALARM_ALARMS; i++) {
|
for (uint8_t i = 0; i < ALARM_ALARMS; i++) {
|
||||||
if (state->alarm[i].enabled) {
|
if (state->alarm[i].enabled && state->alarm[i].beeps != 0) {
|
||||||
// figure out if alarm is to go off in the next 24 h
|
// figure out if alarm is to go off in the next 24 h
|
||||||
if (state->alarm[i].day == ALARM_DAY_EACH_DAY || state->alarm[i].day == ALARM_DAY_ONE_TIME) {
|
if (state->alarm[i].day == ALARM_DAY_EACH_DAY || state->alarm[i].day == ALARM_DAY_ONE_TIME) {
|
||||||
active_alarms = true;
|
active_alarms = true;
|
||||||
@@ -235,7 +235,6 @@ void alarm_face_resign(movement_settings_t *settings, 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(settings, state);
|
_alarm_update_alarm_enabled(settings, state);
|
||||||
watch_set_led_off();
|
|
||||||
state->alarm_quick_ticks = false;
|
state->alarm_quick_ticks = false;
|
||||||
_wait_ticks = -1;
|
_wait_ticks = -1;
|
||||||
movement_request_tick_frequency(1);
|
movement_request_tick_frequency(1);
|
||||||
|
|||||||
@@ -330,6 +330,5 @@ bool simon_face_loop(movement_event_t event, movement_settings_t *settings,
|
|||||||
void simon_face_resign(movement_settings_t *settings, void *context) {
|
void simon_face_resign(movement_settings_t *settings, void *context) {
|
||||||
(void)settings;
|
(void)settings;
|
||||||
(void)context;
|
(void)context;
|
||||||
watch_set_led_off();
|
|
||||||
watch_set_buzzer_off();
|
watch_set_buzzer_off();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,10 +60,6 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
|
|||||||
case EVENT_ACTIVATE:
|
case EVENT_ACTIVATE:
|
||||||
// Do nothing; handled below.
|
// Do nothing; handled below.
|
||||||
break;
|
break;
|
||||||
case EVENT_MODE_BUTTON_UP:
|
|
||||||
watch_set_led_off();
|
|
||||||
movement_move_to_next_face();
|
|
||||||
return false;
|
|
||||||
case EVENT_LIGHT_BUTTON_DOWN:
|
case EVENT_LIGHT_BUTTON_DOWN:
|
||||||
current_page = (current_page + 1) % PREFERENCES_FACE_NUM_PREFERENCES;
|
current_page = (current_page + 1) % PREFERENCES_FACE_NUM_PREFERENCES;
|
||||||
*((uint8_t *)context) = current_page;
|
*((uint8_t *)context) = current_page;
|
||||||
@@ -202,7 +198,6 @@ bool preferences_face_loop(movement_event_t event, movement_settings_t *settings
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
watch_set_led_off();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -183,6 +183,5 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
|
|||||||
void set_time_face_resign(movement_settings_t *settings, void *context) {
|
void set_time_face_resign(movement_settings_t *settings, void *context) {
|
||||||
(void) settings;
|
(void) settings;
|
||||||
(void) context;
|
(void) context;
|
||||||
watch_set_led_off();
|
|
||||||
watch_store_backup_data(settings->reg, 0);
|
watch_store_backup_data(settings->reg, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user