Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advanced clock #373

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b6120d7
movement/faces: add clock_face
matheusmoreira Feb 24, 2024
6230fd6
faces/clock: move structure definition
matheusmoreira Feb 24, 2024
90ea9ac
faces/clock: define general indication function
matheusmoreira Feb 24, 2024
4580600
faces/clock: simplify alarm indication function
matheusmoreira Feb 24, 2024
e84c524
faces/clock: simplify signal indication function
matheusmoreira Feb 24, 2024
3c635ae
faces/clock: simplify 24h indication function
matheusmoreira Feb 24, 2024
d9fda5d
faces/clock: simplify PM indication function
matheusmoreira Feb 24, 2024
5a94467
faces/clock: refactor daily battery check
matheusmoreira Feb 25, 2024
b5513a0
faces/clock: simplify LAP indication function
matheusmoreira Feb 25, 2024
f508cac
faces/clock: refactor low power tick function
matheusmoreira Feb 25, 2024
86dcdad
faces/clock: refactor tick tock animation code
matheusmoreira Feb 25, 2024
a86ccdc
faces/clock: refactor full time display code
matheusmoreira Feb 25, 2024
dd7438d
faces/clock: refactor partial time display code
matheusmoreira Feb 25, 2024
01dd94a
faces/clock: reorder periodic battery check
matheusmoreira Feb 25, 2024
558ad70
faces/clock: refactor clock display code
matheusmoreira Feb 25, 2024
d9f2c88
faces/clock: refactor time signal toggling code
matheusmoreira Feb 25, 2024
4bbc44b
faces/clock: indicate alarm only when necessary
matheusmoreira Feb 25, 2024
115720b
faces/clock: indicate low power only when needed
matheusmoreira Feb 25, 2024
3e475f4
faces/clock: update copyrights and credits
matheusmoreira Feb 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions movement/make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ SRCS += \
../movement.c \
../filesystem.c \
../watch_faces/clock/simple_clock_face.c \
../watch_faces/clock/clock_face.c \
../watch_faces/clock/world_clock_face.c \
../watch_faces/clock/beats_face.c \
../watch_faces/clock/weeknumber_clock_face.c \
Expand Down
1 change: 1 addition & 0 deletions movement/movement_faces.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#define MOVEMENT_FACES_H_

#include "simple_clock_face.h"
#include "clock_face.h"
#include "world_clock_face.h"
#include "preferences_face.h"
#include "set_time_face.h"
Expand Down
282 changes: 282 additions & 0 deletions movement/watch_faces/clock/clock_face.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
/* SPDX-License-Identifier: MIT */

