X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald_main.c;fp=ui%2Foswald_main.c;h=15091a6e7229d6e95e410ca8cd3c7c216d20682e;hp=df95ebb8547c164eb8c363de261ad5952212cf2e;hb=a03500b5bbf376bb275002887ec566872efb40c4;hpb=e9b651b4a531d38826d7952475b5ad0d3d8118e9 diff --git a/ui/oswald_main.c b/ui/oswald_main.c index df95ebb..15091a6 100644 --- a/ui/oswald_main.c +++ b/ui/oswald_main.c @@ -13,7 +13,7 @@ */ clock_state OswaldClk; watch_state OswaldState; -watch_screen OswaldScreens[LAST_SCREEN]; +watch_screen OswaldScreens[SCREENS_END]; void oswald_change_to_screen(screen_number screen_id) @@ -107,7 +107,6 @@ void oswald_handle_button_press(watch_button button) OswaldState.screen_id = IDLE_SCREEN; }; OswaldState.screen = &OswaldScreens[OswaldState.screen_id]; - //oswald_update_screen(); OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL); break; case BUTTON_F: @@ -153,6 +152,9 @@ void oswald_init(void) OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS; OswaldScreens[MENU_TEST_SCREEN].event_func = test_menu_handle_events; + OswaldScreens[STOP_WATCH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_CS_TIMER; + OswaldScreens[STOP_WATCH_SCREEN].event_func = stop_watch_handle_events; + OswaldState.screen_id = IDLE_SCREEN; OswaldState.screen = &OswaldScreens[OswaldState.screen_id];