aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/fonts
diff options
context:
space:
mode:
Diffstat (limited to 'src/gdisp/fonts')
-rw-r--r--src/gdisp/fonts/DejaVuSans10.c6
-rw-r--r--src/gdisp/fonts/DejaVuSans12.c6
-rw-r--r--src/gdisp/fonts/DejaVuSans12_aa.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans16.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans16_aa.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans20.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans20_aa.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans24.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans24_aa.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans32.c8
-rw-r--r--src/gdisp/fonts/DejaVuSans32_aa.c8
-rw-r--r--src/gdisp/fonts/DejaVuSansBold12.c6
-rw-r--r--src/gdisp/fonts/DejaVuSansBold12_aa.c8
-rw-r--r--src/gdisp/fonts/LargeNumbers.c8
-rw-r--r--src/gdisp/fonts/UI1.c16
-rw-r--r--src/gdisp/fonts/UI2.c8
-rw-r--r--src/gdisp/fonts/fixed_10x20.c6
-rw-r--r--src/gdisp/fonts/fixed_5x8.c2
-rw-r--r--src/gdisp/fonts/fixed_7x14.c2
19 files changed, 70 insertions, 70 deletions
diff --git a/src/gdisp/fonts/DejaVuSans10.c b/src/gdisp/fonts/DejaVuSans10.c
index 604fcd02..f3abbae4 100644
--- a/src/gdisp/fonts/DejaVuSans10.c
+++ b/src/gdisp/fonts/DejaVuSans10.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_DejaVuSans10_glyph_data_0[1222] = {
+static const gU8 mf_bwfont_DejaVuSans10_glyph_data_0[1222] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0xe8, 0x00, 0x3e, 0x00, 0x28, 0x00, 0xf8, 0x00,
0x2e, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x94, 0x00, 0xfe, 0x01, 0xa4, 0x00,
@@ -91,7 +91,7 @@ static const uint8_t mf_bwfont_DejaVuSans10_glyph_data_0[1222] = {
0x20, 0x00, 0x20, 0x00, 0x10, 0x00,
};
-static const uint16_t mf_bwfont_DejaVuSans10_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_DejaVuSans10_glyph_offsets_0[96] = {
0x0000, 0x0000, 0x0004, 0x0009, 0x0012, 0x0019, 0x0023, 0x002c,
0x002f, 0x0033, 0x0037, 0x003d, 0x0046, 0x0049, 0x004e, 0x0051,
0x0055, 0x005c, 0x0063, 0x006a, 0x0071, 0x0078, 0x007f, 0x0086,
@@ -106,7 +106,7 @@ static const uint16_t mf_bwfont_DejaVuSans10_glyph_offsets_0[96] = {
0x0238, 0x023f, 0x0246, 0x024c, 0x0252, 0x0255, 0x025b, 0x0263,
};
-static const uint8_t mf_bwfont_DejaVuSans10_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_DejaVuSans10_glyph_widths_0[95] = {
0x03, 0x04, 0x05, 0x08, 0x06, 0x0a, 0x09, 0x03, 0x04, 0x04, 0x05, 0x08, 0x03, 0x04, 0x03, 0x03,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x08, 0x08, 0x08, 0x05,
0x0b, 0x07, 0x07, 0x08, 0x08, 0x07, 0x06, 0x08, 0x08, 0x03, 0x03, 0x07, 0x06, 0x09, 0x08, 0x08,
diff --git a/src/gdisp/fonts/DejaVuSans12.c b/src/gdisp/fonts/DejaVuSans12.c
index e9e16118..e7e39ac3 100644
--- a/src/gdisp/fonts/DejaVuSans12.c
+++ b/src/gdisp/fonts/DejaVuSans12.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_DejaVuSans12_glyph_data_0[1372] = {
+static const gU8 mf_bwfont_DejaVuSans12_glyph_data_0[1372] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x90, 0x02, 0xf0, 0x01, 0x9c, 0x00, 0x90, 0x03,
0xf8, 0x00, 0x94, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x01, 0x24, 0x02,
@@ -100,7 +100,7 @@ static const uint8_t mf_bwfont_DejaVuSans12_glyph_data_0[1372] = {
0x20, 0x00, 0x20, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x20, 0x00,
};
-static const uint16_t mf_bwfont_DejaVuSans12_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_DejaVuSans12_glyph_offsets_0[96] = {
0x0000, 0x0000, 0x0004, 0x0009, 0x0013, 0x001b, 0x0026, 0x0030,
0x0033, 0x0038, 0x003d, 0x0044, 0x004d, 0x0050, 0x0055, 0x0058,
0x005d, 0x0065, 0x006c, 0x0074, 0x007c, 0x0084, 0x008c, 0x0094,
@@ -115,7 +115,7 @@ static const uint16_t mf_bwfont_DejaVuSans12_glyph_offsets_0[96] = {
0x027d, 0x0284, 0x028b, 0x0291, 0x0299, 0x029d, 0x02a4, 0x02ae,
};
-static const uint8_t mf_bwfont_DejaVuSans12_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_DejaVuSans12_glyph_widths_0[95] = {
0x04, 0x05, 0x05, 0x0a, 0x08, 0x0b, 0x0a, 0x03, 0x05, 0x05, 0x06, 0x0a, 0x04, 0x04, 0x04, 0x04,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x0a, 0x0a, 0x0a, 0x06,
0x0d, 0x08, 0x08, 0x08, 0x09, 0x08, 0x07, 0x09, 0x09, 0x03, 0x03, 0x07, 0x06, 0x0a, 0x09, 0x09,
diff --git a/src/gdisp/fonts/DejaVuSans12_aa.c b/src/gdisp/fonts/DejaVuSans12_aa.c
index 3384b4e3..9f5021ea 100644
--- a/src/gdisp/fonts/DejaVuSans12_aa.c
+++ b/src/gdisp/fonts/DejaVuSans12_aa.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans12_aa_dictionary_data[329] = {
+static const gU8 mf_rlefont_DejaVuSans12_aa_dictionary_data[329] = {
0x27, 0x02, 0x0b, 0x80, 0x01, 0x80, 0x07, 0x80, 0x04, 0x80, 0x02, 0x80, 0x06, 0x04, 0x80, 0x02,
0x0e, 0xc9, 0xde, 0xc7, 0x0a, 0x06, 0x2a, 0x10, 0x84, 0x07, 0x80, 0x02, 0x80, 0x0c, 0x80, 0x0c,
0x0f, 0x80, 0x08, 0xcd, 0xc3, 0x86, 0x0d, 0x0c, 0xc2, 0xca, 0x29, 0xc8, 0xcb, 0xc4, 0xcc, 0xce,
@@ -35,7 +35,7 @@ static const uint8_t mf_rlefont_DejaVuSans12_aa_dictionary_data[329] = {
0x45, 0x0f, 0x45, 0x0c, 0x08, 0x48, 0x08, 0x0c, 0x3f,
};
-static const uint16_t mf_rlefont_DejaVuSans12_aa_dictionary_offsets[122] = {
+static const gU16 mf_rlefont_DejaVuSans12_aa_dictionary_offsets[122] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x000b, 0x000d, 0x000e,
0x0010, 0x0011, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019,
0x001c, 0x0020, 0x0021, 0x0023, 0x0025, 0x0026, 0x0027, 0x0028,
@@ -54,7 +54,7 @@ static const uint16_t mf_rlefont_DejaVuSans12_aa_dictionary_offsets[122] = {
0x0143, 0x0149,
};
-static const uint8_t mf_rlefont_DejaVuSans12_aa_glyph_data_0[2069] = {
+static const gU8 mf_rlefont_DejaVuSans12_aa_glyph_data_0[2069] = {
0x04, 0x00, 0x10, 0x05, 0x25, 0x8b, 0x0e, 0x2e, 0x0d, 0x20, 0x83, 0x0f, 0x10, 0x05, 0x1a, 0x94,
0x1d, 0x94, 0x6b, 0xac, 0x10, 0x0a, 0x29, 0x25, 0x0d, 0x01, 0x5d, 0x3f, 0x55, 0x0c, 0x00, 0x08,
0x06, 0x23, 0x05, 0xc3, 0x6b, 0x0a, 0x05, 0x49, 0x45, 0x0d, 0x01, 0x5d, 0x3f, 0x2c, 0x05, 0x23,
@@ -187,7 +187,7 @@ static const uint8_t mf_rlefont_DejaVuSans12_aa_glyph_data_0[2069] = {
0x05, 0x70, 0x0c, 0x05, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans12_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans12_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000d, 0x0015, 0x0039, 0x005e, 0x008a, 0x00b7,
0x00bb, 0x00d2, 0x00ec, 0x0104, 0x010d, 0x0112, 0x0117, 0x011c,
0x0133, 0x0152, 0x015a, 0x0175, 0x0196, 0x01ad, 0x01c7, 0x01f1,
diff --git a/src/gdisp/fonts/DejaVuSans16.c b/src/gdisp/fonts/DejaVuSans16.c
index 375ec048..bfe62297 100644
--- a/src/gdisp/fonts/DejaVuSans16.c
+++ b/src/gdisp/fonts/DejaVuSans16.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans16_dictionary_data[247] = {
+static const gU8 mf_rlefont_DejaVuSans16_dictionary_data[247] = {
0x0f, 0x15, 0x83, 0x0a, 0x41, 0x2f, 0x06, 0x0a, 0x80, 0x01, 0x0b, 0x83, 0x01, 0x3d, 0x05, 0x80,
0x09, 0x80, 0x06, 0x80, 0x09, 0x80, 0x06, 0x80, 0x09, 0x80, 0x01, 0x05, 0x80, 0x03, 0x0a, 0x81,
0x0e, 0x80, 0x0d, 0x03, 0x80, 0x01, 0x0f, 0x80, 0x10, 0x80, 0x10, 0x80, 0x01, 0x09, 0x80, 0x01,
@@ -30,7 +30,7 @@ static const uint8_t mf_rlefont_DejaVuSans16_dictionary_data[247] = {
0xc0, 0xc4, 0x2d, 0x2d, 0x23, 0xfc, 0x36,
};
-static const uint16_t mf_rlefont_DejaVuSans16_dictionary_offsets[88] = {
+static const gU16 mf_rlefont_DejaVuSans16_dictionary_offsets[88] = {
0x0000, 0x0001, 0x0002, 0x0004, 0x0006, 0x0007, 0x000a, 0x000d,
0x000e, 0x001b, 0x001e, 0x0020, 0x0023, 0x0026, 0x002d, 0x0030,
0x0031, 0x0037, 0x0038, 0x003b, 0x0040, 0x0042, 0x0046, 0x0049,
@@ -44,7 +44,7 @@ static const uint16_t mf_rlefont_DejaVuSans16_dictionary_offsets[88] = {
0x00e6, 0x00e8, 0x00ea, 0x00ed, 0x00f0, 0x00f1, 0x00f4, 0x00f7,
};
-static const uint8_t mf_rlefont_DejaVuSans16_glyph_data_0[1166] = {
+static const gU8 mf_rlefont_DejaVuSans16_glyph_data_0[1166] = {
0x05, 0x00, 0x10, 0x06, 0x27, 0x43, 0x49, 0x18, 0x2f, 0x2b, 0x10, 0x06, 0x58, 0x55, 0x3d, 0x55,
0x10, 0x0d, 0xf4, 0x19, 0x41, 0x8d, 0x42, 0xfa, 0x5e, 0x29, 0xdd, 0x5e, 0x29, 0xdd, 0x10, 0x0a,
0x2f, 0x65, 0x2c, 0x1a, 0xfe, 0xa9, 0x1d, 0x55, 0xe0, 0x38, 0x8b, 0x4a, 0x36, 0xd6, 0x1d, 0xde,
@@ -120,7 +120,7 @@ static const uint8_t mf_rlefont_DejaVuSans16_glyph_data_0[1166] = {
0x18, 0x8a, 0x4a, 0x49, 0x4c, 0x10, 0x0d, 0x00, 0x1f, 0x1f, 0x93, 0x68, 0x7c, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans16_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans16_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0011, 0x001f, 0x0034, 0x004f, 0x0064,
0x0068, 0x0074, 0x007f, 0x008d, 0x0097, 0x009c, 0x00a2, 0x00a6,
0x00b2, 0x00c0, 0x00ca, 0x00d9, 0x00e7, 0x00f8, 0x0106, 0x0116,
diff --git a/src/gdisp/fonts/DejaVuSans16_aa.c b/src/gdisp/fonts/DejaVuSans16_aa.c
index adcf9a37..63de43dc 100644
--- a/src/gdisp/fonts/DejaVuSans16_aa.c
+++ b/src/gdisp/fonts/DejaVuSans16_aa.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans16_aa_dictionary_data[425] = {
+static const gU8 mf_rlefont_DejaVuSans16_aa_dictionary_data[425] = {
0x02, 0x07, 0x05, 0x16, 0x0a, 0x80, 0x02, 0x09, 0x04, 0x11, 0x10, 0x0a, 0x08, 0x01, 0x80, 0x04,
0x80, 0x08, 0x80, 0x40, 0x08, 0x86, 0x14, 0x80, 0x01, 0x80, 0x11, 0x80, 0x11, 0x80, 0xc1, 0x80,
0xc3, 0xcb, 0xde, 0x88, 0x85, 0x80, 0x0e, 0x01, 0xc1, 0x07, 0xc7, 0xc9, 0x07, 0x80, 0x03, 0xca,
@@ -41,7 +41,7 @@ static const uint8_t mf_rlefont_DejaVuSans16_aa_dictionary_data[425] = {
0x30, 0x47, 0x05, 0x66, 0x02, 0x65, 0x06, 0x02, 0x00,
};
-static const uint16_t mf_rlefont_DejaVuSans16_aa_dictionary_offsets[140] = {
+static const gU16 mf_rlefont_DejaVuSans16_aa_dictionary_offsets[140] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0007, 0x0008, 0x0009,
0x000a, 0x000b, 0x000c, 0x000d, 0x000f, 0x0011, 0x0013, 0x0015,
0x0016, 0x0017, 0x0019, 0x001e, 0x0020, 0x0023, 0x0024, 0x0025,
@@ -62,7 +62,7 @@ static const uint16_t mf_rlefont_DejaVuSans16_aa_dictionary_offsets[140] = {
0x019a, 0x01a2, 0x01a7, 0x01a9,
};
-static const uint8_t mf_rlefont_DejaVuSans16_aa_glyph_data_0[2853] = {
+static const gU8 mf_rlefont_DejaVuSans16_aa_glyph_data_0[2853] = {
0x05, 0x00, 0x10, 0x06, 0x6a, 0x89, 0x1f, 0x0e, 0x1f, 0x0d, 0x82, 0x69, 0x61, 0x10, 0x06, 0x28,
0xed, 0x48, 0xa8, 0x48, 0xa8, 0x48, 0xa8, 0x10, 0x0d, 0x18, 0x69, 0x70, 0x00, 0x2b, 0x03, 0x48,
0x0d, 0x06, 0x00, 0x05, 0x0e, 0x48, 0x4a, 0xa2, 0x70, 0x22, 0x65, 0x2d, 0x88, 0x0a, 0x09, 0x65,
@@ -244,7 +244,7 @@ static const uint8_t mf_rlefont_DejaVuSans16_aa_glyph_data_0[2853] = {
0x7c, 0x36, 0x19, 0x30, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans16_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans16_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000e, 0x0018, 0x004e, 0x007e, 0x00d1, 0x010e,
0x0111, 0x0136, 0x0158, 0x016f, 0x0179, 0x0183, 0x0188, 0x018e,
0x01ab, 0x01db, 0x01e8, 0x0210, 0x023c, 0x025c, 0x027b, 0x02b1,
diff --git a/src/gdisp/fonts/DejaVuSans20.c b/src/gdisp/fonts/DejaVuSans20.c
index cf9bd271..ccc36cb3 100644
--- a/src/gdisp/fonts/DejaVuSans20.c
+++ b/src/gdisp/fonts/DejaVuSans20.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans20_dictionary_data[320] = {
+static const gU8 mf_rlefont_DejaVuSans20_dictionary_data[320] = {
0x05, 0x0a, 0x81, 0x03, 0x17, 0x05, 0x81, 0x0b, 0x81, 0x84, 0x0b, 0x04, 0x83, 0x03, 0x82, 0x0b,
0x81, 0x02, 0x81, 0x02, 0x85, 0x12, 0x81, 0x0a, 0x80, 0x01, 0x80, 0x40, 0x18, 0x01, 0x87, 0x0b,
0x12, 0x81, 0x12, 0x81, 0x12, 0x81, 0x12, 0x81, 0x10, 0x04, 0x81, 0x1e, 0x11, 0x06, 0x81, 0x83,
@@ -34,7 +34,7 @@ static const uint8_t mf_rlefont_DejaVuSans20_dictionary_data[320] = {
0xaa, 0x34, 0x1c, 0x34, 0x9c, 0x38, 0x20, 0x37, 0xba, 0x34, 0x28, 0x34, 0x3b, 0x34, 0x39, 0x40,
};
-static const uint16_t mf_rlefont_DejaVuSans20_dictionary_offsets[110] = {
+static const gU16 mf_rlefont_DejaVuSans20_dictionary_offsets[110] = {
0x0000, 0x0001, 0x0004, 0x0005, 0x0009, 0x000b, 0x000d, 0x000f,
0x0011, 0x0014, 0x0015, 0x0018, 0x001b, 0x001d, 0x0020, 0x0028,
0x0029, 0x002b, 0x002c, 0x002d, 0x002f, 0x0031, 0x0033, 0x0036,
@@ -51,7 +51,7 @@ static const uint16_t mf_rlefont_DejaVuSans20_dictionary_offsets[110] = {
0x0135, 0x0137, 0x0139, 0x013b, 0x013e, 0x0140,
};
-static const uint8_t mf_rlefont_DejaVuSans20_glyph_data_0[1558] = {
+static const gU8 mf_rlefont_DejaVuSans20_glyph_data_0[1558] = {
0x06, 0x00, 0x10, 0x08, 0x1a, 0x83, 0x65, 0x22, 0x29, 0x70, 0x10, 0x0a, 0x3e, 0x80, 0x7b, 0xd0,
0x80, 0x7b, 0x5f, 0xfc, 0xb7, 0x10, 0x11, 0x1a, 0x5e, 0x5f, 0xea, 0x20, 0x1f, 0x8c, 0x38, 0xa6,
0x3d, 0x33, 0x6e, 0x33, 0x3e, 0xa7, 0x38, 0x5b, 0x38, 0xa6, 0x3d, 0x33, 0x6e, 0x33, 0x19, 0x3d,
@@ -152,7 +152,7 @@ static const uint8_t mf_rlefont_DejaVuSans20_glyph_data_0[1558] = {
0x3f, 0x42, 0x93, 0x43, 0xc2, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans20_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans20_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0016, 0x0037, 0x0058, 0x0084, 0x00a7,
0x00aa, 0x00b7, 0x00c5, 0x00d9, 0x00e5, 0x00ed, 0x00f4, 0x00fa,
0x0104, 0x0114, 0x011f, 0x012f, 0x013d, 0x0155, 0x0165, 0x017d,
diff --git a/src/gdisp/fonts/DejaVuSans20_aa.c b/src/gdisp/fonts/DejaVuSans20_aa.c
index d05ab3b0..5297d319 100644
--- a/src/gdisp/fonts/DejaVuSans20_aa.c
+++ b/src/gdisp/fonts/DejaVuSans20_aa.c
@@ -10,7 +10,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans20_aa_dictionary_data[486] = {
+static const gU8 mf_rlefont_DejaVuSans20_aa_dictionary_data[486] = {
0x05, 0x0b, 0x09, 0x81, 0x12, 0x81, 0x81, 0x05, 0x81, 0x0b, 0x0d, 0x17, 0x10, 0x28, 0x0b, 0x86,
0x12, 0x81, 0x12, 0x81, 0x08, 0x0e, 0x06, 0x84, 0x40, 0x1d, 0x80, 0xce, 0x8b, 0x08, 0x8b, 0x15,
0x80, 0xc3, 0x80, 0xcb, 0xca, 0x81, 0x12, 0x0a, 0x02, 0x81, 0xc7, 0x41, 0x3e, 0x01, 0xc9, 0x80,
@@ -44,7 +44,7 @@ static const uint8_t mf_rlefont_DejaVuSans20_aa_dictionary_data[486] = {
0x0f, 0x60, 0x08, 0x4e, 0x0d, 0x28,
};
-static const uint16_t mf_rlefont_DejaVuSans20_aa_dictionary_offsets[156] = {
+static const gU16 mf_rlefont_DejaVuSans20_aa_dictionary_offsets[156] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0006, 0x000a, 0x000b, 0x000c,
0x000d, 0x000e, 0x0010, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018,
0x001a, 0x001c, 0x001f, 0x0020, 0x0022, 0x0024, 0x0026, 0x0027,
@@ -67,7 +67,7 @@ static const uint16_t mf_rlefont_DejaVuSans20_aa_dictionary_offsets[156] = {
0x01e0, 0x01e2, 0x01e4, 0x01e6,
};
-static const uint8_t mf_rlefont_DejaVuSans20_aa_glyph_data_0[3979] = {
+static const gU8 mf_rlefont_DejaVuSans20_aa_glyph_data_0[3979] = {
0x06, 0x00, 0x10, 0x08, 0x25, 0x22, 0x8a, 0x2e, 0x3d, 0x2e, 0x0d, 0x0d, 0x2e, 0x48, 0x20, 0x22,
0x10, 0x0a, 0x1e, 0xb7, 0x96, 0x96, 0x10, 0x11, 0x58, 0x50, 0x05, 0x6d, 0x30, 0x48, 0x1d, 0x09,
0xf5, 0x01, 0x6f, 0x1d, 0x0d, 0x0b, 0x30, 0x05, 0x6d, 0x37, 0x02, 0x0f, 0x07, 0x00, 0x33, 0x2f,
@@ -319,7 +319,7 @@ static const uint8_t mf_rlefont_DejaVuSans20_aa_glyph_data_0[3979] = {
0x00, 0x01, 0x04, 0x08, 0x0c, 0x47, 0x55, 0x01, 0x25, 0x56, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans20_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans20_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x0011, 0x0017, 0x0066, 0x00ad, 0x0120, 0x017c,
0x017f, 0x01ac, 0x01db, 0x0207, 0x0210, 0x0219, 0x0222, 0x0227,
0x024f, 0x029c, 0x02af, 0x02e3, 0x031d, 0x034d, 0x0378, 0x03bb,
diff --git a/src/gdisp/fonts/DejaVuSans24.c b/src/gdisp/fonts/DejaVuSans24.c
index caabb080..224b6cfe 100644
--- a/src/gdisp/fonts/DejaVuSans24.c
+++ b/src/gdisp/fonts/DejaVuSans24.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans24_dictionary_data[395] = {
+static const gU8 mf_rlefont_DejaVuSans24_dictionary_data[395] = {
0x80, 0x0a, 0x80, 0x3d, 0x81, 0x02, 0x81, 0x81, 0x09, 0x81, 0x0c, 0x81, 0x09, 0x81, 0x0c, 0x81,
0x09, 0x81, 0x08, 0x16, 0x81, 0x01, 0x82, 0x0e, 0x84, 0x01, 0x07, 0x87, 0x01, 0x86, 0x0d, 0x85,
0x80, 0x0c, 0x83, 0x0f, 0x89, 0x0f, 0x82, 0x07, 0x0b, 0x81, 0x09, 0x81, 0x0c, 0x13, 0x81, 0x16,
@@ -39,7 +39,7 @@ static const uint8_t mf_rlefont_DejaVuSans24_dictionary_data[395] = {
0xc2, 0x90, 0x3b, 0x3a, 0x2a, 0xf0, 0x2d, 0x34, 0x3d, 0xf0, 0x54,
};
-static const uint16_t mf_rlefont_DejaVuSans24_dictionary_offsets[119] = {
+static const gU16 mf_rlefont_DejaVuSans24_dictionary_offsets[119] = {
0x0000, 0x0003, 0x0004, 0x0007, 0x0013, 0x0016, 0x0018, 0x001a,
0x001b, 0x001d, 0x001f, 0x0020, 0x0022, 0x0026, 0x0028, 0x002d,
0x002f, 0x0031, 0x0032, 0x0035, 0x0037, 0x003a, 0x003d, 0x0043,
@@ -57,7 +57,7 @@ static const uint16_t mf_rlefont_DejaVuSans24_dictionary_offsets[119] = {
0x0172, 0x0173, 0x0178, 0x017e, 0x0184, 0x0189, 0x018b,
};
-static const uint8_t mf_rlefont_DejaVuSans24_glyph_data_0[1873] = {
+static const gU8 mf_rlefont_DejaVuSans24_glyph_data_0[1873] = {
0x08, 0x00, 0x10, 0x0a, 0x00, 0x4a, 0x47, 0x5d, 0x56, 0x19, 0x74, 0x10, 0x0b, 0x4c, 0x1a, 0x64,
0xfc, 0x1a, 0x64, 0xfc, 0x1a, 0x10, 0x14, 0xc4, 0x4e, 0xc7, 0xc6, 0x82, 0x8d, 0xc7, 0xc7, 0x82,
0x8d, 0xc5, 0xc7, 0x2b, 0x4b, 0x2c, 0x4b, 0xe7, 0x4a, 0x77, 0x8d, 0x4f, 0x3c, 0x2b, 0xa5, 0x4a,
@@ -178,7 +178,7 @@ static const uint8_t mf_rlefont_DejaVuSans24_glyph_data_0[1873] = {
0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans24_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans24_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000c, 0x0016, 0x0043, 0x006c, 0x00a8, 0x00cf,
0x00d3, 0x00e0, 0x00ec, 0x0101, 0x010f, 0x0114, 0x011d, 0x0121,
0x0130, 0x014a, 0x0157, 0x016d, 0x0186, 0x01a5, 0x01bb, 0x01dd,
diff --git a/src/gdisp/fonts/DejaVuSans24_aa.c b/src/gdisp/fonts/DejaVuSans24_aa.c
index 9afd72c9..8a3d235b 100644
--- a/src/gdisp/fonts/DejaVuSans24_aa.c
+++ b/src/gdisp/fonts/DejaVuSans24_aa.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans24_aa_dictionary_data[596] = {
+static const gU8 mf_rlefont_DejaVuSans24_aa_dictionary_data[596] = {
0x20, 0x0f, 0x04, 0x81, 0x05, 0x1e, 0x11, 0x0c, 0x81, 0x01, 0x81, 0x0e, 0x81, 0x07, 0x81, 0x0e,
0x10, 0xc8, 0x80, 0xce, 0xc5, 0xd1, 0x04, 0x0b, 0x84, 0x09, 0x17, 0x81, 0x17, 0x81, 0x06, 0x88,
0x0e, 0x15, 0x12, 0x0a, 0x17, 0x81, 0x02, 0x09, 0x81, 0xce, 0x85, 0x0c, 0x83, 0x85, 0x06, 0xc2,
@@ -52,7 +52,7 @@ static const uint8_t mf_rlefont_DejaVuSans24_aa_dictionary_data[596] = {
0x38, 0x30, 0x0d, 0x65,
};
-static const uint16_t mf_rlefont_DejaVuSans24_aa_dictionary_offsets[170] = {
+static const gU16 mf_rlefont_DejaVuSans24_aa_dictionary_offsets[170] = {
0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007, 0x0009,
0x0010, 0x0011, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001e,
0x001f, 0x0021, 0x0022, 0x0023, 0x0024, 0x0026, 0x0027, 0x0029,
@@ -77,7 +77,7 @@ static const uint16_t mf_rlefont_DejaVuSans24_aa_dictionary_offsets[170] = {
0x0252, 0x0254,
};
-static const uint8_t mf_rlefont_DejaVuSans24_aa_glyph_data_0[4800] = {
+static const gU8 mf_rlefont_DejaVuSans24_aa_glyph_data_0[4800] = {
0x08, 0x00, 0x10, 0x0a, 0x2d, 0x4c, 0xae, 0x7e, 0x5c, 0x7e, 0x8a, 0x7e, 0x0d, 0x0d, 0x7e, 0x0c,
0x0c, 0x7f, 0x81, 0x98, 0x10, 0x0b, 0x4c, 0x50, 0x7f, 0x93, 0x93, 0x93, 0x10, 0x14, 0x3a, 0x18,
0x52, 0x54, 0x53, 0x1d, 0x36, 0x01, 0x2d, 0x09, 0x55, 0x1d, 0x4a, 0x3a, 0x6c, 0x44, 0xb3, 0x85,
@@ -380,7 +380,7 @@ static const uint8_t mf_rlefont_DejaVuSans24_aa_glyph_data_0[4800] = {
0x58, 0x2b, 0x39, 0x05, 0x01, 0x60, 0x0a, 0xc3, 0x46, 0x2b, 0x07, 0x27, 0x8e, 0x4a, 0x8d, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans24_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans24_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x0015, 0x001d, 0x0077, 0x00d4, 0x0174, 0x01dd,
0x01e1, 0x021d, 0x0251, 0x0282, 0x028f, 0x0299, 0x02a2, 0x02a7,
0x02de, 0x0337, 0x034b, 0x0389, 0x03d2, 0x040b, 0x0440, 0x049d,
diff --git a/src/gdisp/fonts/DejaVuSans32.c b/src/gdisp/fonts/DejaVuSans32.c
index ca669582..b63d201f 100644
--- a/src/gdisp/fonts/DejaVuSans32.c
+++ b/src/gdisp/fonts/DejaVuSans32.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans32_dictionary_data[578] = {
+static const gU8 mf_rlefont_DejaVuSans32_dictionary_data[578] = {
0x06, 0x83, 0x1e, 0x82, 0x03, 0x0c, 0x80, 0x09, 0x8b, 0x84, 0x0e, 0x80, 0x82, 0x0c, 0x80, 0x05,
0x83, 0x16, 0x83, 0x93, 0x0d, 0x87, 0x83, 0x11, 0x81, 0x1c, 0x87, 0x17, 0x80, 0x01, 0x1e, 0x82,
0x1e, 0x82, 0x1b, 0x81, 0x07, 0x82, 0x06, 0x06, 0x82, 0x03, 0x0b, 0x82, 0x08, 0x03, 0x82, 0x85,
@@ -51,7 +51,7 @@ static const uint8_t mf_rlefont_DejaVuSans32_dictionary_data[578] = {
0xd2, 0x5e,
};
-static const uint16_t mf_rlefont_DejaVuSans32_dictionary_offsets[141] = {
+static const gU16 mf_rlefont_DejaVuSans32_dictionary_offsets[141] = {
0x0000, 0x0002, 0x0005, 0x0007, 0x0008, 0x0009, 0x000a, 0x000c,
0x000f, 0x0011, 0x0013, 0x0016, 0x0017, 0x0019, 0x001a, 0x001e,
0x0022, 0x0024, 0x0027, 0x002a, 0x002d, 0x002f, 0x0031, 0x0034,
@@ -72,7 +72,7 @@ static const uint16_t mf_rlefont_DejaVuSans32_dictionary_offsets[141] = {
0x0233, 0x0239, 0x023b, 0x023f, 0x0242,
};
-static const uint8_t mf_rlefont_DejaVuSans32_glyph_data_0[2504] = {
+static const gU8 mf_rlefont_DejaVuSans32_glyph_data_0[2504] = {
0x0a, 0x00, 0x10, 0x0d, 0x6e, 0x6c, 0x80, 0x6f, 0x25, 0x6e, 0x8b, 0x10, 0x0f, 0x6e, 0x68, 0x2c,
0x7e, 0x7e, 0x7e, 0x7e, 0x10, 0x1b, 0x67, 0x6e, 0x52, 0x58, 0x5e, 0x74, 0xc7, 0x4f, 0x9d, 0x2c,
0x8c, 0x5a, 0x24, 0x9d, 0x2c, 0x9d, 0x2c, 0x8c, 0x5a, 0x24, 0x9d, 0xb4, 0x9d, 0xdc, 0xa5, 0xc7,
@@ -232,7 +232,7 @@ static const uint8_t mf_rlefont_DejaVuSans32_glyph_data_0[2504] = {
0x36, 0x3d, 0xf0, 0x4b, 0x1e, 0x3b, 0xff, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans32_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans32_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000c, 0x0015, 0x0038, 0x0077, 0x00c9, 0x0105,
0x0109, 0x011f, 0x0135, 0x0156, 0x0165, 0x016f, 0x0179, 0x017f,
0x0196, 0x01b7, 0x01c8, 0x01dc, 0x01f8, 0x0225, 0x023e, 0x026b,
diff --git a/src/gdisp/fonts/DejaVuSans32_aa.c b/src/gdisp/fonts/DejaVuSans32_aa.c
index 8b8f6e8d..78f56141 100644
--- a/src/gdisp/fonts/DejaVuSans32_aa.c
+++ b/src/gdisp/fonts/DejaVuSans32_aa.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSans32_aa_dictionary_data[740] = {
+static const gU8 mf_rlefont_DejaVuSans32_aa_dictionary_data[740] = {
0x86, 0x1a, 0x86, 0x1a, 0x85, 0x1e, 0x82, 0x1e, 0x81, 0x12, 0x82, 0x08, 0x1a, 0x1d, 0x05, 0x85,
0x13, 0x1c, 0x88, 0x0f, 0x81, 0xcb, 0x0a, 0x82, 0x0f, 0x80, 0x1e, 0x82, 0x1e, 0x82, 0x83, 0x08,
0x0c, 0xce, 0x1d, 0x0d, 0x40, 0x07, 0x8d, 0x13, 0xc9, 0x85, 0x1e, 0x82, 0x15, 0x17, 0x8c, 0x01,
@@ -61,7 +61,7 @@ static const uint8_t mf_rlefont_DejaVuSans32_aa_dictionary_data[740] = {
0x3b, 0x2a, 0x0c, 0x1c,
};
-static const uint16_t mf_rlefont_DejaVuSans32_aa_dictionary_offsets[188] = {
+static const gU16 mf_rlefont_DejaVuSans32_aa_dictionary_offsets[188] = {
0x0000, 0x0005, 0x0009, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010,
0x0011, 0x0012, 0x0014, 0x0016, 0x0019, 0x001e, 0x001f, 0x0020,
0x0021, 0x0023, 0x0024, 0x0026, 0x0028, 0x002a, 0x002c, 0x002d,
@@ -88,7 +88,7 @@ static const uint16_t mf_rlefont_DejaVuSans32_aa_dictionary_offsets[188] = {
0x02de, 0x02e0, 0x02e2, 0x02e4,
};
-static const uint8_t mf_rlefont_DejaVuSans32_aa_glyph_data_0[6702] = {
+static const gU8 mf_rlefont_DejaVuSans32_aa_glyph_data_0[6702] = {
0x0a, 0x00, 0x10, 0x0d, 0x82, 0xe0, 0x3b, 0xac, 0x3b, 0x53, 0x28, 0x78, 0x0f, 0x28, 0x78, 0x52,
0x3b, 0x0c, 0x38, 0x3b, 0x0b, 0x88, 0x20, 0x82, 0xc1, 0x10, 0x0f, 0x82, 0xa4, 0xa4, 0xa4, 0xa4,
0xa4, 0xa4, 0xa4, 0xa4, 0xa4, 0x10, 0x1b, 0x76, 0x82, 0x81, 0x4f, 0x3d, 0x0e, 0x93, 0x9f, 0xc6,
@@ -510,7 +510,7 @@ static const uint8_t mf_rlefont_DejaVuSans32_aa_glyph_data_0[6702] = {
0x01, 0x29, 0x0e, 0x06, 0x26, 0x04, 0x09, 0x0c, 0x90, 0x45, 0x03, 0x6b, 0x8f, 0x10,
};
-static const uint16_t mf_rlefont_DejaVuSans32_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSans32_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x001a, 0x0026, 0x00a6, 0x0132, 0x020e, 0x02a9,
0x02ad, 0x0301, 0x0353, 0x039e, 0x03ad, 0x03b9, 0x03c3, 0x03cb,
0x0416, 0x0497, 0x04b2, 0x0511, 0x0571, 0x05c3, 0x060c, 0x0698,
diff --git a/src/gdisp/fonts/DejaVuSansBold12.c b/src/gdisp/fonts/DejaVuSansBold12.c
index b2581760..f3fe8701 100644
--- a/src/gdisp/fonts/DejaVuSansBold12.c
+++ b/src/gdisp/fonts/DejaVuSansBold12.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_DejaVuSansBold12_glyph_data_0[1540] = {
+static const gU8 mf_bwfont_DejaVuSansBold12_glyph_data_0[1540] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x03, 0x7e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00,
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0xc8, 0x03, 0xf8, 0x01, 0x4e, 0x00,
0xc8, 0x03, 0x7c, 0x00, 0x4e, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x02, 0x7c, 0x02,
@@ -111,7 +111,7 @@ static const uint8_t mf_bwfont_DejaVuSansBold12_glyph_data_0[1540] = {
0x40, 0x00, 0x20, 0x00,
};
-static const uint16_t mf_bwfont_DejaVuSansBold12_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_DejaVuSansBold12_glyph_offsets_0[96] = {
0x0000, 0x0000, 0x0005, 0x000a, 0x0014, 0x001d, 0x002a, 0x0035,
0x0038, 0x003e, 0x0043, 0x004a, 0x0053, 0x0057, 0x005d, 0x0061,
0x0066, 0x006f, 0x0077, 0x0080, 0x0089, 0x0092, 0x009b, 0x00a4,
@@ -126,7 +126,7 @@ static const uint16_t mf_bwfont_DejaVuSansBold12_glyph_offsets_0[96] = {
0x02cc, 0x02d4, 0x02dc, 0x02e4, 0x02ec, 0x02f0, 0x02f8, 0x0302,
};
-static const uint8_t mf_bwfont_DejaVuSansBold12_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_DejaVuSansBold12_glyph_widths_0[95] = {
0x04, 0x05, 0x06, 0x0a, 0x08, 0x0c, 0x0a, 0x04, 0x05, 0x05, 0x06, 0x0a, 0x05, 0x05, 0x05, 0x04,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x05, 0x05, 0x0a, 0x0a, 0x0a, 0x07,
0x0c, 0x09, 0x09, 0x09, 0x0a, 0x08, 0x08, 0x0a, 0x0a, 0x04, 0x04, 0x09, 0x08, 0x0c, 0x0a, 0x0b,
diff --git a/src/gdisp/fonts/DejaVuSansBold12_aa.c b/src/gdisp/fonts/DejaVuSansBold12_aa.c
index bab54f58..798444a0 100644
--- a/src/gdisp/fonts/DejaVuSansBold12_aa.c
+++ b/src/gdisp/fonts/DejaVuSansBold12_aa.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_DejaVuSansBold12_aa_dictionary_data[295] = {
+static const gU8 mf_rlefont_DejaVuSansBold12_aa_dictionary_data[295] = {
0x09, 0x06, 0xce, 0x80, 0xc2, 0x02, 0x11, 0x80, 0xc5, 0x07, 0x0a, 0x03, 0x0b, 0x02, 0x01, 0xc2,
0x06, 0x81, 0x81, 0x0c, 0x81, 0x86, 0x04, 0x81, 0x2c, 0x83, 0x05, 0x2b, 0x80, 0xc3, 0x80, 0xcb,
0x0f, 0x40, 0x07, 0xce, 0xcb, 0x80, 0xc6, 0x0c, 0xd9, 0x0c, 0x01, 0xca, 0x84, 0x1a, 0xc5, 0xc1,
@@ -33,7 +33,7 @@ static const uint8_t mf_rlefont_DejaVuSansBold12_aa_dictionary_data[295] = {
0x36, 0x0b, 0x1c, 0x0d, 0x63, 0x0a, 0x49,
};
-static const uint16_t mf_rlefont_DejaVuSansBold12_aa_dictionary_offsets[115] = {
+static const gU16 mf_rlefont_DejaVuSansBold12_aa_dictionary_offsets[115] = {
0x0000, 0x0001, 0x0002, 0x0006, 0x0007, 0x0009, 0x000a, 0x000b,
0x000c, 0x000d, 0x000e, 0x0010, 0x0012, 0x0015, 0x0016, 0x0018,
0x0019, 0x001a, 0x001b, 0x001c, 0x001e, 0x0020, 0x0021, 0x0023,
@@ -51,7 +51,7 @@ static const uint16_t mf_rlefont_DejaVuSansBold12_aa_dictionary_offsets[115] = {
0x0123, 0x0125, 0x0127,
};
-static const uint8_t mf_rlefont_DejaVuSansBold12_aa_glyph_data_0[2289] = {
+static const gU8 mf_rlefont_DejaVuSansBold12_aa_glyph_data_0[2289] = {
0x04, 0x00, 0x10, 0x05, 0x1b, 0x6d, 0x50, 0x0d, 0x0d, 0x50, 0x0c, 0x0c, 0x34, 0x24, 0x10, 0x06,
0x2d, 0xee, 0x52, 0xac, 0x52, 0xac, 0x10, 0x0a, 0x52, 0x82, 0x4a, 0x06, 0x0d, 0x18, 0x46, 0x32,
0x09, 0x19, 0x51, 0x56, 0x69, 0x3f, 0x01, 0x1d, 0x74, 0x4a, 0x06, 0x0d, 0x52, 0xc3, 0x1c, 0x1d,
@@ -198,7 +198,7 @@ static const uint8_t mf_rlefont_DejaVuSansBold12_aa_glyph_data_0[2289] = {
0x10,
};
-static const uint16_t mf_rlefont_DejaVuSansBold12_aa_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_DejaVuSansBold12_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000f, 0x0017, 0x003e, 0x0064, 0x00a2, 0x00d5,
0x00d9, 0x00f5, 0x0113, 0x0129, 0x0132, 0x0136, 0x013d, 0x0142,
0x0158, 0x017b, 0x0184, 0x01a5, 0x01cd, 0x01eb, 0x0201, 0x0227,
diff --git a/src/gdisp/fonts/LargeNumbers.c b/src/gdisp/fonts/LargeNumbers.c
index 08517248..d2251524 100644
--- a/src/gdisp/fonts/LargeNumbers.c
+++ b/src/gdisp/fonts/LargeNumbers.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_LargeNumbers_dictionary_data[141] = {
+static const gU8 mf_rlefont_LargeNumbers_dictionary_data[141] = {
0x82, 0x11, 0x85, 0x11, 0x82, 0x0f, 0x10, 0x82, 0x02, 0x82, 0x10, 0x82, 0x02, 0x82, 0x16, 0x0d,
0x04, 0x15, 0x81, 0x8c, 0x0b, 0x8c, 0x03, 0x86, 0x11, 0x86, 0x80, 0x14, 0x82, 0x84, 0x0a, 0x1a,
0x82, 0x08, 0x03, 0x81, 0x89, 0x80, 0x0c, 0x44, 0x10, 0x09, 0x82, 0x81, 0x13, 0x83, 0x13, 0x84,
@@ -23,7 +23,7 @@ static const uint8_t mf_rlefont_LargeNumbers_dictionary_data[141] = {
0x3c, 0x65, 0x39, 0x23, 0x23, 0x00, 0x2e, 0x25, 0x2c, 0x3d, 0x2a, 0x23, 0x0f,
};
-static const uint16_t mf_rlefont_LargeNumbers_dictionary_offsets[55] = {
+static const gU16 mf_rlefont_LargeNumbers_dictionary_offsets[55] = {
0x0000, 0x0005, 0x0006, 0x000c, 0x000e, 0x000f, 0x0010, 0x0011,
0x0013, 0x0016, 0x0018, 0x001a, 0x001d, 0x001e, 0x001f, 0x0021,
0x0022, 0x0024, 0x0025, 0x0027, 0x0029, 0x002b, 0x003a, 0x003c,
@@ -33,7 +33,7 @@ static const uint16_t mf_rlefont_LargeNumbers_dictionary_offsets[55] = {
0x0080, 0x0082, 0x0085, 0x0087, 0x0089, 0x008b, 0x008d,
};
-static const uint8_t mf_rlefont_LargeNumbers_glyph_data_0[630] = {
+static const gU8 mf_rlefont_LargeNumbers_glyph_data_0[630] = {
0x08, 0x00, 0x10, 0x0b, 0x00, 0x26, 0x45, 0x49, 0x45, 0x3b, 0x7c, 0x49, 0x0f, 0x10, 0x0d, 0x26,
0x1b, 0x1a, 0x1b, 0x1a, 0x1b, 0x1a, 0x1b, 0x10, 0x14, 0x37, 0x1f, 0x75, 0x19, 0x40, 0x42, 0x37,
0x34, 0x29, 0x27, 0xd4, 0x75, 0x19, 0x40, 0xec, 0x2a, 0x34, 0x29, 0x37, 0x40, 0x42, 0x10, 0x11,
@@ -76,7 +76,7 @@ static const uint8_t mf_rlefont_LargeNumbers_glyph_data_0[630] = {
0x37, 0x47, 0x3f, 0x3e, 0x21, 0x10,
};
-static const uint16_t mf_rlefont_LargeNumbers_glyph_offsets_0[26] = {
+static const gU16 mf_rlefont_LargeNumbers_glyph_offsets_0[26] = {
0x0000, 0x0003, 0x000e, 0x0018, 0x002f, 0x0065, 0x00a5, 0x00d5,
0x00db, 0x00eb, 0x00fb, 0x0114, 0x0125, 0x012d, 0x0136, 0x013b,
0x014c, 0x016a, 0x0180, 0x0199, 0x01b7, 0x01dc, 0x01f5, 0x021b,
diff --git a/src/gdisp/fonts/UI1.c b/src/gdisp/fonts/UI1.c
index c61c0f4f..05af02d8 100644
--- a/src/gdisp/fonts/UI1.c
+++ b/src/gdisp/fonts/UI1.c
@@ -26,7 +26,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_UI1_dictionary_data[283] = {
+static const gU8 mf_rlefont_UI1_dictionary_data[283] = {
0x03, 0x80, 0x05, 0x84, 0x04, 0x03, 0x82, 0x08, 0x07, 0x81, 0x24, 0x0b, 0x05, 0x80, 0x02, 0x02,
0x81, 0x80, 0x0f, 0x83, 0x06, 0x01, 0x80, 0x05, 0x80, 0x03, 0x37, 0x22, 0x03, 0x83, 0x20, 0x06,
0x80, 0x01, 0x80, 0x85, 0x04, 0x80, 0x01, 0x80, 0x06, 0x12, 0x05, 0x82, 0x07, 0x80, 0x07, 0x15,
@@ -47,7 +47,7 @@ static const uint8_t mf_rlefont_UI1_dictionary_data[283] = {
0x26, 0x37, 0x2f, 0x3e, 0xec, 0x86, 0x00, 0x85, 0x88, 0x27, 0x86,
};
-static const uint16_t mf_rlefont_UI1_dictionary_offsets[108] = {
+static const gU16 mf_rlefont_UI1_dictionary_offsets[108] = {
0x0000, 0x0003, 0x0005, 0x0008, 0x000a, 0x000b, 0x000c, 0x000f,
0x0011, 0x0013, 0x0015, 0x001a, 0x001b, 0x001c, 0x001e, 0x001f,
0x0020, 0x0023, 0x0024, 0x0029, 0x002a, 0x002c, 0x002f, 0x0030,
@@ -64,15 +64,15 @@ static const uint16_t mf_rlefont_UI1_dictionary_offsets[108] = {
0x0114, 0x0116, 0x0118, 0x011b,
};
-static const uint8_t mf_rlefont_UI1_glyph_data_0[3] = {
+static const gU8 mf_rlefont_UI1_glyph_data_0[3] = {
0x03, 0x00, 0x10,
};
-static const uint16_t mf_rlefont_UI1_glyph_offsets_0[1] = {
+static const gU16 mf_rlefont_UI1_glyph_offsets_0[1] = {
0x0000,
};
-static const uint8_t mf_rlefont_UI1_glyph_data_1[786] = {
+static const gU8 mf_rlefont_UI1_glyph_data_1[786] = {
0x03, 0x00, 0x10, 0x03, 0x56, 0x50, 0x34, 0x32, 0x10, 0x05, 0xfd, 0x5e, 0xee, 0x10, 0x08, 0xc4,
0x44, 0x5e, 0x19, 0x80, 0xac, 0x1b, 0x8b, 0x2a, 0xd8, 0x10, 0x07, 0x35, 0x66, 0x64, 0x35, 0x57,
0x8a, 0x48, 0x88, 0x76, 0x0f, 0x10, 0x0b, 0x2f, 0xd4, 0x8c, 0x8d, 0xa8, 0x81, 0x9a, 0x32, 0x8a,
@@ -125,7 +125,7 @@ static const uint8_t mf_rlefont_UI1_glyph_data_1[786] = {
0x1b, 0x10,
};
-static const uint16_t mf_rlefont_UI1_glyph_offsets_1[100] = {
+static const gU16 mf_rlefont_UI1_glyph_offsets_1[100] = {
0x0000, 0x0003, 0x0009, 0x000e, 0x001a, 0x0026, 0x0036, 0x0045,
0x0048, 0x004f, 0x0056, 0x005e, 0x0066, 0x006c, 0x0070, 0x0075,
0x007c, 0x0088, 0x0090, 0x0098, 0x00a1, 0x00ac, 0x00b5, 0x00bc,
@@ -141,7 +141,7 @@ static const uint16_t mf_rlefont_UI1_glyph_offsets_1[100] = {
0x02ff, 0x02fe, 0x02fe, 0x030a,
};
-static const uint8_t mf_rlefont_UI1_glyph_data_2[786] = {
+static const gU8 mf_rlefont_UI1_glyph_data_2[786] = {
0x06, 0x26, 0xf8, 0x66, 0x21, 0xa2, 0x1b, 0x10, 0x08, 0x23, 0x29, 0x10, 0x0c, 0x23, 0x43, 0x83,
0x10, 0x00, 0x0b, 0x7d, 0x37, 0xdd, 0x8a, 0xad, 0x7a, 0xae, 0x10, 0x03, 0x1d, 0x47, 0x5f, 0x10,
0x06, 0x34, 0x8c, 0x1b, 0x6e, 0xfd, 0x78, 0x70, 0xd0, 0x32, 0x10, 0x07, 0x00, 0x2f, 0x6e, 0x3e,
@@ -194,7 +194,7 @@ static const uint8_t mf_rlefont_UI1_glyph_data_2[786] = {
0x82, 0x10,
};
-static const uint16_t mf_rlefont_UI1_glyph_offsets_2[107] = {
+static const gU16 mf_rlefont_UI1_glyph_offsets_2[107] = {
0x0000, 0x0008, 0x000c, 0x0011, 0x0012, 0x0011, 0x0011, 0x0011,
0x0011, 0x0011, 0x0011, 0x0011, 0x001b, 0x0020, 0x002b, 0x0035,
0x0041, 0x004c, 0x0053, 0x0060, 0x0064, 0x0073, 0x007d, 0x0086,
diff --git a/src/gdisp/fonts/UI2.c b/src/gdisp/fonts/UI2.c
index b1f368c2..6bee68ec 100644
--- a/src/gdisp/fonts/UI2.c
+++ b/src/gdisp/fonts/UI2.c
@@ -26,7 +26,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_rlefont_UI2_dictionary_data[159] = {
+static const gU8 mf_rlefont_UI2_dictionary_data[159] = {
0x2c, 0x80, 0x06, 0x80, 0x03, 0x80, 0x06, 0x80, 0x03, 0x80, 0x01, 0x01, 0x80, 0x06, 0x80, 0x80,
0x0a, 0x80, 0x06, 0x21, 0x82, 0x01, 0x80, 0x07, 0x03, 0x80, 0x01, 0x80, 0x05, 0x02, 0x80, 0x07,
0x80, 0x0a, 0x80, 0x0a, 0x0b, 0x80, 0x01, 0x80, 0x05, 0x80, 0x02, 0x04, 0x80, 0x02, 0x09, 0x01,
@@ -39,7 +39,7 @@ static const uint8_t mf_rlefont_UI2_dictionary_data[159] = {
0xc6, 0xa9, 0x25, 0x2e, 0x1e, 0xd6, 0x29, 0x1e, 0x25, 0x28, 0x1b, 0x1f, 0x22, 0x1b, 0x74,
};
-static const uint16_t mf_rlefont_UI2_dictionary_offsets[62] = {
+static const gU16 mf_rlefont_UI2_dictionary_offsets[62] = {
0x0000, 0x0001, 0x000b, 0x000f, 0x0013, 0x0014, 0x0015, 0x0018,
0x001c, 0x001d, 0x001f, 0x0021, 0x0024, 0x0025, 0x0028, 0x002b,
0x002e, 0x002f, 0x0031, 0x0032, 0x0034, 0x0035, 0x0038, 0x003a,
@@ -50,7 +50,7 @@ static const uint16_t mf_rlefont_UI2_dictionary_offsets[62] = {
0x0092, 0x0095, 0x0096, 0x0098, 0x009d, 0x009f,
};
-static const uint8_t mf_rlefont_UI2_glyph_data_0[822] = {
+static const gU8 mf_rlefont_UI2_glyph_data_0[822] = {
0x03, 0x00, 0x10, 0x03, 0x46, 0x39, 0x4e, 0x10, 0x05, 0x50, 0xee, 0x10, 0x08, 0xfc, 0x24, 0x50,
0xe3, 0x22, 0x86, 0x1f, 0x22, 0x38, 0x50, 0x10, 0x07, 0xfc, 0x1e, 0x92, 0x48, 0x28, 0xd0, 0x23,
0x86, 0x88, 0x41, 0x2e, 0x10, 0x0b, 0x28, 0xdc, 0x94, 0xa8, 0x88, 0x96, 0x85, 0x9a, 0x28, 0x91,
@@ -105,7 +105,7 @@ static const uint8_t mf_rlefont_UI2_glyph_data_0[822] = {
0x07, 0x2c, 0x2e, 0x89, 0x6c, 0x10,
};
-static const uint16_t mf_rlefont_UI2_glyph_offsets_0[95] = {
+static const gU16 mf_rlefont_UI2_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x0008, 0x000c, 0x0018, 0x0025, 0x0036, 0x0045,
0x0048, 0x004e, 0x0054, 0x005e, 0x0067, 0x006c, 0x0070, 0x0075,
0x007e, 0x008c, 0x0095, 0x009e, 0x00a8, 0x00b4, 0x00be, 0x00c5,
diff --git a/src/gdisp/fonts/fixed_10x20.c b/src/gdisp/fonts/fixed_10x20.c
index 6c6fc416..daff69ff 100644
--- a/src/gdisp/fonts/fixed_10x20.c
+++ b/src/gdisp/fonts/fixed_10x20.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_fixed_10x20_glyph_data_0[2193] = {
+static const gU8 mf_bwfont_fixed_10x20_glyph_data_0[2193] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1b, 0x00, 0xff, 0x1b, 0x00, 0x00,
0x00, 0x00, 0x07, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00,
0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x0f, 0x00, 0xf0, 0x0f, 0x00, 0xfe, 0x01, 0x00,
@@ -152,7 +152,7 @@ static const uint8_t mf_bwfont_fixed_10x20_glyph_data_0[2193] = {
0x00,
};
-static const uint16_t mf_bwfont_fixed_10x20_glyph_offsets_0[96] = {
+static const gU16 mf_bwfont_fixed_10x20_glyph_offsets_0[96] = {
0x0000, 0x0000, 0x0005, 0x000c, 0x0015, 0x001d, 0x0026, 0x002f,
0x0034, 0x003b, 0x0041, 0x0049, 0x0051, 0x0057, 0x005f, 0x0065,
0x006d, 0x0075, 0x007d, 0x0085, 0x008d, 0x0095, 0x009d, 0x00a5,
@@ -167,7 +167,7 @@ static const uint16_t mf_bwfont_fixed_10x20_glyph_offsets_0[96] = {
0x02a6, 0x02ae, 0x02b6, 0x02be, 0x02c6, 0x02cb, 0x02d3, 0x02db,
};
-static const uint8_t mf_bwfont_fixed_10x20_glyph_widths_0[95] = {
+static const gU8 mf_bwfont_fixed_10x20_glyph_widths_0[95] = {
0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
diff --git a/src/gdisp/fonts/fixed_5x8.c b/src/gdisp/fonts/fixed_5x8.c
index d65d58bf..367971f5 100644
--- a/src/gdisp/fonts/fixed_5x8.c
+++ b/src/gdisp/fonts/fixed_5x8.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_fixed_5x8_glyph_data_0[475] = {
+static const gU8 mf_bwfont_fixed_5x8_glyph_data_0[475] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x14,
0x7f, 0x14, 0x7f, 0x14, 0x04, 0x2a, 0x7f, 0x2a, 0x10, 0x00, 0x16, 0x08, 0x34, 0x00, 0x36, 0x49,
0x36, 0x40, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x00, 0x00, 0x00, 0x42, 0x3c,
diff --git a/src/gdisp/fonts/fixed_7x14.c b/src/gdisp/fonts/fixed_7x14.c
index 28b05608..bff0ef77 100644
--- a/src/gdisp/fonts/fixed_7x14.c
+++ b/src/gdisp/fonts/fixed_7x14.c
@@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
-static const uint8_t mf_bwfont_fixed_7x14_glyph_data_0[1330] = {
+static const gU8 mf_bwfont_fixed_7x14_glyph_data_0[1330] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0xfe, 0x07,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 13:59:05 +0000