update the type __ttf_char_descriptor_t to improve the support for IAR

ARM-software · Sep 7, 2024 · d7af8d2 · d7af8d2
1 parent d150c20
commit d7af8d2
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 42 deletions.
diff --git a/ARM.Arm-2D.pdsc b/ARM.Arm-2D.pdsc
@@ -251,7 +251,7 @@
             <file category="doc"         name="documentation/index.html"/>
             <file category="preIncludeGlobal"    name="Library/Include/template/arm_2d_cfg.h"   attr="config" version="1.3.9" />
             <file category="utility"     name="tools/img2c.py"                                  attr="config" version="1.2.4"/>
-            <file category="utility"     name="tools/ttf2c.py"                                  attr="config" version="1.3.1"/>
+            <file category="utility"     name="tools/ttf2c.py"                                  attr="config" version="2.1.0"/>
             <file category="other"       name="tools/README.md" />
             <file category="other"       name="ReleaseNote.md" />
 

diff --git a/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/alarm_clock_font32.c b/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/alarm_clock_font32.c
@@ -33,7 +33,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -128,7 +128,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -424,7 +424,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -787,7 +787,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -1267,7 +1267,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },

diff --git a/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/alarm_clock_font64.c b/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/alarm_clock_font64.c
@@ -33,7 +33,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -155,7 +155,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -517,7 +517,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -1007,7 +1007,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -1741,7 +1741,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },

