Dariaceli's Git
Browse code

Add fixes for it to work properly on microcontroller

Nils Faerber authored on 19/03/2013 19:22:58
Showing 14 changed files
ui/Fonts.c
History View file @ a03500b
... ... 
@@ -22,8 +22,9 @@
22 22
23 23 
 const unsigned char MetaWatch5table[PRINTABLE_CHARACTERS][5];
24 24 
 const unsigned char MetaWatch7table[PRINTABLE_CHARACTERS][7];
25 
-const unsigned int MetaWatch16table[PRINTABLE_CHARACTERS][16];
26 
-const unsigned int MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19];
25 
+const u16t MetaWatch16table[PRINTABLE_CHARACTERS][16];
26 
+const u16t MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19];
27 
+const unsigned char MetaWatchMonospaced10Table[PRINTABLE_CHARACTERS][10];
27 28
28 29 
 const unsigned char MetaWatch5width[PRINTABLE_CHARACTERS];
29 30 
 const unsigned char MetaWatch7width[PRINTABLE_CHARACTERS];
... ... 
@@ -73,9 +74,15 @@ void SetFont(etFontType Type)
73 74 
     CurrentFont.Height = 19;
74 75 
     CurrentFont.Spacing = 1;
75 76 
     break;
76 
-
77 
+
78 
+  case MetaWatchMonospaced10:
79 
+    CurrentFont.Type = Type;
80 
+    CurrentFont.Height = 10;
81 
+    CurrentFont.Spacing = 0;
82 
+    break;
83 
+
77 84 
   default:
78 
-    printf("Undefined Font Selected\r\n");
85 
+    //printf("Undefined Font Selected\r\n");
79 86 
     break;
80 87 
   }
81 88 
 }
... ... 
@@ -98,6 +105,7 @@ unsigned char GetCharacterWidth(unsigned char Character)
98 105 
   case MetaWatch7:    Width = MetaWatch7width[index];    break;
99 106 
   case MetaWatch16:   Width = MetaWatch16width[index];   break;
100 107 
   case MetaWatchTime: Width = MetaWatchTimeWidth[index]; break;
108 
+  case MetaWatchMonospaced10: Width = 7; break;
101 109 
   default :
102 110 
     break;
103 111 
   }
... ... 
@@ -145,7 +153,7 @@ unsigned char MapCharacterToIndex(unsigned char CharIn)
145 153 
 }
