launcher: clean up structs

4 files changed, 9 insertions, 9 deletions

diff --git a/launcher/widgets/clock/simple_clock_widget.c b/launcher/widgets/clock/simple_clock_widget.c
index 0c89cbc2..7fe0183d 100644
--- a/launcher/widgets/clock/simple_clock_widget.c
+++ b/launcher/widgets/clock/simple_clock_widget.c
@@ -25,7 +25,7 @@ bool simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, v
 
     watch_date_time date_time;
     uint32_t previous_date_time;
-    switch (event.bit.event_type) {
+    switch (event.event_type) {
         case EVENT_ACTIVATE:
         case EVENT_TICK:
         case EVENT_SCREENSAVER:
@@ -33,11 +33,11 @@ bool simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, v
             previous_date_time = *((uint32_t *)context);
             *((uint32_t *)context) = date_time.reg;
 
-            if (date_time.reg >> 6 == previous_date_time >> 6 && event.bit.event_type != EVENT_SCREENSAVER) {
+            if (date_time.reg >> 6 == previous_date_time >> 6 && event.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.bit.event_type != EVENT_SCREENSAVER) {
+            } else if (date_time.reg >> 12 == previous_date_time >> 12 && event.event_type != EVENT_SCREENSAVER) {
                 // everything before minutes is the same.
                 pos = 6;
                 sprintf(buf, "%02d%02d", date_time.unit.minute, date_time.unit.second);
@@ -54,7 +54,7 @@ bool simple_clock_widget_loop(LauncherEvent event, LauncherSettings *settings, v
                     if (date_time.unit.hour == 0) date_time.unit.hour = 12;
                 }
                 pos = 0;
-                if (event.bit.event_type == EVENT_SCREENSAVER) {
+                if (event.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);
diff --git a/launcher/widgets/complications/pulseometer_widget.c b/launcher/widgets/complications/pulseometer_widget.c
index 3df1cb44..a7272dcb 100644
--- a/launcher/widgets/complications/pulseometer_widget.c
+++ b/launcher/widgets/complications/pulseometer_widget.c
@@ -20,7 +20,7 @@ bool pulseometer_widget_loop(LauncherEvent event, LauncherSettings *settings, vo
     char buf[14];
     // starts at index 15
     const uint8_t pulse_lookup[] = {240, 225, 212, 200, 189, 180, 171, 164, 157, 150, 144, 138, 133, 129, 124, 120, 116, 113, 109, 106, 103, 100, 97, 95, 92, 90, 88, 86, 84, 82, 80, 78, 77, 75, 73, 72, 71, 69, 68, 67, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 55, 54, 53, 52, 51, 51, 50, 49, 49, 48, 47, 47, 46, 46, 45, 44, 44, 43, 43, 42, 42, 41, 41, 40, 40, 40};
-    switch (event.bit.event_type) {
+    switch (event.event_type) {
         case EVENT_TICK:
             if (pulsometer_state->pulse == 0 && !pulsometer_state->measuring) {
                 switch (pulsometer_state->ticks % 5) {
diff --git a/launcher/widgets/settings/preferences_widget.c b/launcher/widgets/settings/preferences_widget.c
index 40e0ac50..1618a72c 100644
--- a/launcher/widgets/settings/preferences_widget.c
+++ b/launcher/widgets/settings/preferences_widget.c
@@ -19,7 +19,7 @@ void preferences_widget_activate(LauncherSettings *settings, void *context) {
 bool preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, void *context) {
     printf("preferences_widget_loop\n");
     uint8_t current_page = *((uint8_t *)context);
-    switch (event.bit.event_type) {
+    switch (event.event_type) {
         case EVENT_MODE_BUTTON_UP:
             watch_set_led_off();
             launcher_move_to_next_widget();
@@ -53,7 +53,7 @@ bool preferences_widget_loop(LauncherEvent event, LauncherSettings *settings, vo
 
     watch_display_string((char *)preferences_widget_titles[current_page], 0);
 
-    if (event.bit.subsecond % 2) return current_page <= 2;
+    if (event.subsecond % 2) return current_page <= 2;
     char buf[3];
     switch (current_page) {
         case 0:
diff --git a/launcher/widgets/settings/set_time_widget.c b/launcher/widgets/settings/set_time_widget.c
index c7949a4f..d8cfb9fc 100644
--- a/launcher/widgets/settings/set_time_widget.c
+++ b/launcher/widgets/settings/set_time_widget.c
@@ -21,7 +21,7 @@ bool set_time_widget_loop(LauncherEvent event, LauncherSettings *settings, void
     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.bit.event_type) {
+    switch (event.event_type) {
         case EVENT_MODE_BUTTON_UP:
             launcher_move_to_next_widget();
             return false;
@@ -79,7 +79,7 @@ bool set_time_widget_loop(LauncherEvent event, LauncherSettings *settings, void
         watch_clear_indicator(WATCH_INDICATOR_PM);
         sprintf(buf, "%s  %2d%02d%02d", set_time_widget_titles[current_page], date_time.unit.year + 20, date_time.unit.month, date_time.unit.day);
     }
-    if (event.bit.subsecond % 2) {
+    if (event.subsecond % 2) {
         switch (current_page) {
             case 0:
             case 3: