Cleanup to the default branch

This commit is contained in:
David Volovskiy 2024-08-03 10:08:24 -04:00
parent e50390b673
commit aebea960c0
3 changed files with 3 additions and 2 deletions

View file

@ -458,7 +458,6 @@ int16_t get_timezone_offset(uint8_t timezone_idx, watch_date_time date_time) {
} }
void app_init(void) { void app_init(void) {
const int16_t* timezone_offsets;
#if defined(NO_FREQCORR) #if defined(NO_FREQCORR)
watch_rtc_freqcorr_write(0, 0); watch_rtc_freqcorr_write(0, 0);
#elif defined(WATCH_IS_BLUE_BOARD) #elif defined(WATCH_IS_BLUE_BOARD)
@ -485,6 +484,7 @@ void app_init(void) {
filesystem_init(); filesystem_init();
#if __EMSCRIPTEN__ #if __EMSCRIPTEN__
const int16_t* timezone_offsets;
int32_t time_zone_offset = EM_ASM_INT({ int32_t time_zone_offset = EM_ASM_INT({
return -new Date().getTimezoneOffset(); return -new Date().getTimezoneOffset();
}); });

View file

@ -151,6 +151,7 @@ void simple_clock_face_resign(movement_settings_t *settings, void *context) {
} }
bool simple_clock_face_wants_background_task(movement_settings_t *settings, void *context) { bool simple_clock_face_wants_background_task(movement_settings_t *settings, void *context) {
(void) settings;
simple_clock_state_t *state = (simple_clock_state_t *)context; simple_clock_state_t *state = (simple_clock_state_t *)context;
watch_date_time date_time = watch_rtc_get_date_time(); watch_date_time date_time = watch_rtc_get_date_time();
uint8_t hour_dst = check_and_act_on_daylight_savings(date_time); uint8_t hour_dst = check_and_act_on_daylight_savings(date_time);

View file

@ -134,7 +134,7 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
return movement_default_loop_handler(event, settings); return movement_default_loop_handler(event, settings);
} }
char buf[11]; char buf[13];
if (current_page < 3) { if (current_page < 3) {
watch_set_colon(); watch_set_colon();
if (settings->bit.clock_mode_24h) { if (settings->bit.clock_mode_24h) {