146 154
147 155
148 
-void GetCharacterBitmap(unsigned char Character,unsigned int * pBitmap)
156 
+void GetCharacterBitmap(unsigned char Character, u16t *pBitmap)
149 157 
 {
150 158 
   unsigned char index = MapCharacterToIndex(Character);
151 159
... ... 
@@ -155,11 +163,11 @@ void GetCharacterBitmap(unsigned char Character,unsigned int * pBitmap)
155 163 
     switch (CurrentFont.Type)
156 164 
     {
157 165 
     case MetaWatch5:
158 
-      pBitmap[row] = (unsigned int)MetaWatch5table[index][row];
166 
+      pBitmap[row] = (u16t)MetaWatch5table[index][row];
159 167 
       break;
160 168
161 169 
     case MetaWatch7:
162 
-      pBitmap[row] = (unsigned int)MetaWatch7table[index][row];
170 
+      pBitmap[row] = (u16t)MetaWatch7table[index][row];
163 171 
       break;
164 172
165 173 
     case MetaWatch16:
... ... 
@@ -170,6 +178,9 @@ void GetCharacterBitmap(unsigned char Character,unsigned int * pBitmap)
170 178 
       pBitmap[row] = MetaWatchTimeTable[index][row];
171 179 
       break;
172 180
181 
+    case MetaWatchMonospaced10:
182 
+      pBitmap[row] = MetaWatchMonospaced10Table[index][row];
183 
+      break;
173 184 
     default:
174 185 
       break;
175 186 
     }
... ... 
@@ -181,293 +192,293 @@ void GetCharacterBitmap(unsigned char Character,unsigned int * pBitmap)
181 192 
 const unsigned char MetaWatch5table[PRINTABLE_CHARACTERS][5] =
182 193 
 {
183 194 
   /* character 0x20 (' '): (width = 2) */
184 
-  0x00, 0x00, 0x00, 0x00, 0x00,
195 
+  {0x00, 0x00, 0x00, 0x00, 0x00,},
185 196
186 197 
   /* character 0x21 ('!'): (width=1) */
187 
-  0x01, 0x01, 0x01, 0x00, 0x01,
198 
+  {0x01, 0x01, 0x01, 0x00, 0x01,},
188 199
189 200 
   /* character 0x22 ('"'): (width=3) */
190 
-  0x05, 0x05, 0x00, 0x00, 0x00,
201 
+  {0x05, 0x05, 0x00, 0x00, 0x00,},
191 202
192 203 
   /* character 0x23 ('#'): (width=5) */
193 
-  0x0A, 0x1F, 0x0A, 0x1F, 0x0A,
194 
-
204 
+  { 0x0A, 0x1F, 0x0A, 0x1F, 0x0A,},
205 
+  {
195 206 
   /* character 0x24 ('$'): (width=3) */
196 
-  0x00, 0x00, 0x00, 0x00, 0x00,
197 
-
207 
+  0x00, 0x00, 0x00, 0x00, 0x00,},
208 
+  {
198 209 
   /* character 0x25 ('%'): (width=3) */
199 
-  0x00, 0x00, 0x00, 0x00, 0x00,
200 
-
210 
+  0x00, 0x00, 0x00, 0x00, 0x00,},
211 
+  {
201 212 
   /* character 0x26 ('&'): (width=5) */
202 
-  0x02, 0x05, 0x16, 0x09, 0x1E,
203 
-
213 
+  0x02, 0x05, 0x16, 0x09, 0x1E,},
214 
+  {
204 215 
   /* character 0x27 ('''): (width=1) */
205 
-  0x01, 0x01, 0x00, 0x00, 0x00,
206 
-
216 
+  0x01, 0x01, 0x00, 0x00, 0x00,},
217 
+  {
207 218 
   /* character 0x28 ('('): (width=2) */
208 
-  0x02, 0x01, 0x01, 0x01, 0x02,
209 
-
219 
+  0x02, 0x01, 0x01, 0x01, 0x02,},
220 
+  {
210 221 
   /* character 0x29 (')'): (width=2) */
211 
-  0x01, 0x02, 0x02, 0x02, 0x01,
212 
-
222 
+  0x01, 0x02, 0x02, 0x02, 0x01,},
223 
+  {
213 224 
   /* character 0x2A ('*'): (width=5) */
214 
-  0x0A, 0x04, 0x1F, 0x04, 0x0A,
215 
-
225 
+  0x0A, 0x04, 0x1F, 0x04, 0x0A,},
226 
+  {
216 227 
   /* character 0x2B ('+'): (width=5) */
217 
-  0x04, 0x04, 0x1F, 0x04, 0x04,
218 
-
228 
+  0x04, 0x04, 0x1F, 0x04, 0x04,},
229 
+  {
219 230 
   /* character 0x2C (','): (width=1) */
220 
-  0x00, 0x00, 0x00, 0x01, 0x01,
221 
-
231 
+  0x00, 0x00, 0x00, 0x01, 0x01,},
232 
+  {
222 233 
   /* character 0x2D ('-'): (width=3) */
223 
-  0x00, 0x00, 0x07, 0x00, 0x00,
224 
-
234 
+  0x00, 0x00, 0x07, 0x00, 0x00,},
235 
+  {
225 236 
   /* character 0x2E ('.'): (width=1) */
226 
-  0x00, 0x00, 0x00, 0x00, 0x01,
227 
-
237 
+  0x00, 0x00, 0x00, 0x00, 0x01,},
238 
+  {
228 239 
   /* character 0x2F ('/'): (width=5) */
229 
-  0x10, 0x08, 0x04, 0x02, 0x01,
230 
-
240 
+  0x10, 0x08, 0x04, 0x02, 0x01,},
241 
+  {
231 242 
   /* character 0x30 ('0'): (width=4) */
232 
-  0x06, 0x09, 0x09, 0x09, 0x06,
233 
-
243 
+  0x06, 0x09, 0x09, 0x09, 0x06,},
244 
+  {
234 245 
   /* character 0x31 ('1'): (width=3) */
235 
-  0x03, 0x02, 0x02, 0x02, 0x07,
236 
-
246 
+  0x03, 0x02, 0x02, 0x02, 0x07,},
247 
+  {
237 248 
   /* character 0x32 ('2'): (width=4) */
238 
-  0x06, 0x09, 0x04, 0x02, 0x0F,
239 
-
249 
+  0x06, 0x09, 0x04, 0x02, 0x0F,},
250 
+  {
240 251 
   /* character 0x33 ('3'): (width=4) */
241 
-  0x0F, 0x08, 0x06, 0x08, 0x07,
242 
-
252 
+  0x0F, 0x08, 0x06, 0x08, 0x07,},
253 
+  {
243 254 
   /* character 0x34 ('4'): (width=4) */
244 
-  0x04, 0x06, 0x05, 0x0F, 0x04,
245 
-
255 
+  0x04, 0x06, 0x05, 0x0F, 0x04,},
256 
+  {
246 257 
   /* character 0x35 ('5'): (width=4) */
247 
-  0x0F, 0x01, 0x0F, 0x08, 0x07,
248 
-
258 
+  0x0F, 0x01, 0x0F, 0x08, 0x07,},
259 
+  {
249 260 
   /* character 0x36 ('6'): (width=4) */
250 
-  0x06, 0x01, 0x07, 0x09, 0x06,
251 
-
261 
+  0x06, 0x01, 0x07, 0x09, 0x06,},
262 
+  {
252 263 
   /* character 0x37 ('7'): (width=4) */
253 
-  0x0F, 0x08, 0x04, 0x02, 0x02,
254 
-
264 
+  0x0F, 0x08, 0x04, 0x02, 0x02,},
265 
+  {
255 266 
   /* character 0x38 ('8'): (width=4) */
256 
-  0x06, 0x09, 0x06, 0x09, 0x06,
257 
-
267 
+  0x06, 0x09, 0x06, 0x09, 0x06,},
268 
+  {
258 269 
   /* character 0x39 ('9'): (width=4) */
259 
-  0x06, 0x09, 0x0E, 0x08, 0x06,
260 
-
270 
+  0x06, 0x09, 0x0E, 0x08, 0x06,},
271 
+  {
261 272 
   /* character 0x3A (':'): (width=1) */
262 
-  0x00, 0x01, 0x00, 0x01, 0x00,
263 
-
273 
+  0x00, 0x01, 0x00, 0x01, 0x00,},
274 
+  {
264 275 
   /* character 0x3B (';'): (width=2) */
265 
-  0x00, 0x02, 0x00, 0x02, 0x01,
266 
-
276 
+  0x00, 0x02, 0x00, 0x02, 0x01,},
277 
+  {
267 278 
   /* character 0x3C ('<'): (width=3) */
268 
-  0x04, 0x02, 0x01, 0x02, 0x04,
269 
-
279 
+  0x04, 0x02, 0x01, 0x02, 0x04,},
280 
+  {
270 281 
   /* character 0x3D ('='): (width=4) */
271 
-  0x00, 0x0F, 0x00, 0x0F, 0x00,
272 
-
282 
+  0x00, 0x0F, 0x00, 0x0F, 0x00,},
283 
+  {
273 284 
   /* character 0x3E ('>'): (width=3) */
274 
-  0x01, 0x02, 0x04, 0x02, 0x01,
275 
-
285 
+  0x01, 0x02, 0x04, 0x02, 0x01,},
286 
+  {
276 287 
   /* character 0x3F ('?'): (width=3) */
277 
-  0x03, 0x04, 0x02, 0x00, 0x02,
278 
-
288 
+  0x03, 0x04, 0x02, 0x00, 0x02,},
289 
+  {
279 290 
   /* character 0x40 ('@'): (width=3) */
280 
-  0x00, 0x00, 0x00, 0x00, 0x00,
281 
-
291 
+  0x00, 0x00, 0x00, 0x00, 0x00,},
292 
+  {
282 293 
   /* character 0x41 ('A'): (width=5) */
283 
-  0x04, 0x04, 0x0A, 0x0E, 0x11,
284 
-
294 
+  0x04, 0x04, 0x0A, 0x0E, 0x11,},
295 
+  {
285 296 
   /* character 0x42 ('B'): (width=4) */
286 
-  0x07, 0x09, 0x07, 0x09, 0x07,
287 
-
297 
+  0x07, 0x09, 0x07, 0x09, 0x07,},
298 
+  {
288 299 
   /* character 0x43 ('C'): (width=4) */
289 
-  0x06, 0x09, 0x01, 0x09, 0x06,
290 
-
300 
+  0x06, 0x09, 0x01, 0x09, 0x06,},
301 
+  {
291 302 
   /* character 0x44 ('D'): (width=4) */
292 
-  0x07, 0x09, 0x09, 0x09, 0x07,
293 
-
303 
+  0x07, 0x09, 0x09, 0x09, 0x07,},
304 
+  {
294 305 
   /* character 0x45 ('E'): (width=4) */
295 
-  0x0F, 0x01, 0x07, 0x01, 0x0F,
296 
-
306 
+  0x0F, 0x01, 0x07, 0x01, 0x0F,},
307 
+  {
297 308 
   /* character 0x46 ('F'): (width=4) */
298 
-  0x0F, 0x01, 0x07, 0x01, 0x01,
299 
-
309 
+  0x0F, 0x01, 0x07, 0x01, 0x01,},
310 
+  {
300 311 
   /* character 0x47 ('G'): (width=4) */
301 
-  0x06, 0x01, 0x0D, 0x09, 0x06,
302 
-
312 
+  0x06, 0x01, 0x0D, 0x09, 0x06,},
313 
+  {
303 314 
   /* character 0x48 ('H'): (width=4) */
304 
-  0x09, 0x09, 0x0F, 0x09, 0x09,
305 
-
315 
+  0x09, 0x09, 0x0F, 0x09, 0x09,},
316 
+  {
306 317 
   /* character 0x49 ('I'): (width=3) */
307 
-  0x07, 0x02, 0x02, 0x02, 0x07,
308 
-
318 
+  0x07, 0x02, 0x02, 0x02, 0x07,},
319 
+  {
309 320 
   /* character 0x4A ('J'): (width=4) */
310 
-  0x08, 0x08, 0x08, 0x09, 0x06,
311 
-
321 
+  0x08, 0x08, 0x08, 0x09, 0x06,},
322 
+  {
312 323 
   /* character 0x4B ('K'): (width=4) */
313 
-  0x09, 0x05, 0x03, 0x05, 0x09,
314 
-
324 
+  0x09, 0x05, 0x03, 0x05, 0x09,},
325 
+  {
315 326 
   /* character 0x4C ('L'): (width=4) */
316 
-  0x01, 0x01, 0x01, 0x01, 0x0F,
317 
-
327 
+  0x01, 0x01, 0x01, 0x01, 0x0F,},
328 
+  {
318 329 
   /* character 0x4D ('M'): (width=5) */
319 
-  0x11, 0x1B, 0x15, 0x11, 0x11,
320 
-
330 
+  0x11, 0x1B, 0x15, 0x11, 0x11,},
331 
+  {
321 332 
   /* character 0x4E ('N'): (width=5) */
322 
-  0x11, 0x13, 0x15, 0x19, 0x11,
323 
-
333 
+  0x11, 0x13, 0x15, 0x19, 0x11,},
334 
+  {
324 335 
   /* character 0x4F ('O'): (width=4) */
325 
-  0x06, 0x09, 0x09, 0x09, 0x06,
326 
-
336 
+  0x06, 0x09, 0x09, 0x09, 0x06,},
337 
+  {
327 338 
   /* character 0x50 ('P'): (width=4) */
328 
-  0x07, 0x09, 0x07, 0x01, 0x01,
329 
-
339 
+  0x07, 0x09, 0x07, 0x01, 0x01,},
340 
+  {
330 341 
   /* character 0x51 ('Q'): (width=5) */
331 
-  0x06, 0x09, 0x09, 0x09, 0x1E,
332 
-
342 
+  0x06, 0x09, 0x09, 0x09, 0x1E,},
343 
+  {
333 344 
   /* character 0x52 ('R'): (width=4) */
334 
-  0x07, 0x09, 0x07, 0x09, 0x09,
335 
-
345 
+  0x07, 0x09, 0x07, 0x09, 0x09,},
346 
+  {
336 347 
   /* character 0x53 ('S'): (width=4) */
337 
-  0x0E, 0x01, 0x06, 0x08, 0x07,
338 
-
348 
+  0x0E, 0x01, 0x06, 0x08, 0x07,},
349 
+  {
339 350 
   /* character 0x54 ('T'): (width=3) */
340 
-  0x07, 0x02, 0x02, 0x02, 0x02,
341 
-
351 
+  0x07, 0x02, 0x02, 0x02, 0x02,},
352 
+  {
342 353 
   /* character 0x55 ('U'): (width=4) */
343 
-  0x09, 0x09, 0x09, 0x09, 0x06,
344 
-
354 
+  0x09, 0x09, 0x09, 0x09, 0x06,},
355 
+  {
345 356 
   /* character 0x56 ('V'): (width=5) */
346 
-  0x11, 0x0A, 0x0A, 0x04, 0x04,
347 
-
357 
+  0x11, 0x0A, 0x0A, 0x04, 0x04,},
358 
+  {
348 359 
   /* character 0x57 ('W'): (width=5) */
349 
-  0x15, 0x15, 0x0A, 0x0A, 0x0A,
350 
-
360 
+  0x15, 0x15, 0x0A, 0x0A, 0x0A,},
361 
+  {
351 362 
   /* character 0x58 ('X'): (width=4) */
352 
-  0x09, 0x09, 0x06, 0x09, 0x09,
353 
-
363 
+  0x09, 0x09, 0x06, 0x09, 0x09,},
364 
+  {
354 365 
   /* character 0x59 ('Y'): (width=5) */
355 
-  0x11, 0x0A, 0x04, 0x04, 0x04,
356 
-
366 
+  0x11, 0x0A, 0x04, 0x04, 0x04,},
367 
+  {
357 368 
   /* character 0x5A ('Z'): (width=4) */
358 
-  0x0F, 0x04, 0x02, 0x01, 0x0F,
359 
-
369 
+  0x0F, 0x04, 0x02, 0x01, 0x0F,},
370 
+  {
360 371 
   /* character 0x5B ('['): (width=2) */
361 
-  0x03, 0x01, 0x01, 0x01, 0x03,
362 
-
372 
+  0x03, 0x01, 0x01, 0x01, 0x03,},
373 
+  {
363 374 
   /* character 0x5C ('\'): (width=5) */
364 
-  0x01, 0x02, 0x04, 0x08, 0x10,
365 
-
375 
+  0x01, 0x02, 0x04, 0x08, 0x10,},
376 
+  {
366 377 
   /* character 0x5D (']'): (width=2) */
367 
-  0x03, 0x02, 0x02, 0x02, 0x03,
368 
-
378 
+  0x03, 0x02, 0x02, 0x02, 0x03,},
379 
+  {
369 380 
   /* character 0x5E ('^'): (width=5) */
370 
-  0x04, 0x0A, 0x11, 0x00, 0x00,
371 
-
381 
+  0x04, 0x0A, 0x11, 0x00, 0x00,},
382 
+  {
372 383 
   /* character 0x5F ('_'): (width=4) */
373 
-  0x00, 0x00, 0x00, 0x00, 0x0F,
374 
-
384 
+  0x00, 0x00, 0x00, 0x00, 0x0F,},
385 
+  {
375 386 
   /* character 0x60 ('`'): (width=1) */
376 
-  0x01, 0x01, 0x00, 0x00, 0x00,
377 
-
387 
+  0x01, 0x01, 0x00, 0x00, 0x00,},
388 
+  {
378 389 
   /* character 0x61 ('a'): (width=5) */
379 
-  0x04, 0x04, 0x0A, 0x0E, 0x11,
380 
-
390 
+  0x04, 0x04, 0x0A, 0x0E, 0x11,},
391 
+  {
381 392 
   /* character 0x62 ('b'): (width=4) */
382 
-  0x07, 0x09, 0x07, 0x09, 0x07,
383 
-
393 
+  0x07, 0x09, 0x07, 0x09, 0x07,},
394 
+  {
384 395 
   /* character 0x63 ('c'): (width=4) */
385 
-  0x06, 0x09, 0x01, 0x09, 0x06,
386 
-
396 
+  0x06, 0x09, 0x01, 0x09, 0x06,},
397 
+  {
387 398 
   /* character 0x64 ('d'): (width=4) */
388 
-  0x07, 0x09, 0x09, 0x09, 0x07,
389 
-
399 
+  0x07, 0x09, 0x09, 0x09, 0x07,},
400 
+  {
390 401 
   /* character 0x65 ('e'): (width=4) */
391 
-  0x0F, 0x01, 0x07, 0x01, 0x0F,
392 
-
402 
+  0x0F, 0x01, 0x07, 0x01, 0x0F,},
403 
+  {
393 404 
   /* character 0x66 ('f'): (width=4) */
394 
-  0x0F, 0x01, 0x07, 0x01, 0x01,
395 
-
405 
+  0x0F, 0x01, 0x07, 0x01, 0x01,},
406 
+  {
396 407 
   /* character 0x67 ('g'): (width=4) */
397 
-  0x06, 0x01, 0x0D, 0x09, 0x06,
398 
-
408 
+  0x06, 0x01, 0x0D, 0x09, 0x06,},
409 
+  {
399 410 
   /* character 0x68 ('h'): (width=4) */
400 
-  0x09, 0x09, 0x0F, 0x09, 0x09,
401 
-
411 
+  0x09, 0x09, 0x0F, 0x09, 0x09,},
412 
+  {
402 413 
   /* character 0x69 ('i'): (width=3) */
403 
-  0x07, 0x02, 0x02, 0x02, 0x07,
404 
-
414 
+  0x07, 0x02, 0x02, 0x02, 0x07,},
415 
+  {
405 416 
   /* character 0x6A ('j'): (width=4) */
406 
-  0x08, 0x08, 0x08, 0x09, 0x06,
407 
-
417 
+  0x08, 0x08, 0x08, 0x09, 0x06,},
418 
+  {
408 419 
   /* character 0x6B ('k'): (width=4) */
409 
-  0x09, 0x05, 0x03, 0x05, 0x09,
410 
-
420 
+  0x09, 0x05, 0x03, 0x05, 0x09,},
421 
+  {
411 422 
   /* character 0x6C ('l'): (width=4) */
412 
-  0x01, 0x01, 0x01, 0x01, 0x0F,
413 
-
423 
+  0x01, 0x01, 0x01, 0x01, 0x0F,},
424 
+  {
414 425 
   /* character 0x6D ('m'): (width=5) */
415 
-  0x11, 0x1B, 0x15, 0x11, 0x11,
416 
-
426 
+  0x11, 0x1B, 0x15, 0x11, 0x11,},
427 
+  {
417 428 
   /* character 0x6E ('n'): (width=5) */
418 
-  0x11, 0x13, 0x15, 0x19, 0x11,
419 
-
429 
+  0x11, 0x13, 0x15, 0x19, 0x11,},
430 
+  {
420 431 
   /* character 0x6F ('o'): (width=4) */
421 
-  0x06, 0x09, 0x09, 0x09, 0x06,
422 
-
432 
+  0x06, 0x09, 0x09, 0x09, 0x06,},
433 
+  {
423 434 
   /* character 0x70 ('p'): (width=4) */
424 
-  0x07, 0x09, 0x07, 0x01, 0x01,
425 
-
435 
+  0x07, 0x09, 0x07, 0x01, 0x01,},
436 
+  {
426 437 
   /* character 0x71 ('q'): (width=5) */
427 
-  0x06, 0x09, 0x09, 0x09, 0x1E,
428 
-
438 
+  0x06, 0x09, 0x09, 0x09, 0x1E,},
439 
+  {
429 440 
   /* character 0x72 ('r'): (width=4) */
430 
-  0x07, 0x09, 0x07, 0x09, 0x09,
431 
-
441 
+  0x07, 0x09, 0x07, 0x09, 0x09,},
442 
+  {
432 443 
   /* character 0x73 ('s'): (width=4) */
433 
-  0x0E, 0x01, 0x06, 0x08, 0x07,
434 
-
444 
+  0x0E, 0x01, 0x06, 0x08, 0x07,},
445 
+  {
435 446 
   /* character 0x74 ('t'): (width=3) */
436 
-  0x07, 0x02, 0x02, 0x02, 0x02,
437 
-
447 
+  0x07, 0x02, 0x02, 0x02, 0x02,},
448 
+  {
438 449 
   /* character 0x75 ('u'): (width=4) */
439 
-  0x09, 0x09, 0x09, 0x09, 0x06,
440 
-
450 
+  0x09, 0x09, 0x09, 0x09, 0x06,},
451 
+  {
441 452 
   /* character 0x76 ('v'): (width=5) */
442 
-  0x11, 0x0A, 0x0A, 0x04, 0x04,
443 
-
453 
+  0x11, 0x0A, 0x0A, 0x04, 0x04,},
454 
+  {
444 455 
   /* character 0x77 ('w'): (width=5) */
445 
-  0x15, 0x15, 0x0A, 0x0A, 0x0A,
446 
-
456 
+  0x15, 0x15, 0x0A, 0x0A, 0x0A,},
457 
+  {
447 458 
   /* character 0x78 ('x'): (width=4) */
448 
-  0x09, 0x09, 0x06, 0x09, 0x09,
449 
-
459 
+  0x09, 0x09, 0x06, 0x09, 0x09,},
460 
+  {
450 461 
   /* character 0x79 ('y'): (width=5) */
451 
-  0x11, 0x0A, 0x04, 0x04, 0x04,
452 
-
462 
+  0x11, 0x0A, 0x04, 0x04, 0x04,},
463 
+  {
453 464 
   /* character 0x7A ('z'): (width=4) */
454 
-  0x0F, 0x04, 0x02, 0x01, 0x0F,
455 
-
465 
+  0x0F, 0x04, 0x02, 0x01, 0x0F,},
466 
+  {
456 467 
   /* character 0x7B ('{'): (width=3) */
457 
-  0x00, 0x00, 0x00, 0x00, 0x00,
458 
-
468 
+  0x00, 0x00, 0x00, 0x00, 0x00,},
469 
+  {
459 470 
   /* character 0x7C ('|'): (width=1) */
460 
-  0x01, 0x01, 0x01, 0x01, 0x01,
461 
-
471 
+  0x01, 0x01, 0x01, 0x01, 0x01,},
472 
+  {
462 473 
   /* character 0x7D ('}'): (width=3) */
463 
-  0x00, 0x00, 0x00, 0x00, 0x00,
474 
+  0x00, 0x00, 0x00, 0x00, 0x00,},
464 475 
 };
465 476
466 477 
 const unsigned char MetaWatch5width[PRINTABLE_CHARACTERS] =
467 478 
 {
468 479 
 /*		width    char    hexcode */
469 480 
 /*		=====    ====    ======= */
470 
-        2, /*  '  '    20      */
481 
+                  2, /*  '  '    20      */
471 482 
   		  1, /*   !      21      */
472 483 
   		  3, /*   "      22      */
473 484 
   		  5, /*   #      23      */
... ... 
@@ -567,286 +578,285 @@ const unsigned char MetaWatch7table[PRINTABLE_CHARACTERS][7] =
567 578 
 {
568 579
569 580 
   /* character 0x20 (' '): (width = 2) */
570 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
571 
-
581 
+  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,},
572 582 
   /* character 0x21 ('!'): (width=1) */
573 
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01,
574 
-
583 
+  {0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01,},
584 
+  {
575 585 
   /* character 0x22 ('"'): (width=3) */
576 
-  0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
577 
-
586 
+  0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,},
587 
+  {
578 588 
   /* character 0x23 ('#'): (width=7) */
579 
-  0x00, 0x28, 0x7E, 0x14, 0x3F, 0x0A, 0x00,
580 
-
589 
+  0x00, 0x28, 0x7E, 0x14, 0x3F, 0x0A, 0x00,},
590 
+  {
581 591 
   /* character 0x24 ('$'): (width=5) */
582 
-  0x04, 0x1E, 0x05, 0x0E, 0x14, 0x0F, 0x04,
583 
-
592 
+  0x04, 0x1E, 0x05, 0x0E, 0x14, 0x0F, 0x04,},
593 
+  {
584 594 
   /* character 0x25 ('%'): (width=7) */
585 
-  0x42, 0x25, 0x15, 0x2A, 0x54, 0x52, 0x21,
586 
-
595 
+  0x42, 0x25, 0x15, 0x2A, 0x54, 0x52, 0x21,},
596 
+  {
587 597 
   /* character 0x26 ('&'): (width=5) */
588 
-  0x02, 0x05, 0x05, 0x02, 0x15, 0x09, 0x16,
589 
-
598 
+  0x02, 0x05, 0x05, 0x02, 0x15, 0x09, 0x16,},
599 
+  {
590 600 
   /* character 0x27 ('''): (width=3) */
591 
-  0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
592 
-
601 
+  0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,},
602 
+  {
593 603 
   /* character 0x28 ('('): (width=3) */
594 
-  0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04,
595 
-
604 
+  0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04,},
605 
+  {
596 606 
   /* character 0x29 (')'): (width=3) */
597 
-  0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01,
598 
-
607 
+  0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01,},
608 
+  {
599 609 
   /* character 0x2A ('*'): (width=7) */
600 
-  0x08, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x08,
601 
-
610 
+  0x08, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x08,},
611 
+  {
602 612 
   /* character 0x2B ('+'): (width=5) */
603 
-  0x00, 0x04, 0x04, 0x1F, 0x04, 0x04, 0x00,
604 
-
613 
+  0x00, 0x04, 0x04, 0x1F, 0x04, 0x04, 0x00,},
614 
+  {
605 615 
   /* character 0x2C (','): (width=1) */
606 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
607 
-
616 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,},
617 
+  {
608 618 
   /* character 0x2D ('-'): (width=4) */
609 
-  0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00,
610 
-
619 
+  0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00,},
620 
+  {
611 621 
   /* character 0x2E ('.'): (width=1) */
612 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
613 
-
622 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,},
623 
+  {
614 624 
   /* character 0x2F ('/'): (width=4) */
615 
-  0x08, 0x08, 0x04, 0x06, 0x02, 0x01, 0x01,
616 
-
625 
+  0x08, 0x08, 0x04, 0x06, 0x02, 0x01, 0x01,},
626 
+  {
617 627 
   /* character 0x30 ('0'): (width=4) */
618 
-  0x06, 0x09, 0x09, 0x09, 0x09, 0x09, 0x06,
619 
-
628 
+  0x06, 0x09, 0x09, 0x09, 0x09, 0x09, 0x06,},
629 
+  {
620 630 
   /* character 0x31 ('1'): (width=2) */
621 
-  0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02,
622 
-
631 
+  0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02,},
632 
+  {
623 633 
   /* character 0x32 ('2'): (width=4) */
624 
-  0x06, 0x09, 0x08, 0x04, 0x02, 0x01, 0x0F,
625 
-
634 
+  0x06, 0x09, 0x08, 0x04, 0x02, 0x01, 0x0F,},
635 
+  {
626 636 
   /* character 0x33 ('3'): (width=4) */
627 
-  0x06, 0x09, 0x08, 0x06, 0x08, 0x09, 0x06,
628 
-
637 
+  0x06, 0x09, 0x08, 0x06, 0x08, 0x09, 0x06,},
638 
+  {
629 639 
   /* character 0x34 ('4'): (width=5) */
630 
-  0x04, 0x04, 0x0A, 0x09, 0x1F, 0x08, 0x08,
631 
-
640 
+  0x04, 0x04, 0x0A, 0x09, 0x1F, 0x08, 0x08,},
641 
+  {
632 642 
   /* character 0x35 ('5'): (width=4) */
633 
-  0x0F, 0x01, 0x07, 0x08, 0x08, 0x09, 0x06,
634 
-
643 
+  0x0F, 0x01, 0x07, 0x08, 0x08, 0x09, 0x06,},
644 
+  {
635 645 
   /* character 0x36 ('6'): (width=4) */
636 
-  0x06, 0x01, 0x07, 0x09, 0x09, 0x09, 0x06,
637 
-
646 
+  0x06, 0x01, 0x07, 0x09, 0x09, 0x09, 0x06,},
647 
+  {
638 648 
   /* character 0x37 ('7'): (width=4) */
639 
-  0x0F, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02,
640 
-
649 
+  0x0F, 0x08, 0x04, 0x04, 0x02, 0x02, 0x02,},
650 
+  {
641 651 
   /* character 0x38 ('8'): (width=4) */
642 
-  0x06, 0x09, 0x09, 0x06, 0x09, 0x09, 0x06,
643 
-
652 
+  0x06, 0x09, 0x09, 0x06, 0x09, 0x09, 0x06,},
653 
+  {
644 654 
   /* character 0x39 ('9'): (width=4) */
645 
-  0x06, 0x09, 0x09, 0x09, 0x0E, 0x08, 0x06,
646 
-
655 
+  0x06, 0x09, 0x09, 0x09, 0x0E, 0x08, 0x06,},
656 
+  {
647 657 
   /* character 0x3A (':'): (width=1) */
648 
-  0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
649 
-
658 
+  0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,},
659 
+  {
650 660 
   /* character 0x3B (';'): (width=1) */
651 
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01,
652 
-
661 
+  0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01,},
662 
+  {
653 663 
   /* character 0x3C ('<'): (width=3) */
654 
-  0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
655 
-
664 
+  0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,},
665 
+  {
656 666 
   /* character 0x3D ('='): (width=4) */
657 
-  0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00,
658 
-
667 
+  0x00, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x00,},
668 
+  {
659 669 
   /* character 0x3E ('>'): (width=3) */
660 
-  0x00, 0x01, 0x02, 0x04, 0x02, 0x01, 0x00,
661 
-
670 
+  0x00, 0x01, 0x02, 0x04, 0x02, 0x01, 0x00,},
671 
+  {
662 672 
   /* character 0x3F ('?'): (width=4) */
663 
-  0x07, 0x08, 0x04, 0x02, 0x02, 0x00, 0x02,
664 
-
673 
+  0x07, 0x08, 0x04, 0x02, 0x02, 0x00, 0x02,},
674 
+  {
665 675 
   /* character 0x40 ('@'): (width=7) */
666 
-  0x3C, 0x42, 0x59, 0x55, 0x39, 0x02, 0x3C,
667 
-
676 
+  0x3C, 0x42, 0x59, 0x55, 0x39, 0x02, 0x3C,},
677 
+  {
668 678 
   /* character 0x41 ('A'): (width=7) */
669 
-  0x08, 0x08, 0x14, 0x14, 0x3E, 0x22, 0x41,
670 
-
679 
+  0x08, 0x08, 0x14, 0x14, 0x3E, 0x22, 0x41,},
680 
+  {
671 681 
   /* character 0x42 ('B'): (width=5) */
672 
-  0x0F, 0x11, 0x11, 0x0F, 0x11, 0x11, 0x0F,
673 
-
682 
+  0x0F, 0x11, 0x11, 0x0F, 0x11, 0x11, 0x0F,},
683 
+  {
674 684 
   /* character 0x43 ('C'): (width=5) */
675 
-  0x0C, 0x12, 0x01, 0x01, 0x01, 0x12, 0x0C,
676 
-
685 
+  0x0C, 0x12, 0x01, 0x01, 0x01, 0x12, 0x0C,},
686 
+  {
677 687 
   /* character 0x44 ('D'): (width=5) */
678 
-  0x07, 0x09, 0x11, 0x11, 0x11, 0x09, 0x07,
679 
-
688 
+  0x07, 0x09, 0x11, 0x11, 0x11, 0x09, 0x07,},
689 
+  {
680 690 
   /* character 0x45 ('E'): (width=4) */
681 
-  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x0F,
682 
-
691 
+  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x0F,},
692 
+  {
683 693 
   /* character 0x46 ('F'): (width=4) */
684 
-  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x01,
685 
-
694 
+  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x01,},
695 
+  {
686 696 
   /* character 0x47 ('G'): (width=6) */
687 
-  0x0C, 0x12, 0x01, 0x39, 0x21, 0x12, 0x0C,
688 
-
697 
+  0x0C, 0x12, 0x01, 0x39, 0x21, 0x12, 0x0C,},
698 
+  {
689 699 
   /* character 0x48 ('H'): (width=5) */
690 
-  0x11, 0x11, 0x11, 0x1F, 0x11, 0x11, 0x11,
691 
-
700 
+  0x11, 0x11, 0x11, 0x1F, 0x11, 0x11, 0x11,},
701 
+  {
692 702 
   /* character 0x49 ('I'): (width=3) */
693 
-  0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x07,
694 
-
703 
+  0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x07,},
704 
+  {
695 705 
   /* character 0x4A ('J'): (width=5) */
696 
-  0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x0E,
697 
-
706 
+  0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x0E,},
707 
+  {
698 708 
   /* character 0x4B ('K'): (width=5) */
699 
-  0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11,
700 
-
709 
+  0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11,},
710 
+  {
701 711 
   /* character 0x4C ('L'): (width=4) */
702 
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F,
703 
-
712 
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F,},
713 
+  {
704 714 
   /* character 0x4D ('M'): (width=7) */
705 
-  0x41, 0x63, 0x63, 0x55, 0x55, 0x49, 0x49,
706 
-
715 
+  0x41, 0x63, 0x63, 0x55, 0x55, 0x49, 0x49,},
716 
+  {
707 717 
   /* character 0x4E ('N'): (width=6) */
708 
-  0x21, 0x23, 0x25, 0x2D, 0x29, 0x31, 0x21,
709 
-
718 
+  0x21, 0x23, 0x25, 0x2D, 0x29, 0x31, 0x21,},
719 
+  {
710 720 
   /* character 0x4F ('O'): (width=6) */
711 
-  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x0C,
712 
-
721 
+  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x0C,},
722 
+  {
713 723 
   /* character 0x50 ('P'): (width=4) */
714 
-  0x07, 0x09, 0x09, 0x07, 0x01, 0x01, 0x01,
715 
-
724 
+  0x07, 0x09, 0x09, 0x07, 0x01, 0x01, 0x01,},
725 
+  {
716 726 
   /* character 0x51 ('Q'): (width=7) */
717 
-  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x6C,
718 
-
727 
+  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x6C,},
728 
+  {
719 729 
   /* character 0x52 ('R'): (width=5) */
720 
-  0x0F, 0x11, 0x11, 0x0F, 0x09, 0x11, 0x11,
721 
-
730 
+  0x0F, 0x11, 0x11, 0x0F, 0x09, 0x11, 0x11,},
731 
+  {
722 732 
   /* character 0x53 ('S'): (width=4) */
723 
-  0x06, 0x09, 0x01, 0x06, 0x08, 0x09, 0x06,
724 
-
733 
+  0x06, 0x09, 0x01, 0x06, 0x08, 0x09, 0x06,},
734 
+  {
725 735 
   /* character 0x54 ('T'): (width=5) */
726 
-  0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
727 
-
736 
+  0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,},
737 
+  {
728 738 
   /* character 0x55 ('U'): (width=5) */
729 
-  0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0E,
730 
-
739 
+  0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0E,},
740 
+  {
731 741 
   /* character 0x56 ('V'): (width=7) */
732 
-  0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08,
733 
-
742 
+  0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08,},
743 
+  {
734 744 
   /* character 0x57 ('W'): (width=7) */
735 
-  0x49, 0x49, 0x49, 0x55, 0x55, 0x22, 0x22,
736 
-
745 
+  0x49, 0x49, 0x49, 0x55, 0x55, 0x22, 0x22,},
746 
+  {
737 747 
   /* character 0x58 ('X'): (width=5) */
738 
-  0x11, 0x1B, 0x0A, 0x04, 0x0A, 0x1B, 0x11,
739 
-
748 
+  0x11, 0x1B, 0x0A, 0x04, 0x0A, 0x1B, 0x11,},
749 
+  {
740 750 
   /* character 0x59 ('Y'): (width=7) */
741 
-  0x41, 0x22, 0x14, 0x08, 0x08, 0x08, 0x08,
742 
-
751 
+  0x41, 0x22, 0x14, 0x08, 0x08, 0x08, 0x08,},
752 
+  {
743 753 
   /* character 0x5A ('Z'): (width=5) */
744 
-  0x1F, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1F,
745 
-
754 
+  0x1F, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1F,},
755 
+  {
746 756 
   /* character 0x5B ('['): (width=3) */
747 
-  0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07,
748 
-
757 
+  0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07,},
758 
+  {
749 759 
   /* character 0x5C ('\'): (width=4) */
750 
-  0x01, 0x01, 0x02, 0x06, 0x04, 0x08, 0x08,
751 
-
760 
+  0x01, 0x01, 0x02, 0x06, 0x04, 0x08, 0x08,},
761 
+  {
752 762 
   /* character 0x5D (']'): (width=3) */
753 
-  0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07,
754 
-
763 
+  0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07,},
764 
+  {
755 765 
   /* character 0x5E ('^'): (width=5) */
756 
-  0x04, 0x0A, 0x11, 0x00, 0x00, 0x00, 0x00,
757 
-
766 
+  0x04, 0x0A, 0x11, 0x00, 0x00, 0x00, 0x00,},
767 
+  {
758 768 
   /* character 0x5F ('_'): (width=5) */
759 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F,
760 
-
769 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F,},
770 
+  {
761 771 
   /* character 0x60 ('`'): (width=1) */
762 
-  0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
763 
-
772 
+  0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,},
773 
+  {
764 774 
   /* character 0x61 ('a'): (width=7) */
765 
-  0x08, 0x08, 0x14, 0x14, 0x3E, 0x22, 0x41,
766 
-
775 
+  0x08, 0x08, 0x14, 0x14, 0x3E, 0x22, 0x41,},
776 
+  {
767 777 
   /* character 0x62 ('b'): (width=5) */
768 
-  0x0F, 0x11, 0x11, 0x0F, 0x11, 0x11, 0x0F,
769 
-
778 
+  0x0F, 0x11, 0x11, 0x0F, 0x11, 0x11, 0x0F,},
779 
+  {
770 780 
   /* character 0x63 ('c'): (width=5) */
771 
-  0x0C, 0x12, 0x01, 0x01, 0x01, 0x12, 0x0C,
772 
-
781 
+  0x0C, 0x12, 0x01, 0x01, 0x01, 0x12, 0x0C,},
782 
+  {
773 783 
   /* character 0x64 ('d'): (width=5) */
774 
-  0x07, 0x09, 0x11, 0x11, 0x11, 0x09, 0x07,
775 
-
784 
+  0x07, 0x09, 0x11, 0x11, 0x11, 0x09, 0x07,},
785 
+  {
776 786 
   /* character 0x65 ('e'): (width=4) */
777 
-  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x0F,
778 
-
787 
+  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x0F,},
788 
+  {
779 789 
   /* character 0x66 ('f'): (width=4) */
780 
-  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x01,
781 
-
790 
+  0x0F, 0x01, 0x01, 0x07, 0x01, 0x01, 0x01,},
791 
+  {
782 792 
   /* character 0x67 ('g'): (width=6) */
783 
-  0x0C, 0x12, 0x01, 0x39, 0x21, 0x12, 0x0C,
784 
-
793 
+  0x0C, 0x12, 0x01, 0x39, 0x21, 0x12, 0x0C,},
794 
+  {
785 795 
   /* character 0x68 ('h'): (width=5) */
786 
-  0x11, 0x11, 0x11, 0x1F, 0x11, 0x11, 0x11,
787 
-
796 
+  0x11, 0x11, 0x11, 0x1F, 0x11, 0x11, 0x11,},
797 
+  {
788 798 
   /* character 0x69 ('i'): (width=3) */
789 
-  0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x07,
790 
-
799 
+  0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x07,},
800 
+  {
791 801 
   /* character 0x6A ('j'): (width=5) */
792 
-  0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x0E,
793 
-
802 
+  0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x0E,},
803 
+  {
794 804 
   /* character 0x6B ('k'): (width=5) */
795 
-  0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11,
796 
-
805 
+  0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11,},
806 
+  {
797 807 
   /* character 0x6C ('l'): (width=4) */
798 
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F,
799 
-
808 
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F,},
809 
+  {
800 810 
   /* character 0x6D ('m'): (width=7) */
801 
-  0x41, 0x63, 0x63, 0x55, 0x55, 0x49, 0x49,
802 
-
811 
+  0x41, 0x63, 0x63, 0x55, 0x55, 0x49, 0x49,},
812 
+  {
803 813 
   /* character 0x6E ('n'): (width=6) */
804 
-  0x21, 0x23, 0x25, 0x2D, 0x29, 0x31, 0x21,
805 
-
814 
+  0x21, 0x23, 0x25, 0x2D, 0x29, 0x31, 0x21,},
815 
+  {
806 816 
   /* character 0x6F ('o'): (width=6) */
807 
-  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x0C,
808 
-
817 
+  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x0C,},
818 
+  {
809 819 
   /* character 0x70 ('p'): (width=4) */
810 
-  0x07, 0x09, 0x09, 0x07, 0x01, 0x01, 0x01,
811 
-
820 
+  0x07, 0x09, 0x09, 0x07, 0x01, 0x01, 0x01,},
821 
+  {
812 822 
   /* character 0x71 ('q'): (width=7) */
813 
-  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x6C,
814 
-
823 
+  0x0C, 0x12, 0x21, 0x21, 0x21, 0x12, 0x6C,},
824 
+  {
815 825 
   /* character 0x72 ('r'): (width=5) */
816 
-  0x0F, 0x11, 0x11, 0x0F, 0x09, 0x11, 0x11,
817 
-
826 
+  0x0F, 0x11, 0x11, 0x0F, 0x09, 0x11, 0x11,},
827 
+  {
818 828 
   /* character 0x73 ('s'): (width=4) */
819 
-  0x06, 0x09, 0x01, 0x06, 0x08, 0x09, 0x06,
820 
-
829 
+  0x06, 0x09, 0x01, 0x06, 0x08, 0x09, 0x06,},
830 
+  {
821 831 
   /* character 0x74 ('t'): (width=5) */
822 
-  0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
823 
-
832 
+  0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,},
833 
+  {
824 834 
   /* character 0x75 ('u'): (width=5) */
825 
-  0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0E,
826 
-
835 
+  0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0E,},
836 
+  {
827 837 
   /* character 0x76 ('v'): (width=7) */
828 
-  0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08,
829 
-
838 
+  0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08,},
839 
+  {
830 840 
   /* character 0x77 ('w'): (width=7) */
831 
-  0x49, 0x49, 0x49, 0x55, 0x55, 0x22, 0x22,
832 
-
841 
+  0x49, 0x49, 0x49, 0x55, 0x55, 0x22, 0x22,},
842 
+  {
833 843 
   /* character 0x78 ('x'): (width=5) */
834 
-  0x11, 0x1B, 0x0A, 0x04, 0x0A, 0x1B, 0x11,
835 
-
844 
+  0x11, 0x1B, 0x0A, 0x04, 0x0A, 0x1B, 0x11,},
845 
+  {
836 846 
   /* character 0x79 ('y'): (width=7) */
837 
-  0x41, 0x22, 0x14, 0x08, 0x08, 0x08, 0x08,
838 
-
847 
+  0x41, 0x22, 0x14, 0x08, 0x08, 0x08, 0x08,},
848 
+  {
839 849 
   /* character 0x7A ('z'): (width=5) */
840 
-  0x1F, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1F,
841 
-
850 
+  0x1F, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1F,},
851 
+  {
842 852 
   /* character 0x7B ('{'): (width=3) */
843 
-  0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04,
844 
-
853 
+  0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04,},
854 
+  {
845 855 
   /* character 0x7C ('|'): (width=1) */
846 
-  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
847 
-
856 
+  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,},
857 
+  {
848 858 
   /* character 0x7D ('}'): (width=3) */
849 
-  0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01,
859 
+  0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01,},
850 860
851 861 
 };
852 862
... ... 
@@ -950,572 +960,570 @@ const unsigned char MetaWatch7width[PRINTABLE_CHARACTERS] = {
950 960 
 };
951 961
952 962
953 
-const unsigned int MetaWatch16table[PRINTABLE_CHARACTERS][16] =
963 
+const u16t MetaWatch16table[PRINTABLE_CHARACTERS][16] =
954 964 
 {
955 965 
   /* character 0x20 (' '): (width=4) */
956 
-  0x0000, 0x0000, 0x0000, 0x0000,
957 
-  0x0000, 0x0000, 0x0000, 0x0000,
958 
-  0x0000, 0x0000, 0x0000, 0x0000,
959 
-  0x0000, 0x0000, 0x0000, 0x0000,
966 
+  {0x0000, 0x0000, 0x0000, 0x0000,
967 
+  0x0000, 0x0000, 0x0000, 0x0000,
968 
+  0x0000, 0x0000, 0x0000, 0x0000,
969 
+  0x0000, 0x0000, 0x0000, 0x0000},
960 970
961 971 
   /* character 0x21 ('!'): (width=2) */
962 
-  0x0000, 0x0000, 0x0003, 0x0003,
963 
-  0x0003, 0x0003, 0x0003, 0x0003,
964 
-  0x0003, 0x0003, 0x0000, 0x0003,
965 
-  0x0003, 0x0000, 0x0000, 0x0000,
966 
-
972 
+  {0x0000, 0x0000, 0x0003, 0x0003,
973 
+  0x0003, 0x0003, 0x0003, 0x0003,
974 
+  0x0003, 0x0003, 0x0000, 0x0003,
975 
+  0x0003, 0x0000, 0x0000, 0x0000},
967 976 
   /* character 0x22 ('"'): (width=5) */
968 
-  0x0000, 0x0012, 0x001B, 0x001B,
969 
-  0x0009, 0x0000, 0x0000, 0x0000,
970 
-  0x0000, 0x0000, 0x0000, 0x0000,
971 
-  0x0000, 0x0000, 0x0000, 0x0000,
977 
+  {0x0000, 0x0012, 0x001B, 0x001B,
978 
+  0x0009, 0x0000, 0x0000, 0x0000,
979 
+  0x0000, 0x0000, 0x0000, 0x0000,
980 
+  0x0000, 0x0000, 0x0000, 0x0000},
972 981
973 982 
   /* character 0x23 ('#'): (width=12) */
974 
-  0x0000, 0x0000, 0x0000, 0x0110,
975 
-  0x0198, 0x0FFE, 0x07FF, 0x0198,
976 
-  0x0198, 0x0FFE, 0x07FF, 0x0198,
977 
-  0x0088, 0x0000, 0x0000, 0x0000,
983 
+  {0x0000, 0x0000, 0x0000, 0x0110,
984 
+  0x0198, 0x0FFE, 0x07FF, 0x0198,
985 
+  0x0198, 0x0FFE, 0x07FF, 0x0198,
986 
+  0x0088, 0x0000, 0x0000, 0x0000},
978 987
979 988 
   /* character 0x24 ('$'): (width=6) */
980 
-  0x000C, 0x000C, 0x001E, 0x003F,
981 
-  0x0033, 0x0003, 0x0007, 0x001E,
982 
-  0x0038, 0x0030, 0x0033, 0x003F,
983 
-  0x001E, 0x000C, 0x000C, 0x0000,
989 
+  {0x000C, 0x000C, 0x001E, 0x003F,
990 
+  0x0033, 0x0003, 0x0007, 0x001E,
991 
+  0x0038, 0x0030, 0x0033, 0x003F,
992 
+  0x001E, 0x000C, 0x000C, 0x0000},
984 993
985 994 
   /* character 0x25 ('%'): (width=10) */
986 
-  0x0000, 0x020E, 0x031F, 0x039B,
987 
-  0x01DF, 0x00EE, 0x0070, 0x0038,
988 
-  0x01DC, 0x03EE, 0x0367, 0x03E3,
989 
-  0x01C1, 0x0000, 0x0000, 0x0000,
995 
+  {0x0000, 0x020E, 0x031F, 0x039B,
996 
+  0x01DF, 0x00EE, 0x0070, 0x0038,
997 
+  0x01DC, 0x03EE, 0x0367, 0x03E3,
998 
+  0x01C1, 0x0000, 0x0000, 0x0000},
990 999
991 1000 
   /* character 0x26 ('&'): (width=10) */
992 
-  0x0000, 0x0000, 0x001C, 0x003E,
993 
-  0x0036, 0x003E, 0x001C, 0x01BE,
994 
-  0x01F7, 0x00E3, 0x01F7, 0x03BE,
995 
-  0x031C, 0x0000, 0x0000, 0x0000,
1001 
+  {0x0000, 0x0000, 0x001C, 0x003E,
1002 
+  0x0036, 0x003E, 0x001C, 0x01BE,
1003 
+  0x01F7, 0x00E3, 0x01F7, 0x03BE,
1004 
+  0x031C, 0x0000, 0x0000, 0x0000},
996 1005
997 1006 
   /* character 0x27 ('''): (width=2) */
998 
-  0x0000, 0x0002, 0x0003, 0x0003,
999 
-  0x0001, 0x0000, 0x0000, 0x0000,
1000 
-  0x0000, 0x0000, 0x0000, 0x0000,
1001 
-  0x0000, 0x0000, 0x0000, 0x0000,
1002 
-
1007 
+  {0x0000, 0x0002, 0x0003, 0x0003,
1008 
+  0x0001, 0x0000, 0x0000, 0x0000,
1009 
+  0x0000, 0x0000, 0x0000, 0x0000,
1010 
+  0x0000, 0x0000, 0x0000, 0x0000},
1011 
+  {
1003 1012 
   /* character 0x28 ('('): (width=4) */
1004 
-  0x0008, 0x0004, 0x0006, 0x0006,
1005 
-  0x0003, 0x0003, 0x0003, 0x0003,
1006 
-  0x0003, 0x0003, 0x0003, 0x0006,
1007 
-  0x0006, 0x0004, 0x0008, 0x0000,
1008 
-
1013 
+  0x0008, 0x0004, 0x0006, 0x0006,
1014 
+  0x0003, 0x0003, 0x0003, 0x0003,
1015 
+  0x0003, 0x0003, 0x0003, 0x0006,
1016 
+  0x0006, 0x0004, 0x0008, 0x0000},
1017 
+  {
1009 1018 
   /* character 0x29 (')'): (width=4) */
1010 
-  0x0001, 0x0002, 0x0006, 0x0006,
1011 
-  0x000C, 0x000C, 0x000C, 0x000C,
1012 
-  0x000C, 0x000C, 0x000C, 0x0006,
1013 
-  0x0006, 0x0002, 0x0001, 0x0000,
1014 
-
1019 
+  0x0001, 0x0002, 0x0006, 0x0006,
1020 
+  0x000C, 0x000C, 0x000C, 0x000C,
1021 
+  0x000C, 0x000C, 0x000C, 0x0006,
1022 
+  0x0006, 0x0002, 0x0001, 0x0000},
1023 
+  {
1015 1024 
   /* character 0x2A ('*'): (width=8) */
1016 
-  0x0000, 0x0000, 0x0018, 0x0018,
1017 
-  0x00DB, 0x00FF, 0x003C, 0x00FF,
1018 
-  0x00DB, 0x0018, 0x0018, 0x0000,
1019 
-  0x0000, 0x0000, 0x0000, 0x0000,
1020 
-
1025 
+  0x0000, 0x0000, 0x0018, 0x0018,
1026 
+  0x00DB, 0x00FF, 0x003C, 0x00FF,
1027 
+  0x00DB, 0x0018, 0x0018, 0x0000,
1028 
+  0x0000, 0x0000, 0x0000, 0x0000},
1029 
+  {
1021 1030 
   /* character 0x2B ('+'): (width=8) */
1022 
-  0x0000, 0x0000, 0x0000, 0x0000,
1023 
-  0x0018, 0x0018, 0x0018, 0x00FF,
1024 
-  0x00FF, 0x0018, 0x0018, 0x0018,
1025 
-  0x0000, 0x0000, 0x0000, 0x0000,
1026 
-
1031 
+  0x0000, 0x0000, 0x0000, 0x0000,
1032 
+  0x0018, 0x0018, 0x0018, 0x00FF,
1033 
+  0x00FF, 0x0018, 0x0018, 0x0018,
1034 
+  0x0000, 0x0000, 0x0000, 0x0000},
1035 
+  {
1027 1036 
   /* character 0x2C (','): (width=2) */
1028 
-  0x0000, 0x0000, 0x0000, 0x0000,
1029 
-  0x0000, 0x0000, 0x0000, 0x0000,
1030 
-  0x0000, 0x0000, 0x0000, 0x0002,
1031 
-  0x0003, 0x0003, 0x0001, 0x0000,
1032 
-
1037 
+  0x0000, 0x0000, 0x0000, 0x0000,
1038 
+  0x0000, 0x0000, 0x0000, 0x0000,
1039 
+  0x0000, 0x0000, 0x0000, 0x0002,
1040 
+  0x0003, 0x0003, 0x0001, 0x0000},
1041 
+  {
1033 1042 
   /* character 0x2D ('-'): (width=8) */
1034 
-  0x0000, 0x0000, 0x0000, 0x0000,
1035 
-  0x0000, 0x0000, 0x0000, 0x00FF,
1036 
-  0x00FF, 0x0000, 0x0000, 0x0000,
1037 
-  0x0000, 0x0000, 0x0000, 0x0000,
1038 
-
1043 
+  0x0000, 0x0000, 0x0000, 0x0000,
1044 
+  0x0000, 0x0000, 0x0000, 0x00FF,
1045 
+  0x00FF, 0x0000, 0x0000, 0x0000,
1046 
+  0x0000, 0x0000, 0x0000, 0x0000},
1047 
+  {
1039 1048 
   /* character 0x2E ('.'): (width=2) */
1040 
-  0x0000, 0x0000, 0x0000, 0x0000,
1041 
-  0x0000, 0x0000, 0x0000, 0x0000,
1042 
-  0x0000, 0x0000, 0x0000, 0x0003,
1043 
-  0x0003, 0x0000, 0x0000, 0x0000,
1044 
-
1049 
+  0x0000, 0x0000, 0x0000, 0x0000,
1050 
+  0x0000, 0x0000, 0x0000, 0x0000,
1051 
+  0x0000, 0x0000, 0x0000, 0x0003,
1052 
+  0x0003, 0x0000, 0x0000, 0x0000},
1053 
+  {
1045 1054 
   /* character 0x2F ('/'): (width=6) */
1046 
-  0x0000, 0x0000, 0x0000, 0x0030,
1047 
-  0x0030, 0x0018, 0x0018, 0x000C,
1048 
-  0x000C, 0x0006, 0x0006, 0x0003,
1049 
-  0x0003, 0x0000, 0x0000, 0x0000,
1050 
-
1055 
+  0x0000, 0x0000, 0x0000, 0x0030,
1056 
+  0x0030, 0x0018, 0x0018, 0x000C,
1057 
+  0x000C, 0x0006, 0x0006, 0x0003,
1058 
+  0x0003, 0x0000, 0x0000, 0x0000},
1059 
+  {
1051 1060 
   /* character 0x30 ('0'): (width=7) */
1052 
-  0x0000, 0x0000, 0x001C, 0x003E,
1053 
-  0x0036, 0x0063, 0x0063, 0x0063,
1054 
-  0x0063, 0x0063, 0x0036, 0x003E,
1055 
-  0x001C, 0x0000, 0x0000, 0x0000,
1056 
-
1061 
+  0x0000, 0x0000, 0x001C, 0x003E,
1062 
+  0x0036, 0x0063, 0x0063, 0x0063,
1063 
+  0x0063, 0x0063, 0x0036, 0x003E,
1064 
+  0x001C, 0x0000, 0x0000, 0x0000},
1065 
+  {
1057 1066 
   /* character 0x31 ('1'): (width=3) */
1058 
-  0x0000, 0x0000, 0x0006, 0x0007,
1059 
-  0x0007, 0x0006, 0x0006, 0x0006,
1060 
-  0x0006, 0x0006, 0x0006, 0x0006,
1061 
-  0x0006, 0x0000, 0x0000, 0x0000,
1062 
-
1067 
+  0x0000, 0x0000, 0x0006, 0x0007,
1068 
+  0x0007, 0x0006, 0x0006, 0x0006,
1069 
+  0x0006, 0x0006, 0x0006, 0x0006,
1070 
+  0x0006, 0x0000, 0x0000, 0x0000},
1071 
+  {
1063 1072 
   /* character 0x32 ('2'): (width=6) */
1064 
-  0x0000, 0x0000, 0x001E, 0x003F,
1065 
-  0x0033, 0x0030, 0x0038, 0x001C,
1066 
-  0x000E, 0x0007, 0x0003, 0x003F,
1067 
-  0x003F, 0x0000, 0x0000, 0x0000,
1068 
-
1073 
+  0x0000, 0x0000, 0x001E, 0x003F,
1074 
+  0x0033, 0x0030, 0x0038, 0x001C,
1075 
+  0x000E, 0x0007, 0x0003, 0x003F,
1076 
+  0x003F, 0x0000, 0x0000, 0x0000},
1077 
+  {
1069 1078 
   /* character 0x33 ('3'): (width=6) */
1070 
-  0x0000, 0x0000, 0x001E, 0x003F,
1071 
-  0x0033, 0x0030, 0x001C, 0x003C,
1072 
-  0x0030, 0x0030, 0x0033, 0x003F,
1073 
-  0x001E, 0x0000, 0x0000, 0x0000,
1074 
-
1079 
+  0x0000, 0x0000, 0x001E, 0x003F,
1080 
+  0x0033, 0x0030, 0x001C, 0x003C,
1081 
+  0x0030, 0x0030, 0x0033, 0x003F,
1082 
+  0x001E, 0x0000, 0x0000, 0x0000},
1083 
+  {
1075 1084 
   /* character 0x34 ('4'): (width=7) */
1076 
-  0x0000, 0x0000, 0x000C, 0x000C,
1077 
-  0x000C, 0x0036, 0x0036, 0x0033,
1078 
-  0x007F, 0x007F, 0x0030, 0x0030,
1079 
-  0x0030, 0x0000, 0x0000, 0x0000,
1080 
-
1085 
+  0x0000, 0x0000, 0x000C, 0x000C,
1086 
+  0x000C, 0x0036, 0x0036, 0x0033,
1087 
+  0x007F, 0x007F, 0x0030, 0x0030,
1088 
+  0x0030, 0x0000, 0x0000, 0x0000},
1089 
+  {
1081 1090 
   /* character 0x35 ('5'): (width=6) */
1082 
-  0x0000, 0x0000, 0x003F, 0x003F,
1083 
-  0x0003, 0x0003, 0x001F, 0x003F,
1084 
-  0x0030, 0x0030, 0x0033, 0x003F,
1085 
-  0x001E, 0x0000, 0x0000, 0x0000,
1086 
-
1091 
+  0x0000, 0x0000, 0x003F, 0x003F,
1092 
+  0x0003, 0x0003, 0x001F, 0x003F,
1093 
+  0x0030, 0x0030, 0x0033, 0x003F,
1094 
+  0x001E, 0x0000, 0x0000, 0x0000},
1095 
+  {
1087 1096 
   /* character 0x36 ('6'): (width=6) */
1088 
-  0x0000, 0x0000, 0x000C, 0x000E,
1089 
-  0x0006, 0x0003, 0x001F, 0x003F,
1090 
-  0x0033, 0x0033, 0x0033, 0x001F,
1091 
-  0x001E, 0x0000, 0x0000, 0x0000,
1092 
-
1097 
+  0x0000, 0x0000, 0x000C, 0x000E,
1098 
+  0x0006, 0x0003, 0x001F, 0x003F,
1099 
+  0x0033, 0x0033, 0x0033, 0x001F,
1100 
+  0x001E, 0x0000, 0x0000, 0x0000},
1101 
+  {
1093 1102 
   /* character 0x37 ('7'): (width=6) */
1094 
-  0x0000, 0x0000, 0x003F, 0x003F,
1095 
-  0x0030, 0x0030, 0x0018, 0x0018,
1096 
-  0x000C, 0x000C, 0x000C, 0x000C,
1097 
-  0x000C, 0x0000, 0x0000, 0x0000,
1098 
-
1103 
+  0x0000, 0x0000, 0x003F, 0x003F,
1104 
+  0x0030, 0x0030, 0x0018, 0x0018,
1105 
+  0x000C, 0x000C, 0x000C, 0x000C,
1106 
+  0x000C, 0x0000, 0x0000, 0x0000},
1107 
+  {
1099 1108 
   /* character 0x38 ('8'): (width=6) */
1100 
-  0x0000, 0x0000, 0x001E, 0x003F,
1101 
-  0x0033, 0x0033, 0x003F, 0x001E,
1102 
-  0x0033, 0x0033, 0x0033, 0x003F,
1103 
-  0x001E, 0x0000, 0x0000, 0x0000,
1104 
-
1109 
+  0x0000, 0x0000, 0x001E, 0x003F,
1110 
+  0x0033, 0x0033, 0x003F, 0x001E,
1111 
+  0x0033, 0x0033, 0x0033, 0x003F,
1112 
+  0x001E, 0x0000, 0x0000, 0x0000},
1113 
+  {
1105 1114 
   /* character 0x39 ('9'): (width=6) */
1106 
-  0x0000, 0x0000, 0x001E, 0x003F,
1107 
-  0x0033, 0x0033, 0x0033, 0x003F,
1108 
-  0x003E, 0x0030, 0x0018, 0x001C,
1109 
-  0x000C, 0x0000, 0x0000, 0x0000,
1110 
-
1115 
+  0x0000, 0x0000, 0x001E, 0x003F,
1116 
+  0x0033, 0x0033, 0x0033, 0x003F,
1117 
+  0x003E, 0x0030, 0x0018, 0x001C,
1118 
+  0x000C, 0x0000, 0x0000, 0x0000},
1119 
+  {
1111 1120 
   /* character 0x3A (':'): (width=2) */
1112 
-  0x0000, 0x0000, 0x0000, 0x0000,
1113 
-  0x0000, 0x0003, 0x0003, 0x0000,
1114 
-  0x0000, 0x0003, 0x0003, 0x0000,
1115 
-  0x0000, 0x0000, 0x0000, 0x0000,
1121 
+  0x0000, 0x0000, 0x0000, 0x0000,
1122 
+  0x0000, 0x0003, 0x0003, 0x0000,
1123 
+  0x0000, 0x0003, 0x0003, 0x0000,
1124 
+  0x0000, 0x0000, 0x0000, 0x0000},
1116 1125
1117 1126 
   /* character 0x3B (';'): (width=2) */
1118 
-  0x0000, 0x0000, 0x0000, 0x0000,
1119 
-  0x0000, 0x0003, 0x0003, 0x0000,
1120 
-  0x0002, 0x0003, 0x0003, 0x0001,
1121 
-  0x0000, 0x0000, 0x0000, 0x0000,
1122 
-
1127 
+  {0x0000, 0x0000, 0x0000, 0x0000,
1128 
+  0x0000, 0x0003, 0x0003, 0x0000,
1129 
+  0x0002, 0x0003, 0x0003, 0x0001,
1130 
+  0x0000, 0x0000, 0x0000, 0x0000},
1131 
+  {
1123 1132 
   /* character 0x3C ('<'): (width=8) */
1124 
-  0x0000, 0x0000, 0x0000, 0x0000,
1125 
-  0x00C0, 0x00F0, 0x003C, 0x000F,
1126 
-  0x003C, 0x00F0, 0x00C0, 0x0000,
1127 
-  0x0000, 0x0000, 0x0000, 0x0000,
1128 
-
1133 
+  0x0000, 0x0000, 0x0000, 0x0000,
1134 
+  0x00C0, 0x00F0, 0x003C, 0x000F,
1135 
+  0x003C, 0x00F0, 0x00C0, 0x0000,
1136 
+  0x0000, 0x0000, 0x0000, 0x0000},
1137 
+  {
1129 1138 
   /* character 0x3D ('='): (width=7) */
1130 
-  0x0000, 0x0000, 0x0000, 0x0000,
1131 
-  0x0000, 0x0000, 0x007F, 0x007F,
1132 
-  0x0000, 0x007F, 0x007F, 0x0000,
1133 
-  0x0000, 0x0000, 0x0000, 0x0000,
1134 
-
1139 
+  0x0000, 0x0000, 0x0000, 0x0000,
1140 
+  0x0000, 0x0000, 0x007F, 0x007F,
1141 
+  0x0000, 0x007F, 0x007F, 0x0000,
1142 
+  0x0000, 0x0000, 0x0000, 0x0000},
1143 
+  {
1135 1144 
   /* character 0x3E ('>'): (width=8) */
1136 
-  0x0000, 0x0000, 0x0000, 0x0000,
1137 
-  0x0003, 0x000F, 0x003C, 0x00F0,
1138 
-  0x003C, 0x000F, 0x0003, 0x0000,
1139 
-  0x0000, 0x0000, 0x0000, 0x0000,
1140 
-
1145 
+  0x0000, 0x0000, 0x0000, 0x0000,
1146 
+  0x0003, 0x000F, 0x003C, 0x00F0,
1147 
+  0x003C, 0x000F, 0x0003, 0x0000,
1148 
+  0x0000, 0x0000, 0x0000, 0x0000},
1149 
+  {
1141 1150 
   /* character 0x3F ('?'): (width=6) */
1142 
-  0x0000, 0x0000, 0x001E, 0x003F,
1143 
-  0x0033, 0x0030, 0x0018, 0x001C,
1144 
-  0x000C, 0x000C, 0x0000, 0x000C,
1145 
-  0x000C, 0x0000, 0x0000, 0x0000,
1146 
-
1151 
+  0x0000, 0x0000, 0x001E, 0x003F,
1152 
+  0x0033, 0x0030, 0x0018, 0x001C,
1153 
+  0x000C, 0x000C, 0x0000, 0x000C,
1154 
+  0x000C, 0x0000, 0x0000, 0x0000},
1155 
+  {
1147 1156 
   /* character 0x40 ('@'): (width=11) */
1148 
-  0x0000, 0x0000, 0x01F8, 0x03FE,
1149 
-  0x0706, 0x06F3, 0x06FB, 0x06DB,
1150 
-  0x07FB, 0x03F3, 0x0006, 0x01FE,
1151 
-  0x00F8, 0x0000, 0x0000, 0x0000,
1152 
-
1157 
+  0x0000, 0x0000, 0x01F8, 0x03FE,
1158 
+  0x0706, 0x06F3, 0x06FB, 0x06DB,
1159 
+  0x07FB, 0x03F3, 0x0006, 0x01FE,
1160 
+  0x00F8, 0x0000, 0x0000, 0x0000},
1161 
+  {
1153 1162 
   /* character 0x41 ('A'): (width=9) */
1154 
-  0x0000, 0x0000, 0x0010, 0x0010,
1155 
-  0x0038, 0x0038, 0x006C, 0x006C,
1156 
-  0x00C6, 0x00C6, 0x01FF, 0x0183,
1157 
-  0x0183, 0x0000, 0x0000, 0x0000,
1158 
-
1163 
+  0x0000, 0x0000, 0x0010, 0x0010,
1164 
+  0x0038, 0x0038, 0x006C, 0x006C,
1165 
+  0x00C6, 0x00C6, 0x01FF, 0x0183,
1166 
+  0x0183, 0x0000, 0x0000, 0x0000},
1167 
+  {
1159 1168 
   /* character 0x42 ('B'): (width=7) */
1160 
-  0x0000, 0x0000, 0x003F, 0x007F,
1161 
-  0x0063, 0x0063, 0x003F, 0x007F,
1162 
-  0x0063, 0x0063, 0x0063, 0x007F,
1163 
-  0x003F, 0x0000, 0x0000, 0x0000,
1164 
-
1169 
+  0x0000, 0x0000, 0x003F, 0x007F,
1170 
+  0x0063, 0x0063, 0x003F, 0x007F,
1171 
+  0x0063, 0x0063, 0x0063, 0x007F,
1172 
+  0x003F, 0x0000, 0x0000, 0x0000},
1173 
+  {
1165 1174 
   /* character 0x43 ('C'): (width=7) */
1166 
-  0x0000, 0x0000, 0x003E, 0x007F,
1167 
-  0x0063, 0x0003, 0x0003, 0x0003,
1168 
-  0x0003, 0x0003, 0x0063, 0x007F,
1169 
-  0x003E, 0x0000, 0x0000, 0x0000,
1170 
-
1175 
+  0x0000, 0x0000, 0x003E, 0x007F,
1176 
+  0x0063, 0x0003, 0x0003, 0x0003,
1177 
+  0x0003, 0x0003, 0x0063, 0x007F,
1178 
+  0x003E, 0x0000, 0x0000, 0x0000},
1179 
+  {
1171 1180 
   /* character 0x44 ('D'): (width=7) */
1172 
-  0x0000, 0x0000, 0x003F, 0x007F,
1173 
-  0x0063, 0x0063, 0x0063, 0x0063,
1174 
-  0x0063, 0x0063, 0x0063, 0x007F,
1175 
-  0x003F, 0x0000, 0x0000, 0x0000,
1176 
-
1181 
+  0x0000, 0x0000, 0x003F, 0x007F,
1182 
+  0x0063, 0x0063, 0x0063, 0x0063,
1183 
+  0x0063, 0x0063, 0x0063, 0x007F,
1184 
+  0x003F, 0x0000, 0x0000, 0x0000},
1185 
+  {
1177 1186 
   /* character 0x45 ('E'): (width=7) */
1178 
-  0x0000, 0x0000, 0x007F, 0x007F,
1179 
-  0x0003, 0x0003, 0x001F, 0x001F,
1180 
-  0x0003, 0x0003, 0x0003, 0x007F,
1181 
-  0x007F, 0x0000, 0x0000, 0x0000,
1182 
-
1187 
+  0x0000, 0x0000, 0x007F, 0x007F,
1188 
+  0x0003, 0x0003, 0x001F, 0x001F,
1189 
+  0x0003, 0x0003, 0x0003, 0x007F,
1190 
+  0x007F, 0x0000, 0x0000, 0x0000},
1191 
+  {
1183 1192 
   /* character 0x46 ('F'): (width=6) */
1184 
-  0x0000, 0x0000, 0x003F, 0x003F,
1185 
-  0x0003, 0x0003, 0x003F, 0x003F,
1186 
-  0x0003, 0x0003, 0x0003, 0x0003,
1187 
-  0x0003, 0x0000, 0x0000, 0x0000,
1188 
-
1193 
+  0x0000, 0x0000, 0x003F, 0x003F,
1194 
+  0x0003, 0x0003, 0x003F, 0x003F,
1195 
+  0x0003, 0x0003, 0x0003, 0x0003,
1196 
+  0x0003, 0x0000, 0x0000, 0x0000},
1197 
+  {
1189 1198 
   /* character 0x47 ('G'): (width=7) */
1190 
-  0x0000, 0x0000, 0x003E, 0x007F,
1191 
-  0x0063, 0x0003, 0x0003, 0x007B,
1192 
-  0x007B, 0x0063, 0x0063, 0x007F,
1193 
-  0x003E, 0x0000, 0x0000, 0x0000,
1194 
-
1199 
+  0x0000, 0x0000, 0x003E, 0x007F,
1200 
+  0x0063, 0x0003, 0x0003, 0x007B,
1201 
+  0x007B, 0x0063, 0x0063, 0x007F,
1202 
+  0x003E, 0x0000, 0x0000, 0x0000},
1203 
+  {
1195 1204 
   /* character 0x48 ('H'): (width=7) */
1196 
-  0x0000, 0x0000, 0x0063, 0x0063,
1197 
-  0x0063, 0x0063, 0x007F, 0x007F,
1198 
-  0x0063, 0x0063, 0x0063, 0x0063,
1199 
-  0x0063, 0x0000, 0x0000, 0x0000,
1200 
-
1205 
+  0x0000, 0x0000, 0x0063, 0x0063,
1206 
+  0x0063, 0x0063, 0x007F, 0x007F,
1207 
+  0x0063, 0x0063, 0x0063, 0x0063,
1208 
+  0x0063, 0x0000, 0x0000, 0x0000},
1209 
+  {
1201 1210 
   /* character 0x49 ('I'): (width=4) */
1202 
-  0x0000, 0x0000, 0x000F, 0x000F,
1203 
-  0x0006, 0x0006, 0x0006, 0x0006,
1204 
-  0x0006, 0x0006, 0x0006, 0x000F,
1205 
-  0x000F, 0x0000, 0x0000, 0x0000,
1206 
-
1211 
+  0x0000, 0x0000, 0x000F, 0x000F,
1212 
+  0x0006, 0x0006, 0x0006, 0x0006,
1213 
+  0x0006, 0x0006, 0x0006, 0x000F,
1214 
+  0x000F, 0x0000, 0x0000, 0x0000},
1215 
+  {
1207 1216 
   /* character 0x4A ('J'): (width=6) */
1208 
-  0x0000, 0x0000, 0x0030, 0x0030,
1209 
-  0x0030, 0x0030, 0x0030, 0x0030,
1210 
-  0x0030, 0x0030, 0x0033, 0x003F,
1211 
-  0x001E, 0x0000, 0x0000, 0x0000,
1212 
-
1217 
+  0x0000, 0x0000, 0x0030, 0x0030,
1218 
+  0x0030, 0x0030, 0x0030, 0x0030,
1219 
+  0x0030, 0x0030, 0x0033, 0x003F,
1220 
+  0x001E, 0x0000, 0x0000, 0x0000},
1221 
+  {
1213 1222 
   /* character 0x4B ('K'): (width=7) */
1214 
-  0x0000, 0x0000, 0x0063, 0x0073,
1215 
-  0x003B, 0x001F, 0x000F, 0x0007,
1216 
-  0x000F, 0x001F, 0x003B, 0x0073,
1217 
-  0x0063, 0x0000, 0x0000, 0x0000,
1218 
-
1223 
+  0x0000, 0x0000, 0x0063, 0x0073,
1224 
+  0x003B, 0x001F, 0x000F, 0x0007,
1225 
+  0x000F, 0x001F, 0x003B, 0x0073,
1226 
+  0x0063, 0x0000, 0x0000, 0x0000},
1227 
+  {
1219 1228 
   /* character 0x4C ('L'): (width=6) */
1220 
-  0x0000, 0x0000, 0x0003, 0x0003,
1221 
-  0x0003, 0x0003, 0x0003, 0x0003,
1222 
-  0x0003, 0x0003, 0x0003, 0x003F,
1223 
-  0x003F, 0x0000, 0x0000, 0x0000,
1224 
-
1229 
+  0x0000, 0x0000, 0x0003, 0x0003,
1230 
+  0x0003, 0x0003, 0x0003, 0x0003,
1231 
+  0x0003, 0x0003, 0x0003, 0x003F,
1232 
+  0x003F, 0x0000, 0x0000, 0x0000},
1233 
+  {
1225 1234 
   /* character 0x4D ('M'): (width=11) */
1226 
-  0x0000, 0x0000, 0x0401, 0x0603,
1227 
-  0x0707, 0x078F, 0x07DF, 0x06FB,
1228 
-  0x0673, 0x0623, 0x0603, 0x0603,
1229 
-  0x0603, 0x0000, 0x0000, 0x0000,
1230 
-
1235 
+  0x0000, 0x0000, 0x0401, 0x0603,
1236 
+  0x0707, 0x078F, 0x07DF, 0x06FB,
1237 
+  0x0673, 0x0623, 0x0603, 0x0603,
1238 
+  0x0603, 0x0000, 0x0000, 0x0000},
1239 
+  {
1231 1240 
   /* character 0x4E ('N'): (width=9) */
1232 
-  0x0000, 0x0000, 0x0181, 0x0183,
1233 
-  0x0187, 0x018F, 0x019F, 0x01BB,
1234 
-  0x01F3, 0x01E3, 0x01C3, 0x0183,
1235 
-  0x0103, 0x0000, 0x0000, 0x0000,
1236 
-
1241 
+  0x0000, 0x0000, 0x0181, 0x0183,
1242 
+  0x0187, 0x018F, 0x019F, 0x01BB,
1243 
+  0x01F3, 0x01E3, 0x01C3, 0x0183,
1244 
+  0x0103, 0x0000, 0x0000, 0x0000},
1245 
+  {
1237 1246 
   /* character 0x4F ('O'): (width=7) */
1238 
-  0x0000, 0x0000, 0x003E, 0x007F,
1239 
-  0x0063, 0x0063, 0x0063, 0x0063,
1240 
-  0x0063, 0x0063, 0x0063, 0x007F,
1241 
-  0x003E, 0x0000, 0x0000, 0x0000,
1242 
-
1247 
+  0x0000, 0x0000, 0x003E, 0x007F,
1248 
+  0x0063, 0x0063, 0x0063, 0x0063,
1249 
+  0x0063, 0x0063, 0x0063, 0x007F,
1250 
+  0x003E, 0x0000, 0x0000, 0x0000},
1251 
+  {
1243 1252 
   /* character 0x50 ('P'): (width=7) */
1244 
-  0x0000, 0x0000, 0x003F, 0x007F,
1245 
-  0x0063, 0x0063, 0x0063, 0x007F,
1246 
-  0x003F, 0x0003, 0x0003, 0x0003,
1247 
-  0x0003, 0x0000, 0x0000, 0x0000,
1248 
-
1253 
+  0x0000, 0x0000, 0x003F, 0x007F,
1254 
+  0x0063, 0x0063, 0x0063, 0x007F,
1255 
+  0x003F, 0x0003, 0x0003, 0x0003,
1256 
+  0x0003, 0x0000, 0x0000, 0x0000},
1257 
+  {
1249 1258 
   /* character 0x51 ('Q'): (width=8) */
1250 
-  0x0000, 0x0000, 0x003E, 0x007F,
1251 
-  0x0063, 0x0063, 0x0063, 0x0063,
1252 
-  0x0063, 0x0063, 0x0063, 0x007F,
1253 
-  0x003E, 0x00F0, 0x0060, 0x0000,
1254 
-
1259 
+  0x0000, 0x0000, 0x003E, 0x007F,
1260 
+  0x0063, 0x0063, 0x0063, 0x0063,
1261 
+  0x0063, 0x0063, 0x0063, 0x007F,
1262 
+  0x003E, 0x00F0, 0x0060, 0x0000},
1263 
+  {
1255 1264 
   /* character 0x52 ('R'): (width=7) */
1256 
-  0x0000, 0x0000, 0x003F, 0x007F,
1257 
-  0x0063, 0x0063, 0x0063, 0x003F,
1258 
-  0x007F, 0x0063, 0x0063, 0x0063,
1259 
-  0x0063, 0x0000, 0x0000, 0x0000,
1260 
-
1265 
+  0x0000, 0x0000, 0x003F, 0x007F,
1266 
+  0x0063, 0x0063, 0x0063, 0x003F,
1267 
+  0x007F, 0x0063, 0x0063, 0x0063,
1268 
+  0x0063, 0x0000, 0x0000, 0x0000},
1269 
+  {
1261 1270 
   /* character 0x53 ('S'): (width=6) */
1262 
-  0x0000, 0x0000, 0x001E, 0x003F,
1263 
-  0x0033, 0x0003, 0x0007, 0x001E,
1264 
-  0x0038, 0x0030, 0x0033, 0x003F,
1265 
-  0x001E, 0x0000, 0x0000, 0x0000,
1266 
-
1271 
+  0x0000, 0x0000, 0x001E, 0x003F,
1272 
+  0x0033, 0x0003, 0x0007, 0x001E,
1273 
+  0x0038, 0x0030, 0x0033, 0x003F,
1274 
+  0x001E, 0x0000, 0x0000, 0x0000},
1275 
+  {
1267 1276 
   /* character 0x54 ('T'): (width=6) */
1268 
-  0x0000, 0x0000, 0x003F, 0x003F,
1269 
-  0x000C, 0x000C, 0x000C, 0x000C,
1270 
-  0x000C, 0x000C, 0x000C, 0x000C,
1271 
-  0x000C, 0x0000, 0x0000, 0x0000,
1272 
-
1277 
+  0x0000, 0x0000, 0x003F, 0x003F,
1278 
+  0x000C, 0x000C, 0x000C, 0x000C,
1279 
+  0x000C, 0x000C, 0x000C, 0x000C,
1280 
+  0x000C, 0x0000, 0x0000, 0x0000},
1281 
+  {
1273 1282 
   /* character 0x55 ('U'): (width=7) */
1274 
-  0x0000, 0x0000, 0x0063, 0x0063,
1275 
-  0x0063, 0x0063, 0x0063, 0x0063,
1276 
-  0x0063, 0x0063, 0x0063, 0x007F,
1277 
-  0x003E, 0x0000, 0x0000, 0x0000,
1278 
-
1283 
+  0x0000, 0x0000, 0x0063, 0x0063,
1284 
+  0x0063, 0x0063, 0x0063, 0x0063,
1285 
+  0x0063, 0x0063, 0x0063, 0x007F,
1286 
+  0x003E, 0x0000, 0x0000, 0x0000},
1287 
+  {
1279 1288 
   /* character 0x56 ('V'): (width=7) */
1280 
-  0x0000, 0x0000, 0x0063, 0x0063,
1281 
-  0x0063, 0x0036, 0x0036, 0x0036,
1282 
-  0x001C, 0x001C, 0x001C, 0x0008,
1283 
-  0x0008, 0x0000, 0x0000, 0x0000,
1284 
-
1289 
+  0x0000, 0x0000, 0x0063, 0x0063,
1290 
+  0x0063, 0x0036, 0x0036, 0x0036,
1291 
+  0x001C, 0x001C, 0x001C, 0x0008,
1292 
+  0x0008, 0x0000, 0x0000, 0x0000},
1293 
+  {
1285 1294 
   /* character 0x57 ('W'): (width=11) */
1286 
-  0x0000, 0x0000, 0x0603, 0x0623,
1287 
-  0x0623, 0x0376, 0x0376, 0x0376,
1288 
-  0x01DC, 0x01DC, 0x01DC, 0x0088,
1289 
-  0x0088, 0x0000, 0x0000, 0x0000,
1290 
-
1295 
+  0x0000, 0x0000, 0x0603, 0x0623,
1296 
+  0x0623, 0x0376, 0x0376, 0x0376,
1297 
+  0x01DC, 0x01DC, 0x01DC, 0x0088,
1298 
+  0x0088, 0x0000, 0x0000, 0x0000},
1299 
+  {
1291 1300 
   /* character 0x58 ('X'): (width=7) */
1292 
-  0x0000, 0x0000, 0x0063, 0x0063,
1293 
-  0x0036, 0x0036, 0x001C, 0x001C,
1294 
-  0x001C, 0x0036, 0x0036, 0x0063,
1295 
-  0x0063, 0x0000, 0x0000, 0x0000,
1296 
-
1301 
+  0x0000, 0x0000, 0x0063, 0x0063,
1302 
+  0x0036, 0x0036, 0x001C, 0x001C,
1303 
+  0x001C, 0x0036, 0x0036, 0x0063,
1304 
+  0x0063, 0x0000, 0x0000, 0x0000},
1305 
+  {
1297 1306 
   /* character 0x59 ('Y'): (width=8) */
1298 
-  0x0000, 0x0000, 0x00C3, 0x00C3,
1299 
-  0x0066, 0x0066, 0x003C, 0x003C,
1300 
-  0x0018, 0x0018, 0x0018, 0x0018,
1301 
-  0x0018, 0x0000, 0x0000, 0x0000,
1302 
-
1307 
+  0x0000, 0x0000, 0x00C3, 0x00C3,
1308 
+  0x0066, 0x0066, 0x003C, 0x003C,
1309 
+  0x0018, 0x0018, 0x0018, 0x0018,
1310 
+  0x0018, 0x0000, 0x0000, 0x0000},
1311 
+  {
1303 1312 
   /* character 0x5A ('Z'): (width=7) */
1304 
-  0x0000, 0x0000, 0x007F, 0x007F,
1305 
-  0x0030, 0x0030, 0x0018, 0x0018,
1306 
-  0x000C, 0x000E, 0x0006, 0x007F,
1307 
-  0x007F, 0x0000, 0x0000, 0x0000,
1308 
-
1313 
+  0x0000, 0x0000, 0x007F, 0x007F,
1314 
+  0x0030, 0x0030, 0x0018, 0x0018,
1315 
+  0x000C, 0x000E, 0x0006, 0x007F,
1316 
+  0x007F, 0x0000, 0x0000, 0x0000},
1317 
+  {
1309 1318 
   /* character 0x5B ('['): (width=4) */
1310 
-  0x000F, 0x000F, 0x0003, 0x0003,
1311 
-  0x0003, 0x0003, 0x0003, 0x0003,
1312 
-  0x0003, 0x0003, 0x0003, 0x0003,
1313 
-  0x0003, 0x000F, 0x000F, 0x0000,
1314 
-
1319 
+  0x000F, 0x000F, 0x0003, 0x0003,
1320 
+  0x0003, 0x0003, 0x0003, 0x0003,
1321 
+  0x0003, 0x0003, 0x0003, 0x0003,
1322 
+  0x0003, 0x000F, 0x000F, 0x0000},
1323 
+  {
1315 1324 
   /* character 0x5C ('\'): (width=6) */
1316 
-  0x0000, 0x0000, 0x0000, 0x0003,
1317 
-  0x0003, 0x0006, 0x0006, 0x000C,
1318 
-  0x000C, 0x0018, 0x0018, 0x0030,
1319 
-  0x0030, 0x0000, 0x0000, 0x0000,
1320 
-
1325 
+  0x0000, 0x0000, 0x0000, 0x0003,
1326 
+  0x0003, 0x0006, 0x0006, 0x000C,
1327 
+  0x000C, 0x0018, 0x0018, 0x0030,
1328 
+  0x0030, 0x0000, 0x0000, 0x0000},
1329 
+  {
1321 1330 
   /* character 0x5D (']'): (width=4) */
1322 
-  0x000F, 0x000F, 0x000C, 0x000C,
1323 
-  0x000C, 0x000C, 0x000C, 0x000C,
1324 
-  0x000C, 0x000C, 0x000C, 0x000C,
1325 
-  0x000C, 0x000F, 0x000F, 0x0000,
1326 
-
1331 
+  0x000F, 0x000F, 0x000C, 0x000C,
1332 
+  0x000C, 0x000C, 0x000C, 0x000C,
1333 
+  0x000C, 0x000C, 0x000C, 0x000C,
1334 
+  0x000C, 0x000F, 0x000F, 0x0000},
1335 
+  {
1327 1336 
   /* character 0x5E ('^'): (width=7) */
1328 
-  0x0000, 0x0000, 0x0000, 0x0008,
1329 
-  0x0008, 0x001C, 0x001C, 0x0036,
1330 
-  0x0036, 0x0063, 0x0063, 0x0000,
1331 
-  0x0000, 0x0000, 0x0000, 0x0000,
1332 
-
1337 
+  0x0000, 0x0000, 0x0000, 0x0008,
1338 
+  0x0008, 0x001C, 0x001C, 0x0036,
1339 
+  0x0036, 0x0063, 0x0063, 0x0000,
1340 
+  0x0000, 0x0000, 0x0000, 0x0000},
1341 
+  {
1333 1342 
   /* character 0x5F ('_'): (width=9) */
1334 
-  0x0000, 0x0000, 0x0000, 0x0000,
1335 
-  0x0000, 0x0000, 0x0000, 0x0000,
1336 
-  0x0000, 0x0000, 0x0000, 0x0000,
1337 
-  0x01FF, 0x0000, 0x0000, 0x0000,
1338 
-
1343 
+  0x0000, 0x0000, 0x0000, 0x0000,
1344 
+  0x0000, 0x0000, 0x0000, 0x0000,
1345 
+  0x0000, 0x0000, 0x0000, 0x0000,
1346 
+  0x01FF, 0x0000, 0x0000, 0x0000},
1347 
+  {
1339 1348 
   /* character 0x60 ('`'): (width=3) */
1340 
-  0x0000, 0x0000, 0x0000, 0x0001,
1341 
-  0x0003, 0x0006, 0x0004, 0x0000,
1342 
-  0x0000, 0x0000, 0x0000, 0x0000,
1343 
-  0x0000, 0x0000, 0x0000, 0x0000,
1344 
-
1349 
+  0x0000, 0x0000, 0x0000, 0x0001,
1350 
+  0x0003, 0x0006, 0x0004, 0x0000,
1351 
+  0x0000, 0x0000, 0x0000, 0x0000,
1352 
+  0x0000, 0x0000, 0x0000, 0x0000},
1353 
+  {
1345 1354 
   /* character 0x61 ('a'): (width=6) */
1346 
-  0x0000, 0x0000, 0x0000, 0x0000,
1347 
-  0x0000, 0x001E, 0x003F, 0x0030,
1348 
-  0x003E, 0x003F, 0x0033, 0x003F,
1349 
-  0x003E, 0x0000, 0x0000, 0x0000,
1350 
-
1355 
+  0x0000, 0x0000, 0x0000, 0x0000,
1356 
+  0x0000, 0x001E, 0x003F, 0x0030,
1357 
+  0x003E, 0x003F, 0x0033, 0x003F,
1358 
+  0x003E, 0x0000, 0x0000, 0x0000},
1359 
+  {
1351 1360 
   /* character 0x62 ('b'): (width=6) */
1352 
-  0x0000, 0x0000, 0x0003, 0x0003,
1353 
-  0x0003, 0x001F, 0x003F, 0x0033,
1354 
-  0x0033, 0x0033, 0x0033, 0x003F,
1355 
-  0x001F, 0x0000, 0x0000, 0x0000,
1356 
-
1361 
+  0x0000, 0x0000, 0x0003, 0x0003,
1362 
+  0x0003, 0x001F, 0x003F, 0x0033,
1363 
+  0x0033, 0x0033, 0x0033, 0x003F,
1364 
+  0x001F, 0x0000, 0x0000, 0x0000},
1365 
+  {
1357 1366 
   /* character 0x63 ('c'): (width=6) */
1358 
-  0x0000, 0x0000, 0x0000, 0x0000,
1359 
-  0x0000, 0x001E, 0x003F, 0x0033,
1360 
-  0x0003, 0x0003, 0x0033, 0x003F,
1361 
-  0x001E, 0x0000, 0x0000, 0x0000,
1362 
-
1367 
+  0x0000, 0x0000, 0x0000, 0x0000,
1368 
+  0x0000, 0x001E, 0x003F, 0x0033,
1369 
+  0x0003, 0x0003, 0x0033, 0x003F,
1370 
+  0x001E, 0x0000, 0x0000, 0x0000},
1371 
+  {
1363 1372 
   /* character 0x64 ('d'): (width=6) */
1364 
-  0x0000, 0x0000, 0x0030, 0x0030,
1365 
-  0x0030, 0x003E, 0x003F, 0x0033,
1366 
-  0x0033, 0x0033, 0x0033, 0x003F,
1367 
-  0x003E, 0x0000, 0x0000, 0x0000,
1368 
-
1373 
+  0x0000, 0x0000, 0x0030, 0x0030,
1374 
+  0x0030, 0x003E, 0x003F, 0x0033,
1375 
+  0x0033, 0x0033, 0x0033, 0x003F,
1376 
+  0x003E, 0x0000, 0x0000, 0x0000},
1377 
+  {
1369 1378 
   /* character 0x65 ('e'): (width=6) */
1370 
-  0x0000, 0x0000, 0x0000, 0x0000,
1371 
-  0x0000, 0x001E, 0x003F, 0x0033,
1372 
-  0x003F, 0x003F, 0x0003, 0x003F,
1373 
-  0x001E, 0x0000, 0x0000, 0x0000,
1374 
-
1379 
+  0x0000, 0x0000, 0x0000, 0x0000,
1380 
+  0x0000, 0x001E, 0x003F, 0x0033,
1381 
+  0x003F, 0x003F, 0x0003, 0x003F,
1382 
+  0x001E, 0x0000, 0x0000, 0x0000},
1383 
+  {
1375 1384 
   /* character 0x66 ('f'): (width=4) */
1376 
-  0x0000, 0x0000, 0x000C, 0x000E,
1377 
-  0x0006, 0x000F, 0x000F, 0x0006,
1378 
-  0x0006, 0x0006, 0x0006, 0x0006,
1379 
-  0x0006, 0x0000, 0x0000, 0x0000,
1380 
-
1385 
+  0x0000, 0x0000, 0x000C, 0x000E,
1386 
+  0x0006, 0x000F, 0x000F, 0x0006,
1387 
+  0x0006, 0x0006, 0x0006, 0x0006,
1388 
+  0x0006, 0x0000, 0x0000, 0x0000},
1389 
+  {
1381 1390 
   /* character 0x67 ('g'): (width=6) */
1382 
-  0x0000, 0x0000, 0x0000, 0x0000,
1383 
-  0x0000, 0x003E, 0x003F, 0x0033,
1384 
-  0x0033, 0x0033, 0x0033, 0x003F,
1385 
-  0x003E, 0x0030, 0x003E, 0x001C,
1386 
-
1391 
+  0x0000, 0x0000, 0x0000, 0x0000,
1392 
+  0x0000, 0x003E, 0x003F, 0x0033,
1393 
+  0x0033, 0x0033, 0x0033, 0x003F,
1394 
+  0x003E, 0x0030, 0x003E, 0x001C},
1395 
+  {
1387 1396 
   /* character 0x68 ('h'): (width=6) */
1388 
-  0x0000, 0x0000, 0x0003, 0x0003,
1389 
-  0x0003, 0x001F, 0x003F, 0x0033,
1390 
-  0x0033, 0x0033, 0x0033, 0x0033,
1391 
-  0x0033, 0x0000, 0x0000, 0x0000,
1392 
-
1397 
+  0x0000, 0x0000, 0x0003, 0x0003,
1398 
+  0x0003, 0x001F, 0x003F, 0x0033,
1399 
+  0x0033, 0x0033, 0x0033, 0x0033,
1400 
+  0x0033, 0x0000, 0x0000, 0x0000},
1401 
+  {
1393 1402 
   /* character 0x69 ('i'): (width=2) */
1394 
-  0x0000, 0x0000, 0x0003, 0x0003,
1395 
-  0x0000, 0x0003, 0x0003, 0x0003,
1396 
-  0x0003, 0x0003, 0x0003, 0x0003,
1397 
-  0x0003, 0x0000, 0x0000, 0x0000,
1398 
-
1403 
+  0x0000, 0x0000, 0x0003, 0x0003,
1404 
+  0x0000, 0x0003, 0x0003, 0x0003,
1405 
+  0x0003, 0x0003, 0x0003, 0x0003,
1406 
+  0x0003, 0x0000, 0x0000, 0x0000},
1407 
+  {
1399 1408 
   /* character 0x6A ('j'): (width=5) */
1400 
-  0x0000, 0x0000, 0x0018, 0x0018,
1401 
-  0x0000, 0x0018, 0x0018, 0x0018,
1402 
-  0x0018, 0x0018, 0x0018, 0x0018,
1403 
-  0x0018, 0x0018, 0x001F, 0x000E,
1404 
-
1409 
+  0x0000, 0x0000, 0x0018, 0x0018,
1410 
+  0x0000, 0x0018, 0x0018, 0x0018,
1411 
+  0x0018, 0x0018, 0x0018, 0x0018,
1412 
+  0x0018, 0x0018, 0x001F, 0x000E},
1413 
+  {
1405 1414 
   /* character 0x6B ('k'): (width=6) */
1406 
-  0x0000, 0x0000, 0x0003, 0x0003,
1407 
-  0x0003, 0x0033, 0x003B, 0x001F,
1408 
-  0x000F, 0x000F, 0x001F, 0x003B,
1409 
-  0x0033, 0x0000, 0x0000, 0x0000,
1410 
-
1415 
+  0x0000, 0x0000, 0x0003, 0x0003,
1416 
+  0x0003, 0x0033, 0x003B, 0x001F,
1417 
+  0x000F, 0x000F, 0x001F, 0x003B,
1418 
+  0x0033, 0x0000, 0x0000, 0x0000},
1419 
+  {
1411 1420 
   /* character 0x6C ('l'): (width=2) */
1412 
-  0x0000, 0x0000, 0x0003, 0x0003,
1413 
-  0x0003, 0x0003, 0x0003, 0x0003,
1414 
-  0x0003, 0x0003, 0x0003, 0x0003,
1415 
-  0x0003, 0x0000, 0x0000, 0x0000,
1416 
-
1421 
+  0x0000, 0x0000, 0x0003, 0x0003,
1422 
+  0x0003, 0x0003, 0x0003, 0x0003,
1423 
+  0x0003, 0x0003, 0x0003, 0x0003,
1424 
+  0x0003, 0x0000, 0x0000, 0x0000},
1425 
+  {
1417 1426 
   /* character 0x6D ('m'): (width=10) */
1418 
-  0x0000, 0x0000, 0x0000, 0x0000,
1419 
-  0x0000, 0x01DB, 0x03FF, 0x0377,
1420 
-  0x0333, 0x0333, 0x0333, 0x0333,
1421 
-  0x0333, 0x0000, 0x0000, 0x0000,
1422 
-
1427 
+  0x0000, 0x0000, 0x0000, 0x0000,
1428 
+  0x0000, 0x01DB, 0x03FF, 0x0377,
1429 
+  0x0333, 0x0333, 0x0333, 0x0333,
1430 
+  0x0333, 0x0000, 0x0000, 0x0000},
1431 
+  {
1423 1432 
   /* character 0x6E ('n'): (width=6) */
1424 
-  0x0000, 0x0000, 0x0000, 0x0000,
1425 
-  0x0000, 0x001B, 0x003F, 0x0037,
1426 
-  0x0033, 0x0033, 0x0033, 0x0033,
1427 
-  0x0033, 0x0000, 0x0000, 0x0000,
1428 
-
1433 
+  0x0000, 0x0000, 0x0000, 0x0000,
1434 
+  0x0000, 0x001B, 0x003F, 0x0037,
1435 
+  0x0033, 0x0033, 0x0033, 0x0033,
1436 
+  0x0033, 0x0000, 0x0000, 0x0000},
1437 
+  {
1429 1438 
   /* character 0x6F ('o'): (width=6) */
1430 
-  0x0000, 0x0000, 0x0000, 0x0000,
1431 
-  0x0000, 0x001E, 0x003F, 0x0033,
1432 
-  0x0033, 0x0033, 0x0033, 0x003F,
1433 
-  0x001E, 0x0000, 0x0000, 0x0000,
1434 
-
1439 
+  0x0000, 0x0000, 0x0000, 0x0000,
1440 
+  0x0000, 0x001E, 0x003F, 0x0033,
1441 
+  0x0033, 0x0033, 0x0033, 0x003F,
1442 
+  0x001E, 0x0000, 0x0000, 0x0000},
1443 
+  {
1435 1444 
   /* character 0x70 ('p'): (width=6) */
1436 
-  0x0000, 0x0000, 0x0000, 0x0000,
1437 
-  0x0000, 0x001F, 0x003F, 0x0033,
1438 
-  0x0033, 0x0033, 0x0033, 0x001F,
1439 
-  0x001F, 0x0003, 0x0003, 0x0003,
1440 
-
1445 
+  0x0000, 0x0000, 0x0000, 0x0000,
1446 
+  0x0000, 0x001F, 0x003F, 0x0033,
1447 
+  0x0033, 0x0033, 0x0033, 0x001F,
1448 
+  0x001F, 0x0003, 0x0003, 0x0003},
1449 
+  {
1441 1450 
   /* character 0x71 ('q'): (width=6) */
1442 
-  0x0000, 0x0000, 0x0000, 0x0000,
1443 
-  0x0000, 0x003E, 0x003F, 0x0033,
1444 
-  0x0033, 0x0033, 0x0033, 0x003E,
1445 
-  0x003E, 0x0030, 0x0030, 0x0030,
1446 
-
1451 
+  0x0000, 0x0000, 0x0000, 0x0000,
1452 
+  0x0000, 0x003E, 0x003F, 0x0033,
1453 
+  0x0033, 0x0033, 0x0033, 0x003E,
1454 
+  0x003E, 0x0030, 0x0030, 0x0030},
1455 
+  {
1447 1456 
   /* character 0x72 ('r'): (width=5) */
1448 
-  0x0000, 0x0000, 0x0000, 0x0000,
1449 
-  0x0000, 0x001B, 0x001F, 0x0007,
1450 
-  0x0003, 0x0003, 0x0003, 0x0003,
1451 
-  0x0003, 0x0000, 0x0000, 0x0000,
1452 
-
1457 
+  0x0000, 0x0000, 0x0000, 0x0000,
1458 
+  0x0000, 0x001B, 0x001F, 0x0007,
1459 
+  0x0003, 0x0003, 0x0003, 0x0003,
1460 
+  0x0003, 0x0000, 0x0000, 0x0000},
1461 
+  {
1453 1462 
   /* character 0x73 ('s'): (width=5) */
1454 
-  0x0000, 0x0000, 0x0000, 0x0000,
1455 
-  0x0000, 0x000E, 0x001F, 0x0003,
1456 
-  0x000F, 0x001E, 0x0018, 0x001F,
1457 
-  0x000E, 0x0000, 0x0000, 0x0000,
1458 
-
1463 
+  0x0000, 0x0000, 0x0000, 0x0000,
1464 
+  0x0000, 0x000E, 0x001F, 0x0003,
1465 
+  0x000F, 0x001E, 0x0018, 0x001F,
1466 
+  0x000E, 0x0000, 0x0000, 0x0000},
1467 
+  {
1459 1468 
   /* character 0x74 ('t'): (width=4) */
1460 
-  0x0000, 0x0000, 0x0004, 0x0006,
1461 
-  0x0006, 0x000F, 0x000F, 0x0006,
1462 
-  0x0006, 0x0006, 0x0006, 0x000E,
1463 
-  0x000C, 0x0000, 0x0000, 0x0000,
1464 
-
1469 
+  0x0000, 0x0000, 0x0004, 0x0006,
1470 
+  0x0006, 0x000F, 0x000F, 0x0006,
1471 
+  0x0006, 0x0006, 0x0006, 0x000E,
1472 
+  0x000C, 0x0000, 0x0000, 0x0000},
1473 
+  {
1465 1474 
   /* character 0x75 ('u'): (width=6) */
1466 
-  0x0000, 0x0000, 0x0000, 0x0000,
1467 
-  0x0000, 0x0033, 0x0033, 0x0033,
1468 
-  0x0033, 0x0033, 0x0033, 0x003F,
1469 
-  0x003E, 0x0000, 0x0000, 0x0000,
1470 
-
1475 
+  0x0000, 0x0000, 0x0000, 0x0000,
1476 
+  0x0000, 0x0033, 0x0033, 0x0033,
1477 
+  0x0033, 0x0033, 0x0033, 0x003F,
1478 
+  0x003E, 0x0000, 0x0000, 0x0000},
1479 
+  {
1471 1480 
   /* character 0x76 ('v'): (width=7) */
1472 
-  0x0000, 0x0000, 0x0000, 0x0000,
1473 
-  0x0000, 0x0063, 0x0063, 0x0036,
1474 
-  0x0036, 0x001C, 0x001C, 0x0008,
1475 
-  0x0008, 0x0000, 0x0000, 0x0000,
1476 
-
1481 
+  0x0000, 0x0000, 0x0000, 0x0000,
1482 
+  0x0000, 0x0063, 0x0063, 0x0036,
1483 
+  0x0036, 0x001C, 0x001C, 0x0008,
1484 
+  0x0008, 0x0000, 0x0000, 0x0000},
1485 
+  {
1477 1486 
   /* character 0x77 ('w'): (width=11) */
1478 
-  0x0000, 0x0000, 0x0000, 0x0000,
1479 
-  0x0000, 0x0623, 0x0623, 0x0376,
1480 
-  0x0376, 0x01DC, 0x01DC, 0x0088,
1481 
-  0x0088, 0x0000, 0x0000, 0x0000,
1482 
-
1487 
+  0x0000, 0x0000, 0x0000, 0x0000,
1488 
+  0x0000, 0x0623, 0x0623, 0x0376,
1489 
+  0x0376, 0x01DC, 0x01DC, 0x0088,
1490 
+  0x0088, 0x0000, 0x0000, 0x0000},
1491 
+  {
1483 1492 
   /* character 0x78 ('x'): (width=7) */
1484 
-  0x0000, 0x0000, 0x0000, 0x0000,
1485 
-  0x0000, 0x0063, 0x0077, 0x003E,
1486 
-  0x001C, 0x001C, 0x003E, 0x0077,
1487 
-  0x0063, 0x0000, 0x0000, 0x0000,
1488 
-
1493 
+  0x0000, 0x0000, 0x0000, 0x0000,
1494 
+  0x0000, 0x0063, 0x0077, 0x003E,
1495 
+  0x001C, 0x001C, 0x003E, 0x0077,
1496 
+  0x0063, 0x0000, 0x0000, 0x0000},
1497 
+  {
1489 1498 
   /* character 0x79 ('y'): (width=6) */
1490 
-  0x0000, 0x0000, 0x0000, 0x0000,
1491 
-  0x0000, 0x0033, 0x0033, 0x0033,
1492 
-  0x0033, 0x0033, 0x0033, 0x003F,
1493 
-  0x003E, 0x0030, 0x003E, 0x001C,
1494 
-
1499 
+  0x0000, 0x0000, 0x0000, 0x0000,
1500 
+  0x0000, 0x0033, 0x0033, 0x0033,
1501 
+  0x0033, 0x0033, 0x0033, 0x003F,
1502 
+  0x003E, 0x0030, 0x003E, 0x001C},
1503 
+  {
1495 1504 
   /* character 0x7A ('z'): (width=6) */
1496 
-  0x0000, 0x0000, 0x0000, 0x0000,
1497 
-  0x0000, 0x003F, 0x003F, 0x0030,
1498 
-  0x0018, 0x000C, 0x0006, 0x003F,
1499 
-  0x003F, 0x0000, 0x0000, 0x0000,
1500 
-
1505 
+  0x0000, 0x0000, 0x0000, 0x0000,
1506 
+  0x0000, 0x003F, 0x003F, 0x0030,
1507 
+  0x0018, 0x000C, 0x0006, 0x003F,
1508 
+  0x003F, 0x0000, 0x0000, 0x0000},
1509 
+  {
1501 1510 
   /* character 0x7B ('{'): (width=4) */
1502 
-  0x0008, 0x0004, 0x0006, 0x0006,
1503 
-  0x0003, 0x0003, 0x0003, 0x0003,
1504 
-  0x0003, 0x0003, 0x0003, 0x0006,
1505 
-  0x0006, 0x0004, 0x0008, 0x0000,
1506 
-
1511 
+  0x0008, 0x0004, 0x0006, 0x0006,
1512 
+  0x0003, 0x0003, 0x0003, 0x0003,
1513 
+  0x0003, 0x0003, 0x0003, 0x0006,
1514 
+  0x0006, 0x0004, 0x0008, 0x0000},
1515 
+  {
1507 1516 
   /* character 0x7C ('|'): (width=2) */
1508 
-  0x0000, 0x0003, 0x0003, 0x0003,
1509 
-  0x0003, 0x0003, 0x0000, 0x0000,
1510 
-  0x0003, 0x0003, 0x0003, 0x0003,
1511 
-  0x0003, 0x0000, 0x0000, 0x0000,
1512 
-
1517 
+  0x0000, 0x0003, 0x0003, 0x0003,
1518 
+  0x0003, 0x0003, 0x0000, 0x0000,
1519 
+  0x0003, 0x0003, 0x0003, 0x0003,
1520 
+  0x0003, 0x0000, 0x0000, 0x0000},
1521 
+  {
1513 1522 
   /* character 0x7D ('}'): (width=4) */
1514 
-  0x0001, 0x0002, 0x0006, 0x0006,
1515 
-  0x000C, 0x000C, 0x000C, 0x000C,
1516 
-  0x000C, 0x000C, 0x000C, 0x0006,
1517 
-  0x0006, 0x0002, 0x0001, 0x0000,
1518 
-
1523 
+  0x0001, 0x0002, 0x0006, 0x0006,
1524 
+  0x000C, 0x000C, 0x000C, 0x000C,
1525 
+  0x000C, 0x000C, 0x000C, 0x0006,
1526 
+  0x0006, 0x0002, 0x0001, 0x0000},
1519 1527 
 };
1520 1528
1521 1529 
 const unsigned char MetaWatch16width[PRINTABLE_CHARACTERS] =
... ... 
@@ -1619,91 +1627,91 @@ const unsigned char MetaWatch16width[PRINTABLE_CHARACTERS] =
1619 1627 
 };
