@@ -174,7 +174,7 @@ void DrawLcdAnaClock(boolean show_seconds)

 	hal_lcd_clear_display();

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

-	snprintf(tstr, 16, "%2d", OswaldClk.day);

+	tstr[num2str(OswaldClk.day,tstr,1,2)]='\0';

 	oswald_write_string(70, 44, FONT_5x8, 1, tstr);

 	// Marker

@@ -221,7 +221,7 @@ void DrawLcdDigitalClockGen(boolean show_seconds, int show_wday)

 	static char *dnames[]={"SUN","MON","TUE","WED","THU","FRI","SAT"};

 	int w,x,y,yf;

 	unsigned char val;

-	char *t;

+	const char *t;

 	hal_lcd_clear_display();

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

 	if(show_wday) {

@@ -269,6 +269,8 @@ void DrawCalendarClock(boolean show_seconds)

 	int sx,sy;

 	int gw,gh;

 	int wday,yday,month,year,day,rollup;

+	const char *ptr;

+	int off;

 	hal_lcd_clear_display();

 	gRow=4;

@@ -301,10 +303,24 @@ void DrawCalendarClock(boolean show_seconds)

 	if(!OswaldClk.clk24hr)

 		oswald_write_string(gRow+3,gColumn+3,FONT_6x9, FALSE,(OswaldClk.hour>12)?"PM":"AM");

 	/* The date */

-	if (OswaldClk.day_first)

-		snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);

-	else

-		snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);

+	off=0;

+	ptr=daynames[OswaldClk.wday];

+	off=mystrlen(ptr);

+	mymemcpy(tstr,ptr,off);

+	tstr[off++]=' ';

+	if (OswaldClk.day_first) {

+		off+=num2str(OswaldClk.day,tstr+off,1,sizeof(tstr)-off-3);

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

+		off+=num2str(OswaldClk.month,tstr+off,1,sizeof(tstr)-off-2);

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

+	} else {

+		off+=num2str(OswaldClk.month,tstr+off,1,sizeof(tstr)-off-3);

+		tstr[off++]='/';

+		off+=num2str(OswaldClk.day,tstr+off,1,sizeof(tstr)-off-2);

+		tstr[off++]=' ';

+	}

+	off+=num2str(OswaldClk.year,tstr+off,1,sizeof(tstr)-off-1);

+	tstr[off]='\0';

 	oswald_draw_rect(2,0,93,7,1);

 	oswald_write_string(3, 0, FONT_5x8, 1, tstr);

 	/* The minicalendar */

@@ -41,6 +41,10 @@ __attribute__((__far__))

 #if defined(__GNUC__) && (__MSP430X__ > 0)

 __attribute__((__far__))

 #endif

+#include "bitmaps/tinybluetooth_icon.xbm"

+#if defined(__GNUC__) && (__MSP430X__ > 0)

+__attribute__((__far__))

+#endif

 #include "bitmaps/bluetooth_con_icon.xbm"

 #if defined(__GNUC__) && (__MSP430X__ > 0)

 __attribute__((__far__))

@@ -140,7 +144,7 @@ void draw_status_icons(int x, int y, int fg)

 	}

 	if (hal_bluetooth_get_state() == BLUETOOTH_ON)

-		oswald_draw_bitmap(x, y, bluetooth_icon_width, bluetooth_icon_height, fg, bluetooth_icon_bits);

+		oswald_draw_bitmap(x, y, tinybluetooth_icon_width, tinybluetooth_icon_height, fg, tinybluetooth_icon_bits);

 	else if (hal_bluetooth_get_state() == BLUETOOTH_CONNECTED)

 		oswald_draw_bitmap(x, y, bluetooth_con_icon_width, bluetooth_con_icon_height, fg, bluetooth_con_icon_bits);

 }

@@ -212,19 +212,24 @@ void DrawLcdAnaClock(boolean show_seconds)

 static const char *daynames[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };

-void DrawLcdDigitalClock(boolean show_seconds)

+void DrawLcdDigitalClockGen(boolean show_seconds, int show_wday)

 {

+	static char *dnames[]={"SUN","MON","TUE","WED","THU","FRI","SAT"};

 	int w,x,y,yf;

 	unsigned char val;

+	char *t;

 	hal_lcd_clear_display();

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

+	if(show_wday) {

+		for(x=24,y=6,t=daynames[OswaldClk.wday];*t!='\0';t++,x+=w+4) 

+			oswald_draw_font58_scaled(x,y,*t,&w,0,1,3,2);

+	}

 	val = OswaldClk.hour;

 	if (!OswaldClk.clk24hr)

 		val=(val>12)?val-12:val;

 	x=6;

-	//yf=5;

 	yf=10;

-	y=(96/2)-(3*yf);

+	y=(96/2)-(3*yf)+(show_wday?10:0);

 	if(val>=10)

 		oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,0,1,4,yf);

 	oswald_draw_font58_scaled((x=x+16+2),y,(val % 10)+'0',&w,0,1,4,yf);

