@@ -4,6 +4,8 @@

 #include "oswald_hal.h"

 #include "embedvm.h"

+#include "mymem.h"

+#include "strutils.h"

 #include "oswald_main.h"

@@ -174,27 +176,46 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 	if (icmd[0] == '$') {

 		if (strncmp(icmd, "$GRT", 4) == 0) { // get current RTC

-			char rtime[16];

-			snprintf(rtime, 16, "#RTC%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);

+			char rtime[12];

+			mymemcpy(rtime,"#RTC",4);

+			num2str(OswaldClk.hour,rtime+4,2,2);

+			num2str(OswaldClk.minute,rtime+6,2,2);

+			num2str(OswaldClk.second,rtime+8,2,2);

+			rtime[10]='\n';

+			rtime[11]='\0';

 			hal_bluetooth_send_data(rtime, strlen(rtime));

 		} else if (strncmp(icmd, "$SRT", 4) == 0) { // set current RTC

 			char rtime[16];

-			snprintf(rtime, 16, "#USP\n");

+			mymemcpy(rtime,"#USP\n",6);

 			hal_bluetooth_send_data(rtime, strlen(rtime));

 		} else if (strncmp(icmd, "$MSG", 4) == 0) { // message on main screen

 			char *msg = (icmd+4);

 			mlen -= 4;

-			memset(MainMessage, 0, 148);

-			strncpy(MainMessage, msg, (mlen > 147) ? 147 : mlen);

+			mymemset(MainMessage, 0, 148);

+			if(mlen>147) 

+				mlen=147;

+			mymemcpy(MainMessage,msg,mlen);

+			MainMessage[mlen]='\0';

 		} else if (strncmp(icmd, "$MCL", 4) == 0) { // clear message

-			memset(MainMessage, 0, 148);

+			mymemset(MainMessage, 0, 148);

 		} else if (strncmp(icmd, "$BAT", 4) == 0) { // clear message

 			char rtime[16];

-			snprintf(rtime, 16, "#BAT%d,%d\n", OswaldPowerState.charge_state, OswaldPowerState.percent);

+			int off;

+			mymemcpy(rtime,"#BAT",4);

+			off=4;

+			off+=num2str(OswaldPowerState.charge_state,rtime+off,1,sizeof(rtime)-3-off);

+			rtime[off++]=',';

+			off+=num2str(OswaldPowerState.percent,rtime+off,1,sizeof(rtime)-2-off);

+			rtime[off++]='\n';

+			rtime[off++]='\0';

 			hal_bluetooth_send_data(rtime, strlen(rtime));

 		} else if (strncmp(icmd, "$GAL", 4) == 0) { // get ambient light value

-			char rtime[16];

-			snprintf(rtime, 16, "#GAL%d\n", hal_amblight_get_val());

+			char rtime[16],off;

+			mymemcpy(rtime,"#GAL",4);

+			off=4;

+			off+=num2str(hal_amblight_get_val(),rtime+off,1,sizeof(rtime)-2-off);

+			rtime[off++]='\n';

+			rtime[off++]='\0';

 			hal_bluetooth_send_data(rtime, strlen(rtime));

 		}

 	}

@@ -13,7 +13,7 @@

  * through function calls thus saving stack space

  */

 clock_state OswaldClk;

-alarm_clk OswaldAlarm;

+alarm_clk OswaldAlarm[MAX_ALARM];

 watch_state OswaldState;

 watch_screen OswaldScreens[SCREENS_END];

 power_state OswaldPowerState;

@@ -54,13 +54,17 @@ static void update_clock_state (void)

 	/* check for pending alarm once per minute */

 	if (OswaldClk.second == 0) {

-		if (OswaldClk.hour == OswaldAlarm.hour &&

-			OswaldClk.minute == OswaldAlarm.minute &&

-			((1 << OswaldClk.wday) & OswaldAlarm.wday)) {

-			OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

-			OswaldState.screen_id = ALARM_SCREEN;

-			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

-			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

+		int i;

+		for(i=0;i<MAX_ALARM;i++) {

+			if (OswaldClk.hour == OswaldAlarm[i].hour &&

+				OswaldClk.minute == OswaldAlarm[i].minute &&

+				((1 << OswaldClk.wday) & OswaldAlarm[i].wday)) {

+				OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

+				OswaldState.screen_id = ALARM_SCREEN;

+				OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

+				OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

+				break;

+			}

 		}

 	}

 }

@@ -198,6 +202,7 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 void oswald_init(void)

 {

+	int i;

 	OswaldScreens[IDLE_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;

 	OswaldScreens[IDLE_SCREEN].event_func = idle_handle_events;

@@ -241,10 +246,10 @@ void oswald_init(void)

 	if (OswaldState.screen->event_func != NULL)

 		OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

-

-	OswaldAlarm.hour = 12;

-	OswaldAlarm.minute = 0;

-	OswaldAlarm.wday = 0x00;

-

+	for(i=0;i<MAX_ALARM;i++) {

+		OswaldAlarm[i].hour = 12;

+		OswaldAlarm[i].minute = 0;

+		OswaldAlarm[i].wday = 0x00;

+	}

 }

@@ -102,14 +102,14 @@ void oswald_handle_button_press(watch_button button)

 	switch (button) {

 		case BUTTON_A:

 		case BUTTON_B:

-		case BUTTON_E:

+		case BUTTON_C:

 		case BUTTON_F:

 			if (OswaldState.screen->event_func != NULL &&

 			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS)) {

 			    	OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

 			}

 			break;

-		case BUTTON_C:

+		case BUTTON_E:

 			if (OswaldState.screen->event_func != NULL &&

 			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS)) {

 			    	if (OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button) == EVENT_RET_HANDLED)

@@ -227,6 +227,8 @@ void oswald_init(void)

 	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

+	OswaldScreens[CALENDAR_OVERVIEW_SCREEN].event_mask = EVENT_USER_BUTTONS|EVENT_ONE_SEC_TIMER;

+	OswaldScreens[CALENDAR_OVERVIEW_SCREEN].event_func = calendar_overview_handle_events;

 	OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS;

 	OswaldScreens[MENU_TEST_SCREEN].event_func = test_menu_handle_events;

@@ -116,11 +116,15 @@ void oswald_handle_button_press(watch_button button)

 			    		break;

 			}

 			OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