1620 1628
1621 1629 
 /******************************************************************************/
1622 
-const unsigned int MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19] =
1630 
+const u16t MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19] =
1623 1631 
 {
1624 1632 
   /* character 0x30 ('0'): (width=11, offset=0) */
1625 
-  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1626 
-  0x078F, 0x078F, 0x078F, 0x078F,
1627 
-  0x078F, 0x078F, 0x078F, 0x078F,
1628 
-  0x078F, 0x078F, 0x078F, 0x07FF,
1629 
-  0x07FF, 0x03FE, 0x01FC,
1630 
-
1633 
+  {0x01FC, 0x03FE, 0x07FF, 0x07FF,
1634 
+  0x078F, 0x078F, 0x078F, 0x078F,
1635 
+  0x078F, 0x078F, 0x078F, 0x078F,
1636 
+  0x078F, 0x078F, 0x078F, 0x07FF,
1637 
+  0x07FF, 0x03FE, 0x01FC},
1638 
+  {
1631 1639 
   /* character 0x31 ('1'): (width=11, offset=38) */
1632 
-  0x01C0, 0x01E0, 0x01F8, 0x01F8,
1633 
-  0x01F8, 0x01F8, 0x01E0, 0x01E0,
1634 
-  0x01E0, 0x01E0, 0x01E0, 0x01E0,
1635 
-  0x01E0, 0x01E0, 0x01E0, 0x01E0,
1636 
-  0x01E0, 0x01E0, 0x01E0,
1637 
-
1640 
+  0x01C0, 0x01E0, 0x01F8, 0x01F8,
1641 
+  0x01F8, 0x01F8, 0x01E0, 0x01E0,
1642 
+  0x01E0, 0x01E0, 0x01E0, 0x01E0,
1643 
+  0x01E0, 0x01E0, 0x01E0, 0x01E0,
1644 
+  0x01E0, 0x01E0, 0x01E0},
1645 
+  {
1638 1646 
   /* character 0x32 ('2'): (width=11, offset=76) */
1639 
-  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1640 
-  0x078F, 0x078F, 0x0780, 0x07C0,
1641 
-  0x07E0, 0x03F0, 0x01F8, 0x00FC,
1642 
-  0x007E, 0x003F, 0x001F, 0x07FF,
1643 
-  0x07FF, 0x07FF, 0x07FF,
1644 
-
1647 
+  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1648 
+  0x078F, 0x078F, 0x0780, 0x07C0,
1649 
+  0x07E0, 0x03F0, 0x01F8, 0x00FC,
1650 
+  0x007E, 0x003F, 0x001F, 0x07FF,
1651 
+  0x07FF, 0x07FF, 0x07FF},
1652 
+  {
1645 1653 
   /* character 0x33 ('3'): (width=11, offset=114) */
1646 
-  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1647 
-  0x078F, 0x078F, 0x0780, 0x07C0,
1648 
-  0x03F0, 0x01F0, 0x03F0, 0x07C0,
1649 
-  0x0780, 0x078F, 0x078F, 0x07FF,
1650 
-  0x07FF, 0x03FE, 0x01FC,
1651 
-
1654 
+  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1655 
+  0x078F, 0x078F, 0x0780, 0x07C0,
1656 
+  0x03F0, 0x01F0, 0x03F0, 0x07C0,
1657 
+  0x0780, 0x078F, 0x078F, 0x07FF,
1658 
+  0x07FF, 0x03FE, 0x01FC},
1659 
+  {
1652 1660 
   /* character 0x34 ('4'): (width=11, offset=152) */
1653 
-  0x003C, 0x07BC, 0x07BC, 0x079E,
1654 
-  0x079E, 0x078F, 0x078F, 0x07FF,
1655 
-  0x07FF, 0x07FF, 0x07FF, 0x0780,
1656 
-  0x0780, 0x0780, 0x0780, 0x0780,
1657 
-  0x0780, 0x0780, 0x0780,
1658 
-
1661 
+  0x003C, 0x07BC, 0x07BC, 0x079E,
1662 
+  0x079E, 0x078F, 0x078F, 0x07FF,
1663 
+  0x07FF, 0x07FF, 0x07FF, 0x0780,
1664 
+  0x0780, 0x0780, 0x0780, 0x0780,
1665 
+  0x0780, 0x0780, 0x0780},
1666 
+  {
1659 1667 
   /* character 0x35 ('5'): (width=11, offset=190) */
1660 
-  0x07FF, 0x07FF, 0x07FF, 0x07FF,
1661 
-  0x000F, 0x000F, 0x000F, 0x03FF,
1662 
-  0x07FF, 0x07FF, 0x07FF, 0x0780,
1663 
-  0x0780, 0x0780, 0x07C0, 0x07FF,
1664 
-  0x03FF, 0x03FF, 0x00FF,
1665 
-
1668 
+  0x07FF, 0x07FF, 0x07FF, 0x07FF,
1669 
+  0x000F, 0x000F, 0x000F, 0x03FF,
1670 
+  0x07FF, 0x07FF, 0x07FF, 0x0780,
1671 
+  0x0780, 0x0780, 0x07C0, 0x07FF,
1672 
+  0x03FF, 0x03FF, 0x00FF},
1673 
+  {
1666 1674 
   /* character 0x36 ('6'): (width=11, offset=228) */
1667 
-  0x01F0, 0x01FC, 0x01FE, 0x01FE,
1668 
-  0x001F, 0x000F, 0x000F, 0x01FF,
1669 
-  0x03FF, 0x07FF, 0x07FF, 0x078F,
1670 
-  0x078F, 0x078F, 0x078F, 0x07FF,
1671 
-  0x07FF, 0x03FE, 0x01FC,
1672 
-
1675 
+  0x01F0, 0x01FC, 0x01FE, 0x01FE,
1676 
+  0x001F, 0x000F, 0x000F, 0x01FF,
1677 
+  0x03FF, 0x07FF, 0x07FF, 0x078F,
1678 
+  0x078F, 0x078F, 0x078F, 0x07FF,
1679 
+  0x07FF, 0x03FE, 0x01FC},
1680 
+  {
1673 1681 
   /* character 0x37 ('7'): (width=11, offset=266) */
1674 
-  0x07FF, 0x07FF, 0x07FF, 0x07FF,
1675 
-  0x0780, 0x07C0, 0x03C0, 0x03E0,
1676 
-  0x01E0, 0x01F0, 0x00F0, 0x00F8,
1677 
-  0x0078, 0x0078, 0x0078, 0x0078,
1678 
-  0x0078, 0x0078, 0x0078,
1679 
-
1682 
+  0x07FF, 0x07FF, 0x07FF, 0x07FF,
1683 
+  0x0780, 0x07C0, 0x03C0, 0x03E0,
1684 
+  0x01E0, 0x01F0, 0x00F0, 0x00F8,
1685 
+  0x0078, 0x0078, 0x0078, 0x0078,
1686 
+  0x0078, 0x0078, 0x0078},
1687 
+  {
1680 1688 
   /* character 0x38 ('8'): (width=11, offset=304) */
1681 
-  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1682 
-  0x078F, 0x078F, 0x078F, 0x07FF,
1683 
-  0x07FF, 0x03FE, 0x07FF, 0x078F,
1684 
-  0x078F, 0x078F, 0x078F, 0x07FF,
1685 
-  0x07FF, 0x03FE, 0x01FC,
1686 
-
1689 
+  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1690 
+  0x078F, 0x078F, 0x078F, 0x07FF,
1691 
+  0x07FF, 0x03FE, 0x07FF, 0x078F,
1692 
+  0x078F, 0x078F, 0x078F, 0x07FF,
1693 
+  0x07FF, 0x03FE, 0x01FC},
1694 
+  {
1687 1695 
   /* character 0x39 ('9'): (width=11, offset=342) */
1688 
-  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1689 
-  0x078F, 0x078F, 0x078F, 0x078F,
1690 
-  0x07FF, 0x07FF, 0x07FE, 0x07FC,
1691 
-  0x0780, 0x0780, 0x07C0, 0x03FC,
1692 
-  0x03FC, 0x01FC, 0x007C,
1693 
-
1696 
+  0x01FC, 0x03FE, 0x07FF, 0x07FF,
1697 
+  0x078F, 0x078F, 0x078F, 0x078F,
1698 
+  0x07FF, 0x07FF, 0x07FE, 0x07FC,
1699 
+  0x0780, 0x0780, 0x07C0, 0x03FC,
1700 
+  0x03FC, 0x01FC, 0x007C},
1701 
+  {
1694 1702 
   /* character 0x3A (':'): (width=4, offset=380) */
1695 
-  0x0000, 0x0000, 0x0000, 0x0000,
1696 
-  0x0006, 0x000F, 0x000F, 0x0006,
1697 
-  0x0000, 0x0000, 0x0000, 0x0006,
1698 
-  0x000F, 0x000F, 0x0006, 0x0000,
1699 
-  0x0000, 0x0000, 0x0000,
1700 
-
1703 
+  0x0000, 0x0000, 0x0000, 0x0000,
1704 
+  0x0006, 0x000F, 0x000F, 0x0006,
1705 
+  0x0000, 0x0000, 0x0000, 0x0006,
1706 
+  0x000F, 0x000F, 0x0006, 0x0000,
1707 
+  0x0000, 0x0000, 0x0000},
1708 
+  {
1701 1709 
   /* character 0x3B (';'): (width=11, offset=418) */
1702 
-  0x0000, 0x0000, 0x0000, 0x0000,
1703 
-  0x0000, 0x0000, 0x0000, 0x0000,
1704 
-  0x0000, 0x0000, 0x0000, 0x0000,
1705 
-  0x0000, 0x0000, 0x0000, 0x0000,
1706 
-  0x0000, 0x0000, 0x0000,
1710 
+  0x0000, 0x0000, 0x0000, 0x0000,
1711 
+  0x0000, 0x0000, 0x0000, 0x0000,
1712 
+  0x0000, 0x0000, 0x0000, 0x0000,
1713 
+  0x0000, 0x0000, 0x0000, 0x0000,
1714 
+  0x0000, 0x0000, 0x0000},
1707 1715 
 };