@@ -239,6 +244,16 @@ void DrawLcdDigitalClock(boolean show_seconds)

 	hal_lcd_update_display();

 }

+void 

+DrawLcdDigitalClock(boolean show_seconds) {

+	DrawLcdDigitalClockGen(show_seconds,0);

+}

+

+void 

+DrawLcdDigitalClock2(boolean show_seconds) {

+	DrawLcdDigitalClockGen(show_seconds,1);

+}

+

 void DrawCalendarClock(boolean show_seconds)

 {

 	int gRow = 1;

@@ -104,41 +104,45 @@ int16_t f_cos(int16_t v)

 	return sintab[v];

 }

-void draw_status_icons(void)

+void draw_status_icons(int x, int y, int fg)

 {

 	static uint8_t ci = 0;

+	if(x==-1)

+		x=81;

+	if(y==-1)

+		y=0;

 	if (OswaldPowerState.source) {

-		oswald_draw_bitmap(81, 0, charger_icon_width, charger_icon_height, charger_icon_bits);

+		oswald_draw_bitmap(x, y, charger_icon_width, charger_icon_height, fg, charger_icon_bits);

 		if (OswaldPowerState.charge_state != POWER_CHARGER_DONE) {

-			if (ci==0) oswald_draw_bitmap(81, 0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);

-			else if (ci==1) oswald_draw_bitmap(81, 0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);

-			else if (ci==2) oswald_draw_bitmap(81, 0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);

-			else if (ci==3) oswald_draw_bitmap(81, 0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);

-			else if (ci==4) oswald_draw_bitmap(81, 0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);

+			if (ci==0) oswald_draw_bitmap(x, y, battery0_icon_width, battery0_icon_height, fg, battery0_icon_bits);

+			else if (ci==1) oswald_draw_bitmap(x, y, battery25_icon_width, battery25_icon_height, fg, battery25_icon_bits);

+			else if (ci==2) oswald_draw_bitmap(x, y, battery50_icon_width, battery50_icon_height, fg, battery50_icon_bits);

+			else if (ci==3) oswald_draw_bitmap(x, y, battery75_icon_width, battery75_icon_height, fg, battery75_icon_bits);

+			else if (ci==4) oswald_draw_bitmap(x, y, battery100_icon_width, battery100_icon_height, fg, battery100_icon_bits);

 			ci++;

 			ci %= 5;

 		} else {

-			oswald_draw_bitmap(81, 0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);

+			oswald_draw_bitmap(x, y, battery100_icon_width, battery100_icon_height, fg, battery100_icon_bits);

 		}

 	} else {

 		if (OswaldPowerState.percent > 75)

-			oswald_draw_bitmap(81, 0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);

+			oswald_draw_bitmap(x, y, battery100_icon_width, battery100_icon_height, fg, battery100_icon_bits);

 		else if (OswaldPowerState.percent > 50)

-			oswald_draw_bitmap(81, 0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);

+			oswald_draw_bitmap(x, y, battery75_icon_width, battery75_icon_height, fg, battery75_icon_bits);

 		else if (OswaldPowerState.percent > 25)

-			oswald_draw_bitmap(81, 0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);

+			oswald_draw_bitmap(x, y, battery50_icon_width, battery50_icon_height, fg, battery50_icon_bits);

 		else if (OswaldPowerState.percent > 5)

-			oswald_draw_bitmap(81, 0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);

+			oswald_draw_bitmap(x, y, battery25_icon_width, battery25_icon_height, fg, battery25_icon_bits);

 		else

-			oswald_draw_bitmap(81, 0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);

+			oswald_draw_bitmap(x, y, battery0_icon_width, battery0_icon_height, fg, battery0_icon_bits);

 	}

 	if (hal_bluetooth_get_state() == BLUETOOTH_ON)

-		oswald_draw_bitmap(81, 0, bluetooth_icon_width, bluetooth_icon_height, bluetooth_icon_bits);

+		oswald_draw_bitmap(x, y, bluetooth_icon_width, bluetooth_icon_height, fg, bluetooth_icon_bits);

 	else if (hal_bluetooth_get_state() == BLUETOOTH_CONNECTED)

-		oswald_draw_bitmap(81, 0, bluetooth_con_icon_width, bluetooth_con_icon_height, bluetooth_con_icon_bits);

+		oswald_draw_bitmap(x, y, bluetooth_con_icon_width, bluetooth_con_icon_height, fg, bluetooth_con_icon_bits);

 }

 void DrawLcdAnaClock(boolean show_seconds)