+#if 0

 			// next screen

 			OswaldState.screen_id++;

 			if (OswaldState.screen_id >= LAST_SCREEN) {

 				OswaldState.screen_id = IDLE_SCREEN;

 			};

+#else

+			OswaldState.screen_id = IDLE_SCREEN;

+#endif

 			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

 			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 			break;

@@ -170,6 +174,9 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 			snprintf(rtime, 16, "#RTC%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);

 			hal_bluetooth_send_data(rtime, strlen(rtime));

 		} else if (strncmp(icmd, "$SRT", 4) == 0) { // set current RTC

+			char rtime[16];

+			snprintf(rtime, 16, "#USP\n");

+			hal_bluetooth_send_data(rtime, strlen(rtime));

 		} else if (strncmp(icmd, "$MSG", 4) == 0) { // message on main screen

 			char *msg = (icmd+4);

 			mlen -= 4;

@@ -181,6 +188,10 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 			char rtime[16];

 			snprintf(rtime, 16, "#BAT%d,%d\n", OswaldPowerState.charge_state, OswaldPowerState.percent);

 			hal_bluetooth_send_data(rtime, strlen(rtime));

+		} else if (strncmp(icmd, "$GAL", 4) == 0) { // get ambient light value

+			char rtime[16];

+			snprintf(rtime, 16, "#GAL%d\n", hal_amblight_get_val());

+			hal_bluetooth_send_data(rtime, strlen(rtime));

 		}

 	}

 }

@@ -190,30 +201,39 @@ void oswald_init(void)

 	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 | EVENT_ACCEL_UPDATE;

-	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_func = accel_handle_events;

-

-	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

-	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