1708 1716
1709 1717 
 const unsigned char MetaWatchTimeWidth[TOTAL_TIME_CHARACTERS] =
... ... 
@@ -1726,101 +1734,102 @@ const unsigned char MetaWatchTimeWidth[TOTAL_TIME_CHARACTERS] =
1726 1734
1727 1735 
 /******************************************************************************/
1728 1736
1729 
-const unsigned char MetaWatchMonospaced10[PRINTABLE_CHARACTERS][10] =
1737 
+const unsigned char MetaWatchMonospaced10Table[PRINTABLE_CHARACTERS][10] =
1730 1738 
 {
1731 
-  0x00,0x00,0x10,0x38,0x38,0x10,0x10,0x00,0x10,0x00,
1732 
-  0x00,0x00,0x6C,0x6C,0x24,0x00,0x00,0x00,0x00,0x00,
1733 
-  0x00,0x00,0x00,0x28,0x7C,0x28,0x28,0x7C,0x28,0x00,
1734 
-  0x00,0x00,0x10,0x70,0x08,0x30,0x40,0x38,0x20,0x00,
1735 
-  0x00,0x00,0x4C,0x4C,0x20,0x10,0x08,0x64,0x64,0x00,
1736 
-  0x00,0x00,0x08,0x14,0x14,0x08,0x54,0x24,0x58,0x00,
1737 
-  0x00,0x00,0x18,0x18,0x10,0x08,0x00,0x00,0x00,0x00,
1738 
-  0x00,0x00,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x00,
1739 
-  0x00,0x00,0x10,0x20,0x20,0x20,0x20,0x20,0x10,0x00,
1740 
-  0x00,0x00,0x92,0x54,0x38,0xFE,0x38,0x54,0x92,0x00,
1741 
-  0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00,
1742 
-  0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x10,0x08,
1743 
-  0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,
1744 
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,
1745 
-  0x00,0x00,0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00,
1746 
-  0x00,0x00,0x38,0x44,0x64,0x54,0x4C,0x44,0x38,0x00,
1747 
-  0x00,0x00,0x10,0x18,0x10,0x10,0x10,0x10,0x38,0x00,
1748 
-  0x00,0x00,0x38,0x44,0x40,0x30,0x08,0x04,0x7C,0x00,
1749 
-  0x00,0x00,0x38,0x44,0x40,0x38,0x40,0x44,0x38,0x00,
1750 
-  0x00,0x00,0x20,0x30,0x28,0x24,0x7C,0x20,0x20,0x00,
1751 
-  0x00,0x00,0x7C,0x04,0x04,0x3C,0x40,0x44,0x38,0x00,
1752 
-  0x00,0x00,0x30,0x08,0x04,0x3C,0x44,0x44,0x38,0x00,
1753 
-  0x00,0x00,0x7C,0x40,0x20,0x10,0x08,0x08,0x08,0x00,
1754 
-  0x00,0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x38,0x00,
1755 
-  0x00,0x00,0x38,0x44,0x44,0x78,0x40,0x20,0x18,0x00,
1756 
-  0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x00,
1757 
-  0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x10,
1758 
-  0x00,0x00,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x00,
1759 
-  0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,
1760 
-  0x00,0x00,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00,
1761 
-  0x00,0x00,0x38,0x44,0x40,0x30,0x10,0x00,0x10,0x00,
1762 
-  0x00,0x00,0x38,0x44,0x74,0x54,0x74,0x04,0x38,0x00,
1763 
-  0x00,0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x00,
1764 
-  0x00,0x00,0x3C,0x44,0x44,0x3C,0x44,0x44,0x3C,0x00,
1765 
-  0x00,0x00,0x38,0x44,0x04,0x04,0x04,0x44,0x38,0x00,
1766 
-  0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00,
1767 
-  0x00,0x00,0x7C,0x04,0x04,0x3C,0x04,0x04,0x7C,0x00,
1768 
-  0x00,0x00,0x7C,0x04,0x04,0x3C,0x04,0x04,0x04,0x00,
1769 
-  0x00,0x00,0x38,0x44,0x04,0x74,0x44,0x44,0x78,0x00,
1770 
-  0x00,0x00,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00,
1771 
-  0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x38,0x00,
1772 
-  0x00,0x00,0x40,0x40,0x40,0x40,0x44,0x44,0x38,0x00,
1773 
-  0x00,0x00,0x44,0x24,0x14,0x0C,0x14,0x24,0x44,0x00,
1774 
-  0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x7C,0x00,
1775 
-  0x00,0x00,0x44,0x6C,0x54,0x44,0x44,0x44,0x44,0x00,
1776 
-  0x00,0x00,0x44,0x4C,0x54,0x64,0x44,0x44,0x44,0x00,
1777 
-  0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00,
1778 
-  0x00,0x00,0x3C,0x44,0x44,0x3C,0x04,0x04,0x04,0x00,
1779 
-  0x00,0x00,0x38,0x44,0x44,0x44,0x54,0x24,0x58,0x00,
1780 
-  0x00,0x00,0x3C,0x44,0x44,0x3C,0x24,0x44,0x44,0x00,
1781 
-  0x00,0x00,0x38,0x44,0x04,0x38,0x40,0x44,0x38,0x00,
1782 
-  0x00,0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
1783 
-  0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00,
1784 
-  0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x28,0x10,0x00,
1785 
-  0x00,0x00,0x44,0x44,0x54,0x54,0x54,0x54,0x28,0x00,
1786 
-  0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00,
1787 
-  0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x00,
1788 
-  0x00,0x00,0x7C,0x40,0x20,0x10,0x08,0x04,0x7C,0x00,
1789 
-  0x00,0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x38,0x00,
1790 
-  0x00,0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x00,0x00,
1791 
-  0x00,0x00,0x38,0x20,0x20,0x20,0x20,0x20,0x38,0x00,
1792 
-  0x00,0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00,
1793 
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,
1794 
-  0x00,0x18,0x18,0x08,0x10,0x00,0x00,0x00,0x00,0x00,
1795 
-  0x00,0x00,0x00,0x00,0x38,0x40,0x78,0x44,0x78,0x00,
1796 
-  0x00,0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00,
1797 
-  0x00,0x00,0x00,0x00,0x38,0x44,0x04,0x44,0x38,0x00,
1798 
-  0x00,0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x78,0x00,
1799 
-  0x00,0x00,0x00,0x00,0x38,0x44,0x3C,0x04,0x38,0x00,
1800 
-  0x00,0x00,0x60,0x10,0x10,0x78,0x10,0x10,0x10,0x00,
1801 
-  0x00,0x00,0x00,0x78,0x44,0x44,0x78,0x40,0x38,0x00,
1802 
-  0x00,0x00,0x08,0x08,0x38,0x48,0x48,0x48,0x48,0x00,
1803 
-  0x00,0x00,0x10,0x00,0x10,0x10,0x10,0x10,0x10,0x00,
1804 
-  0x00,0x00,0x40,0x00,0x60,0x40,0x40,0x40,0x48,0x30,
1805 
-  0x00,0x00,0x08,0x08,0x48,0x28,0x18,0x28,0x48,0x00,
1806 
-  0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,
1807 
-  0x00,0x00,0x00,0x00,0x2C,0x54,0x54,0x44,0x44,0x00,
1808 
-  0x00,0x00,0x00,0x00,0x38,0x48,0x48,0x48,0x48,0x00,
1809 
-  0x00,0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x38,0x00,
1810 
-  0x00,0x00,0x00,0x00,0x3C,0x44,0x44,0x3C,0x04,0x04,
1811 
-  0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x78,0x40,0x40,
1812 
-  0x00,0x00,0x00,0x00,0x34,0x48,0x08,0x08,0x1C,0x00,
1813 
-  0x00,0x00,0x00,0x00,0x38,0x04,0x38,0x40,0x38,0x00,
1814 
-  0x00,0x00,0x00,0x10,0x78,0x10,0x10,0x50,0x20,0x00,
1815 
-  0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x68,0x50,0x00,
1816 
-  0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x00,
1817 
-  0x00,0x00,0x00,0x00,0x44,0x44,0x54,0x7C,0x28,0x00,
1818 
-  0x00,0x00,0x00,0x00,0x44,0x28,0x10,0x28,0x44,0x00,
1819 
-  0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x70,0x40,0x70,
1820 
-  0x00,0x00,0x00,0x00,0x78,0x40,0x30,0x08,0x78,0x00,
1821 
-  0x00,0x00,0x30,0x08,0x08,0x0C,0x08,0x08,0x30,0x00,
1822 
-  0x00,0x00,0x10,0x10,0x10,0x00,0x10,0x10,0x10,0x00,
1823 
-  0x00,0x00,0x18,0x20,0x20,0x60,0x20,0x20,0x18,0x00,
1824 
-  0x00,0x00,0x00,0x50,0x28,0x00,0x00,0x00,0x00,0x00,
1739 
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
1740 
+  {0x00,0x00,0x10,0x38,0x38,0x10,0x10,0x00,0x10,0x00},
1741 
+  {0x00,0x00,0x6C,0x6C,0x24,0x00,0x00,0x00,0x00,0x00},
1742 
+  {0x00,0x00,0x00,0x28,0x7C,0x28,0x28,0x7C,0x28,0x00},
1743 
+  {0x00,0x00,0x10,0x70,0x08,0x30,0x40,0x38,0x20,0x00},
1744 
+  {0x00,0x00,0x4C,0x4C,0x20,0x10,0x08,0x64,0x64,0x00},
1745 
+  {0x00,0x00,0x08,0x14,0x14,0x08,0x54,0x24,0x58,0x00},
1746 
+  {0x00,0x00,0x18,0x18,0x10,0x08,0x00,0x00,0x00,0x00},
1747 
+  {0x00,0x00,0x10,0x08,0x08,0x08,0x08,0x08,0x10,0x00},
1748 
+  {0x00,0x00,0x10,0x20,0x20,0x20,0x20,0x20,0x10,0x00},
1749 
+  {0x00,0x00,0x92,0x54,0x38,0xFE,0x38,0x54,0x92,0x00},
1750 
+  {0x00,0x00,0x00,0x10,0x10,0x7C,0x10,0x10,0x00,0x00},
1751 
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x10,0x08},
1752 
+  {0x00,0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00},
1753 
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00},
1754 
+  {0x00,0x00,0x00,0x40,0x20,0x10,0x08,0x04,0x00,0x00},
1755 
+  {0x00,0x00,0x38,0x44,0x64,0x54,0x4C,0x44,0x38,0x00},
1756 
+  {0x00,0x00,0x10,0x18,0x10,0x10,0x10,0x10,0x38,0x00},
1757 
+  {0x00,0x00,0x38,0x44,0x40,0x30,0x08,0x04,0x7C,0x00},
1758 
+  {0x00,0x00,0x38,0x44,0x40,0x38,0x40,0x44,0x38,0x00},
1759 
+  {0x00,0x00,0x20,0x30,0x28,0x24,0x7C,0x20,0x20,0x00},
1760 
+  {0x00,0x00,0x7C,0x04,0x04,0x3C,0x40,0x44,0x38,0x00},
1761 
+  {0x00,0x00,0x30,0x08,0x04,0x3C,0x44,0x44,0x38,0x00},
1762 
+  {0x00,0x00,0x7C,0x40,0x20,0x10,0x08,0x08,0x08,0x00},
1763 
+  {0x00,0x00,0x38,0x44,0x44,0x38,0x44,0x44,0x38,0x00},
1764 
+  {0x00,0x00,0x38,0x44,0x44,0x78,0x40,0x20,0x18,0x00},
1765 
+  {0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x00},
1766 
+  {0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x18,0x18,0x10},
1767 
+  {0x00,0x00,0x20,0x10,0x08,0x04,0x08,0x10,0x20,0x00},
1768 
+  {0x00,0x00,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00},
1769 
+  {0x00,0x00,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x00},
1770 
+  {0x00,0x00,0x38,0x44,0x40,0x30,0x10,0x00,0x10,0x00},
1771 
+  {0x00,0x00,0x38,0x44,0x74,0x54,0x74,0x04,0x38,0x00},
1772 
+  {0x00,0x00,0x38,0x44,0x44,0x44,0x7C,0x44,0x44,0x00},
1773 
+  {0x00,0x00,0x3C,0x44,0x44,0x3C,0x44,0x44,0x3C,0x00},
1774 
+  {0x00,0x00,0x38,0x44,0x04,0x04,0x04,0x44,0x38,0x00},
1775 
+  {0x00,0x00,0x3C,0x44,0x44,0x44,0x44,0x44,0x3C,0x00},
1776 
+  {0x00,0x00,0x7C,0x04,0x04,0x3C,0x04,0x04,0x7C,0x00},
1777 
+  {0x00,0x00,0x7C,0x04,0x04,0x3C,0x04,0x04,0x04,0x00},
1778 
+  {0x00,0x00,0x38,0x44,0x04,0x74,0x44,0x44,0x78,0x00},
1779 
+  {0x00,0x00,0x44,0x44,0x44,0x7C,0x44,0x44,0x44,0x00},
1780 
+  {0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x38,0x00},
1781 
+  {0x00,0x00,0x40,0x40,0x40,0x40,0x44,0x44,0x38,0x00},
1782 
+  {0x00,0x00,0x44,0x24,0x14,0x0C,0x14,0x24,0x44,0x00},
1783 
+  {0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x7C,0x00},
1784 
+  {0x00,0x00,0x44,0x6C,0x54,0x44,0x44,0x44,0x44,0x00},
1785 
+  {0x00,0x00,0x44,0x4C,0x54,0x64,0x44,0x44,0x44,0x00},
1786 
+  {0x00,0x00,0x38,0x44,0x44,0x44,0x44,0x44,0x38,0x00},
1787 
+  {0x00,0x00,0x3C,0x44,0x44,0x3C,0x04,0x04,0x04,0x00},
1788 
+  {0x00,0x00,0x38,0x44,0x44,0x44,0x54,0x24,0x58,0x00},
1789 
+  {0x00,0x00,0x3C,0x44,0x44,0x3C,0x24,0x44,0x44,0x00},
1790 
+  {0x00,0x00,0x38,0x44,0x04,0x38,0x40,0x44,0x38,0x00},
1791 
+  {0x00,0x00,0x7C,0x10,0x10,0x10,0x10,0x10,0x10,0x00},
1792 
+  {0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x44,0x38,0x00},
1793 
+  {0x00,0x00,0x44,0x44,0x44,0x44,0x44,0x28,0x10,0x00},
1794 
+  {0x00,0x00,0x44,0x44,0x54,0x54,0x54,0x54,0x28,0x00},
1795 
+  {0x00,0x00,0x44,0x44,0x28,0x10,0x28,0x44,0x44,0x00},
1796 
+  {0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x10,0x10,0x00},
1797 
+  {0x00,0x00,0x7C,0x40,0x20,0x10,0x08,0x04,0x7C,0x00},
1798 
+  {0x00,0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x38,0x00},
1799 
+  {0x00,0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x00,0x00},
1800 
+  {0x00,0x00,0x38,0x20,0x20,0x20,0x20,0x20,0x38,0x00},
1801 
+  {0x00,0x00,0x10,0x28,0x44,0x00,0x00,0x00,0x00,0x00},
1802 
+  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00},
1803 
+  {0x00,0x18,0x18,0x08,0x10,0x00,0x00,0x00,0x00,0x00},
1804 
+  {0x00,0x00,0x00,0x00,0x38,0x40,0x78,0x44,0x78,0x00},
1805 
+  {0x00,0x00,0x04,0x04,0x3C,0x44,0x44,0x44,0x3C,0x00},
1806 
+  {0x00,0x00,0x00,0x00,0x38,0x44,0x04,0x44,0x38,0x00},
1807 
+  {0x00,0x00,0x40,0x40,0x78,0x44,0x44,0x44,0x78,0x00},
1808 
+  {0x00,0x00,0x00,0x00,0x38,0x44,0x3C,0x04,0x38,0x00},
1809 
+  {0x00,0x00,0x60,0x10,0x10,0x78,0x10,0x10,0x10,0x00},
1810 
+  {0x00,0x00,0x00,0x78,0x44,0x44,0x78,0x40,0x38,0x00},
1811 
+  {0x00,0x00,0x08,0x08,0x38,0x48,0x48,0x48,0x48,0x00},
1812 
+  {0x00,0x00,0x10,0x00,0x10,0x10,0x10,0x10,0x10,0x00},
1813 
+  {0x00,0x00,0x40,0x00,0x60,0x40,0x40,0x40,0x48,0x30},
1814 
+  {0x00,0x00,0x08,0x08,0x48,0x28,0x18,0x28,0x48,0x00},
1815 
+  {0x00,0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00},
1816 
+  {0x00,0x00,0x00,0x00,0x2C,0x54,0x54,0x44,0x44,0x00},
1817 
+  {0x00,0x00,0x00,0x00,0x38,0x48,0x48,0x48,0x48,0x00},
1818 
+  {0x00,0x00,0x00,0x00,0x38,0x44,0x44,0x44,0x38,0x00},
1819 
+  {0x00,0x00,0x00,0x00,0x3C,0x44,0x44,0x3C,0x04,0x04},
1820 
+  {0x00,0x00,0x00,0x00,0x78,0x44,0x44,0x78,0x40,0x40},
1821 
+  {0x00,0x00,0x00,0x00,0x34,0x48,0x08,0x08,0x1C,0x00},
1822 
+  {0x00,0x00,0x00,0x00,0x38,0x04,0x38,0x40,0x38,0x00},
1823 
+  {0x00,0x00,0x00,0x10,0x78,0x10,0x10,0x50,0x20,0x00},
1824 
+  {0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x68,0x50,0x00},
1825 
+  {0x00,0x00,0x00,0x00,0x44,0x44,0x44,0x28,0x10,0x00},
1826 
+  {0x00,0x00,0x00,0x00,0x44,0x44,0x54,0x7C,0x28,0x00},
1827 
+  {0x00,0x00,0x00,0x00,0x44,0x28,0x10,0x28,0x44,0x00},
1828 
+  {0x00,0x00,0x00,0x00,0x48,0x48,0x48,0x70,0x40,0x70},
1829 
+  {0x00,0x00,0x00,0x00,0x78,0x40,0x30,0x08,0x78,0x00},
1830 
+  {0x00,0x00,0x30,0x08,0x08,0x0C,0x08,0x08,0x30,0x00},
1831 
+  {0x00,0x00,0x10,0x10,0x10,0x00,0x10,0x10,0x10,0x00},
1832 
+  {0x00,0x00,0x18,0x20,0x20,0x60,0x20,0x20,0x18,0x00},
1833 
+//  {0x00,0x00,0x00,0x50,0x28,0x00,0x00,0x00,0x00,0x00},
1825 1834 
 };