@@ -164,9 +168,10 @@ void DrawLcdAnaClock(boolean show_seconds)

 		seconds += 60;

 	hal_lcd_clear_display();

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

 	snprintf(tstr, 16, "%2d", OswaldClk.day);

-	oswald_write_string(70, 43, FONT_6x9, FALSE, tstr);

+	oswald_write_string(70, 44, FONT_5x8, 1, tstr);

 	// Marker

 	// plot(R*cos(360° * i/N), R*sin(360° * i/N))

@@ -175,7 +180,7 @@ void DrawLcdAnaClock(boolean show_seconds)

 		y = 47 + ((43 * f_sin((360 / 12) * i)) / 100);

 		x2 = 47 + ((47 * f_cos((360 / 12) * i)) / 100);

 		y2 = 47 + ((47 * f_sin((360 / 12) * i)) / 100);

-		oswald_draw_line_ww(x, y, x2, y2, 2);

+		oswald_draw_line_ww(x, y, x2, y2, 0, 2);

 		// g_printerr("br %d,%d %d,%d\n", x,y,x2,y2);

 	};

@@ -184,14 +189,14 @@ void DrawLcdAnaClock(boolean show_seconds)

 	x =  tmp;

 	tmp = 47 + (30 * f_sin(((360 / 12) * hour) + ((OswaldClk.minute * 360) /12 / 60)) / 100);

 	y =  tmp;

-	oswald_draw_line_ww(47, 47, x, y, 2);

+	oswald_draw_line_ww(47, 47, x, y, 0, 2);

 	// Minute

 	tmp = 47 + ((40 * f_cos((360 / 60) * minute)) / 100);

 	x =  tmp;

 	tmp = 47 + ((40 * f_sin((360 / 60) * minute)) / 100);

 	y =  tmp;

-	oswald_draw_line_ww(47, 47, x, y, 2);

+	oswald_draw_line_ww(47, 47, x, y, 0, 2);

 	if (show_seconds) {

 		// Seconds

@@ -199,11 +204,9 @@ void DrawLcdAnaClock(boolean show_seconds)

 		x =  tmp;

 		tmp = 47 + ((40 * f_sin((360 / 60) * seconds)) / 100);

 		y =  tmp;

-		oswald_draw_line(47, 47, x, y);

+		oswald_draw_line(47, 47, x, y, 0);

 	};

-	draw_status_icons();

-

 	hal_lcd_update_display();

 }

@@ -284,7 +287,7 @@ void DrawCalendarClock(boolean show_seconds)

 	else

 		snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);

 	oswald_draw_rect(2,0,93,7,1);

-	oswald_write_string(3, 0, FONT_DROID8x12, 1, tstr);

+	oswald_write_string(3, 0, FONT_5x8, 1, tstr);

 	/* The minicalendar */

 	gw=13;

 	gh=11;

@@ -318,7 +321,7 @@ void DrawCalendarClock(boolean show_seconds)

       	        }

 	}

 	/* The banner */

-	oswald_draw_bitmap(0, 95-32, banner_img_width, banner_img_height, banner_img_bits);

+	oswald_draw_bitmap(0, 95-32, banner_img_width, banner_img_height, 1, banner_img_bits);

 	hal_lcd_update_display();

 }

@@ -333,24 +336,23 @@ void DrawHelpClock(boolean show_seconds)

 		val=(val>12)?val-12:val;

 	x=31;

 	y=40;

-	//oswald_draw_grid(0,0,95,95,2,2);

-	oswald_draw_grid(x-2,0,x+32,95,2,2);

-	oswald_draw_rect(x-2+1,y-4+1,x+32-1,y+15-1,0);

+	oswald_draw_grid(x-2+7,0,x+32-7,95,2,2);

+	oswald_draw_rect(x-2+1,y-4+1-6,x+32-1,y+15-1+6,1);

 	if(val>=10)

-		oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,1,0,1,2);

-	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,1,0,1,2);

+		oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,0,1,1,2);

+	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,0,1,1,2);

 	x+=5+2;

 	if(OswaldClk.second % 2) {

-		oswald_draw_rect(x,y+4,x+1,y+5,1);

-		oswald_draw_rect(x,y+8,x+1,y+9,1);

+		oswald_draw_rect(x,y+4,x+1,y+5,0);

+		oswald_draw_rect(x,y+8,x+1,y+9,0);

 	}

 	x+=4;

 	val = OswaldClk.minute;

-	oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,1,0,1,2);

-	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,1,0,1,2);

+	oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,0,1,1,2);