+	OswaldScreens[MAIN_MENU_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;

+	OswaldScreens[MAIN_MENU_SCREEN].event_func = main_menu_handle_events;

 	OswaldScreens[ALARM_SETUP_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[ALARM_SETUP_SCREEN].event_func = alarm_setup_events;

-	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;

 	OswaldScreens[BLUETOOTH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[BLUETOOTH_SCREEN].event_func = bluetooth_screen_events;

-	OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

-	OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;

+	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ACCEL_UPDATE;

+	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_func = accel_handle_events;

+

+	OswaldScreens[MESSAGES_SCREEN].event_mask = EVENT_USER_BUTTONS;

+	OswaldScreens[MESSAGES_SCREEN].event_func = messages_screen_handle_events;

+

+	OswaldScreens[MESSAGE_SCREEN].event_mask = EVENT_USER_BUTTONS;

+	OswaldScreens[MESSAGE_SCREEN].event_func = message_screen_handle_events;

 	OswaldScreens[INFO_SCREEN].event_mask = 0x00; // this one does not consume any events

 	OswaldScreens[INFO_SCREEN].event_func = info_screen_handle_events;

+	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

+	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

+

+	OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS;

+	OswaldScreens[MENU_TEST_SCREEN].event_func = test_menu_handle_events;

+

+	OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

+	OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;

+

 	OswaldState.screen_id = IDLE_SCREEN;

 	OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

@@ -224,6 +244,5 @@ void oswald_init(void)

 	OswaldAlarm.minute = 0;

 	OswaldAlarm.wday = 0x00;

-	// strcpy(MainMessage, "So koennte dann eine Nachricht aussehen. Samt Text mit Unterlaengen. Und dies ist dann die letzte Zeile und mehr Text als paßt.");

 }

@@ -211,6 +211,9 @@ void oswald_init(void)

 	OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;

+	OswaldScreens[INFO_SCREEN].event_mask = 0x00; // this one does not consume any events

+	OswaldScreens[INFO_SCREEN].event_func = info_screen_handle_events;

+

 	OswaldState.screen_id = IDLE_SCREEN;

 	OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

@@ -17,7 +17,7 @@ alarm_clk OswaldAlarm;

 watch_state OswaldState;

 watch_screen OswaldScreens[SCREENS_END];

 power_state OswaldPowerState;

-u8t backlight_safety_off = 0;

+uint8_t backlight_safety_off = 0;

 char MainMessage[148];

@@ -32,7 +32,7 @@ void oswald_change_to_screen(screen_number screen_id)

 	}

 }

-void oswald_set_time(u8t hour, u8t minute, u8t second, boolean clk24hr)

+void oswald_set_time(uint8_t hour, uint8_t minute, uint8_t second, boolean clk24hr)

 {

 	OswaldClk.hour = hour;

 	OswaldClk.minute = minute;

@@ -40,7 +40,7 @@ void oswald_set_time(u8t hour, u8t minute, u8t second, boolean clk24hr)

 	OswaldClk.clk24hr = clk24hr;

 }

-void oswald_set_date(u8t day, u8t month, u16t year, boolean day_first)

+void oswald_set_date(uint8_t day, uint8_t month, uint16_t year, boolean day_first)

 {

 	OswaldClk.day = day;

 	OswaldClk.month = month;

@@ -100,25 +100,21 @@ void oswald_halfsecond_tick(void)

 void oswald_handle_button_press(watch_button button)

 {

 	switch (button) {

-		case BUTTON_D:

-			// backlight on/off

-			if (hal_lcd_get_backlight()) {

-				hal_lcd_set_backlight(FALSE);

-				backlight_safety_off = 0;

-			} else {

-				hal_lcd_set_backlight(TRUE);

-				backlight_safety_off = 2;

-			}

-			break;

 		case BUTTON_A:

 		case BUTTON_B:

 		case BUTTON_E:

 		case BUTTON_F:

 			if (OswaldState.screen->event_func != NULL &&

-			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS))

-				OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

+			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS)) {

+			    	OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

+			}

 			break;

 		case BUTTON_C:

+			if (OswaldState.screen->event_func != NULL &&

+			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS)) {

+			    	if (OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button) == EVENT_RET_HANDLED)

+			    		break;

+			}

 			OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

 			// next screen

 			OswaldState.screen_id++;

@@ -128,13 +124,23 @@ void oswald_handle_button_press(watch_button button)

 			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

 			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 			break;

+		case BUTTON_D:

+			// backlight on/off

+			if (hal_lcd_get_backlight()) {

+				hal_lcd_set_backlight(FALSE);

+				backlight_safety_off = 0;

+			} else {

+				hal_lcd_set_backlight(TRUE);

+				backlight_safety_off = 2;

+			}

+			break;

 		default:

 			// should never get here

 			break;

 	};

 }