1826 1835
ui/Fonts.h
History View file @ a03500b
... ... 
@@ -23,6 +23,8 @@
23 23 
 */
24 24 
 /******************************************************************************/
25 25
26 
+#include "oswald.h"
27 
+
26 28 
 #ifndef FONTS_H
27 29 
 #define FONTS_H
28 30
... ... 
@@ -38,8 +40,8 @@ typedef enum
38 40 
   MetaWatch5Oled,
39 41 
   MetaWatch7Oled,
40 42 
   MetaWatch16Oled,
41 
-  MetaWatchIconOled
42 
-
43 
+  MetaWatchIconOled,
44 
+  MetaWatchMonospaced10
43 45 
 } etFontType;
44 46
45 47 
 /*! Use to size the bitmap used in the Display Task for printing characters FOR
... ... 
@@ -84,7 +86,7 @@ unsigned char MapDigitToIndex(unsigned char Digit);
84 86 
  * The function works with ints so that it is generic for both types
85 87 
  *
86 88 
  */
87 
-void GetCharacterBitmap(unsigned char Character,unsigned int * pBitmap);
89 
+void GetCharacterBitmap(unsigned char Character, u16t *pBitmap);
88 90
89 91 
 /*! Get the width for a specified character *
90 92 
  *
ui/LcdDisplay.c
History View file @ a03500b
... ... 
@@ -4,11 +4,6 @@
4 4
5 5 
 #include "LcdDisplay.h"
6 6
7 
-#define NUM_LCD_ROWS  96
8 
-#define NUM_LCD_COL_BYTES  ( 12 )
9 
-#define MAX_FONT_ROWS ( 19 )
10 
-
11 
-
12 7 
 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
13 8 
 {
14 9 
 	int x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
... ... 
@@ -51,6 +46,7 @@ void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
51 46 
 		}
52 47 
 		lcd_set_pixel(x, y, TRUE);
53 48 
 	}
49 
+	// lcd_update_display();
54 50 
 }
55 51
56 52 
 void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness)
... ... 
@@ -107,16 +103,17 @@ void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thic
107 103 
 			lcd_set_pixel(x, y+i, TRUE);
108 104 
 		}
109 105 
 	}
106 
+	// lcd_update_display();
110 107 
 }
111 108
112 109 
 u8t WriteLcdCharacter(u8t x, u8t y, u8t Character)
113 110 
 {
114 111 
 	u8t CharacterHeight = GetCharacterHeight();
115 112 
 	u8t CharacterWidth = GetCharacterWidth(Character);
116 
-	unsigned int bitmap[MAX_FONT_ROWS];
117 
-	register lx, ly;
113 
+	u16t bitmap[MAX_FONT_ROWS];
114 
+	int lx, ly;
118 115
119 
-	GetCharacterBitmap(Character,(unsigned int*)&bitmap);
116 
+	GetCharacterBitmap(Character, bitmap);
120 117
121 118 
 	// printf("cw=%d ch=%d\n", CharacterWidth, CharacterHeight);
122 119 
 	for (ly=0; ly<CharacterHeight; ly++) {
... ... 
@@ -131,13 +128,13 @@ u8t WriteLcdCharacter(u8t x, u8t y, u8t Character)
131 128 
 		}
132 129 
 		// printf("\n");
133 130 
 	}
134 
-
131 
+	// lcd_update_display();
135 132 
 	return CharacterWidth + GetFontSpacing();
136 133 
 }
137 134
138 
-void WriteLcdString(u8t x, u8t y, u8t *str)
135 
+void WriteLcdString(u8t x, u8t y, char *str)
139 136 
 {
140 
-	register lx, i, strl;
137 
+	int lx, i, strl;
141 138
142 139 
 	strl = oswald_strlen(str);
143 140 
 	if (strl == 0)
... ... 
@@ -152,8 +149,8 @@ void WriteLcdString(u8t x, u8t y, u8t *str)
152 149
153 150 
 void WriteLcdNumber(u8t x, u8t y, s16t number)
154 151 
 {
155 
-	register lx, i, strl;
156 
-	u8t str[8];
152 
+	int lx, i, strl;
153 
+	char str[8];
157 154
158 155 
 	itoa(number, str, 10);
159 156 
 	strl = oswald_strlen(str);
ui/LcdDisplay.h
History View file @ a03500b
... ... 
@@ -6,7 +6,8 @@
6 6 
 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend);
7 7 
 void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
8 8 
 u8t WriteLcdCharacter(u8t x, u8t y, u8t Character);
9 
-void WriteLcdString(u8t x, u8t y, u8t *str);
9 
+void WriteLcdString(u8t x, u8t y, char *str);
10 
+void WriteLcdNumber(u8t x, u8t y, s16t number);
10 11
11 12 
 #endif
12 13
ui/Makefile.am
History View file @ a03500b
... ... 
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c \
6 
-embedvm.c
6 
+embedvm.c oswald_fonts.c oswald_graphics.c
7 7 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
8 8 
 oswald_gui_LDADD = $(GTK_LIBS)
9 9
ui/oswald-ui.c
History View file @ a03500b
... ... 
@@ -35,6 +35,12 @@ void lcd_set_pixel(gint x, gint y, gboolean state)
35 35 
 	gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy+1);
36 36 
 	gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy+1);
37 37
38 
+//	gtk_widget_queue_draw(ui_g->darea);
39 
+}
40 
+
41 
+/* updates the actual LCD so that drawing becomes visible */
42 
+void lcd_update_display(void)
43 
+{
38 44 
 	gtk_widget_queue_draw(ui_g->darea);
39 45 
 }