+	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,0,1,1,2);

 	x=31;

 	y=40;

-	oswald_draw_grid(x-2,y-4,x+32,y+15,100,100);

+	oswald_draw_grid(x-2,y-4-6,x+32,y+15+6,100,100);

 	// Help text: left buttons

 	oswald_write_string(0, 0,  FONT_5x8, 0, "[Edit]");

 	oswald_write_string(0, 96/2-8,  FONT_5x8, 0, "Esc");

@@ -361,6 +363,11 @@ void DrawHelpClock(boolean show_seconds)

 	oswald_write_string(72, 96/2-8,  FONT_5x8, 0, "Enter");

 	oswald_write_string(65, 96/2,  FONT_5x8, 0, "[Right]");

 	oswald_write_string(75, 96-8-1,  FONT_5x8, 0, "Down");

+	// Status

+	oswald_draw_grid(38-2,68-2,38+16+2,68+18+2,100,100);

+	oswald_draw_rect(38-2+1,68-2+1,38+16+2-1,68+18+2-1,1);

+	draw_status_icons(38,68,0);	

+

 	// Commit display

 	hal_lcd_update_display();

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

 #include "oswald_hal.h"

 #include "oswald_graphics.h"

+#include "dayslib.h"

+

 #include "oswald_watch_faces.h"

 #if defined(__GNUC__) && (__MSP430X__ > 0)

@@ -40,6 +42,10 @@ __attribute__((__far__))

 __attribute__((__far__))

 #endif

 #include "bitmaps/bluetooth_con_icon.xbm"

+#if defined(__GNUC__) && (__MSP430X__ > 0)

+__attribute__((__far__))

+#endif

+#include "bitmaps/banner_img.xbm"

 /* sine table, per degree, factor 100 */

@@ -204,95 +210,158 @@ void DrawLcdAnaClock(boolean show_seconds)

 static const char *daynames[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };

 void DrawLcdDigitalClock(boolean show_seconds)

+{

+	int w,x,y,yf;

+	unsigned char val;

+	hal_lcd_clear_display();

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

+	val = OswaldClk.hour;

+	if (!OswaldClk.clk24hr)

+		val=(val>12)?val-12:val;

+	x=6;

+	//yf=5;

+	yf=10;

+	y=(96/2)-(3*yf);

+	if(val>=10)

+		oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,0,1,4,yf);

+	oswald_draw_font58_scaled((x=x+16+2),y,(val % 10)+'0',&w,0,1,4,yf);

+	x+=16+4;

+	if(OswaldClk.second % 2)

+		oswald_draw_rect(x,y+5*yf,x+4,y+6*yf-1,0);

+	x+=8;

+	val = OswaldClk.minute;

+	oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,0,1,4,yf);

+	oswald_draw_font58_scaled((x=x+16+2),y,(val % 10)+'0',&w,0,1,4,yf);

+	// Commit display

+	hal_lcd_update_display();

+}

+

+void DrawCalendarClock(boolean show_seconds)

 {

 	int gRow = 1;

 	int gColumn = 1;

 	char tstr[16];

-	int i;

+	int i,k,n,x,y,c;

+	int w;

+	unsigned char val;

+	int sx,sy;

+	int gw,gh;

+	int wday,yday,month,year,day,rollup;

-#if 0

-	snprintf(tstr, 16, "%d%% (%dmV)", OswaldPowerState.percent, OswaldPowerState.level);

-	WriteLcdString(2, 48, tstr);

-	WriteLcdString(2, 64, OswaldPowerState.source ? "ext" : "bat");

-

-	/* this makes only sense when the charger is active */

-	if (OswaldPowerState.source) {

-		switch (OswaldPowerState.charge_state) {

-			case POWER_CHARGER_DONE:

-				WriteLcdString(2, 80, "charge done");

-				break;

-			case POWER_CHARGER_PRECHARGE:

-				WriteLcdString(2, 80, "precharging");

-				break;

-			case POWER_CHARGER_CHARGING:

-				WriteLcdString(2, 80, "charging");

-				break;

-			case POWER_CHARGER_UNK:

-				WriteLcdString(2, 80, "charge unkn.");

-				break;

-			default:

-				break;

-		};

-	};

-#endif

 	hal_lcd_clear_display();

-

-	if (OswaldClk.clk24hr) {

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour / 10));

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour % 10));

-	} else {

-		unsigned char val = OswaldClk.hour;

-		if (val > 12) {

-			val -= 12;

-			oswald_write_string(59, 0, FONT_6x9, FALSE, "PM");

-		} else {

-			oswald_write_string(59, 0, FONT_6x9, FALSE, "AM");

-		}

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val / 10));

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val % 10));

-	}

-	if (OswaldClk.second % 2)