-void oswald_handle_accel_event(u8t x, u8t y, u8t z)

+void oswald_handle_accel_event(uint8_t x, uint8_t y, uint8_t z)

 {

 	accel_data_t accel_data;

@@ -147,7 +153,7 @@ void oswald_handle_accel_event(u8t x, u8t y, u8t z)

 		OswaldState.screen->event_func(EVENT_ACCEL_UPDATE, &accel_data);

 }

-void oswald_handle_ambientlight_event(u8t light_level)

+void oswald_handle_ambientlight_event(uint8_t light_level)

 {

 	if (OswaldState.screen->event_func != NULL &&

 	    (OswaldState.screen->event_mask & EVENT_AMBIENTLIGHT_UPDATE))

@@ -214,5 +220,7 @@ void oswald_init(void)

 	OswaldAlarm.hour = 12;

 	OswaldAlarm.minute = 0;

 	OswaldAlarm.wday = 0x00;

+

+	// strcpy(MainMessage, "So koennte dann eine Nachricht aussehen. Samt Text mit Unterlaengen. Und dies ist dann die letzte Zeile und mehr Text als paßt.");

 }

@@ -161,8 +161,9 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 	if (icmd[0] == '$') {

 		if (strncmp(icmd, "$GRT", 4) == 0) { // get current RTC

 			char rtime[16];

-			snprintf(rtime, 10, "%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);

+			snprintf(rtime, 16, "#RTC%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);

 			hal_bluetooth_send_data(rtime, strlen(rtime));

+		} else if (strncmp(icmd, "$SRT", 4) == 0) { // set current RTC

 		} else if (strncmp(icmd, "$MSG", 4) == 0) { // message on main screen

 			char *msg = (icmd+4);

 			mlen -= 4;

@@ -170,6 +171,10 @@ void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

 			strncpy(MainMessage, msg, (mlen > 147) ? 147 : mlen);

 		} else if (strncmp(icmd, "$MCL", 4) == 0) { // clear message

 			memset(MainMessage, 0, 148);

+		} else if (strncmp(icmd, "$BAT", 4) == 0) { // clear message

+			char rtime[16];

+			snprintf(rtime, 16, "#BAT%d,%d\n", OswaldPowerState.charge_state, OswaldPowerState.percent);

+			hal_bluetooth_send_data(rtime, strlen(rtime));

 		}

 	}

 }

@@ -18,6 +18,8 @@ watch_state OswaldState;

 watch_screen OswaldScreens[SCREENS_END];

 power_state OswaldPowerState;

 u8t backlight_safety_off = 0;

+char MainMessage[148];

+

 void oswald_change_to_screen(screen_number screen_id)

 {

@@ -152,6 +154,26 @@ void oswald_handle_ambientlight_event(u8t light_level)

 		OswaldState.screen->event_func(EVENT_AMBIENTLIGHT_UPDATE, &light_level);

 }

+void oswald_handle_comm_input(uint16_t mlen, const void *mdat)

+{

+	char *icmd = (char *) mdat;

+

+	if (icmd[0] == '$') {

+		if (strncmp(icmd, "$GRT", 4) == 0) { // get current RTC

+			char rtime[16];

+			snprintf(rtime, 10, "%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);

+			hal_bluetooth_send_data(rtime, strlen(rtime));

+		} else if (strncmp(icmd, "$MSG", 4) == 0) { // message on main screen

+			char *msg = (icmd+4);

+			mlen -= 4;

+			memset(MainMessage, 0, 148);

+			strncpy(MainMessage, msg, (mlen > 147) ? 147 : mlen);

+		} else if (strncmp(icmd, "$MCL", 4) == 0) { // clear message

+			memset(MainMessage, 0, 148);

+		}

+	}

+}

+

 void oswald_init(void)

 {

 	OswaldScreens[IDLE_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;

@@ -172,6 +194,9 @@ void oswald_init(void)

 	OswaldScreens[STOP_WATCH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_CS_TIMER;

 	OswaldScreens[STOP_WATCH_SCREEN].event_func = stop_watch_handle_events;

+	OswaldScreens[BLUETOOTH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

+	OswaldScreens[BLUETOOTH_SCREEN].event_func = bluetooth_screen_events;

+

 	OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;

@@ -1,6 +1,7 @@

 #include "oswald.h"

 #include "oswald_watch_faces.h"

 #include "oswald_screens.h"

+#include "oswald_hal.h"

 #include "embedvm.h"

@@ -12,9 +13,11 @@

  * through function calls thus saving stack space

  */

 clock_state OswaldClk;

+alarm_clk OswaldAlarm;

 watch_state OswaldState;

 watch_screen OswaldScreens[SCREENS_END];

-

+power_state OswaldPowerState;

+u8t backlight_safety_off = 0;

 void oswald_change_to_screen(screen_number screen_id)

 {

@@ -45,29 +48,33 @@ void oswald_set_date(u8t day, u8t month, u16t year, boolean day_first)

 static void update_clock_state (void)

 {

-	OswaldClk.second += 1;

-	if (OswaldClk.second > 59) {

-		OswaldClk.second = 0;

-		OswaldClk.minute += 1;

-	} else

-		return;

-	if (OswaldClk.minute > 59) {

-		OswaldClk.minute = 0;

-		OswaldClk.hour += 1;

-	} else

-		return;

-	if (OswaldClk.hour > 23) {

-		OswaldClk.hour = 0;

-		// day++

-	} else

-		return;

+	hal_get_rtc(&OswaldClk);

+

+	/* check for pending alarm once per minute */

+	if (OswaldClk.second == 0) {

+		if (OswaldClk.hour == OswaldAlarm.hour &&

+			OswaldClk.minute == OswaldAlarm.minute &&

+			((1 << OswaldClk.wday) & OswaldAlarm.wday)) {

+			OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

+			OswaldState.screen_id = ALARM_SCREEN;

+			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

+			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

+		}

+	}

 }

 void oswald_one_second_tick(void)

 {

-	/* update our 'RTC' */

+	/* update clock - should use RTC if available */

 	update_clock_state();

+	hal_get_power_state(&OswaldPowerState);

+	if (backlight_safety_off) {

+		backlight_safety_off--;

+		if (!backlight_safety_off)

+			hal_lcd_set_backlight(FALSE);

+	}

+

 	/* wake-up screen if interested in the one-second-event */

 	if (OswaldState.screen->event_func != NULL &&

 	    (OswaldState.screen->event_mask & EVENT_ONE_SEC_TIMER))

@@ -91,10 +98,20 @@ void oswald_halfsecond_tick(void)

 void oswald_handle_button_press(watch_button button)

 {

 	switch (button) {

+		case BUTTON_D:

+			// backlight on/off

+			if (hal_lcd_get_backlight()) {

+				hal_lcd_set_backlight(FALSE);

+				backlight_safety_off = 0;

+			} else {

+				hal_lcd_set_backlight(TRUE);

+				backlight_safety_off = 2;

+			}

+			break;

 		case BUTTON_A:

 		case BUTTON_B:

-		case BUTTON_D:

 		case BUTTON_E:

+		case BUTTON_F:

 			if (OswaldState.screen->event_func != NULL &&

 			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS))

 				OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

@@ -109,9 +126,6 @@ void oswald_handle_button_press(watch_button button)

 			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

 			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 			break;

-		case BUTTON_F:

-			// backlight on/off

-			break;

 		default:

 			// should never get here

 			break;

@@ -149,16 +163,26 @@ void oswald_init(void)

 	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

+	OswaldScreens[ALARM_SETUP_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

+	OswaldScreens[ALARM_SETUP_SCREEN].event_func = alarm_setup_events;

+

 	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;

+	OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

+	OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;

+

 	OswaldState.screen_id = IDLE_SCREEN;

 	OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

 	if (OswaldState.screen->event_func != NULL)

 		OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

+

+	OswaldAlarm.hour = 12;

+	OswaldAlarm.minute = 0;

+	OswaldAlarm.wday = 0x00;

 }

@@ -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];

@@ -27,11 +27,20 @@ void oswald_change_to_screen(screen_number screen_id)

 	}

 }

-void oswald_set_time(u8t hour, u8t minute, u8t second)

+void oswald_set_time(u8t hour, u8t minute, u8t second, boolean clk24hr)

 {

 	OswaldClk.hour = hour;

 	OswaldClk.minute = minute;

 	OswaldClk.second = second;

+	OswaldClk.clk24hr = clk24hr;

+}

+

+void oswald_set_date(u8t day, u8t month, u16t year, boolean day_first)

+{

+	OswaldClk.day = day;

+	OswaldClk.month = month;

+	OswaldClk.year = year;

+	OswaldClk.day_first = day_first;

 }

 static void update_clock_state (void)

@@ -63,7 +72,20 @@ void oswald_one_second_tick(void)

 	if (OswaldState.screen->event_func != NULL &&

 	    (OswaldState.screen->event_mask & EVENT_ONE_SEC_TIMER))

 		OswaldState.screen->event_func(EVENT_ONE_SEC_TIMER, NULL);

-	// oswald_update_screen();

+}

+

+void oswald_centisecond_tick(void)

+{

+	if (OswaldState.screen->event_func != NULL &&

+	    (OswaldState.screen->event_mask & EVENT_CS_TIMER))

+		OswaldState.screen->event_func(EVENT_CS_TIMER, NULL);

+}

+

+void oswald_halfsecond_tick(void)

+{

+	if (OswaldState.screen->event_func != NULL &&

+	    (OswaldState.screen->event_mask & EVENT_HALF_SEC_TIMER))

+		OswaldState.screen->event_func(EVENT_HALF_SEC_TIMER, NULL);

 }

 void oswald_handle_button_press(watch_button button)

@@ -78,6 +100,7 @@ void oswald_handle_button_press(watch_button button)

 				OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

 			break;

 		case BUTTON_C:

+			OswaldState.screen->event_func(EVENT_SCREEN_DESTROY, NULL);

 			// next screen

 			OswaldState.screen_id++;

 			if (OswaldState.screen_id >= LAST_SCREEN) {

@@ -96,16 +119,35 @@ void oswald_handle_button_press(watch_button button)

 	};

 }

+void oswald_handle_accel_event(u8t x, u8t y, u8t z)

+{

+	accel_data_t accel_data;

+

+	accel_data.x = x;

+	accel_data.y = y;

+	accel_data.z = z;

+

+	if (OswaldState.screen->event_func != NULL &&

+	    (OswaldState.screen->event_mask & EVENT_ACCEL_UPDATE))

+		OswaldState.screen->event_func(EVENT_ACCEL_UPDATE, &accel_data);

+}

+

+void oswald_handle_ambientlight_event(u8t light_level)

+{

+	if (OswaldState.screen->event_func != NULL &&

+	    (OswaldState.screen->event_mask & EVENT_AMBIENTLIGHT_UPDATE))

+		OswaldState.screen->event_func(EVENT_AMBIENTLIGHT_UPDATE, &light_level);

+}

+

 void oswald_init(void)

 {

 	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;

+	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ACCEL_UPDATE;

 	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_func = accel_handle_events;

-	

-	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;

+	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;

 	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

 	OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS;

@@ -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);

@@ -1,8 +1,10 @@

 #include "oswald.h"

 #include "oswald_watch_faces.h"

+#include "oswald_screens.h"

+#if 0

 #include "Fonts.h"

 #include "LcdDisplay.h"

-

+#endif

 #include "oswald_main.h"

 /*

@@ -12,19 +14,17 @@

  */

 clock_state OswaldClk;

 watch_state OswaldState;

+watch_screen OswaldScreens[LAST_SCREEN];

-void update_screen(void)

-{

-	if (OswaldState.user_screendraw_func != NULL)

-		OswaldState.user_screendraw_func();

-}

-void oswald_change_to_screen(screen_number screen)

+void oswald_change_to_screen(screen_number screen_id)

 {

 	// we spare the update if no change happened

-	if (OswaldState.screen != screen) {

-		OswaldState.screen = screen;

-		update_screen();

+	if (OswaldState.screen_id != screen_id) {

+		OswaldState.screen_id = screen_id;

+		if ((OswaldState.screen->event_func != NULL) &&

+		    (OswaldState.screen->event_mask & EVENT_SCREEN_VISIBLE))

+				OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 	}

 }

@@ -57,24 +57,14 @@ static void update_clock_state (void)

 void oswald_one_second_tick(void)

 {

+	/* update our 'RTC' */

 	update_clock_state();

-	update_screen();

-}

-void draw_accel_screen(void)

-{

-	lcd_clear_display();

-	SetFont(MetaWatch16);

-	WriteLcdString(2, 2, "X:");

-	WriteLcdString(20, 2, "123");

-	WriteLcdString(2, 18, "Z:");

-	WriteLcdString(20, 18, "123");

-	WriteLcdString(2, 34, "Y:");

-	WriteLcdString(20, 34, "123");

-}

-

-void idle_handle_user_buttons(watch_button button)

-{

+	/* wake-up screen if interested in the one-second-event */

+	if (OswaldState.screen->event_func != NULL &&

+	    (OswaldState.screen->event_mask & EVENT_ONE_SEC_TIMER))

+		OswaldState.screen->event_func(EVENT_ONE_SEC_TIMER, NULL);

+	// oswald_update_screen();

 }

 void oswald_handle_button_press(watch_button button)

@@ -84,27 +74,19 @@ void oswald_handle_button_press(watch_button button)

 		case BUTTON_B:

 		case BUTTON_D:

 		case BUTTON_E:

-			if (OswaldState.user_button_func != NULL)

-				OswaldState.user_button_func(button);

+			if (OswaldState.screen->event_func != NULL &&

+			    (OswaldState.screen->event_mask & EVENT_USER_BUTTONS))

+				OswaldState.screen->event_func(EVENT_USER_BUTTONS, &button);

 			break;

 		case BUTTON_C:

 			// next screen

-			OswaldState.screen++;

-			if (OswaldState.screen >= LAST_SCREEN) {

-				OswaldState.screen = IDLE_SCREEN;

-				OswaldState.user_button_func = idle_handle_user_buttons;

-				OswaldState.user_screendraw_func = DrawLcdDigitalClock;

-			} else {

-				switch (OswaldState.screen) {

-					case SETTING_DATETIME_SCREEN:

-						OswaldState.user_button_func = idle_handle_user_buttons;

-						OswaldState.user_screendraw_func = draw_accel_screen;

-						break;

-					default:

-						break;

-				};

+			OswaldState.screen_id++;

+			if (OswaldState.screen_id >= LAST_SCREEN) {

+				OswaldState.screen_id = IDLE_SCREEN;

 			};

-			update_screen();

+			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

+			//oswald_update_screen();

+			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 			break;

 		case BUTTON_F:

 			// backlight on/off

@@ -117,9 +99,24 @@ void oswald_handle_button_press(watch_button button)

 void oswald_init(void)

 {

-	OswaldState.screen = IDLE_SCREEN;

+	OswaldScreens[IDLE_SCREEN].event_mask = EVENT_ONE_SEC_TIMER;

+	OswaldScreens[IDLE_SCREEN].event_func = idle_handle_events;

+

+	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_mask = EVENT_USER_BUTTONS;

+	OswaldScreens[ACCEL_DISPLAY_SCREEN].event_func = accel_handle_events;

+	

+

+	OswaldScreens[DATETIME_SETTING_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;

+	OswaldScreens[DATETIME_SETTING_SCREEN].event_func = datetime_setup_events;

+

+	OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS;

+	OswaldScreens[MENU_TEST_SCREEN].event_func = test_menu_handle_events;

+

+	OswaldState.screen_id = IDLE_SCREEN;

+	OswaldState.screen = &OswaldScreens[OswaldState.screen_id];

 	OswaldState.idle_show_seconds = FALSE;

-	OswaldState.user_screendraw_func = DrawLcdDigitalClock;

-	OswaldState.user_button_func = idle_handle_user_buttons;

+

+	if (OswaldState.screen->event_func != NULL)

+		OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);

 }

@@ -1,5 +1,7 @@

 #include "oswald.h"

 #include "oswald_watch_faces.h"

+#include "Fonts.h"

+#include "LcdDisplay.h"

 #include "oswald_main.h"

@@ -13,21 +15,13 @@ watch_state OswaldState;

 void update_screen(void)

 {

-	switch (OswaldState.screen) {

-		case IDLE_SCREEN:

-			if (OswaldState.idle_draw_func != NULL)

-				OswaldState.idle_draw_func(OswaldState.idle_show_seconds);

-			break;

-		case APPLICATION_SCREEN:

-			break;

-		deafault:

-			break;

-	};

+	if (OswaldState.user_screendraw_func != NULL)

+		OswaldState.user_screendraw_func();

 }

 void oswald_change_to_screen(screen_number screen)

 {