fern/sensor-watch
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/Sensor-Watch.git synced 2024-11-22 19:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more cleanup

Browse source
This commit is contained in:
David Volovskiy 2024-08-02 17:57:29 -04:00
parent bae8c65825
commit fa2907e098
5 changed files with 76 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
movement/movement.c
View file

@ -96,6 +96,11 @@
#define MOVEMENT_DEFAULT_LED_DURATION 1 #define MOVEMENT_DEFAULT_LED_DURATION 1
#endif #endif
// Default to having DST get set
#ifndef MOVEMENT_DEFAULT_DST_ACTIVE
#define MOVEMENT_DEFAULT_DST_ACTIVE true
#endif
#if __EMSCRIPTEN__ #if __EMSCRIPTEN__
#include <emscripten.h> #include <emscripten.h>
#endif #endif
@ -107,7 +112,8 @@ const int32_t movement_le_inactivity_deadlines[8] = {INT_MAX, 600, 3600, 7200, 2
const int16_t movement_timeout_inactivity_deadlines[4] = {60, 120, 300, 1800}; const int16_t movement_timeout_inactivity_deadlines[4] = {60, 120, 300, 1800};
movement_event_t event; movement_event_t event;
const int16_t movement_timezone_offsets[] = { #define NUM_TIME_ZONES 41
const int16_t movement_timezone_offsets[NUM_TIME_ZONES] = {
0, // 0 : 0:00:00 (UTC) 0, // 0 : 0:00:00 (UTC)
60, // 1 : 1:00:00 (Central European Time) 60, // 1 : 1:00:00 (Central European Time)
120, // 2 : 2:00:00 (South African Standard Time) 120, // 2 : 2:00:00 (South African Standard Time)
@ -164,47 +170,47 @@ const int16_t movement_timezone_offsets[] = {
* having to separately change the hour and timezone info * having to separately change the hour and timezone info
* in the time set face. * in the time set face.
*/ */
const uint8_t movement_dst_jump_table[] = { const int16_t movement_timezone_dst_offsets[NUM_TIME_ZONES] = {
1, // 0 UTC + 1 = CET 60, // 0 UTC + 1 = CET
2, // 1 CET + 1 = SAST 120, // 1 CET + 1 = SAST
3, // 2 SAST + 1 = AST 189, // 2 SAST + 1 = AST
5, // 3 AST + 1 = GST 240, // 3 AST + 1 = GST
6, // 4 IST + 1 = AT 270, // 4 IST + 1 = AT
7, // 5 GST + 1 = PST 300, // 5 GST + 1 = PST
8, // 6 AT + 1 = IST 330, // 6 AT + 1 = IST
10, // 7 PST + 1 = KT 360, // 7 PST + 1 = KT
11, // 8 IST + 1 = MT 390, // 8 IST + 1 = MT
9, // 9 Nepal has no equivalent DST timezone, but they don't observe DST anyway 345, // 9 Nepal has no equivalent DST timezone, but they don't observe DST anyway
12, // 10 KT + 1 = TST 420, // 10 KT + 1 = TST
11, // 11 Myanmar has no equivalent DST timezone, but they don't observe DST anyway 390, // 11 Myanmar has no equivalent DST timezone, but they don't observe DST anyway
13, // 12 TST + 1 = CST 480, // 12 TST + 1 = CST
15, // 13 CST + 1 = JST 540, // 13 CST + 1 = JST
14, // 14 ACWST has no equivalent DST timezone, but they don't observe DST anyway 525, // 14 ACWST has no equivalent DST timezone, but they don't observe DST anyway
17, // 15 JST + 1 = AEST 600, // 15 JST + 1 = AEST
18, // 16 ACST + 1 = LHST 630, // 16 ACST + 1 = LHST
19, // 17 AEST + 1 = SIT 660, // 17 AEST + 1 = SIT
18, // 18 LHST has no equivalent DST timezone, but they don't observe DST anyway 630, // 18 LHST has no equivalent DST timezone, but they don't observe DST anyway
20, // 19 SIT + 1 = NZST 720, // 19 SIT + 1 = NZST
22, // 20 NZST + 1 = TT 780, // 20 NZST + 1 = TT
23, // 21 CST + 1 = CDT 825, // 21 CST + 1 = CDT
24, // 22 TT + 1 = LIT 840, // 22 TT + 1 = LIT
23, // 23 CDT is already a daylight timezone 825, // 23 CDT is already a daylight timezone
24, // 24 LIT has no equivalent DST timezone, but they don't observe DST anyway 840, // 24 LIT has no equivalent DST timezone, but they don't observe DST anyway
26, // 25 BIT + 1 = NT -660, // 25 BIT + 1 = NT
27, // 26 NT + 1 = HAST -600, // 26 NT + 1 = HAST
29, // 27 HAST + 1 = AST -540, // 27 HAST + 1 = AST
28, // 28 MIT has no equivalent DST timezone, but they don't observe DST anyway -570, // 28 MIT has no equivalent DST timezone, but they don't observe DST anyway
30, // 29 AST + 1 = PST -480, // 29 AST + 1 = PST
31, // 30 PST + 1 = MST -420, // 30 PST + 1 = MST
32, // 31 MST + 1 = CST -360, // 31 MST + 1 = CST
33, // 32 CST + 1 = EST -300, // 32 CST + 1 = EST
35, // 33 EST + 1 = AST -240, // 33 EST + 1 = AST
36, // 34 VST + 1 = NST -210, // 34 VST + 1 = NST
37, // 35 AST + 1 = BT -180, // 35 AST + 1 = BT
38, // 36 NST + 1 = NDT -150, // 36 NST + 1 = NDT
39, // 37 BT + 1 = 39 -120, // 37 BT + 1 = 39
38, // 38 NDT is already a daylight timezone -150, // 38 NDT is already a daylight timezone
40, // 39 FNT + 1 = AST -60, // 39 FNT + 1 = AST
0 // 40 AST + 1 = UTC 0 // 40 AST + 1 = UTC
}; };
@ -426,20 +432,13 @@ uint8_t movement_claim_backup_register(void) {
int16_t get_timezone_offset(uint8_t timezone_idx, watch_date_time date_time) { int16_t get_timezone_offset(uint8_t timezone_idx, watch_date_time date_time) {
if (!movement_state.settings.bit.dst_active) return movement_timezone_offsets[timezone_idx]; if (!movement_state.settings.bit.dst_active) return movement_timezone_offsets[timezone_idx];
uint8_t dst_result = is_dst(date_time); if (dst_occurring(date_time))
switch (dst_result) return movement_timezone_dst_offsets[timezone_idx];
{ return movement_timezone_offsets[timezone_idx];
case DST_STARTED:
case DST_OCCURRING:
return movement_timezone_offsets[movement_dst_jump_table[timezone_idx]];
case DST_ENDING:
case DST_ENDED:
default:
return movement_timezone_offsets[timezone_idx];
}
} }
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)
@ -457,6 +456,7 @@ void app_init(void) {
movement_state.settings.bit.to_interval = MOVEMENT_DEFAULT_TIMEOUT_INTERVAL; movement_state.settings.bit.to_interval = MOVEMENT_DEFAULT_TIMEOUT_INTERVAL;
movement_state.settings.bit.le_interval = MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL; movement_state.settings.bit.le_interval = MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL;
movement_state.settings.bit.led_duration = MOVEMENT_DEFAULT_LED_DURATION; movement_state.settings.bit.led_duration = MOVEMENT_DEFAULT_LED_DURATION;
movement_state.settings.bit.dst_active = MOVEMENT_DEFAULT_DST_ACTIVE;
movement_state.light_ticks = -1; movement_state.light_ticks = -1;
movement_state.alarm_ticks = -1; movement_state.alarm_ticks = -1;
movement_state.next_available_backup_register = 4; movement_state.next_available_backup_register = 4;
@ -468,8 +468,9 @@ void app_init(void) {
int32_t time_zone_offset = EM_ASM_INT({ int32_t time_zone_offset = EM_ASM_INT({
return -new Date().getTimezoneOffset(); return -new Date().getTimezoneOffset();
}); });
for (int i = 0, count = sizeof(movement_timezone_offsets) / sizeof(movement_timezone_offsets[0]); i < count; i++) { timezone_offsets = dst_occurring(watch_rtc_get_date_time()) ? movement_timezone_dst_offsets : movement_timezone_offsets;
if (movement_timezone_offsets[i] == time_zone_offset) { for (int i = 0; i < NUM_TIME_ZONES; i++) {
if (timezone_offsets[i] == time_zone_offset) {
movement_state.settings.bit.time_zone = i; movement_state.settings.bit.time_zone = i;
break; break;
} }

2
movement/movement.h
View file

@ -129,7 +129,7 @@ typedef struct {
} movement_event_t; } movement_event_t;
extern const int16_t movement_timezone_offsets[]; extern const int16_t movement_timezone_offsets[];
extern const uint8_t movement_dst_jump_table[]; extern const int16_t movement_timezone_dst_offsets[];
extern const char movement_valid_position_0_chars[]; extern const char movement_valid_position_0_chars[];
extern const char movement_valid_position_1_chars[]; extern const char movement_valid_position_1_chars[];

7
movement/movement_config.h
View file

@ -95,4 +95,11 @@ const watch_face_t watch_faces[] = {
*/ */
#define MOVEMENT_DEFAULT_LED_DURATION 1 #define MOVEMENT_DEFAULT_LED_DURATION 1
/* Set if using DST
* Valid values are:
* false: Don't allow the watch to use DST
* true: Allow the watch to use DST
*/
#define MOVEMENT_DEFAULT_DST_ACTIVE true
#endif // MOVEMENT_CONFIG_H_ #endif // MOVEMENT_CONFIG_H_

9
movement/watch_faces/settings/set_time_face.c
View file

@ -25,6 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "set_time_face.h" #include "set_time_face.h"
#include "watch.h" #include "watch.h"
#include "watch_utility.h"
#define SET_TIME_FACE_NUM_SETTINGS (8) #define SET_TIME_FACE_NUM_SETTINGS (8)
const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "M1", "SE", "YR", "MO", "DA", "ZO", "DS"}; const char set_time_face_titles[SET_TIME_FACE_NUM_SETTINGS][3] = {"HR", "M1", "SE", "YR", "MO", "DA", "ZO", "DS"};
@ -150,18 +151,18 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
watch_clear_indicator(WATCH_INDICATOR_PM); watch_clear_indicator(WATCH_INDICATOR_PM);
sprintf(buf, "%s %2d%02d%02d", set_time_face_titles[current_page], date_time.unit.year + 20, date_time.unit.month, date_time.unit.day); sprintf(buf, "%s %2d%02d%02d", set_time_face_titles[current_page], date_time.unit.year + 20, date_time.unit.month, date_time.unit.day);
} else if (current_page < 7) { // zone } else if (current_page < 7) { // zone
char dst_char = (settings->bit.dst_active && dst_occurring(watch_rtc_get_date_time())) ? 'd' : ' ';
if (event.subsecond % 2) { if (event.subsecond % 2) {
watch_clear_colon(); watch_clear_colon();
sprintf(buf, "%s ", set_time_face_titles[current_page]); sprintf(buf, "%s %c", set_time_face_titles[current_page], dst_char);
} else { } else {
int16_t tz = get_timezone_offset(settings->bit.time_zone, date_time); int16_t tz = get_timezone_offset(settings->bit.time_zone, date_time);
watch_set_colon(); watch_set_colon();
sprintf(buf, "%s %3d%02d ", set_time_face_titles[current_page], (int8_t) (tz / 60), (int8_t) (tz % 60) * (tz < 0 ? -1 : 1)); sprintf(buf, "%s %3d%02d %c", set_time_face_titles[current_page], (int8_t) (tz / 60), (int8_t) (tz % 60) * (tz < 0 ? -1 : 1), dst_char);
} }
} else { // daylight savings } else { // daylight savings
watch_clear_colon(); watch_clear_colon();
if (settings->bit.dst_active) sprintf(buf, "%s dsT y", set_time_face_titles[current_page]); sprintf(buf, "%s dsT %c", set_time_face_titles[current_page], settings->bit.dst_active ? 'y' : 'n');
else sprintf(buf, "%s dsT n", set_time_face_titles[current_page]);
} }
// blink up the parameter we're setting // blink up the parameter we're setting

9
watch-library/shared/watch/watch_utility.h
View file

@ -46,7 +46,7 @@ typedef struct {
} watch_duration_t; } watch_duration_t;
typedef enum { typedef enum {
DST_STARTED, DST_STARTING,
DST_OCCURRING, DST_OCCURRING,
DST_ENDING, DST_ENDING,
DST_ENDED DST_ENDED
@ -89,7 +89,12 @@ uint8_t is_leap(uint16_t year);
* @param date_time The watch_date_time that you wish to convert. * @param date_time The watch_date_time that you wish to convert.
* @return DST_OCCURRING, DST_HAPPENING, DST_ENDING, DST_ENDED * @return DST_OCCURRING, DST_HAPPENING, DST_ENDING, DST_ENDED
*/ */
uint8_t is_dst(watch_date_time date_time); uint8_t get_dst_status(watch_date_time date_time);
/** @brief Returns true if it's DST and false otherwise.
* @param date_time The watch_date_time that you wish to convert.
*/
bool dst_occurring(watch_date_time date_time);
/** @brief Returns the UNIX time (seconds since 1970) for a given date/time in UTC. /** @brief Returns the UNIX time (seconds since 1970) for a given date/time in UTC.
* @param date_time The watch_date_time that you wish to convert. * @param date_time The watch_date_time that you wish to convert.