diff --git a/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/ttf2c.py b/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/ttf2c.py
@@ -69,7 +69,7 @@
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 """
 
 

diff --git a/examples/[template][cmsis-rtos2]/RTE/Acceleration/alarm_clock_font32.c b/examples/[template][cmsis-rtos2]/RTE/Acceleration/alarm_clock_font32.c
@@ -29,7 +29,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -124,7 +124,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -420,7 +420,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -783,7 +783,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -1263,7 +1263,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },

diff --git a/examples/[template][cmsis-rtos2]/RTE/Acceleration/alarm_clock_font64.c b/examples/[template][cmsis-rtos2]/RTE/Acceleration/alarm_clock_font64.c
@@ -29,7 +29,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -151,7 +151,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -513,7 +513,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -1003,7 +1003,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -1737,7 +1737,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },

diff --git a/examples/[template][cmsis-rtos2]/RTE/Acceleration/ttf2c.py b/examples/[template][cmsis-rtos2]/RTE/Acceleration/ttf2c.py
@@ -64,7 +64,7 @@
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 """
 
 
@@ -372,7 +372,7 @@ def write_c_code(glyphs_data, output_file, name, char_max_width, char_max_height
         f.write("0x00, " * (char_max_width * char_max_height))
         f.write("\n};\n\n")
 
-        print("ARM_SECTION(\"arm2d.asset.FONT\")\nconst static __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
+        print("ARM_SECTION(\"arm2d.asset.FONT\")\nstatic __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
                 .format(font_bit_size), file=f)
 
         last_index = 0;

diff --git a/examples/[template][csolution]/arm2d_generic_bench/RTE/Acceleration/ttf2c.py b/examples/[template][csolution]/arm2d_generic_bench/RTE/Acceleration/ttf2c.py
@@ -64,7 +64,7 @@
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 """
 
 
@@ -385,7 +385,7 @@ def write_c_code(glyphs_data, output_file, name, char_max_width, char_max_height
         f.write("0x00, " * (char_max_width * char_max_height))
         f.write("\n};\n\n")
 
-        print("ARM_SECTION(\"arm2d.asset.FONT\")\nconst static __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
+        print("ARM_SECTION(\"arm2d.asset.FONT\")\nstatic __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
                 .format(font_bit_size), file=f)
 
         last_index = 0;

diff --git a/examples/[template][csolution]/arm2d_smartwatch_bench/RTE/Acceleration/ttf2c.py b/examples/[template][csolution]/arm2d_smartwatch_bench/RTE/Acceleration/ttf2c.py
@@ -64,7 +64,7 @@
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 """
 
 
@@ -385,7 +385,7 @@ def write_c_code(glyphs_data, output_file, name, char_max_width, char_max_height
         f.write("0x00, " * (char_max_width * char_max_height))
         f.write("\n};\n\n")
 
-        print("ARM_SECTION(\"arm2d.asset.FONT\")\nconst static __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
+        print("ARM_SECTION(\"arm2d.asset.FONT\")\nstatic __ttf_char_descriptor_t c_tUTF8LookUpTableA{0}[] = {{\n"
                 .format(font_bit_size), file=f)
 
         last_index = 0;

diff --git a/examples/common/asset/alarm_clock_font32.c b/examples/common/asset/alarm_clock_font32.c
@@ -29,7 +29,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -124,7 +124,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -361,7 +361,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -666,7 +666,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },
@@ -1088,7 +1088,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 12, 18, }, 19, 2, 20, 1, {0x2b} },
     { 18, { 12, 3, }, 19, 2, 13, 1, {0x2d} },

diff --git a/examples/common/asset/alarm_clock_font64.c b/examples/common/asset/alarm_clock_font64.c
@@ -29,7 +29,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const static uint8_t c_bmpUTF8UserA1Font[] = {
@@ -151,7 +151,7 @@ const static uint8_t c_bmpUTF8UserA1Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA1[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -454,7 +454,7 @@ const static uint8_t c_bmpUTF8UserA2Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA2[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -885,7 +885,7 @@ const static uint8_t c_bmpUTF8UserA4Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA4[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },
@@ -1561,7 +1561,7 @@ const static uint8_t c_bmpUTF8UserA8Font[] = {
 };
 
 ARM_SECTION("arm2d.asset.FONT")
-const static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
+static __ttf_char_descriptor_t c_tUTF8LookUpTableA8[] = {
 
     { 0, { 23, 36, }, 38, 5, 41, 1, {0x2b} },
     { 36, { 23, 5, }, 38, 5, 25, 1, {0x2d} },

diff --git a/examples/common/asset/arial_ascii_font14.c b/examples/common/asset/arial_ascii_font14.c
@@ -33,7 +33,7 @@ typedef struct {
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 
 ARM_SECTION("arm2d.asset.FONT")
 const uint8_t c_bmpUTF8Arial14A1Font[] = {

diff --git a/tools/ttf2c.py b/tools/ttf2c.py
@@ -69,7 +69,7 @@
     int16_t       iBearingY;
     uint8_t       chCodeLength;
     uint8_t       chUTF8[4];
-} __ttf_char_descriptor_t;
+} const __ttf_char_descriptor_t;
 """
 
 
@@ -357,7 +357,7 @@ def write_c_code(glyphs_data, output_file, name, char_max_width, char_max_height
         f.write("0x00, " * (char_max_width * char_max_height))
         f.write("\n};\n\n")
 
-        print("ARM_SECTION(\"arm2d.asset.FONT\")\n const __ttf_char_descriptor_t c_tUTF8{0}LookUpTableA{1}[] = {{\n"
+        print("ARM_SECTION(\"arm2d.asset.FONT\")\n __ttf_char_descriptor_t c_tUTF8{0}LookUpTableA{1}[] = {{\n"
                 .format(name, font_bit_size), file=f)
 
         last_index = 0;
@@ -384,7 +384,7 @@ def write_c_code(glyphs_data, output_file, name, char_max_width, char_max_height
 
 
 def main():
-    parser = argparse.ArgumentParser(description='TrueTypeFont to C array converter (v2.0.0)')
+    parser = argparse.ArgumentParser(description='TrueTypeFont to C array converter (v2.1.0)')
     parser.add_argument("-i", "--input",    type=str,   help="Path to the TTF file",            required=True)
     parser.add_argument("--index",          type=int,   help="The Font Index in a TTC file",    required=False,     default=0)
     parser.add_argument("-t", "--text",     type=str,   help="Path to the text file",           required=True)