X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald_main.c;h=82b856712f9ebe3a1ec42c3c64dcac273b2a3a4c;hp=90be0d0a5fd6d831564d9fcb2b0696a961fa926b;hb=8e3cbad72c8e3abb97f2081527f91af98d8558be;hpb=019424a494c8312fd8bac9eb89839aea943f4d88 diff --git a/ui/oswald_main.c b/ui/oswald_main.c index 90be0d0..82b8567 100644 --- a/ui/oswald_main.c +++ b/ui/oswald_main.c @@ -1,10 +1,9 @@ #include "oswald.h" #include "oswald_watch_faces.h" #include "oswald_screens.h" -#if 0 -#include "Fonts.h" -#include "LcdDisplay.h" -#endif + +#include "embedvm.h" + #include "oswald_main.h" /* @@ -99,7 +98,7 @@ void oswald_handle_button_press(watch_button button) void oswald_init(void) { - OswaldScreens[IDLE_SCREEN].event_mask = EVENT_ONE_SEC_TIMER; + OswaldScreens[IDLE_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER; OswaldScreens[IDLE_SCREEN].event_func = idle_handle_events; OswaldScreens[ACCEL_DISPLAY_SCREEN].event_mask = EVENT_USER_BUTTONS; @@ -114,7 +113,6 @@ void oswald_init(void) OswaldState.screen_id = IDLE_SCREEN; OswaldState.screen = &OswaldScreens[OswaldState.screen_id]; - OswaldState.idle_show_seconds = FALSE; if (OswaldState.screen->event_func != NULL) OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);