40 46
ui/oswald-ui.h
History View file @ a03500b
... ... 
@@ -18,6 +18,7 @@ typedef struct {
18 18
19 19 
 void lcd_set_pixel(gint x, gint y, gboolean state);
20 20 
 void lcd_clear_display(void);
21 
+void lcd_update_display(void);
21 22
22 23 
 void enable_centisecond_timer(void);
23 24 
 void disable_centisecond_timer(void);
ui/oswald.h
History View file @ a03500b
... ... 
@@ -1,7 +1,7 @@
1 1 
 #ifndef _OSWALD_H
2 2 
 #define _OSWALD_H
3 3
4 
-#define DEBUG 1
4 
+//#define DEBUG 1
5 5 
 #ifdef DEBUG
6 6 
 #define dbg_out( args... ) fprintf(stderr, args)
7 7 
 #else
... ... 
@@ -40,11 +40,11 @@ typedef enum {
40 40 
 	IDLE_SCREEN = 0,
41 41 
 	ACCEL_DISPLAY_SCREEN,
42 42 
 	MENU_TEST_SCREEN,
43 
-//	SCREEN2_SCREEN,
44 
-//	SCREEN3_SCREEN,
43 
+	STOP_WATCH_SCREEN,
45 44 
 //	APPLICATION_SCREEN,
46 45 
 	LAST_SCREEN,		// a marker for the last (not valid) screen)
47 46 
 	DATETIME_SETTING_SCREEN,
47 
+	SCREENS_END,
48 48 
 } screen_number;
49 49
50 50 
 typedef enum {
ui/oswald_main.c
History View file @ a03500b
... ... 
@@ -13,7 +13,7 @@
13 13 
  */
14 14 
 clock_state OswaldClk;
15 15 
 watch_state OswaldState;
16 
-watch_screen OswaldScreens[LAST_SCREEN];
16 
+watch_screen OswaldScreens[SCREENS_END];
17 17
18 18
19 19 
 void oswald_change_to_screen(screen_number screen_id)
... ... 
@@ -107,7 +107,6 @@ void oswald_handle_button_press(watch_button button)
107 107 
 				OswaldState.screen_id = IDLE_SCREEN;
108 108 
 			};
109 109 
 			OswaldState.screen = &OswaldScreens[OswaldState.screen_id];
110 
-			//oswald_update_screen();
111 110 
 			OswaldState.screen->event_func(EVENT_SCREEN_VISIBLE, NULL);
112 111 
 			break;
113 112 
 		case BUTTON_F:
... ... 
@@ -153,6 +152,9 @@ void oswald_init(void)
153 152 
 	OswaldScreens[MENU_TEST_SCREEN].event_mask = EVENT_USER_BUTTONS;
154 153 
 	OswaldScreens[MENU_TEST_SCREEN].event_func = test_menu_handle_events;
155 154
155 
+	OswaldScreens[STOP_WATCH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_CS_TIMER;
156 
+	OswaldScreens[STOP_WATCH_SCREEN].event_func = stop_watch_handle_events;
157 
+
156 158 
 	OswaldState.screen_id = IDLE_SCREEN;
157 159 
 	OswaldState.screen = &OswaldScreens[OswaldState.screen_id];
158 160
ui/oswald_screens.c
History View file @ a03500b
... ... 
@@ -82,6 +82,7 @@ void draw_accel_screen(accel_data_t *accel_data)
82 82 
 	WriteLcdNumber(20, 18, accel_data->y);
83 83 
 	WriteLcdString(2, 34, "Z:");
84 84 
 	WriteLcdNumber(20, 34, accel_data->z);
85 
+	lcd_update_display();
85 86 
 }
86 87
87 88 
 void accel_handle_events(u16t event, void *data)
... ... 
@@ -170,6 +171,8 @@ void draw_datetime_setup_screen(datetime_setup_data_t *sdata)
170 171 
 			WriteLcdString(2, 79, "_");
171 172 
 	}
