hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

event type / subsecond refactor

Browse Source
This commit is contained in:
Joey Castillo
2021-10-04 00:37:58 -04:00
parent a6115de94d
commit 51e2f0d77d
10 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/widgets/clock/simple_clock_widget.c
View File

@@ -17,16 +17,15 @@ void simple_clock_widget_activate(LauncherSettings *settings, void *context) {
*((uint32_t *)context) = 0xFFFFFFFF;
}
void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context) {
void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
printf("simple_clock_widget_loop\n");
(void) subsecond;
const char weekdays[7][3] = {"SA", "SU", "MO", "TU", "WE", "TH", "FR"};
char buf[11];
uint8_t pos;
watch_date_time date_time;
uint32_t previous_date_time;
switch (event) {
switch (event.bit.event_type) {
case EVENT_ACTIVATE:
case EVENT_TICK:
case EVENT_SCREENSAVER:
@@ -34,11 +33,11 @@ void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, u
previous_date_time = *((uint32_t *)context);
*((uint32_t *)context) = date_time.reg;
if (date_time.reg >> 6 == previous_date_time >> 6 && event != EVENT_SCREENSAVER) {
if (date_time.reg >> 6 == previous_date_time >> 6 && event.bit.event_type != EVENT_SCREENSAVER) {
// everything before seconds is the same, don't waste cycles setting those segments.
pos = 8;
sprintf(buf, "%02d", date_time.unit.second);
} else if (date_time.reg >> 12 == previous_date_time >> 12 && event != EVENT_SCREENSAVER) {
} else if (date_time.reg >> 12 == previous_date_time >> 12 && event.bit.event_type != EVENT_SCREENSAVER) {
// everything before minutes is the same.
pos = 6;
sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
@@ -55,7 +54,7 @@ void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, u
if (date_time.unit.hour == 0) date_time.unit.hour = 12;
}
pos = 0;
if (event == EVENT_SCREENSAVER) {
if (event.bit.event_type == EVENT_SCREENSAVER) {
sprintf(buf, "%s%2d%2d%02d ", weekdays[simple_clock_widget_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute);
} else {
sprintf(buf, "%s%2d%2d%02d%02d", weekdays[simple_clock_widget_get_weekday(date_time.unit.year, date_time.unit.month, date_time.unit.day)], date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);

2
launcher/widgets/clock/simple_clock_widget.h
View File

@@ -5,7 +5,7 @@
void simple_clock_widget_setup(LauncherSettings *settings, void ** context_ptr);
void simple_clock_widget_activate(LauncherSettings *settings, void *context);
void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context);
void simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
void simple_clock_widget_resign(LauncherSettings *settings, void *context);
uint8_t simple_clock_widget_get_weekday(uint16_t day, uint16_t month, uint16_t year);

5
launcher/widgets/fake_widget_1.c
View File

@@ -11,14 +11,13 @@ void fake_widget_1_activate(LauncherSettings *settings, void *context) {
(void) context;
}
void fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context) {
void fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
printf("fake_widget_1_loop\n");
(void) settings;
(void) subsecond;
(void) context;
watch_display_string("W1 d get01", 0);
switch (event) {
switch (event.bit.event_type) {
case EVENT_MODE_BUTTON_UP:
launcher_move_to_next_widget();
return;

2
launcher/widgets/fake_widget_1.h
View File

@@ -5,7 +5,7 @@
void fake_widget_1_setup(LauncherSettings *settings, void ** context_ptr);
void fake_widget_1_activate(LauncherSettings *settings, void *context);
void fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context);
void fake_widget_1_loop(LauncherEvent event, LauncherSettings *settings, void *context);
void fake_widget_1_resign(LauncherSettings *settings, void *context);
#define fake_widget_1 { \

5
launcher/widgets/fake_widget_2.c
View File

@@ -11,14 +11,13 @@ void fake_widget_2_activate(LauncherSettings *settings, void *context) {
(void) context;
}
void fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context) {
void fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
printf("fake_widget_2_loop\n");
(void) settings;
(void) subsecond;
(void) context;
watch_display_string("W1 d get02", 0);
switch (event) {
switch (event.bit.event_type) {
case EVENT_MODE_BUTTON_UP:
launcher_move_to_next_widget();
return;

2
launcher/widgets/fake_widget_2.h
View File

@@ -5,7 +5,7 @@
void fake_widget_2_setup(LauncherSettings *settings, void ** context_ptr);
void fake_widget_2_activate(LauncherSettings *settings, void *context);
void fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context);
void fake_widget_2_loop(LauncherEvent event, LauncherSettings *settings, void *context);
void fake_widget_2_resign(LauncherSettings *settings, void *context);
#define fake_widget_2 { \

6
launcher/widgets/settings/preferences_widget.c
View File

@@ -16,12 +16,12 @@ void preferences_widget_activate(LauncherSettings *settings, void *context) {
launcher_request_tick_frequency(4); // we need to manually blink some pixels
}
void preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context) {
void preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
(void) settings;
(void) context;
printf("preferences_widget_loop\n");
uint8_t current_page = *((uint8_t *)context);
switch (event) {
switch (event.bit.event_type) {
case EVENT_MODE_BUTTON_UP:
launcher_move_to_next_widget();
return;
@@ -63,7 +63,7 @@ void preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, ui
watch_set_led_off();
}
if (subsecond % 2) return;
if (event.bit.subsecond % 2) return;
char buf[3];
switch (current_page) {
case 0:

2
launcher/widgets/settings/preferences_widget.h
View File

@@ -5,7 +5,7 @@
void preferences_widget_setup(LauncherSettings *settings, void ** context_ptr);
void preferences_widget_activate(LauncherSettings *settings, void *context);
void preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, uint8_t subsecond, void *context);
void preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context);
void preferences_widget_resign(LauncherSettings *settings, void *context);
#define preferences_widget { \