Minor fixes to settings faces to work with the new rtc mode
This commit is contained in:
@@ -106,7 +106,7 @@ static void finetune_adjust_subseconds(int delta) {
|
||||
watch_rtc_enable(false);
|
||||
delay_ms(delta);
|
||||
if (delta > 500) {
|
||||
watch_date_time_t date_time = watch_rtc_get_date_time();
|
||||
watch_date_time_t date_time = movement_get_utc_date_time();
|
||||
date_time.unit.second = (date_time.unit.second + 1) % 60;
|
||||
if (date_time.unit.second == 0) { // Overflow
|
||||
date_time.unit.minute = (date_time.unit.minute + 1) % 60;
|
||||
@@ -116,7 +116,7 @@ static void finetune_adjust_subseconds(int delta) {
|
||||
date_time.unit.day++;
|
||||
}
|
||||
}
|
||||
watch_rtc_set_date_time(date_time);
|
||||
movement_set_utc_date_time(date_time);
|
||||
}
|
||||
watch_rtc_enable(true);
|
||||
}
|
||||
|
||||
@@ -108,10 +108,6 @@ bool set_time_face_loop(movement_event_t event, void *context) {
|
||||
case EVENT_ALARM_LONG_UP:
|
||||
_abort_quick_ticks();
|
||||
break;
|
||||
case EVENT_MODE_BUTTON_UP:
|
||||
_abort_quick_ticks();
|
||||
movement_move_to_next_face();
|
||||
return false;
|
||||
case EVENT_LIGHT_BUTTON_DOWN:
|
||||
current_page = (current_page + 1) % SET_TIME_FACE_NUM_SETTINGS;
|
||||
*((uint8_t *)context) = current_page;
|
||||
@@ -187,6 +183,6 @@ bool set_time_face_loop(movement_event_t event, void *context) {
|
||||
|
||||
void set_time_face_resign(void *context) {
|
||||
(void) context;
|
||||
watch_set_led_off();
|
||||
movement_store_settings();
|
||||
movement_request_tick_frequency(1);
|
||||
}
|
||||
|
||||
@@ -322,7 +322,7 @@ bool settings_face_loop(movement_event_t event, void *context) {
|
||||
case EVENT_MODE_BUTTON_UP:
|
||||
movement_force_led_off();
|
||||
movement_move_to_next_face();
|
||||
return false;
|
||||
return true;
|
||||
case EVENT_ALARM_BUTTON_UP:
|
||||
state->settings_screens[state->current_page].advance();
|
||||
break;
|
||||
@@ -339,7 +339,7 @@ bool settings_face_loop(movement_event_t event, void *context) {
|
||||
movement_force_led_on(color.red | color.red << 4,
|
||||
color.green | color.green << 4,
|
||||
color.blue | color.blue << 4);
|
||||
return false;
|
||||
return true;
|
||||
} else {
|
||||
movement_force_led_off();
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user