-		oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, FALSE, 10);

-	gRow += 5;

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute / 10));

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute % 10));

-

+	gRow=4;

+	gColumn=34;

+	val = OswaldClk.hour;

+	if (!OswaldClk.clk24hr)

+		val=(val>12)?val-12:val;

+	if(val>=10)

+		oswald_draw_bigdigit(gRow,gColumn,(val / 10)+'0',&w,1,0);

+	else

+		w=14;

+	gRow+=w+2;

+	oswald_draw_bigdigit(gRow,gColumn,(val % 10)+'0',&w,1,0);

+	gRow+=w+2;

+	w=4;

+	if(OswaldClk.second % 2)

+		oswald_draw_rect(gRow,gColumn+26-w,gRow+w-1,gColumn+26-1,1);

+	gRow+=w+2;

+	oswald_draw_bigdigit(gRow,gColumn,(OswaldClk.minute / 10)+'0',&w,1,0);

+	gRow+=w+2;

+	oswald_draw_bigdigit(gRow,gColumn,(OswaldClk.minute % 10)+'0',&w,1,0);

+	gRow+=w+2;

+

+	sx=2,sy=2;

+	gRow+=2;

 	if (show_seconds) {

-		oswald_write_character(59, 9, FONT_LCD8x13, FALSE, (OswaldClk.second / 10));

-		oswald_write_character(67, 9, FONT_LCD8x13, FALSE, (OswaldClk.second % 10));

+		oswald_draw_font58_scaled(gRow,gColumn+26-6*sy, (OswaldClk.second / 10)+'0',&w,1,0,sx,sy);

+		oswald_draw_font58_scaled(gRow+w+1,gColumn+26-6*sy, (OswaldClk.second % 10)+'0',&w,1,0,sx,sy);

 	}

-

+	if(!OswaldClk.clk24hr)

+		oswald_write_string(gRow+3,gColumn+3,FONT_6x9, FALSE,(OswaldClk.hour>12)?"PM":"AM");

+	/* The date */

 	if (OswaldClk.day_first)

 		snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);

 	else

 		snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);

-	oswald_write_string(0, 25, FONT_DROID8x12, FALSE, tstr);

-

-	gRow = 0;

-	gColumn = 45;

-	for (i=0; i<strlen(MainMessage); i++) {

-		// do not draw a whitespace as first character of a row

-		if (gRow == 0 && MainMessage[i] == ' ')

-			continue;

-		// interpret new line

-		if (MainMessage[i] == '\n') {

-			gRow = 0;

-			gColumn += 9;

-			continue;

-		}

-		gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, FALSE, MainMessage[i]);

-		// wrap to new line if line is full

-		if (gRow > 90) {

-			gRow = 0;

-			gColumn += 9;

-		}

-		// OK, screen ends, leave the loop, no matter what

-		if (gColumn > 86)

-			i = 255;

+	oswald_draw_rect(2,0,93,7,1);

+	oswald_write_string(3, 0, FONT_DROID8x12, 1, tstr);

+	/* The minicalendar */

+	gw=13;

+	gh=11;

+	oswald_draw_grid(2,7,1+gw*7+1,29,gw,gh);

+	month=OswaldClk.month;

+	year=OswaldClk.year;

+	mday2yday(OswaldClk.year,OswaldClk.month,OswaldClk.day,&yday);

+	yday2wday(OswaldClk.year,yday,&wday);

+	yday=yday-((wday+6)%7); /* we begin the week in monday */

+	yday2mday(year,yday, &month, &day);

+	rollup=GetYearDays(year)[month]-GetYearDays(year)[month-1];

+	if(day<=0) { /*Ok, we have gone to the previous year. Then fixup year/month*/

+                year--;

+                month=12;

+                day=GetYearDays(year)[12]+day;

+        }

+	for(i=0,k=day;i<14;i++) {

+		n=((k+i-1)%(rollup))+1;

+		x=2+2+(i%7)*gw;

+		y=7+2+(i/7)*gh;

+      	        if(n==OswaldClk.day) {

+			oswald_draw_rect(x-1,y-1,x-1+gw-1,y-1+gh-1,1);

+			c=0;

+      	        } else

+			c=1;

+      	        if(n<10) {

+      	                 oswald_draw_tinydigit(x,y,n+'0',&w,c,!c);

+      	        } else {

+      	                 oswald_draw_tinydigit(x,y,n/10+'0',&w,c,!c);

+      	                 oswald_draw_tinydigit(x+w,y,n%10+'0',&w,c,!c);

+      	        }

 	}

-

-	draw_status_icons();

-

+	/* The banner */

