Cleanup to the default branch

diff --git a/movement/movement.c b/movement/movement.c
index eabc29c244ffc728b5388e52c44457f43b2c8605..256aa8a84d33187a7d2545cdc8df054d93d48e03 100644 (file)
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -458,7 +458,6 @@ int16_t get_timezone_offset(uint8_t timezone_idx, watch_date_time date_time) {
 }
 
 void app_init(void) {
-    const int16_t* timezone_offsets;
 #if defined(NO_FREQCORR)
     watch_rtc_freqcorr_write(0, 0);
 #elif defined(WATCH_IS_BLUE_BOARD)
@@ -485,6 +484,7 @@ void app_init(void) {
     filesystem_init();
 
 #if __EMSCRIPTEN__
+    const int16_t* timezone_offsets;
     int32_t time_zone_offset = EM_ASM_INT({
         return -new Date().getTimezoneOffset();
     });

diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
index 3866e2c26d57afaaf6e53306f1f710dbe31f3344..20dfb54479ccc4d1b07f1ea0d28440f77a02c42f 100644 (file)
--- a/movement/watch_faces/clock/simple_clock_face.c
+++ b/movement/watch_faces/clock/simple_clock_face.c
@@ -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) {
+    (void) settings;
     simple_clock_state_t *state = (simple_clock_state_t *)context;
     watch_date_time date_time = watch_rtc_get_date_time();
     uint8_t hour_dst = check_and_act_on_daylight_savings(date_time);

diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index b16cb6d17b24c369142d3be18f2e392492fdbc74..1b19df8d1c3242794be560ef66eb8763940c0ad9 100644 (file)
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -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);
     }
 
-    char buf[11];
+    char buf[13];
     if (current_page < 3) {
         watch_set_colon();
         if (settings->bit.clock_mode_24h) {