diff options
-rw-r--r-- | apps/player/icons.h | 4 | ||||
-rw-r--r-- | apps/tree.c | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-player-charset.c | 104 | ||||
-rw-r--r-- | firmware/export/lcd-player-charset.h | 2 | ||||
-rw-r--r-- | www/docs/lcd_new.gif | bin | 43437 -> 43437 bytes | |||
-rw-r--r-- | www/docs/lcd_new_hw.gif | bin | 41878 -> 41878 bytes | |||
-rw-r--r-- | www/docs/lcd_new_subst.gif | bin | 43437 -> 43437 bytes | |||
-rw-r--r-- | www/docs/lcd_old.gif | bin | 43437 -> 43437 bytes | |||
-rw-r--r-- | www/docs/lcd_old_hw.gif | bin | 41878 -> 41878 bytes | |||
-rw-r--r-- | www/docs/lcd_old_subst.gif | bin | 43437 -> 43437 bytes | |||
-rw-r--r-- | www/docs/rocklatin.t | 2 |
11 files changed, 57 insertions, 59 deletions
diff --git a/apps/player/icons.h b/apps/player/icons.h index 041f09eca6..f5842eca40 100644 --- a/apps/player/icons.h +++ b/apps/player/icons.h | |||
@@ -29,8 +29,8 @@ | |||
29 | 29 | ||
30 | enum { | 30 | enum { |
31 | Unknown = 0x90, | 31 | Unknown = 0x90, |
32 | Plugin = 0x17, | 32 | Bookmark = 0x16, |
33 | Folder, Mod_Ajz, Language, File, Wps, Playlist, Text, Config, | 33 | Plugin, Folder, Mod_Ajz, Language, File, Wps, Playlist, Text, Config, |
34 | }; | 34 | }; |
35 | 35 | ||
36 | #endif | 36 | #endif |
diff --git a/apps/tree.c b/apps/tree.c index 820974979b..988e6b3d93 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -80,10 +80,8 @@ struct filetype filetypes[] = { | |||
80 | { ".rock",TREE_ATTR_ROCK,Plugin, VOICE_EXT_ROCK }, | 80 | { ".rock",TREE_ATTR_ROCK,Plugin, VOICE_EXT_ROCK }, |
81 | #ifdef HAVE_LCD_BITMAP | 81 | #ifdef HAVE_LCD_BITMAP |
82 | { ".fnt", TREE_ATTR_FONT,Font, VOICE_EXT_FONT }, | 82 | { ".fnt", TREE_ATTR_FONT,Font, VOICE_EXT_FONT }, |
83 | { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK }, | ||
84 | #else | ||
85 | { ".bmark", TREE_ATTR_BMARK, -1, VOICE_EXT_BMARK }, | ||
86 | #endif | 83 | #endif |
84 | { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK }, | ||
87 | #ifndef SIMULATOR | 85 | #ifndef SIMULATOR |
88 | #ifdef HAVE_LCD_BITMAP | 86 | #ifdef HAVE_LCD_BITMAP |
89 | { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, | 87 | { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ }, |
diff --git a/firmware/drivers/lcd-player-charset.c b/firmware/drivers/lcd-player-charset.c index ca1b6a3db9..ff35e4efa1 100644 --- a/firmware/drivers/lcd-player-charset.c +++ b/firmware/drivers/lcd-player-charset.c | |||
@@ -25,28 +25,28 @@ | |||
25 | unsigned short new_lcd_rocklatin1_to_xlcd[] = | 25 | unsigned short new_lcd_rocklatin1_to_xlcd[] = |
26 | { | 26 | { |
27 | NOCHAR_NEW, /* 0x00 reserved never to be used */ | 27 | NOCHAR_NEW, /* 0x00 reserved never to be used */ |
28 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 28 | RESERVED_CHAR, /* reserved */ |
29 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 29 | RESERVED_CHAR, /* reserved */ |
30 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 30 | RESERVED_CHAR, /* reserved */ |
31 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 31 | RESERVED_CHAR, /* reserved */ |
32 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 32 | RESERVED_CHAR, /* reserved */ |
33 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 33 | RESERVED_CHAR, /* reserved */ |
34 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 34 | RESERVED_CHAR, /* reserved */ |
35 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 35 | RESERVED_CHAR, /* reserved */ |
36 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 36 | RESERVED_CHAR, /* reserved */ |
37 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 37 | RESERVED_CHAR, /* reserved */ |
38 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 38 | RESERVED_CHAR, /* reserved */ |
39 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 39 | RESERVED_CHAR, /* reserved */ |
40 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 40 | RESERVED_CHAR, /* reserved */ |
41 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 41 | RESERVED_CHAR, /* reserved */ |
42 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 42 | RESERVED_CHAR, /* reserved */ |
43 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 43 | RESERVED_CHAR, /* reserved */ |
44 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 44 | RESERVED_CHAR, /* reserved */ |
45 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 45 | RESERVED_CHAR, /* reserved */ |
46 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 46 | RESERVED_CHAR, /* reserved */ |
47 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 47 | RESERVED_CHAR, /* reserved */ |
48 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 48 | RESERVED_CHAR, /* reserved */ |
49 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 49 | 0x216, /* 0x16 .. "bookmark" icon */ |
50 | 0x217, /* 0x17 .. "plugin" icon */ | 50 | 0x217, /* 0x17 .. "plugin" icon */ |
51 | 0x218, /* 0x18 .. "folder" icon */ | 51 | 0x218, /* 0x18 .. "folder" icon */ |
52 | 0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */ | 52 | 0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */ |
@@ -287,28 +287,28 @@ unsigned short old_lcd_rocklatin1_to_xlcd[] = | |||
287 | { | 287 | { |
288 | /* OLD LCD */ | 288 | /* OLD LCD */ |
289 | NOCHAR_OLD, /* 0x00 reserved never to be used */ | 289 | NOCHAR_OLD, /* 0x00 reserved never to be used */ |
290 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 290 | RESERVED_CHAR, /* reserved */ |
291 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 291 | RESERVED_CHAR, /* reserved */ |
292 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 292 | RESERVED_CHAR, /* reserved */ |
293 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 293 | RESERVED_CHAR, /* reserved */ |
294 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 294 | RESERVED_CHAR, /* reserved */ |
295 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 295 | RESERVED_CHAR, /* reserved */ |
296 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 296 | RESERVED_CHAR, /* reserved */ |
297 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 297 | RESERVED_CHAR, /* reserved */ |
298 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 298 | RESERVED_CHAR, /* reserved */ |
299 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 299 | RESERVED_CHAR, /* reserved */ |
300 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 300 | RESERVED_CHAR, /* reserved */ |
301 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 301 | RESERVED_CHAR, /* reserved */ |
302 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 302 | RESERVED_CHAR, /* reserved */ |
303 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 303 | RESERVED_CHAR, /* reserved */ |
304 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 304 | RESERVED_CHAR, /* reserved */ |
305 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 305 | RESERVED_CHAR, /* reserved */ |
306 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 306 | RESERVED_CHAR, /* reserved */ |
307 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 307 | RESERVED_CHAR, /* reserved */ |
308 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 308 | RESERVED_CHAR, /* reserved */ |
309 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 309 | RESERVED_CHAR, /* reserved */ |
310 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 310 | RESERVED_CHAR, /* reserved */ |
311 | RESERVED_CHAR, /* 0x01-0x16 reserved */ | 311 | 0x216, /* 0x16 .. "bookmark" icon */ |
312 | 0x217, /* 0x17 .. "plugin" icon */ | 312 | 0x217, /* 0x17 .. "plugin" icon */ |
313 | 0x218, /* 0x18 .. "folder" icon */ | 313 | 0x218, /* 0x18 .. "folder" icon */ |
314 | 0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */ | 314 | 0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */ |
@@ -563,13 +563,13 @@ unsigned char lcd_player_extended_lcd_to_rocklatin1[NO_EXTENDED_LCD_CHARS] = | |||
563 | /* 0d */ NOCHAR_NEW, /* 0-16 user defined */ | 563 | /* 0d */ NOCHAR_NEW, /* 0-16 user defined */ |
564 | /* 0e */ NOCHAR_NEW, /* 0-16 user defined */ | 564 | /* 0e */ NOCHAR_NEW, /* 0-16 user defined */ |
565 | /* 0f */ NOCHAR_NEW, /* 0-16 user defined */ | 565 | /* 0f */ NOCHAR_NEW, /* 0-16 user defined */ |
566 | /* 10 */ NOCHAR_NEW, /* 16-31 reserved */ | 566 | /* 10 */ NOCHAR_NEW, /* reserved */ |
567 | /* 11 */ NOCHAR_NEW, /* 16-31 reserved */ | 567 | /* 11 */ NOCHAR_NEW, /* reserved */ |
568 | /* 12 */ NOCHAR_NEW, /* 16-31 reserved */ | 568 | /* 12 */ NOCHAR_NEW, /* reserved */ |
569 | /* 13 */ NOCHAR_NEW, /* 16-31 reserved */ | 569 | /* 13 */ NOCHAR_NEW, /* reserved */ |
570 | /* 14 */ NOCHAR_NEW, /* 16-31 reserved */ | 570 | /* 14 */ NOCHAR_NEW, /* reserved */ |
571 | /* 15 */ NOCHAR_NEW, /* 16-31 reserved */ | 571 | /* 15 */ NOCHAR_NEW, /* reserved */ |
572 | /* 16 */ NOCHAR_NEW, /* 16-31 reserved */ | 572 | /* 16 */ 0x91, /* bookmark icon */ |
573 | /* 17 */ 0x29, /* plugin icon */ | 573 | /* 17 */ 0x29, /* plugin icon */ |
574 | /* 18 */ 0x93, /* folder icon */ | 574 | /* 18 */ 0x93, /* folder icon */ |
575 | /* 19 */ 'x', /* MOD/AJZ icon */ | 575 | /* 19 */ 'x', /* MOD/AJZ icon */ |
@@ -667,7 +667,7 @@ unsigned char extended_font_player[NO_EXTENDED_LCD_CHARS][8] = { | |||
667 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 13 */ | 667 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 13 */ |
668 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 14 */ | 668 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 14 */ |
669 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 15 */ | 669 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 15 */ |
670 | { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 16 */ | 670 | { 0x00, 0x03, 0x07, 0x0e, 0x1c, 0x08, 0x00, 0x00}, /* 16 Bookmark icon */ |
671 | { 0x04, 0x1e, 0x07, 0x1f, 0x05, 0x01, 0x06, 0x00}, /* 17 Plugin file icon */ | 671 | { 0x04, 0x1e, 0x07, 0x1f, 0x05, 0x01, 0x06, 0x00}, /* 17 Plugin file icon */ |
672 | { 0x0c, 0x13, 0x11, 0x11, 0x11, 0x11, 0x1f, 0x00}, /* 18 Folder icon */ | 672 | { 0x0c, 0x13, 0x11, 0x11, 0x11, 0x11, 0x1f, 0x00}, /* 18 Folder icon */ |
673 | { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00}, /* 19 MOD/AJZ icon */ | 673 | { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00}, /* 19 MOD/AJZ icon */ |
diff --git a/firmware/export/lcd-player-charset.h b/firmware/export/lcd-player-charset.h index 2789f8da70..c94fab8f3b 100644 --- a/firmware/export/lcd-player-charset.h +++ b/firmware/export/lcd-player-charset.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | #define NO_EXTENDED_LCD_CHARS 0x5e | 21 | #define NO_EXTENDED_LCD_CHARS 0x5e |
22 | #define RESERVED_CHAR 0xff | 22 | #define RESERVED_CHAR 0xff |
23 | #define LAST_RESERVED_CHAR 0x17 | 23 | #define LAST_RESERVED_CHAR 0x16 |
24 | #define NOCHAR_OLD 0x24 | 24 | #define NOCHAR_OLD 0x24 |
25 | #define NOCHAR_NEW 0x20 | 25 | #define NOCHAR_NEW 0x20 |
26 | 26 | ||
diff --git a/www/docs/lcd_new.gif b/www/docs/lcd_new.gif index 5d6e3587a1..39a6287b8c 100644 --- a/www/docs/lcd_new.gif +++ b/www/docs/lcd_new.gif | |||
Binary files differ | |||
diff --git a/www/docs/lcd_new_hw.gif b/www/docs/lcd_new_hw.gif index 11690897b1..87930d3d65 100644 --- a/www/docs/lcd_new_hw.gif +++ b/www/docs/lcd_new_hw.gif | |||
Binary files differ | |||
diff --git a/www/docs/lcd_new_subst.gif b/www/docs/lcd_new_subst.gif index 5a1e126a64..17bdd834a1 100644 --- a/www/docs/lcd_new_subst.gif +++ b/www/docs/lcd_new_subst.gif | |||
Binary files differ | |||
diff --git a/www/docs/lcd_old.gif b/www/docs/lcd_old.gif index 2683f54f26..877b3f57bf 100644 --- a/www/docs/lcd_old.gif +++ b/www/docs/lcd_old.gif | |||
Binary files differ | |||
diff --git a/www/docs/lcd_old_hw.gif b/www/docs/lcd_old_hw.gif index 651450187f..19f35f6711 100644 --- a/www/docs/lcd_old_hw.gif +++ b/www/docs/lcd_old_hw.gif | |||
Binary files differ | |||
diff --git a/www/docs/lcd_old_subst.gif b/www/docs/lcd_old_subst.gif index dfffde9850..a9f40f12f9 100644 --- a/www/docs/lcd_old_subst.gif +++ b/www/docs/lcd_old_subst.gif | |||
Binary files differ | |||
diff --git a/www/docs/rocklatin.t b/www/docs/rocklatin.t index 7aee26fd3e..819a845051 100644 --- a/www/docs/rocklatin.t +++ b/www/docs/rocklatin.t | |||
@@ -68,7 +68,7 @@ or 8 of such characters. This code example shows how to define a pattern: | |||
68 | lcd_unlock_pattern(handle); | 68 | lcd_unlock_pattern(handle); |
69 | } | 69 | } |
70 | </pre> | 70 | </pre> |
71 | The handle is very likely to be between 0x01 to 0x16, which in software will | 71 | The handle is very likely to be between 0x01 to 0x15, which in software will |
72 | be handled as a prioritized character (even higher than the icons). | 72 | be handled as a prioritized character (even higher than the icons). |
73 | 73 | ||
74 | <h2>Some notes</h2> | 74 | <h2>Some notes</h2> |