/*
* MIT License
*
* Copyright © 2021-2023 Joey Castillo <joeycastillo@utexas.edu> <jose.castillo@gmail.com>
* Copyright © 2022 David Keck <davidskeck@users.noreply.github.com>
* Copyright © 2022 TheOnePerson <a.nebinger@web.de>
* Copyright © 2023 Jeremy O'Brien <neutral@fastmail.com>
* Copyright © 2023 Mikhail Svarichevsky <3@14.by>
* Copyright © 2023 Wesley Aptekar-Cassels <me@wesleyac.com>
* Copyright © 2024 Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#include <stdlib.h>
#include "clock_face.h"
#include "watch.h"
#include "watch_utility.h"
#include "watch_private_display.h"

// 2.2 volts will happen when the battery has maybe 5-10% remaining?
// we can refine this later.
#ifndef CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD
#define CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD 2200
#endif

typedef struct {
struct {
watch_date_time previous;
} date_time;
uint8_t last_battery_check;
uint8_t watch_face_index;
bool time_signal_enabled;
bool battery_low;
} clock_state_t;

static void clock_indicate(WatchIndicatorSegment indicator, bool on) {
if (on) {
watch_set_indicator(indicator);
} else {
watch_clear_indicator(indicator);
}
}

static void clock_indicate_alarm(movement_settings_t *settings) {
clock_indicate(WATCH_INDICATOR_BELL, settings->bit.alarm_enabled);
}

static void clock_indicate_time_signal(clock_state_t *clock) {
clock_indicate(WATCH_INDICATOR_SIGNAL, clock->time_signal_enabled);
}

static void clock_indicate_24h(movement_settings_t *settings) {
clock_indicate(WATCH_INDICATOR_24H, settings->bit.clock_mode_24h);
}

static bool clock_is_pm(watch_date_time date_time) {
return date_time.unit.hour >= 12;
}

static void clock_indicate_pm(movement_settings_t *settings, watch_date_time date_time) {
if (settings->bit.clock_mode_24h) { return; }
clock_indicate(WATCH_INDICATOR_PM, clock_is_pm(date_time));
}

static void clock_indicate_low_available_power(clock_state_t *clock) {
// Set the LAP indicator if battery power is low
clock_indicate(WATCH_INDICATOR_LAP, clock->battery_low);
}

static watch_date_time clock_24h_to_12h(watch_date_time date_time) {
date_time.unit.hour %= 12;

if (date_time.unit.hour == 0) {
date_time.unit.hour = 12;
}

return date_time;
}

static void clock_check_battery_periodically(clock_state_t *clock, watch_date_time date_time) {
// check the battery voltage once a day
if (date_time.unit.day == clock->last_battery_check) { return; }

clock->last_battery_check = date_time.unit.day;

watch_enable_adc();
uint16_t voltage = watch_get_vcc_voltage();
watch_disable_adc();

clock->battery_low = voltage < CLOCK_FACE_LOW_BATTERY_VOLTAGE_THRESHOLD;

clock_indicate_low_available_power(clock);
}

static void clock_toggle_time_signal(clock_state_t *clock) {
clock->time_signal_enabled = !clock->time_signal_enabled;
clock_indicate_time_signal(clock);
}

static void clock_display_all(watch_date_time date_time) {
char buf[10 + 1];

snprintf(
buf,
sizeof(buf),
"%s%2d%2d%02d%02d",
watch_utility_get_weekday(date_time),
date_time.unit.day,
date_time.unit.hour,
date_time.unit.minute,
date_time.unit.second
);

watch_display_string(buf, 0);
}

static bool clock_display_some(watch_date_time current, watch_date_time previous) {
if ((current.reg >> 6) == (previous.reg >> 6)) {
// everything before seconds is the same, don't waste cycles setting those segments.

watch_display_character_lp_seconds('0' + current.unit.second / 10, 8);
watch_display_character_lp_seconds('0' + current.unit.second % 10, 9);

return true;

} else if ((current.reg >> 12) == (previous.reg >> 12)) {
// everything before minutes is the same.

char buf[4 + 1];

snprintf(
buf,
sizeof(buf),
"%02d%02d",
current.unit.minute,
current.unit.second
);

watch_display_string(buf, 6);

return true;

} else {
// other stuff changed; let's do it all.
return false;
}
}

static void clock_display_clock(movement_settings_t *settings, clock_state_t *clock, watch_date_time current) {
if (!clock_display_some(current, clock->date_time.previous)) {
if (!settings->bit.clock_mode_24h) {
// if we are in 12 hour mode, do some cleanup.
clock_indicate_pm(settings, current);
current = clock_24h_to_12h(current);
}
clock_display_all(current);
}
}

static void clock_display_low_energy(watch_date_time date_time) {
char buf[10 + 1];

snprintf(
buf,
sizeof(buf),
"%s%2d%2d%02d ",
watch_utility_get_weekday(date_time),
date_time.unit.day,
date_time.unit.hour,
date_time.unit.minute
);

watch_display_string(buf, 0);
}

static void clock_start_tick_tock_animation(void) {
if (!watch_tick_animation_is_running()) {
watch_start_tick_animation(500);
}
}

static void clock_stop_tick_tock_animation(void) {
if (watch_tick_animation_is_running()) {
watch_stop_tick_animation();
}
}

void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
(void) settings;
(void) watch_face_index;

if (*context_ptr == NULL) {
*context_ptr = malloc(sizeof(clock_state_t));
clock_state_t *state = (clock_state_t *) *context_ptr;
state->time_signal_enabled = false;
state->watch_face_index = watch_face_index;
}
}

void clock_face_activate(movement_settings_t *settings, void *context) {
clock_state_t *clock = (clock_state_t *) context;

clock_stop_tick_tock_animation();

clock_indicate_time_signal(clock);
clock_indicate_alarm(settings);
clock_indicate_24h(settings);

watch_set_colon();

// this ensures that none of the timestamp fields will match, so we can re-render them all.
clock->date_time.previous.reg = 0xFFFFFFFF;
}

bool clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
clock_state_t *state = (clock_state_t *) context;
watch_date_time current;

switch (event.event_type) {
case EVENT_LOW_ENERGY_UPDATE:
clock_start_tick_tock_animation();
clock_display_low_energy(watch_rtc_get_date_time());
break;
case EVENT_TICK:
case EVENT_ACTIVATE:
current = watch_rtc_get_date_time();

clock_display_clock(settings, state, current);

clock_check_battery_periodically(state, current);

state->date_time.previous = current;

break;
case EVENT_ALARM_LONG_PRESS:
clock_toggle_time_signal(state);
break;
case EVENT_BACKGROUND_TASK:
// uncomment this line to snap back to the clock face when the hour signal sounds:
// movement_move_to_face(state->watch_face_index);
movement_play_signal();
break;
default:
return movement_default_loop_handler(event, settings);
}

return true;
}

void clock_face_resign(movement_settings_t *settings, void *context) {
(void) settings;
(void) context;
}

bool clock_face_wants_background_task(movement_settings_t *settings, void *context) {
(void) settings;
clock_state_t *state = (clock_state_t *) context;
if (!state->time_signal_enabled) return false;

watch_date_time date_time = watch_rtc_get_date_time();

return date_time.unit.minute == 0;
}
60 changes: 60 additions & 0 deletions movement/watch_faces/clock/clock_face.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/* SPDX-License-Identifier: MIT */

/*
* MIT License
*
* Copyright © 2021-2022 Joey Castillo <joeycastillo@utexas.edu> <jose.castillo@gmail.com>
* Copyright © 2022 Alexsander Akers <me@a2.io>
* Copyright © 2022 TheOnePerson <a.nebinger@web.de>
* Copyright © 2023 Alex Utter <ooterness@gmail.com>
* Copyright © 2024 Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

#ifndef CLOCK_FACE_H_
#define CLOCK_FACE_H_

/*
* CLOCK FACE
*
* Displays the current local time, just like the original watch.
* This is the default display mode in most watch configurations.
*
* Long-press ALARM to toggle the hourly chime.
*
*/

#include "movement.h"

void clock_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
void clock_face_activate(movement_settings_t *settings, void *context);
bool clock_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
void clock_face_resign(movement_settings_t *settings, void *context);
bool clock_face_wants_background_task(movement_settings_t *settings, void *context);

#define clock_face ((const watch_face_t) { \
clock_face_setup, \
clock_face_activate, \
clock_face_loop, \
clock_face_resign, \
clock_face_wants_background_task, \
})

#endif // CLOCK_FACE_H_
Loading