+	oswald_draw_bitmap(0, 95-32, banner_img_width, banner_img_height, banner_img_bits);

 	hal_lcd_update_display();

 }

+void DrawHelpClock(boolean show_seconds)

+{

+	int w,x,y;

+	unsigned char val;

+	hal_lcd_clear_display();

+	// Time

+	val = OswaldClk.hour;

+	if (!OswaldClk.clk24hr)

+		val=(val>12)?val-12:val;

+	x=31;

+	y=40;

+	//oswald_draw_grid(0,0,95,95,2,2);

+	oswald_draw_grid(x-2,0,x+32,95,2,2);

+	oswald_draw_rect(x-2+1,y-4+1,x+32-1,y+15-1,0);

+	if(val>=10)

+		oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,1,0,1,2);

+	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,1,0,1,2);

+	x+=5+2;

+	if(OswaldClk.second % 2) {

+		oswald_draw_rect(x,y+4,x+1,y+5,1);

+		oswald_draw_rect(x,y+8,x+1,y+9,1);

+	}

+	x+=4;

+	val = OswaldClk.minute;

+	oswald_draw_font58_scaled(x,y,(val / 10)+'0',&w,1,0,1,2);

+	oswald_draw_font58_scaled((x=x+5+2),y,(val % 10)+'0',&w,1,0,1,2);

+	x=31;

+	y=40;

+	oswald_draw_grid(x-2,y-4,x+32,y+15,100,100);

+	// Help text: left buttons

+	oswald_write_string(0, 0,  FONT_5x8, 0, "[Edit]");

+	oswald_write_string(0, 96/2-8,  FONT_5x8, 0, "Esc");

+	oswald_write_string(0, 96/2,  FONT_5x8, 0, "[Left]");

+	oswald_write_string(0, 96-8-1,  FONT_5x8, 0, "Light");

+	// Help text: right buttons

+	oswald_write_string(86, 0,  FONT_5x8, 0, "Up");

+	oswald_write_string(72, 96/2-8,  FONT_5x8, 0, "Enter");

+	oswald_write_string(65, 96/2,  FONT_5x8, 0, "[Right]");

+	oswald_write_string(75, 96-8-1,  FONT_5x8, 0, "Down");

+	// Commit display

+	hal_lcd_update_display();

+	

+}

@@ -271,13 +271,22 @@ void DrawLcdDigitalClock(boolean show_seconds)

 	gRow = 0;

 	gColumn = 45;

 	for (i=0; i<strlen(MainMessage); i++) {

+		// do not draw a whitespace as first character of a row

 		if (gRow == 0 && MainMessage[i] == ' ')

 			continue;

+		// interpret new line

+		if (MainMessage[i] == '\n') {

+			gRow = 0;

+			gColumn += 9;

+			continue;

+		}

 		gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, FALSE, MainMessage[i]);

+		// wrap to new line if line is full

 		if (gRow > 90) {

 			gRow = 0;

 			gColumn += 9;

 		}

+		// OK, screen ends, leave the loop, no matter what

 		if (gColumn > 86)

 			i = 255;

 	}

@@ -160,12 +160,7 @@ void DrawLcdAnaClock(boolean show_seconds)

 	hal_lcd_clear_display();

 	snprintf(tstr, 16, "%2d", OswaldClk.day);

-#if 0

-	SetFont(MetaWatch16);

-	WriteLcdString(70, 40, tstr);

-#else

-	oswald_write_string(70, 43, FONT_6x9, tstr);

-#endif

+	oswald_write_string(70, 43, FONT_6x9, FALSE, tstr);

 	// Marker

 	// plot(R*cos(360° * i/N), R*sin(360° * i/N))

@@ -215,64 +210,6 @@ void DrawLcdDigitalClock(boolean show_seconds)

 	char tstr[16];

 	int i;

-#if 0

-	SetFont(MetaWatchTime);

-

-	hal_lcd_clear_display();

-	//gRow += WriteLcdCharacter(ui, gRow, gColumn, TIME_CHARACTER_SPACE_INDEX);

-	if (OswaldClk.clk24hr) {

-		gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.hour / 10));

-		gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.hour % 10));

-	} else {

-		unsigned char val = OswaldClk.hour;

-		if (val > 12)

-			val -= 12;

-		gRow += WriteLcdCharacter(gRow, gColumn, (val / 10));

-		gRow += WriteLcdCharacter(gRow, gColumn, (val % 10));

-	}

-	gRow += WriteLcdCharacter(gRow, gColumn, TIME_CHARACTER_COLON_INDEX);

-	gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.minute / 10));

-	gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.minute % 10));

-

-	gRow += 3;

-	if (show_seconds) {

-		SetFont(MetaWatch16);

-		snprintf(tstr, 16, "%02d", OswaldClk.second);

-		WriteLcdString(gRow, 9, tstr);

-	};

