@@ -709,6 +709,7 @@ event_ret_t handle_setup_alarm_buttons(watch_button button, alarm_setup_data_t *

 				break;

 			case BUTTON_F:

 				alarm_setup_screen.set_mode = FALSE;

+				alarm_setup_screen.pos = 0;

 				break;

 			default:

 				return EVENT_RET_UNHANDLED;

@@ -931,7 +932,16 @@ static int timerecord_cmp(timerecord *a, timerecord *b)

 	return(a->csec-b->csec);

 }

-static void draw_stop_watch_screen(stopwatch_data_t *sdata)

+typedef enum estopwmask {

+	stopwm_icon=0x1,

+	stopwm_laps=0x2,

+	stopwm_split=0x4,

+	stopwm_current=0x8,

+	stopwm_menu=0x10,

+	stopwm_all=0x1f

+} stopwmask;

+

+static void draw_stop_watch_screen(stopwatch_data_t *sdata, int mask)

 {

 	int w;

 	char *hint;

@@ -961,49 +971,67 @@ static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 		hal_lcd_update_display();

 		return;

 	}

-	hal_lcd_clear_display();

+	if(mask==stopwm_all)

+		hal_lcd_clear_display();

-	oswald_draw_bitmap(36, 3, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

+	if(mask&stopwm_icon) {

+		if(mask!=stopwm_all)

+			oswald_draw_rect(36,3,36-1+stopwatch_icon_width,3-1+stopwatch_icon_height,0);

+		oswald_draw_bitmap(36, 3, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

+	}

 	/* Current menu option */

-	oswald_draw_rect(0,95-12,95,95,1);

-	hint=(sdata->item==stopw_startstop)?"Start-Stop":

-		(sdata->item==stopw_split)?"Start-Split":

-		(sdata->item==stopw_reset)?"Reset":

-		"Unknown";

-	w=oswald_getwidth_font58_scaled(hint,2,1);

-	oswald_writestr_font58_scaled((96-w)/2,95-8,hint,&w,0,1,2,1);

-

+	if(mask&stopwm_menu) {

+		oswald_draw_rect(0,95-12,95,95,1);

+		hint=(sdata->item==stopw_startstop)?"Start-Stop":

+			(sdata->item==stopw_split)?"Start-Split":

+			(sdata->item==stopw_reset)?"Reset":

+			"Unknown";

+		w=oswald_getwidth_font58_scaled(hint,2,1);

+		oswald_writestr_font58_scaled((96-w)/2,95-8,hint,&w,0,1,2,1);

+	}

 	/* Lap number */

-	num2str(sdata->laps,lapbuf,3,3);

-	oswald_writestr_font58_scaled(3,3,lapbuf,&w,1,0,2,2);

-

-	/* Split diff */

-	timerecord2str(&(sdata->lastlap),timebuf,csecbuf);

-        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

-        oswald_writestr_font58_scaled(x,28,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

-        oswald_writestr_font58_scaled(x+w+1,34,csecbuf,&w,1,0,2,1);

-

-

-	/* Split */

-	if(sdata->laps>0)

-		timerecord2str(sdata->lapsdata+((sdata->laps<MAX_LAPS)?sdata->laps-1:MAX_LAPS-1),timebuf,csecbuf);	

-	else {

-		mymemcpy(timebuf," 0:00:00",9);

-		mymemcpy(csecbuf,"00",3);

+	if(mask&stopwm_laps) {

+		if(mask!=stopwm_all)

+			oswald_draw_rect(3,3,3+9*3,3+12,0);

+		num2str(sdata->laps,lapbuf,3,3);

+		oswald_writestr_font58_scaled(3,3,lapbuf,&w,1,0,2,2);

+	}

+

+	/* Split diff /Split diff */

+	if(mask&stopwm_split) {

+		if(mask!=stopwm_all)

+			oswald_draw_rect(0,28,95,60,0);

+		/* diff */

+		timerecord2str(&(sdata->lastlap),timebuf,csecbuf);

+	        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+	        oswald_writestr_font58_scaled(x,28,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

+	        oswald_writestr_font58_scaled(x+w+1,34,csecbuf,&w,1,0,2,1);

+

+		/* Split */

+		if(sdata->laps>0)

+			timerecord2str(sdata->lapsdata+((sdata->laps<MAX_LAPS)?sdata->laps-1:MAX_LAPS-1),timebuf,csecbuf);	

+		else {

+			mymemcpy(timebuf," 0:00:00",9);

+			mymemcpy(csecbuf,"00",3);

+		}

+	        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+	        oswald_writestr_font58_scaled(x,42,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

+	        oswald_writestr_font58_scaled(x+w+1,48,csecbuf,&w,1,0,2,1);

 	}

-        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

-        oswald_writestr_font58_scaled(x,42,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

-        oswald_writestr_font58_scaled(x+w+1,48,csecbuf,&w,1,0,2,1);

 	/* main display */

-	timerecord2str(&(sdata->current),timebuf,csecbuf);

-	x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

-	oswald_writestr_font58_scaled(x,61,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,3);

-	x+=w;

-	oswald_writestr_font58_scaled(x+1,67,csecbuf,&w,1,0,2,2);

-	if(sdata->running)

-		oswald_draw_rect(x+10,67,x+17,78,0);

-	

+	if(mask&stopwm_current) {

+		if(mask!=stopwm_all)

+			oswald_draw_rect(0,61,95,95-13,0);

+		timerecord2str(&(sdata->current),timebuf,csecbuf);

+		x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+		oswald_writestr_font58_scaled(x,61,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,3);

+		x+=w;

+		if(sdata->running)

+			csecbuf[1]='\0';

+		oswald_writestr_font58_scaled(x+1,67,csecbuf,&w,1,0,2,2);

+	}

+		

 	hal_lcd_update_display();

 }

@@ -1014,6 +1042,7 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 			stopwatch_screen.showstats=0;

 		else if(button==BUTTON_D)

 			return(EVENT_RET_UNHANDLED);

+		draw_stop_watch_screen(&stopwatch_screen,stopwm_all);

 		return(EVENT_RET_HANDLED);

 	}

 	switch (button) {

@@ -1026,6 +1055,7 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 					hal_enable_centisecond_timer();

 					stopwatch_screen.running = TRUE;

 				}

+				draw_stop_watch_screen(&stopwatch_screen,stopwm_current);

 			} else if(stopwatch_screen.item==stopw_split) {

 				if (stopwatch_screen.running) {

 					int l;

@@ -1047,6 +1077,7 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 						mymemcpy(&(stopwatch_screen.min),&(stopwatch_screen.lastlap),sizeof(timerecord));

 					if(stopwatch_screen.laps==1 || timerecord_cmp(&(stopwatch_screen.lastlap),&(stopwatch_screen.max))>0)

 						mymemcpy(&(stopwatch_screen.max),&(stopwatch_screen.lastlap),sizeof(timerecord));

+					draw_stop_watch_screen(&stopwatch_screen,stopwm_split|stopwm_laps);

 				} else {

 					hal_enable_centisecond_timer();

 					stopwatch_screen.running = TRUE;

@@ -1055,6 +1086,7 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 				if(stopwatch_screen.running)

 					hal_disable_centisecond_timer();

 				mymemset(&(stopwatch_screen),0,sizeof(stopwatch_screen));

+				draw_stop_watch_screen(&stopwatch_screen,stopwm_all);

 			} else {

 				return EVENT_RET_UNHANDLED;

 			}

@@ -1063,15 +1095,20 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 		case BUTTON_A: 

 			stopwatch_screen.item+=stopw_end-1;

 			stopwatch_screen.item%=stopw_end;

+			draw_stop_watch_screen(&stopwatch_screen,stopwm_menu);

 			return EVENT_RET_HANDLED;

 			break;

 		case BUTTON_C: 

 			stopwatch_screen.item++;

 			stopwatch_screen.item%=stopw_end;

+			draw_stop_watch_screen(&stopwatch_screen,stopwm_menu);

 			return EVENT_RET_HANDLED;

 			break;

 		case BUTTON_F:

 			stopwatch_screen.showstats=1-stopwatch_screen.showstats;

+			draw_stop_watch_screen(&stopwatch_screen,stopwm_all);

+			return EVENT_RET_HANDLED;

+			break;

 		default:

 			return EVENT_RET_UNHANDLED;

 			break;

@@ -1086,11 +1123,10 @@ event_ret_t stop_watch_handle_events(uint16_t event, void *data)

 		case EVENT_USER_BUTTONS:

 			dbg_out("button event %d\n", *(int *)data);

 			ret=handle_stop_watch_buttons(*(watch_button *)data);

-			draw_stop_watch_screen(&stopwatch_screen);

 			return(ret);

 			break;

 		case EVENT_SCREEN_VISIBLE:

-			draw_stop_watch_screen(&stopwatch_screen);

+			draw_stop_watch_screen(&stopwatch_screen,stopwm_all);

 			return EVENT_RET_HANDLED;

 			break;

 		case EVENT_SCREEN_DESTROY:

@@ -1116,8 +1152,7 @@ event_ret_t stop_watch_handle_events(uint16_t event, void *data)

 				stopwatch_screen.current.hr = 0;

 			};

 			if ((stopwatch_screen.current.csec % 10)==0 || stopwatch_screen.running!=TRUE)

-				draw_stop_watch_screen(&stopwatch_screen);

-				//update_stop_watch_screen(&stopwatch_screen);

+				draw_stop_watch_screen(&stopwatch_screen,stopwm_current);

 			return EVENT_RET_HANDLED;

 			break;

 		default:

@@ -329,8 +329,6 @@ void draw_accel_screen(accel_data_t *accel_data)

 	oswald_draw_bitmap(36, 0, acc_icon_width, acc_icon_height, 1, acc_icon_bits);

-	oswald_draw_bitmap(81, 79, enterbutton_icon_width, enterbutton_icon_height, 1, enterbutton_icon_bits);

-

 	oswald_write_string(1, 40, FONT_6x9, FALSE, "X:");

 	oswald_write_number(15, 40, FONT_6x9, FALSE, accel_data->x);

 	oswald_write_string(1, 52, FONT_6x9, FALSE, "Y:");

@@ -872,8 +870,13 @@ typedef struct {

 	timerecord current;

 	int laps;

 	timerecord lapsdata[MAX_LAPS];

+	timerecord avg;

+	timerecord max;

+	timerecord min;

+	timerecord lastlap;

 	boolean running;

 	stopw_item item;

+	boolean showstats;

 } stopwatch_data_t;

 static stopwatch_data_t stopwatch_screen = { {0, 0, 0, 0},0,{{0, 0, 0, 0}} , FALSE,0};

@@ -886,22 +889,81 @@ static void timerecord2str(timerecord *tr, char *timebuf /* sizeof(timebuf)>=9 *

 	num2str(tr->min,timebuf+3,2,2);

 	timebuf[5]=':';

 	num2str(tr->sec,timebuf+6,2,2);

-	

 	num2str(tr->csec,csecbuf,2,2);

 }

+static void timerecord_diff(timerecord *new, timerecord *old, timerecord *res)

+{

+	int d,od;

+	mymemset(res,0,sizeof(timerecord));

+	d=(old->csec>new->csec)?1:0;

+	res->csec=(new->csec+d*100)-old->csec;

+	od=d,d=(old->sec>(new->sec-od))?1:0;

+	res->sec=(new->sec-od+d*60)-old->sec;

+	od=d,d=(old->min>(new->min-od))?1:0;

+	res->min=(new->min-od+d*60)-old->min;

+	res->hr=(new->hr-d)-old->hr;

+}

+

+static void timerecord_div(timerecord *total, int div, timerecord *res)

+{

+	int n;

+	mymemset(res,0,sizeof(timerecord));

+	if(div<0)

+		return;

+	res->hr=total->hr/div;

+	n=(((int)total->min)+(total->hr%div)*60);

+	res->min=n/div;

+	n=(((int)total->sec)+(n%div)*60);

+	res->sec=n/div;

+	n=(((int)total->csec)+(n%div)*100);

+	res->csec=n/div;

+}

+

+static int timerecord_cmp(timerecord *a, timerecord *b)

+{

+	if(a->hr!=b->hr) 

+		return(a->hr-b->hr);

+	if(a->min!=b->min)

+		return(a->min-b->min);

+	if(a->sec!=b->sec)

+		return(a->sec-b->sec);

+	return(a->csec-b->csec);

+}

+

 static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 {

 	int w;

 	char *hint;

-	int x;

+	int x,y;

 	char lapbuf[4];

 	char timebuf[9];

 	char csecbuf[3];

+	int i;

+	if(sdata->showstats) {

+		hal_lcd_clear_display();

+		oswald_draw_grid(1,1,94,94,100,100);

+		oswald_draw_bitmap(36, 3, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

+		/* laps */

+		num2str(sdata->laps,lapbuf,3,3);

+		oswald_writestr_font58_scaled(3,3,lapbuf,&w,1,0,2,2);

+		/* stats */

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

+			y=20+i*24;

+			hint=((i==0)?"Average":(i==1)?"Min":"Max");

+			oswald_writestr_font58(4,y+3,hint,&w,1,0);

+			timerecord2str(i==0?&(sdata->avg):i==1?&(sdata->min):&(sdata->max),timebuf,csecbuf);

+		        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+		        oswald_writestr_font58_scaled(x,y+12,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

+		        oswald_writestr_font58_scaled(x+w+1,y+12+6,csecbuf,&w,1,0,2,1);

+		}

+		hal_lcd_update_display();

+		return;

+	}

 	hal_lcd_clear_display();

-	oswald_draw_bitmap(36, 0, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

+	oswald_draw_bitmap(36, 3, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

 	/* Current menu option */

 	oswald_draw_rect(0,95-12,95,95,1);

 	hint=(sdata->item==stopw_startstop)?"Start-Stop":

@@ -913,14 +975,13 @@ static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 	/* Lap number */

 	num2str(sdata->laps,lapbuf,3,3);

-	oswald_writestr_font58_scaled(0,0,lapbuf,&w,1,0,2,2);

+	oswald_writestr_font58_scaled(3,3,lapbuf,&w,1,0,2,2);

 	/* Split diff */

-        mymemcpy(timebuf," 0:00:00",9);

-        mymemcpy(csecbuf,"00",3);

+	timerecord2str(&(sdata->lastlap),timebuf,csecbuf);

         x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

         oswald_writestr_font58_scaled(x,28,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

-        oswald_writestr_font58_scaled(x+w+1,35,csecbuf,&w,1,0,2,1);

+        oswald_writestr_font58_scaled(x+w+1,34,csecbuf,&w,1,0,2,1);

 	/* Split */

@@ -932,38 +993,29 @@ static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 	}

         x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

         oswald_writestr_font58_scaled(x,42,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

-        oswald_writestr_font58_scaled(x+w+1,49,csecbuf,&w,1,0,2,1);

-#warning TODO DIFF

+        oswald_writestr_font58_scaled(x+w+1,48,csecbuf,&w,1,0,2,1);

 	/* main display */

 	timerecord2str(&(sdata->current),timebuf,csecbuf);

 	x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

 	oswald_writestr_font58_scaled(x,61,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,3);

-	oswald_writestr_font58_scaled(x+w+1,67,csecbuf,&w,1,0,2,2);

+	x+=w;

+	oswald_writestr_font58_scaled(x+1,67,csecbuf,&w,1,0,2,2);

+	if(sdata->running)

+		oswald_draw_rect(x+10,67,x+17,78,0);

-/*	

-	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->hr % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->min / 10)+'0');

-	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->min % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->sec / 10)+'0');

-	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->sec % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->csec / 10)+'0');

-

-	gRow = 6;

-	gColumn = 61;

-	gRow += 13 + oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_hr % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_min / 10)+'0');

-	gRow += 13 + oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_min % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_sec / 10)+'0');

-	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_sec % 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_csec / 10)+'0');

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_csec % 10)+'0');

-*/

 	hal_lcd_update_display();

 }

 event_ret_t handle_stop_watch_buttons(watch_button button)

 {

+	if(stopwatch_screen.showstats) {

+		if(button==BUTTON_F)

+			stopwatch_screen.showstats=0;

+		else if(button==BUTTON_D)

+			return(EVENT_RET_UNHANDLED);

+		return(EVENT_RET_HANDLED);

+	}

 	switch (button) {

 		case BUTTON_B: // start/stop

 			if(stopwatch_screen.item==stopw_startstop) {

@@ -985,35 +1037,41 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 					}

 					stopwatch_screen.laps++;

 					mymemcpy(stopwatch_screen.lapsdata+l,&(stopwatch_screen.current),sizeof(timerecord));

+					/* update statistics */

+					if(l>0)

+						timerecord_diff(stopwatch_screen.lapsdata+l,stopwatch_screen.lapsdata+l-1,&(stopwatch_screen.lastlap));

+					else

+						mymemcpy(&(stopwatch_screen.lastlap),stopwatch_screen.lapsdata+l,sizeof(timerecord));

+					timerecord_div(stopwatch_screen.lapsdata+l,stopwatch_screen.laps,&(stopwatch_screen.avg));

+					if(stopwatch_screen.laps==1 || timerecord_cmp(&(stopwatch_screen.lastlap),&(stopwatch_screen.min))<0)

+						mymemcpy(&(stopwatch_screen.min),&(stopwatch_screen.lastlap),sizeof(timerecord));

+					if(stopwatch_screen.laps==1 || timerecord_cmp(&(stopwatch_screen.lastlap),&(stopwatch_screen.max))>0)

+						mymemcpy(&(stopwatch_screen.max),&(stopwatch_screen.lastlap),sizeof(timerecord));

 				} else {

 					hal_enable_centisecond_timer();

 					stopwatch_screen.running = TRUE;

 				}

-#warning TODO: statistics

 			} else if(stopwatch_screen.item==stopw_reset) {

-				stopwatch_screen.current.hr = 0;

-				stopwatch_screen.current.min = 0;

-				stopwatch_screen.current.sec = 0;

-				stopwatch_screen.current.csec = 0;

-				stopwatch_screen.laps=0;

+				if(stopwatch_screen.running)

+					hal_disable_centisecond_timer();

+				mymemset(&(stopwatch_screen),0,sizeof(stopwatch_screen));

 			} else {

 				return EVENT_RET_UNHANDLED;

 			}

-			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

 		case BUTTON_A: 

 			stopwatch_screen.item+=stopw_end-1;

 			stopwatch_screen.item%=stopw_end;

-			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

 		case BUTTON_C: 

 			stopwatch_screen.item++;

 			stopwatch_screen.item%=stopw_end;

-			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

+		case BUTTON_F:

+			stopwatch_screen.showstats=1-stopwatch_screen.showstats;

 		default:

 			return EVENT_RET_UNHANDLED;

 			break;

@@ -1023,11 +1081,13 @@ event_ret_t handle_stop_watch_buttons(watch_button button)

 event_ret_t stop_watch_handle_events(uint16_t event, void *data)

 {

+	event_ret_t ret;

 	switch (event) {

 		case EVENT_USER_BUTTONS:

 			dbg_out("button event %d\n", *(int *)data);

+			ret=handle_stop_watch_buttons(*(watch_button *)data);

 			draw_stop_watch_screen(&stopwatch_screen);

-			return handle_stop_watch_buttons(*(watch_button *)data);

+			return(ret);

 			break;

 		case EVENT_SCREEN_VISIBLE:

 			draw_stop_watch_screen(&stopwatch_screen);

@@ -1055,7 +1115,7 @@ event_ret_t stop_watch_handle_events(uint16_t event, void *data)

 			if (stopwatch_screen.current.hr > 59) {

 				stopwatch_screen.current.hr = 0;

 			};

-			if (stopwatch_screen.current.csec % 10 == 0)

+			if ((stopwatch_screen.current.csec % 10)==0 || stopwatch_screen.running!=TRUE)

 				draw_stop_watch_screen(&stopwatch_screen);

 				//update_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

@@ -1073,10 +1133,12 @@ event_ret_t stop_watch_handle_events(uint16_t event, void *data)

  */

 void draw_alarm_screen(void)

 {

+	static char txt[]={"Alarm"};

+	int w;

 	hal_lcd_clear_display();

-

 	oswald_draw_bitmap(36, 20, alarm_icon_width, alarm_icon_height, 1, alarm_icon_bits);

-

+	w=oswald_getwidth_font58_scaled(txt,1,2);

+	oswald_writestr_font58_scaled((96-1-w)/2+1,49,txt,&w,1,0,1,2);

 	hal_lcd_update_display();

 }

@@ -1136,50 +1198,45 @@ void draw_bluetooth_screen(bluetooth_data_t *sdata)

 	hal_lcd_clear_display();

-	oswald_draw_bitmap(36, 0, bluetooth_icon_width, bluetooth_icon_height, 1, bluetooth_icon_bits);

+	oswald_draw_bitmap(36, 3, bluetooth_icon_width, bluetooth_icon_height, 1, bluetooth_icon_bits);

-	if (sdata->set_mode) {

-		oswald_draw_bitmap(81, 6, upbutton_icon_width, upbutton_icon_height, 1, upbutton_icon_bits);

-		oswald_draw_bitmap(81, 38, downbutton_icon_width, downbutton_icon_height, 1, downbutton_icon_bits);

-		oswald_draw_bitmap(81, 70, rightbutton_icon_width, rightbutton_icon_height, 1, rightbutton_icon_bits);

-	} else {

-		oswald_draw_bitmap(81, 70, enterbutton_icon_width, enterbutton_icon_height, 1, enterbutton_icon_bits);

-	}

+	if (sdata->set_mode) 

+		oswald_draw_grid(1,1,94,94,100,100);

-	oswald_write_string(1, 30, FONT_DROID8x12, FALSE, "Enable:");

-	if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {

-		if (bluetooth_screen.bt_en)

-			oswald_draw_bitmap(53, 33, checked_icon_width, checked_icon_height, 1, checked_icon_bits);

-		else

-			oswald_draw_bitmap(53, 33, unchecked_icon_width, unchecked_icon_height, 1, unchecked_icon_bits);

-	}

-	oswald_write_string(1, 40, FONT_DROID8x12, FALSE, "State:");

+	oswald_write_string(25, 39, FONT_DROID8x12, FALSE, "State");

 	switch (hal_bluetooth_get_state()) {

 		case BLUETOOTH_OFF:

-			oswald_write_string(53, 40, FONT_DROID8x12, FALSE, "off");

+			oswald_write_string(53, 39, FONT_DROID8x12, FALSE, "off");

 			break;

 		case BLUETOOTH_ON:

-			oswald_write_string(53, 40, FONT_DROID8x12, FALSE, "on");

+			oswald_write_string(53, 39, FONT_DROID8x12, FALSE, "on");

 			break;

 		case BLUETOOTH_CONNECTED:

-			oswald_write_string(53, 40, FONT_DROID8x12, FALSE, "conn.");

+			oswald_write_string(53, 39, FONT_DROID8x12, FALSE, "conn.");

 			break;

 		default:

 			break;

 	};

-	oswald_write_string(1, 50, FONT_DROID8x12, FALSE, "Visible:");

+	oswald_write_string(16, 54, FONT_DROID8x12, FALSE, "Enabled");

+	if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {

+		if (bluetooth_screen.bt_en)

+			oswald_draw_bitmap(53, 53, checked_icon_width, checked_icon_height, 1, checked_icon_bits);

+		else

+			oswald_draw_bitmap(53, 53, unchecked_icon_width, unchecked_icon_height, 1, unchecked_icon_bits);

+	}

+	oswald_write_string(18, 69, FONT_DROID8x12, FALSE, "Visible");

 	if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {

 		// oswald_write_character(53, 50, FONT_DROID8x12, hal_bluetooth_get_visible() ? 'x' : '_');

 		if (hal_bluetooth_get_visible())

-			oswald_draw_bitmap(53, 53, checked_icon_width, checked_icon_height, 1, checked_icon_bits);

+			oswald_draw_bitmap(53, 68, checked_icon_width, checked_icon_height, 1, checked_icon_bits);

 		else

-			oswald_draw_bitmap(53, 53, unchecked_icon_width, unchecked_icon_height, 1, unchecked_icon_bits);

+			oswald_draw_bitmap(53, 68, unchecked_icon_width, unchecked_icon_height, 1, unchecked_icon_bits);

 	}

 	if (hal_bluetooth_get_state() >= BLUETOOTH_ON) {

 		int i,off,c;

 		bd_addr = hal_bluetooth_get_local_bdaddr();

-		for(i=5,off=0;i>=0;i++) {

+		for(i=5,off=0;i>=0;i--) {

 			if(i!=5)

 				bstr[off++]=':';

 			c=(bd_addr[i]>>4)&0xf;

@@ -1188,8 +1245,7 @@ void draw_bluetooth_screen(bluetooth_data_t *sdata)

 			bstr[off++]=((c<10)?(c+'0'):(c+'a'-10));

 		}

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

-		oswald_write_string(2, 85, FONT_5x7, FALSE, bstr);

-	} else {

+		oswald_write_string(11, 85, FONT_5x7, FALSE, bstr);

 	}

 	hal_lcd_update_display();

@@ -1223,15 +1279,17 @@ event_ret_t handle_bluetooth_buttons(watch_button button, bluetooth_data_t *sdat

 {

 	if (bluetooth_screen.set_mode) {

 		switch (button) {

-			case BUTTON_A:

+			case BUTTON_B:

 				bluetooth_handle_updown(sdata->pos, 1);

 				break;

-			case BUTTON_B:

+			case BUTTON_E:

 				bluetooth_handle_updown(sdata->pos, -1);

 				break;

+			case BUTTON_A:

+				sdata->pos=1-sdata->pos;

+				break;

 			case BUTTON_C:

-				sdata->pos++;

-				sdata->pos %= 2;

+				sdata->pos=1-sdata->pos;

 				break;

 			case BUTTON_F:

 				bluetooth_screen.set_mode = FALSE;

@@ -7,6 +7,8 @@

 #include "oswald_hal.h"

 #include "dayslib.h"

+#include "mymem.h"

+#include "strutils.h"

 #include "oswald_screens.h"

@@ -234,9 +236,7 @@ void draw_main_menu_screen(main_menu_data_t *sdata)

 		if(i==sdata->pos)

 			oswald_draw_rect(0,y-5,95,y+32-5,1);

 		oswald_draw_bitmap(x,y,menu_items[i].width,menu_items[i].height,(i==sdata->pos)?0:1,menu_items[i].bits);

-		for(t=menu_items[i].name;*t!='\0';t++,x+=w+1) {

-			oswald_draw_font58_scaled(x+30, y+6,*t,&w,(i==sdata->pos)?0:1,(i==sdata->pos)?1:0,1,2);

-		}

+		oswald_writestr_font58_scaled(x+30, y+6,menu_items[i].name,&w,(i==sdata->pos)?0:1,(i==sdata->pos)?1:0,1,2);

 	}

@@ -855,33 +855,93 @@ event_ret_t test_menu_handle_events(uint16_t event, void *data)

 /*

  * Stop Watch

  */

+typedef enum estopw_item {

+	stopw_startstop,

+	stopw_split,

+	stopw_reset,

+	stopw_end

+} stopw_item;

 typedef struct {

 	uint8_t hr;

 	uint8_t min;

 	uint8_t sec;

 	uint8_t csec;

-	uint8_t lapse_hr;

-	uint8_t lapse_min;

-	uint8_t lapse_sec;

-	uint8_t lapse_csec;

+} timerecord;

+#define MAX_LAPS 2

+typedef struct {

+	timerecord current;

+	int laps;

+	timerecord lapsdata[MAX_LAPS];

 	boolean running;

+	stopw_item item;

 } stopwatch_data_t;

-static stopwatch_data_t stopwatch_screen = { 0, 0, 0, 0, 0, 0, 0, 0, FALSE };

+static stopwatch_data_t stopwatch_screen = { {0, 0, 0, 0},0,{{0, 0, 0, 0}} , FALSE,0};

+static void timerecord2str(timerecord *tr, char *timebuf /* sizeof(timebuf)>=9 */, char *csecbuf /*sizeof(csecbuf)>=3*/)

+{

+	num2str(tr->hr,timebuf,2,2);

+	if(tr->hr<10)

+		timebuf[0]=' ';

+	timebuf[2]=':';

+	num2str(tr->min,timebuf+3,2,2);

+	timebuf[5]=':';

+	num2str(tr->sec,timebuf+6,2,2);

+	

+	num2str(tr->csec,csecbuf,2,2);

+}

 static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 {

-	int gRow = 1;

-	int gColumn = 35;

+	int w;

+	char *hint;

+	int x;

+	char lapbuf[4];

+	char timebuf[9];

+	char csecbuf[3];

 	hal_lcd_clear_display();

 	oswald_draw_bitmap(36, 0, stopwatch_icon_width, stopwatch_icon_height, 1, stopwatch_icon_bits);

-

-	oswald_draw_bitmap(81, 6, startstopbutton_icon_width, startstopbutton_icon_height, 1, startstopbutton_icon_bits);

-	oswald_draw_bitmap(81, 38, lapsebutton_icon_width, lapsebutton_icon_height, 1, lapsebutton_icon_bits);

-	oswald_draw_bitmap(81, 70, enterbutton_icon_width, enterbutton_icon_height, 1, enterbutton_icon_bits);

-

+	/* Current menu option */

+	oswald_draw_rect(0,95-12,95,95,1);

+	hint=(sdata->item==stopw_startstop)?"Start-Stop":

+		(sdata->item==stopw_split)?"Start-Split":

+		(sdata->item==stopw_reset)?"Reset":

+		"Unknown";

+	w=oswald_getwidth_font58_scaled(hint,2,1);

+	oswald_writestr_font58_scaled((96-w)/2,95-8,hint,&w,0,1,2,1);

+

+	/* Lap number */

+	num2str(sdata->laps,lapbuf,3,3);

+	oswald_writestr_font58_scaled(0,0,lapbuf,&w,1,0,2,2);

+

+	/* Split diff */

+        mymemcpy(timebuf," 0:00:00",9);

+        mymemcpy(csecbuf,"00",3);

+        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+        oswald_writestr_font58_scaled(x,28,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

+        oswald_writestr_font58_scaled(x+w+1,35,csecbuf,&w,1,0,2,1);

+

+

+	/* Split */

+	if(sdata->laps>0)

+		timerecord2str(sdata->lapsdata+((sdata->laps<MAX_LAPS)?sdata->laps-1:MAX_LAPS-1),timebuf,csecbuf);	

+	else {

+		mymemcpy(timebuf," 0:00:00",9);

+		mymemcpy(csecbuf,"00",3);

+	}

+        x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+        oswald_writestr_font58_scaled(x,42,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,2);

+        oswald_writestr_font58_scaled(x+w+1,49,csecbuf,&w,1,0,2,1);

+#warning TODO DIFF

+

+	/* main display */

+	timerecord2str(&(sdata->current),timebuf,csecbuf);

+	x=8+((timebuf[0]==' ')?oswald_getwidth_font58_scaled("0",2,3):0);

+	oswald_writestr_font58_scaled(x,61,timebuf+((timebuf[0]==' ')?1:0),&w,1,0,2,3);

+	oswald_writestr_font58_scaled(x+w+1,67,csecbuf,&w,1,0,2,2);

+	

+/*	

 	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->hr % 10)+'0');

 	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->min / 10)+'0');

 	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (sdata->min % 10)+'0');

@@ -898,39 +958,60 @@ static void draw_stop_watch_screen(stopwatch_data_t *sdata)

 	gRow += 3 + oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_sec % 10)+'0');

 	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_csec / 10)+'0');

 	gRow += oswald_write_character(gRow, gColumn, FONT_LCD8x13, FALSE, (sdata->lapse_csec % 10)+'0');

-

+*/

 	hal_lcd_update_display();

 }

 event_ret_t handle_stop_watch_buttons(watch_button button)

 {

 	switch (button) {

-		case BUTTON_A: // start/stop

-			if (stopwatch_screen.running) {

-				hal_disable_centisecond_timer();

-				stopwatch_screen.running = FALSE;

+		case BUTTON_B: // start/stop

+			if(stopwatch_screen.item==stopw_startstop) {

+				if (stopwatch_screen.running) {

+					hal_disable_centisecond_timer();

+					stopwatch_screen.running = FALSE;

+				} else {

+					hal_enable_centisecond_timer();

+					stopwatch_screen.running = TRUE;

+				}

+			} else if(stopwatch_screen.item==stopw_split) {

+				if (stopwatch_screen.running) {

+					int l;

+					if(stopwatch_screen.laps>=MAX_LAPS) {

+						mymemmove(stopwatch_screen.lapsdata,stopwatch_screen.lapsdata+1,(MAX_LAPS-1)*sizeof(timerecord));

+						l=MAX_LAPS-1;

+					} else {

+						l=stopwatch_screen.laps;

+					}

+					stopwatch_screen.laps++;

+					mymemcpy(stopwatch_screen.lapsdata+l,&(stopwatch_screen.current),sizeof(timerecord));

+				} else {

+					hal_enable_centisecond_timer();

+					stopwatch_screen.running = TRUE;

+				}

+#warning TODO: statistics

+			} else if(stopwatch_screen.item==stopw_reset) {

+				stopwatch_screen.current.hr = 0;

+				stopwatch_screen.current.min = 0;

+				stopwatch_screen.current.sec = 0;

+				stopwatch_screen.current.csec = 0;

+				stopwatch_screen.laps=0;

 			} else {

-				hal_enable_centisecond_timer();

-				stopwatch_screen.running = TRUE;

+				return EVENT_RET_UNHANDLED;

 			}

+			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

-		case BUTTON_B: // lapse

-			stopwatch_screen.lapse_hr = stopwatch_screen.hr;

-			stopwatch_screen.lapse_min = stopwatch_screen.min;

-			stopwatch_screen.lapse_sec = stopwatch_screen.sec;

-			stopwatch_screen.lapse_csec = stopwatch_screen.csec;

+		case BUTTON_A: 

+			stopwatch_screen.item+=stopw_end-1;

+			stopwatch_screen.item%=stopw_end;

+			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

-		case BUTTON_F: // reset

-			stopwatch_screen.hr = 0;

-			stopwatch_screen.min = 0;

-			stopwatch_screen.sec = 0;

-			stopwatch_screen.csec = 0;

-			stopwatch_screen.lapse_hr = 0;

-			stopwatch_screen.lapse_min = 0;

-			stopwatch_screen.lapse_sec = 0;

-			stopwatch_screen.lapse_csec = 0;

+		case BUTTON_C: 

+			stopwatch_screen.item++;

+			stopwatch_screen.item%=stopw_end;

+			draw_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

 			break;

 		default:

@@ -958,23 +1039,23 @@ event_ret_t stop_watch_handle_events(uint16_t event, void *data)

 			return EVENT_RET_HANDLED;

 			break;

 		case EVENT_CS_TIMER:

-			stopwatch_screen.csec++;

-			if (stopwatch_screen.csec > 99) {

-				stopwatch_screen.csec = 0;

-				stopwatch_screen.sec++;

+			stopwatch_screen.current.csec++;

+			if (stopwatch_screen.current.csec > 99) {

+				stopwatch_screen.current.csec = 0;

+				stopwatch_screen.current.sec++;

 			};

-			if (stopwatch_screen.sec > 59) {

-				stopwatch_screen.sec = 0;

-				stopwatch_screen.min++;

+			if (stopwatch_screen.current.sec > 59) {

+				stopwatch_screen.current.sec = 0;

+				stopwatch_screen.current.min++;

 			};

-			if (stopwatch_screen.min > 59) {

-				stopwatch_screen.min = 0;

-				stopwatch_screen.hr++;

+			if (stopwatch_screen.current.min > 59) {

+				stopwatch_screen.current.min = 0;

+				stopwatch_screen.current.hr++;

 			};

-			if (stopwatch_screen.hr > 59) {

-				stopwatch_screen.hr = 0;

+			if (stopwatch_screen.current.hr > 59) {

+				stopwatch_screen.current.hr = 0;

 			};

-			if (stopwatch_screen.csec % 10 == 0)

+			if (stopwatch_screen.current.csec % 10 == 0)

 				draw_stop_watch_screen(&stopwatch_screen);

 				//update_stop_watch_screen(&stopwatch_screen);

 			return EVENT_RET_HANDLED;

@@ -1096,8 +1177,17 @@ void draw_bluetooth_screen(bluetooth_data_t *sdata)

 	}

 	if (hal_bluetooth_get_state() >= BLUETOOTH_ON) {

+		int i,off,c;

 		bd_addr = hal_bluetooth_get_local_bdaddr();

-		snprintf(bstr, 20, "%02x:%02x:%02x:%02x:%02x:%02x", bd_addr[5], bd_addr[4], bd_addr[3], bd_addr[2], bd_addr[1], bd_addr[0]);

+		for(i=5,off=0;i>=0;i++) {

+			if(i!=5)

+				bstr[off++]=':';

+			c=(bd_addr[i]>>4)&0xf;

+			bstr[off++]=((c<10)?(c+'0'):(c+'a'-10));

+			c=bd_addr[i]&0xf;

+			bstr[off++]=((c<10)?(c+'0'):(c+'a'-10));

+		}

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

 		oswald_write_string(2, 85, FONT_5x7, FALSE, bstr);

 	} else {

 	}

@@ -1212,13 +1302,10 @@ void draw_info_screen(void)

 	oswald_draw_bitmap(36, 0, info_icon_width, info_icon_height, 1, info_icon_bits);

-	w=oswald_getwidth_string(FONT_5x8,OsName);

-	for(x=(96-w-1)/2,ptr=OsName;*ptr!='\0';ptr++) {

-		oswald_draw_font58_scaled(x,29,*ptr,&w,1,0,1,2);

-		x+=w+1;

-	}

-	w=oswald_getwidth_string(FONT_5x8,OSWALD_VERSION);

-	oswald_write_string((96-w-1)/2, 44, FONT_5x8, FALSE, OSWALD_VERSION);

+	w=oswald_getwidth_font58_scaled(OsName,1,2);

+	oswald_writestr_font58_scaled((96-w-1)/2,29,OsName,&w,1,0,1,2);

+	w=oswald_getwidth_font58(OSWALD_VERSION);

+	oswald_writestr_font58((96-w-1)/2, 44, OSWALD_VERSION, &w, 1, 0);

 	oswald_write_string(2, 61, FONT_DROID8x12, FALSE, "HAL");

 	oswald_write_string(35, 61, FONT_DROID8x12, FALSE, (char *)hal_get_version_string());

 	oswald_write_string(2, 73, FONT_DROID8x12, FALSE, "Build");

@@ -1297,9 +1384,27 @@ message_t Msg[] = {

 	{ MSG_TYPE_END, {0,0,0,0,0}, "Exit" },

 };

+static void msginfo2str(message_t *msginfo,char *dstr, int dstrsize)

+{

+	int off=0;

+	dstr[off++]=(msginfo->type == MSG_TYPE_NEW) ? '*':' ';

+	dstr[off++]=' ';

+	off+=num2str(msginfo->td.day,dstr+off,2,2);

+	dstr[off++]='.';

+	off+=num2str(msginfo->td.month,dstr+off,2,2);

+	dstr[off++]='.';

+	off+=num2str(msginfo->td.year+1900,dstr+off,4,4);

+	dstr[off++]=' ';

+	off+=num2str(msginfo->td.hour,dstr+off,2,2);

+	dstr[off++]=':';

+	off+=num2str(msginfo->td.minute,dstr+off,2,2);

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

+}

+

 void draw_message_screen(messages_data_t *sdata)

 {

 	char dstr[32];

+	int off;

 	uint8_t strpos, msglen;

 	uint8_t line;

@@ -1312,7 +1417,12 @@ void draw_message_screen(messages_data_t *sdata)

 	oswald_draw_bitmap(81, 70, enterbutton_icon_width, enterbutton_icon_height, 1, enterbutton_icon_bits);

 	Msg[sdata->offset + sdata->pos].type = MSG_TYPE_READ;