172 173 
 	WriteLcdString(15, 79, "dd.mm.  mm/dd");
174 
+
175 
+	lcd_update_display();
173 176 
 }
174 177
175 178 
 void datetime_handle_updown(u8t pos, s8t incr)
... ... 
@@ -298,6 +301,7 @@ void draw_menu_test_screen(void)
298 301 
 	WriteLcdString(2, 56, "Item 5");
299 302
300 303 
 	WriteLcdString(50, 20+(9*test_menu.menu_pos), "*");
304 
+	lcd_update_display();
301 305 
 }
302 306
303 307 
 static void handle_menu_user_buttons(watch_button button)
... ... 
@@ -333,3 +337,122 @@ void test_menu_handle_events(u16t event, void *data)
333 337 
 	};
334 338 
 }
335 339
340 
+
341 
+typedef struct {
342 
+	u8t hr;
343 
+	u8t min;
344 
+	u8t sec;
345 
+	u8t csec;
346 
+	u8t lapse_hr;
347 
+	u8t lapse_min;
348 
+	u8t lapse_sec;
349 
+	u8t lapse_csec;
350 
+	boolean running;
351 
+} stopwatch_data_t;
352 
+static stopwatch_data_t stopwatch_screen = { 0, 0, 0, 0, 0, 0, 0, 0, FALSE };
353 
+
354 
+
355 
+static void update_stop_watch_screen(stopwatch_data_t *sdata)
356 
+{
357 
+	SetFont(MetaWatchMonospaced10);
358 
+
359 
+	WriteLcdNumber(0, 30, sdata->hr);
360 
+	WriteLcdCharacter(14, 30, ':');
361 
+	WriteLcdNumber(19, 30, sdata->min);
362 
+	WriteLcdCharacter(33, 30, ':');
363 
+	WriteLcdNumber(38, 30, sdata->sec);
364 
+	WriteLcdCharacter(52, 30, '.');
365 
+	WriteLcdNumber(57, 30, sdata->csec / 10);
366 
+
367 
+	WriteLcdNumber(0, 50, sdata->lapse_hr);
368 
+	WriteLcdCharacter(14, 50, ':');
369 
+	WriteLcdNumber(19, 50, sdata->lapse_min);
370 
+	WriteLcdCharacter(33, 50, ':');
371 
+	WriteLcdNumber(38, 50, sdata->lapse_sec);
372 
+	WriteLcdCharacter(52, 50, '.');
373 
+	WriteLcdNumber(57, 50, sdata->lapse_csec / 10);
374 
+
375 
+	lcd_update_display();
376 
+}
377 
+
378 
+static void draw_stop_watch_screen(stopwatch_data_t *sdata)
379 
+{
380 
+	SetFont(MetaWatch16);
381 
+	WriteLcdString(2, 5, "StopWatch");
382 
+
383 
+	update_stop_watch_screen(sdata);
384 
+}
385 
+
386 
+static void handle_stop_watch_buttons(watch_button button)
387 
+{
388 
+	switch (button) {
389 
+		case BUTTON_A: // start/stop
390 
+			if (stopwatch_screen.running) {
391 
+				disable_centisecond_timer();
392 
+				stopwatch_screen.running = FALSE;
393 
+			} else {
394 
+				enable_centisecond_timer();
395 
+				stopwatch_screen.running = TRUE;
396 
+			}
397 
+			break;
398 
+		case BUTTON_B: // lapse
399 
+			stopwatch_screen.lapse_hr = stopwatch_screen.hr;
400 
+			stopwatch_screen.lapse_min = stopwatch_screen.min;
401 
+			stopwatch_screen.lapse_sec = stopwatch_screen.sec;
402 
+			stopwatch_screen.lapse_csec = stopwatch_screen.csec;
403 
+			break;
404 
+		case BUTTON_D: // reset
405 
+			stopwatch_screen.hr = 0;
406 
+			stopwatch_screen.min = 0;
407 
+			stopwatch_screen.sec = 0;
408 
+			stopwatch_screen.csec = 0;
409 
+			stopwatch_screen.lapse_hr = 0;
410 
+			stopwatch_screen.lapse_min = 0;
411 
+			stopwatch_screen.lapse_sec = 0;
412 
+			stopwatch_screen.lapse_csec = 0;
413 
+			break;
414 
+		default:
415 
+			break;
416 
+	}
417 
+}
418 
+
419 
+void stop_watch_handle_events(u16t event, void *data)
420 
+{
421 
+	switch (event) {
422 
+		case EVENT_USER_BUTTONS:
423 
+			dbg_out("button event %d\n", *(int *)data);
424 
+			handle_stop_watch_buttons(*(watch_button *)data);
425 
+			update_stop_watch_screen(&stopwatch_screen);
426 
+			break;
427 
+		case EVENT_SCREEN_VISIBLE:
428 
+			lcd_clear_display();
429 
+			draw_stop_watch_screen(&stopwatch_screen);
430 
+			break;
431 
+		case EVENT_SCREEN_DESTROY:
432 
+			disable_centisecond_timer();
433 
+			stopwatch_screen.running = FALSE;
434 
+			break;
435 
+		case EVENT_CS_TIMER:
436 
+			stopwatch_screen.csec++;
437 
+			if (stopwatch_screen.csec > 99) {
438 
+				stopwatch_screen.csec = 0;
439 
+				stopwatch_screen.sec++;
440 
+			};
441 
+			if (stopwatch_screen.sec > 59) {
442 
+				stopwatch_screen.sec = 0;
443 
+				stopwatch_screen.min++;
444 
+			};
445 
+			if (stopwatch_screen.min > 59) {
446 
+				stopwatch_screen.min = 0;
447 
+				stopwatch_screen.hr++;
448 
+			};
449 
+			if (stopwatch_screen.hr > 59) {
450 
+				stopwatch_screen.hr = 0;
451 
+			};
452 
+			if (stopwatch_screen.csec % 10 == 0)
453 
+				update_stop_watch_screen(&stopwatch_screen);
454 
+			break;
455 
+		default:
456 
+			break;
457 
+	};
458 
+}
ui/oswald_screens.h
History View file @ a03500b
... ... 
@@ -10,5 +10,7 @@ void datetime_setup_events(u16t event, void *data);
10 10
11 11 
 void test_menu_handle_events(u16t event, void *data);