-

-	SetFont(MetaWatch7);

-

-	if (!OswaldClk.clk24hr) {

-		if (OswaldClk.hour > 12) {

-			WriteLcdString(gRow, 3, "PM");

-		} else {

-			WriteLcdString(gRow, 3, "AM");

-		}

-	}

-

-	SetFont(MetaWatch16);

-

-	if (OswaldClk.day_first)

-		snprintf(tstr, 16, "%d.%d.%d", OswaldClk.day, OswaldClk.month, OswaldClk.year);

-	else

-		snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);

-	WriteLcdString(3, 25, tstr);

-

-	draw_status_icons();

-

-	gRow = 0;

-	gColumn = 45;

-	SetFont(MetaWatch5);

-	for (i=0; i<strlen(MainMessage); i++) {

-		gRow += WriteLcdCharacter(gRow, gColumn, MainMessage[i]);

-		if (gRow > 90) {

-			gRow = 0;

-			gColumn += 7;

-		}

-		if (gColumn > 95)

-			i = 255;

-	}

 #if 0

 	snprintf(tstr, 16, "%d%% (%dmV)", OswaldPowerState.percent, OswaldPowerState.level);

 	WriteLcdString(2, 48, tstr);

@@ -298,42 +235,45 @@ void DrawLcdDigitalClock(boolean show_seconds)

 		};

 	};

 #endif

-#else

 	hal_lcd_clear_display();

 	if (OswaldClk.clk24hr) {

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour / 10));

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour % 10));

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour / 10));

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour % 10));

 	} else {

 		unsigned char val = OswaldClk.hour;

-		if (val > 12)

+		if (val > 12) {

 			val -= 12;

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val / 10));

-		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val % 10));

+			oswald_write_string(59, 0, FONT_6x9, FALSE, "PM");

+		} else {

+			oswald_write_string(59, 0, FONT_6x9, FALSE, "AM");

+		}

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val / 10));

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val % 10));

 	}

 	if (OswaldClk.second % 2)

-		oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, 10);

+		oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, FALSE, 10);

 	gRow += 5;

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute / 10));

-	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute % 10));

-#endif

+	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute / 10));

+	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute % 10));

+

 	if (show_seconds) {

-		oswald_write_character(59, 9, FONT_LCD8x13, (OswaldClk.second / 10));

-		oswald_write_character(67, 9, FONT_LCD8x13, (OswaldClk.second % 10));

+		oswald_write_character(59, 9, FONT_LCD8x13, FALSE, (OswaldClk.second / 10));

+		oswald_write_character(67, 9, FONT_LCD8x13, FALSE, (OswaldClk.second % 10));

 	}

 	if (OswaldClk.day_first)

 		snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);

 	else

 		snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);

-	oswald_write_string(0, 25, FONT_6x9, tstr);

+	oswald_write_string(0, 25, FONT_DROID8x12, FALSE, tstr);

 	gRow = 0;

 	gColumn = 45;

 	for (i=0; i<strlen(MainMessage); i++) {

 		if (gRow == 0 && MainMessage[i] == ' ')

 			continue;

-		gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, MainMessage[i]);

+		gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, FALSE, MainMessage[i]);

 		if (gRow > 90) {

 			gRow = 0;

 			gColumn += 9;

@@ -206,6 +206,8 @@ void DrawLcdAnaClock(boolean show_seconds)

 	hal_lcd_update_display();

 }

+static const char *daynames[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };

+

 void DrawLcdDigitalClock(boolean show_seconds)

 {

 	int gRow = 1;

@@ -321,9 +323,9 @@ void DrawLcdDigitalClock(boolean show_seconds)

 	}

 	if (OswaldClk.day_first)

-		snprintf(tstr, 16, "%2d.%2d.%4d", OswaldClk.day, OswaldClk.month, OswaldClk.year);

+		snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);

 	else

-		snprintf(tstr, 16, "%2d/%2d %4d", OswaldClk.month, OswaldClk.day, OswaldClk.year);

+		snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);

 	oswald_write_string(0, 25, FONT_6x9, tstr);

 	gRow = 0;

@@ -3,8 +3,6 @@

 #include "oswald.h"

 #include "oswald_main.h"

-#include "Fonts.h"

-#include "LcdDisplay.h"

 #include "oswald_hal.h"

 #include "oswald_graphics.h"

