wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amstrand cpc extended

This commit is contained in:
olikraus 2015-12-26 10:06:48 +01:00
parent a8388086d5
commit af26540ccf
7 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
csrc/u8g2.h
View File

@ -552,10 +552,10 @@ extern const uint8_t u8g2_font_profont29_tn[] U8G2_FONT_SECTION("u8g2_font_profo
extern const uint8_t u8g2_font_profont29_mf[] U8G2_FONT_SECTION("u8g2_font_profont29_mf");
extern const uint8_t u8g2_font_profont29_mr[] U8G2_FONT_SECTION("u8g2_font_profont29_mr");
extern const uint8_t u8g2_font_profont29_mn[] U8G2_FONT_SECTION("u8g2_font_profont29_mn");
extern const uint8_t u8g2_font_amstrad_cpc_8f[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_8f");
extern const uint8_t u8g2_font_amstrad_cpc_8r[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_8r");
extern const uint8_t u8g2_font_amstrad_cpc_8n[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_8n");
extern const uint8_t u8g2_font_amstrad_cpc_8u[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_8u");
extern const uint8_t u8g2_font_amstrad_cpc_extended_8f[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8f");
extern const uint8_t u8g2_font_amstrad_cpc_extended_8r[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8r");
extern const uint8_t u8g2_font_amstrad_cpc_extended_8n[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8n");
extern const uint8_t u8g2_font_amstrad_cpc_extended_8u[] U8G2_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8u");
extern const uint8_t u8g2_font_cu12_tf[] U8G2_FONT_SECTION("u8g2_font_cu12_tf");
extern const uint8_t u8g2_font_cu12_tr[] U8G2_FONT_SECTION("u8g2_font_cu12_tr");
extern const uint8_t u8g2_font_cu12_tn[] U8G2_FONT_SECTION("u8g2_font_cu12_tn");

8
csrc/u8g2_fonts.c
View File

@ -10441,7 +10441,7 @@ const uint8_t u8g2_font_profont29_mn[518] U8G2_FONT_SECTION("u8g2_font_profont29
Glyphs: 222/228
BBX Build Mode: 3
*/
const uint8_t u8g2_font_amstrad_cpc_8f[2672] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_8f") =
const uint8_t u8g2_font_amstrad_cpc_extended_8f[2672] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8f") =
"\336\3\4\3\4\4\1\1\5\10\7\0\0\10\0\10\1\1~\3 \12W \7\210\343\307\21\0!\11"
"\210\343\21\323\271,\0\42\14\210\343P#!#!\217\30\0#\17\210\343P#!rRr\42!#"
"!\12$\16\210\343\221*\211\220\242\222\10\251\222\5%\16\210c\224\221\20\221\322DBF\22\0&\17"
@ -10532,7 +10532,7 @@ const uint8_t u8g2_font_amstrad_cpc_8f[2672] U8X8_FONT_SECTION("u8g2_font_amstra
Glyphs: 95/228
BBX Build Mode: 3
*/
const uint8_t u8g2_font_amstrad_cpc_8r[1184] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_8r") =
const uint8_t u8g2_font_amstrad_cpc_extended_8r[1184] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8r") =
"_\3\4\3\4\4\1\1\5\10\7\0\0\10\0\10\1\1~\3 \4\207 \7\210\343\307\21\0!\11"
"\210\343\21\323\271,\0\42\14\210\343P#!#!\217\30\0#\17\210\343P#!rRr\42!#"
"!\12$\16\210\343\221*\211\220\242\222\10\251\222\5%\16\210c\224\221\20\221\322DBF\22\0&\17"
@ -10576,7 +10576,7 @@ const uint8_t u8g2_font_amstrad_cpc_8r[1184] U8X8_FONT_SECTION("u8g2_font_amstra
Glyphs: 18/228
BBX Build Mode: 3
*/
const uint8_t u8g2_font_amstrad_cpc_8n[235] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_8n") =
const uint8_t u8g2_font_amstrad_cpc_extended_8n[235] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8n") =
"\22\3\4\3\4\4\1\1\5\10\7\0\0\10\0\10\1\0\0\0\0\0\322 \7\210\343\307\21\0*\16"
"\210\343\24\221!\71\10\241\21\221\7\1+\13\210\343\25\23\62\22\223\7\2,\11\210\343G-&%\4"
"-\10\210\343\7\265G\3.\10\210\343G-&\13/\10\210\343\322g\361\0\60\22\210\343(\221\221\20"
@ -10591,7 +10591,7 @@ const uint8_t u8g2_font_amstrad_cpc_8n[235] U8X8_FONT_SECTION("u8g2_font_amstrad
Glyphs: 64/228
BBX Build Mode: 3
*/
const uint8_t u8g2_font_amstrad_cpc_8u[818] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_8u") =
const uint8_t u8g2_font_amstrad_cpc_extended_8u[818] U8X8_FONT_SECTION("u8g2_font_amstrad_cpc_extended_8u") =
"@\3\4\3\4\4\1\1\5\10\7\0\0\10\0\10\1\1~\0\0\3\31 \7\210\343\307\21\0!\11"
"\210\343\21\323\271,\0\42\14\210\343P#!#!\217\30\0#\17\210\343P#!rRr\42!#"
"!\12$\16\210\343\221*\211\220\242\222\10\251\222\5%\16\210c\224\221\20\221\322DBF\22\0&\17"

8
csrc/u8x8.h
View File

@ -575,10 +575,10 @@ extern const uint8_t u8x8_font_5x7_n[] U8X8_FONT_SECTION("u8x8_font_5x7_n");
extern const uint8_t u8x8_font_5x8_f[] U8X8_FONT_SECTION("u8x8_font_5x8_f");
extern const uint8_t u8x8_font_5x8_r[] U8X8_FONT_SECTION("u8x8_font_5x8_r");
extern const uint8_t u8x8_font_5x8_n[] U8X8_FONT_SECTION("u8x8_font_5x8_n");
extern const uint8_t u8x8_font_amstrad_cpc_f[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_f");
extern const uint8_t u8x8_font_amstrad_cpc_r[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_r");
extern const uint8_t u8x8_font_amstrad_cpc_n[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_n");
extern const uint8_t u8x8_font_amstrad_cpc_u[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_u");
extern const uint8_t u8x8_font_amstrad_cpc_extended_f[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_f");
extern const uint8_t u8x8_font_amstrad_cpc_extended_r[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_r");
extern const uint8_t u8x8_font_amstrad_cpc_extended_n[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_n");
extern const uint8_t u8x8_font_amstrad_cpc_extended_u[] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_u");
extern const uint8_t u8x8_font_artossans8_r[] U8X8_FONT_SECTION("u8x8_font_artossans8_r");
extern const uint8_t u8x8_font_artossans8_n[] U8X8_FONT_SECTION("u8x8_font_artossans8_n");
extern const uint8_t u8x8_font_artossans8_u[] U8X8_FONT_SECTION("u8x8_font_artossans8_u");

8
csrc/u8x8_fonts.c
View File

@ -227,7 +227,7 @@ const uint8_t u8x8_font_5x8_n[218] U8X8_FONT_SECTION("u8x8_font_5x8_n") =
Glyphs: 222/228
BBX Build Mode: 3
*/
const uint8_t u8x8_font_amstrad_cpc_f[1794] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_f") =
const uint8_t u8x8_font_amstrad_cpc_extended_f[1794] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_f") =
" \377\0\0\0\0\0\0\0\0\0\0\0__\0\0\0\0\7\7\0\7\7\0\0\24\34"
"\24\0\0$**\22\0Ff\60\30\14fb\0\60zO]\67zH\0\0\0\0\7\7\0"
"\0\0\0\0\34>cA\0\0\0\0Ac>\34\0\0\10*>\34\34>*\10\0\10\10>>\10"
@ -291,7 +291,7 @@ const uint8_t u8x8_font_amstrad_cpc_f[1794] U8X8_FONT_SECTION("u8x8_font_amstrad
Glyphs: 95/228
BBX Build Mode: 3
*/
const uint8_t u8x8_font_amstrad_cpc_r[762] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_r") =
const uint8_t u8x8_font_amstrad_cpc_extended_r[762] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_r") =
" ~\0\0\0\0\0\0\0\0\0\0\0__\0\0\0\0\7\7\0\7\7\0\0\24\34"
"\24\0\0$**\22\0Ff\60\30\14fb\0\60zO]\67zH\0\0\0\0\7\7\0"
"\0\0\0\0\34>cA\0\0\0\0Ac>\34\0\0\10*>\34\34>*\10\0\10\10>>\10"
@ -322,7 +322,7 @@ const uint8_t u8x8_font_amstrad_cpc_r[762] U8X8_FONT_SECTION("u8x8_font_amstrad_
Glyphs: 18/228
BBX Build Mode: 3
*/
const uint8_t u8x8_font_amstrad_cpc_n[218] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_n") =
const uint8_t u8x8_font_amstrad_cpc_extended_n[218] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_n") =
" :\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\10*>\34\34>*\10\0\10\10>>\10"
@ -336,7 +336,7 @@ const uint8_t u8x8_font_amstrad_cpc_n[218] U8X8_FONT_SECTION("u8x8_font_amstrad_
Glyphs: 64/228
BBX Build Mode: 3
*/
const uint8_t u8x8_font_amstrad_cpc_u[515] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_u") =
const uint8_t u8x8_font_amstrad_cpc_extended_u[515] U8X8_FONT_SECTION("u8x8_font_amstrad_cpc_extended_u") =
" _\0\0\0\0\0\0\0\0\0\0\0__\0\0\0\0\7\7\0\7\7\0\0\24\34"
"\24\0\0$**\22\0Ff\60\30\14fb\0\60zO]\67zH\0\0\0\0\7\7\0"
"\0\0\0\0\34>cA\0\0\0\0Ac>\34\0\0\10*>\34\34>*\10\0\10\10>>\10"

0
tools/font/bdf/amstrad_cpc.bdf → tools/font/bdf/amstrad_cpc_extended.bdf
View File

6
tools/font/build/build.c
View File

@ -225,7 +225,7 @@ struct fontinfo fi[] = {
{ 0, "profont17.bdf", "profont17", 4, 0, BM_T|BM_M, FM_C, MM_F|MM_R|MM_N, "", "" },
{ 0, "profont22.bdf", "profont22", 4, 0, BM_T|BM_M, FM_C, MM_F|MM_R|MM_N, "", "" },
{ 0, "profont29.bdf", "profont29", 4, 0, BM_T|BM_M, FM_C, MM_F|MM_R|MM_N, "", "" },
{ 0, "amstrad_cpc.bdf", "amstrad_cpc", 2, 0, BM_8, FM_C|FM_8, MM_F|MM_R|MM_U|MM_N, "" , ""},
{ 0, "amstrad_cpc_extended.bdf", "amstrad_cpc_extended", 2, 0, BM_8, FM_C|FM_8, MM_F|MM_R|MM_U|MM_N, "" , ""},
//#ifdef TMP
@ -668,7 +668,7 @@ void overviewpic(int i, int fm, char *fms, int bm, char *bms, int mm, char *mms)
u8x8_InitDisplay(u8g2_GetU8x8(&u8g2));
u8x8_SetPowerSave(u8g2_GetU8x8(&u8g2), 0);
//u8x8_ClearDisplay(u8g2_GetU8x8(&u8g2));
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_amstrad_cpc_r);
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_amstrad_cpc_extended_r);
u8x8_DrawString(u8g2_GetU8x8(&u8g2), 0, 0, target_font_identifier);
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_list[u8x8_fnt_cnt]);
{
@ -677,7 +677,7 @@ void overviewpic(int i, int fm, char *fms, int bm, char *bms, int mm, char *mms)
static char s[32];
for( y = 0; y < 16; y++ )
{
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_amstrad_cpc_r);
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_amstrad_cpc_extended_r);
sprintf(s, "%3d/%02x ", y*16, y*16);
u8x8_DrawString(u8g2_GetU8x8(&u8g2), 0, y+2, s);
u8x8_SetFont(u8g2_GetU8x8(&u8g2), u8x8_font_list[u8x8_fnt_cnt]);

3
tools/font/build/fntgrpfontstruct.pre
View File

@ -4,8 +4,7 @@ This page contains fonts from http://fontstruct.com.
# Amstrad CPC extended
This font is called `amstrad_cpc` in u8g2. Additionally encodings 128 to 159
had been added by this project.
Additionally encodings 128 to 159 had been added to this font by this project.
## Reference