12 12
13 
+void stop_watch_handle_events(u16t event, void *data);
14 
+
13 15 
 #endif
14 16
ui/oswald_strings.c
History View file @ a03500b
... ... 
@@ -2,9 +2,9 @@
2 2
3 3 
 #include "oswald_strings.h"
4 4
5 
-u16t oswald_strlen(u8t *string)
5 
+u16t oswald_strlen(char *string)
6 6 
 {
7 
-	register i=0;
7 
+	int i=0;
8 8
9 9 
 	if (string == NULL)
10 10 
 		return 0;
ui/oswald_strings.h
History View file @ a03500b
... ... 
@@ -1,7 +1,7 @@
1 1 
 #ifndef _OSWALD_STRINGS_H
2 2 
 #define _OSWALD_STRINGS_H
3 3
4 
-u16t oswald_strlen(u8t *string);
4 
+u16t oswald_strlen(char *string);
5 5 
 char* itoa(s16t value, char* result, int base);
6 6
7 7 
 #endif
ui/oswald_watch_faces.c
History View file @ a03500b
... ... 
@@ -10,10 +10,10 @@
10 10
11 11 
 void DrawLcdAnaClock(boolean show_seconds)
12 12 
 {
13 
-	unsigned char *bbuf;
14 
-	char daystr[5];
15 
-	int len;
16 
-	register i, x, y, x2, y2;
13 
+	//unsigned char *bbuf;
14 
+	//char daystr[5];
15 
+	//int len;
16 
+	int i, x, y, x2, y2;
17 17 
 	double tmp, mf;
18 18 
 	s8t hour, minute, seconds;
19 19
... ... 
@@ -63,12 +63,13 @@ void DrawLcdAnaClock(boolean show_seconds)
63 63
64 64 
 	//snprintf(daystr, 5, "%d", day);
65 65 
 	// mw_buf_print(mwbuf, 74, 45, daystr, 0, MW_WHITE, MW_BLACK);
66 
+	lcd_update_display();
66 67 
 }
67 68
68 69 
 void DrawLcdDigitalClock(boolean show_seconds)
69 70 
 {
70 
-	gint gRow = 3;
71 
-	gint gColumn = 4;
71 
+	int gRow = 3;
72 
+	int gColumn = 4;
72 73
73 74 
 	SetFont(MetaWatchTime);
74 75
... ... 
@@ -84,5 +85,5 @@ void DrawLcdDigitalClock(boolean show_seconds)
84 85 
 		gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.second / 10));
85 86 
 		gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.second % 10));
86 87 
 	};
88 
+	lcd_update_display();
87 89 
 }
88 
-