@@ -120,15 +118,15 @@ void draw_status_icons(void)

 		}

 	} else {

 		if (OswaldPowerState.percent > 75)

-			oswald_draw_bitmap_offset(81, 0, 0,0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);

+			oswald_draw_bitmap(81, 0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);

 		else if (OswaldPowerState.percent > 50)

-			oswald_draw_bitmap_offset(81, 0, 0,0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);

+			oswald_draw_bitmap(81, 0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);

 		else if (OswaldPowerState.percent > 25)

-			oswald_draw_bitmap_offset(81, 0, 0,0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);

+			oswald_draw_bitmap(81, 0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);

 		else if (OswaldPowerState.percent > 5)

-			oswald_draw_bitmap_offset(81, 0, 0,0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);

+			oswald_draw_bitmap(81, 0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);

 		else

-			oswald_draw_bitmap_offset(81, 0, 0,0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);

+			oswald_draw_bitmap(81, 0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);

 	}

 	if (hal_bluetooth_get_state() == BLUETOOTH_ON)

@@ -161,12 +159,12 @@ void DrawLcdAnaClock(boolean show_seconds)

 	hal_lcd_clear_display();

-	snprintf(tstr, 16, "%02d", OswaldClk.day);

+	snprintf(tstr, 16, "%2d", OswaldClk.day);

 #if 0

 	SetFont(MetaWatch16);

 	WriteLcdString(70, 40, tstr);

 #else

-	oswald_write_string(70, 43, FONT_7x12b, tstr);

+	oswald_write_string(70, 43, FONT_6x9, tstr);

 #endif

 	// Marker

@@ -210,8 +208,8 @@ void DrawLcdAnaClock(boolean show_seconds)

 void DrawLcdDigitalClock(boolean show_seconds)

 {

-	int gRow = 3;

-	int gColumn = 3;

+	int gRow = 1;

+	int gColumn = 1;

 	char tstr[16];

 	int i;

@@ -300,32 +298,50 @@ void DrawLcdDigitalClock(boolean show_seconds)

 #endif

 #else

 	hal_lcd_clear_display();

-	snprintf(tstr, 16, "%02d", OswaldClk.hour);

-	oswald_write_string(0, 0, FONT_16x26, tstr);

-	oswald_write_character(26, 0, FONT_16x26, ':');

-	snprintf(tstr, 16, "%02d", OswaldClk.minute);

-	oswald_write_string(36, 0, FONT_16x26, tstr);

+

+	if (OswaldClk.clk24hr) {

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour / 10));

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour % 10));

+	} else {

+		unsigned char val = OswaldClk.hour;

+		if (val > 12)

+			val -= 12;

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val / 10));

+		gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val % 10));

+	}

+	if (OswaldClk.second % 2)

+		oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, 10);

+	gRow += 5;

+	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute / 10));

+	gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute % 10));

+#endif

+	if (show_seconds) {

+		oswald_write_character(59, 9, FONT_LCD8x13, (OswaldClk.second / 10));

+		oswald_write_character(67, 9, FONT_LCD8x13, (OswaldClk.second % 10));

+	}

 	if (OswaldClk.day_first)

-		snprintf(tstr, 16, "%d.%d.%d", OswaldClk.day, OswaldClk.month, OswaldClk.year);

+		snprintf(tstr, 16, "%2d.%2d.%4d", OswaldClk.day, OswaldClk.month, OswaldClk.year);

 	else

-		snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);

-	oswald_write_string(0, 25, FONT_7x12b, tstr);

+		snprintf(tstr, 16, "%2d/%2d %4d", OswaldClk.month, OswaldClk.day, OswaldClk.year);

+	oswald_write_string(0, 25, FONT_6x9, tstr);

 	gRow = 0;

 	gColumn = 45;

 	for (i=0; i<strlen(MainMessage); i++) {

-		gRow += oswald_write_character(gRow, gColumn, FONT_6x8, MainMessage[i]);

+		if (gRow == 0 && MainMessage[i] == ' ')

+			continue;

+		gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, MainMessage[i]);

 		if (gRow > 90) {

 			gRow = 0;

 			gColumn += 9;

 		}

-		if (gColumn > 95)

+		if (gColumn > 86)

 			i = 255;

 	}

 	draw_status_icons();

-#endif

+

 	hal_lcd_update_display();

 }

@@ -6,20 +6,48 @@

 #include "Fonts.h"

 #include "LcdDisplay.h"

 #include "oswald_hal.h"

+#include "oswald_graphics.h"

 #include "oswald_watch_faces.h"

-#include "battery0_icon.xbm"

-#include "battery25_icon.xbm"

-#include "battery50_icon.xbm"

-#include "battery75_icon.xbm"

-#include "battery100_icon.xbm"

-#include "charger_icon.xbm"

-#include "bluetooth_icon.xbm"

-#include "bluetooth_con_icon.xbm"

+#if defined(__GNUC__) && (__MSP430X__ > 0)