summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheOnePerson <a.nebinger@web.de>2023-01-11 21:05:43 +0100
committerGitHub <noreply@github.com>2023-01-11 15:05:43 -0500
commitca7e70442930ad24285385291dc98c1437b9881b (patch)
treeb3441683bda98df724a569f7382ffe552709b93a
parent05a539ab523dc4d92f2d2bfcf14b06abe11bf195 (diff)
downloadSensor-Watch-ca7e70442930ad24285385291dc98c1437b9881b.tar.gz
Sensor-Watch-ca7e70442930ad24285385291dc98c1437b9881b.tar.bz2
Sensor-Watch-ca7e70442930ad24285385291dc98c1437b9881b.zip
Add quick counting through hours, minutes, etc. to set time face. (#131)
* set time face: add quick cycling through hours, minutes, etc. and handle February 29th properly * set time face: add failsafe for "hanging" quick cycle mode * set time face: get rid of compiler warning * set time face: Fix typo and indentation errors
-rw-r--r--movement/watch_faces/settings/set_time_face.c103
1 files changed, 70 insertions, 33 deletions
diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index 1605f119..f6ac4935 100644
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -29,6 +29,55 @@
#define SET_TIME_FACE_NUM_SETTINGS (7)
const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "M1", "SE", "YR", "MO", "DA", "ZO"};
+static bool _quick_ticks_running;
+
+static void _handle_alarm_button(movement_settings_t *settings, watch_date_time date_time, uint8_t current_page) {
+ // handles short or long pressing of the alarm button
+ const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
+
+ switch (current_page) {
+ case 0: // hour
+ date_time.unit.hour = (date_time.unit.hour + 1) % 24;
+ break;
+ case 1: // minute
+ date_time.unit.minute = (date_time.unit.minute + 1) % 60;
+ break;
+ case 2: // second
+ date_time.unit.second = 0;
+ break;
+ case 3: // year
+ // only allow 2021-2030. fix this sometime next decade
+ date_time.unit.year = ((date_time.unit.year % 10) + 1);
+ break;
+ case 4: // month
+ date_time.unit.month = (date_time.unit.month % 12) + 1;
+ break;
+ case 5: { // day
+ uint32_t tmp_day = date_time.unit.day; // use a temporary variable to avoid messing up the months
+ tmp_day = tmp_day + 1;
+ // handle February 29th on a leap year
+ if (((tmp_day > days_in_month[date_time.unit.month - 1]) && (date_time.unit.month != 2 || (date_time.unit.year % 4) != 0))
+ || (date_time.unit.month == 2 && (date_time.unit.year % 4) == 0 && tmp_day > 29)) {
+ tmp_day = 1;
+ }
+ date_time.unit.day = tmp_day;
+ break;
+ }
+ case 6: // time zone
+ settings->bit.time_zone++;
+ if (settings->bit.time_zone > 40) settings->bit.time_zone = 0;
+ break;
+ }
+ watch_rtc_set_date_time(date_time);
+}
+
+static void _abort_quick_ticks() {
+ if (_quick_ticks_running) {
+ _quick_ticks_running = false;
+ movement_request_tick_frequency(4);
+ }
+}
+
void set_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
(void) settings;
(void) watch_face_index;
@@ -39,15 +88,31 @@ void set_time_face_activate(movement_settings_t *settings, void *context) {
(void) settings;
*((uint8_t *)context) = 0;
movement_request_tick_frequency(4);
+ _quick_ticks_running = false;
}
bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
uint8_t current_page = *((uint8_t *)context);
- const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
watch_date_time date_time = watch_rtc_get_date_time();
switch (event.event_type) {
+ case EVENT_TICK:
+ if (_quick_ticks_running) {
+ if (watch_get_pin_level(BTN_ALARM)) _handle_alarm_button(settings, date_time, current_page);
+ else _abort_quick_ticks();
+ }
+ break;
+ case EVENT_ALARM_LONG_PRESS:
+ if (current_page != 2) {
+ _quick_ticks_running = true;
+ movement_request_tick_frequency(8);
+ }
+ break;
+ 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_UP:
@@ -55,39 +120,11 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
*((uint8_t *)context) = current_page;
break;
case EVENT_ALARM_BUTTON_UP:
- switch (current_page) {
- case 0: // hour
- date_time.unit.hour = (date_time.unit.hour + 1) % 24;
- break;
- case 1: // minute
- date_time.unit.minute = (date_time.unit.minute + 1) % 60;
- break;
- case 2: // second
- date_time.unit.second = 0;
- break;
- case 3: // year
- // only allow 2021-2050. fix this if we make it that far.
- date_time.unit.year = ((date_time.unit.year % 30) + 1);
- break;
- case 4: // month
- date_time.unit.month = (date_time.unit.month % 12) + 1;
- break;
- case 5: // day
- date_time.unit.day = date_time.unit.day + 1;
- // can't set to the 29th on a leap year. if it's february 29, set to 11:59 on the 28th.
- // and it should roll over.
- if (date_time.unit.day > days_in_month[date_time.unit.month - 1]) {
- date_time.unit.day = 1;
- }
- break;
- case 6: // time zone
- settings->bit.time_zone++;
- if (settings->bit.time_zone > 40) settings->bit.time_zone = 0;
- break;
- }
- watch_rtc_set_date_time(date_time);
+ _abort_quick_ticks();
+ _handle_alarm_button(settings, date_time, current_page);
break;
case EVENT_TIMEOUT:
+ _abort_quick_ticks();
movement_move_to_face(0);
break;
default:
@@ -121,7 +158,7 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
}
// blink up the parameter we're setting
- if (event.subsecond % 2) {
+ if (event.subsecond % 2 && !_quick_ticks_running) {
switch (current_page) {
case 0:
case 3: