Mercurial > public > ostc4

diff Discovery/Inc/Fonts/font_T54.h @ 74:f2d98ad6f1be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move font to upper memory
author Ideenmodellierer
date Thu, 04 Oct 2018 20:40:53 +0200
parents 10386cdcba84
children
line wrap: on
line diff
--- a/Discovery/Inc/Fonts/font_T54.h	Thu Oct 04 20:40:21 2018 +0200
+++ b/Discovery/Inc/Fonts/font_T54.h	Thu Oct 04 20:40:53 2018 +0200
@@ -120,7 +120,7 @@
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static const uint8_t image_data_FontT54_0x002b[28*42 - 4*41] __attribute__(( section(".lower_fonts.image_data_FontT54_0x002b") )) = {
+static const uint8_t image_data_FontT54_0x002b[28*42 - 4*41] __attribute__(( section(".upper_fonts.image_data_FontT54_0x002b") )) = {
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -562,7 +562,7 @@
 };
 
 
-static const uint8_t image_data_FontT54_0x0040[42*42 - (4 * 41)] __attribute__(( section(".lower_fonts.image_data_FontT54_0x0040") )) = {
+static const uint8_t image_data_FontT54_0x0040[42*42 - (4 * 41)] __attribute__(( section(".upper_fonts.image_data_FontT54_0x0040") )) = {
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0b, 0x23, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x23, 0x0b, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -642,8 +642,9 @@
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static const uint8_t image_data_FontT54_0x0046[25*40 - 4*39] __attribute__(( section(".lower_fonts.image_data_FontT54_0x0046") )) = { // added 170206 hw, F (Farenheit) 25*42 - 4*42
+static const uint8_t image_data_FontT54_0x0046[25*42 - 4*39] __attribute__(( section(".upper_fonts.image_data_FontT54_0x0046") )) = { // added 170206 hw, F (Farenheit) 25*42 - 4*42
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -668,6 +669,7 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 static const uint8_t image_data_FontT54_0x006c[672 - (5 * 41)] __attribute__(( section(".upper_fonts.image_data_FontT54_0x006c") )) = {
@@ -794,33 +796,33 @@
     0x01,//0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static const tImage FontT54_0x0022 __attribute__(( section(".lower_fonts.FontT54_0x0022") )) = { image_data_FontT54_0x0022, 18, 42};
-static const tImage FontT54_0x0025 __attribute__(( section(".lower_fonts.FontT54_0x0025") )) = { image_data_FontT54_0x0025, 32, 42};
-static const tImage FontT54_0x0027 __attribute__(( section(".lower_fonts.FontT54_0x0027") )) = { image_data_FontT54_0x0027,  9, 42};
-static const tImage FontT54_0x002a __attribute__(( section(".lower_fonts.FontT54_0x002a") )) = { image_data_FontT54_0x002a, 20, 42};
-static const tImage FontT54_0x002b __attribute__(( section(".lower_fonts.FontT54_0x002b") )) = { image_data_FontT54_0x002b, 28, 42};
-static const tImage FontT54_0x002d __attribute__(( section(".lower_fonts.FontT54_0x002d") )) = { image_data_FontT54_0x002d, 20, 42};
-static const tImage FontT54_0x002e __attribute__(( section(".lower_fonts.FontT54_0x002e") )) = { image_data_FontT54_0x002e, 20, 42};
-static const tImage FontT54_0x002f __attribute__(( section(".lower_fonts.FontT54_0x002f") )) = { image_data_FontT54_0x002f, 28, 42};
-static const tImage FontT54_0x0030 __attribute__(( section(".lower_fonts.FontT54_0x0030") )) = { image_data_FontT54_0x0030, 28, 42};
-static const tImage FontT54_0x0031 __attribute__(( section(".lower_fonts.FontT54_0x0031") )) = { image_data_FontT54_0x0031, 28, 42};
-static const tImage FontT54_0x0032 __attribute__(( section(".lower_fonts.FontT54_0x0032") )) = { image_data_FontT54_0x0032, 28, 42};
-static const tImage FontT54_0x0033 __attribute__(( section(".lower_fonts.FontT54_0x0033") )) = { image_data_FontT54_0x0033, 28, 42};
-static const tImage FontT54_0x0034 __attribute__(( section(".lower_fonts.FontT54_0x0034") )) = { image_data_FontT54_0x0034, 28, 42};
-static const tImage FontT54_0x0035 __attribute__(( section(".lower_fonts.FontT54_0x0035") )) = { image_data_FontT54_0x0035, 28, 42};
-static const tImage FontT54_0x0036 __attribute__(( section(".lower_fonts.FontT54_0x0036") )) = { image_data_FontT54_0x0036, 28, 42};
-static const tImage FontT54_0x0037 __attribute__(( section(".lower_fonts.FontT54_0x0037") )) = { image_data_FontT54_0x0037, 28, 42};
-static const tImage FontT54_0x0038 __attribute__(( section(".lower_fonts.FontT54_0x0038") )) = { image_data_FontT54_0x0038, 28, 42};
-static const tImage FontT54_0x0039 __attribute__(( section(".lower_fonts.FontT54_0x0039") )) = { image_data_FontT54_0x0039, 28, 42};
-static const tImage FontT54_0x003a __attribute__(( section(".lower_fonts.FontT54_0x003a") )) = { image_data_FontT54_0x003a, 20, 42};
-static const tImage FontT54_0x0043 __attribute__(( section(".lower_fonts.FontT54_0x0043") )) = { image_data_FontT54_0x0043, 32, 42};
-static const tImage FontT54_0x0040 __attribute__(( section(".lower_fonts.FontT54_0x0040") )) = { image_data_FontT54_0x0040, 42, 42};
-static const tImage FontT54_0x0046 __attribute__(( section(".lower_fonts.FontT54_0x0046") )) = { image_data_FontT54_0x0046, 25, 40};
-static const tImage FontT54_0x006c __attribute__(( section(".lower_fonts.FontT54_0x006c") )) = { image_data_FontT54_0x006c, 16, 42};
-static const tImage FontT54_0x006d __attribute__(( section(".lower_fonts.FontT54_0x006d") )) = { image_data_FontT54_0x006d, 45, 42};
-static const tImage FontT54_0x00ba __attribute__(( section(".lower_fonts.FontT54_0x00ba") )) = { image_data_FontT54_0x00ba, 20, 42};
+static const tImage FontT54_0x0022 __attribute__(( section(".upper_fonts.FontT54_0x0022") )) = { image_data_FontT54_0x0022, 18, 42};
+static const tImage FontT54_0x0025 __attribute__(( section(".upper_fonts.FontT54_0x0025") )) = { image_data_FontT54_0x0025, 32, 42};
+static const tImage FontT54_0x0027 __attribute__(( section(".upper_fonts.FontT54_0x0027") )) = { image_data_FontT54_0x0027,  9, 42};
+static const tImage FontT54_0x002a __attribute__(( section(".upper_fonts.FontT54_0x002a") )) = { image_data_FontT54_0x002a, 20, 42};
+static const tImage FontT54_0x002b __attribute__(( section(".upper_fonts.FontT54_0x002b") )) = { image_data_FontT54_0x002b, 28, 42};
+static const tImage FontT54_0x002d __attribute__(( section(".upper_fonts.FontT54_0x002d") )) = { image_data_FontT54_0x002d, 20, 42};
+static const tImage FontT54_0x002e __attribute__(( section(".upper_fonts.FontT54_0x002e") )) = { image_data_FontT54_0x002e, 20, 42};
+static const tImage FontT54_0x002f __attribute__(( section(".upper_fonts.FontT54_0x002f") )) = { image_data_FontT54_0x002f, 28, 42};
+static const tImage FontT54_0x0030 __attribute__(( section(".upper_fonts.FontT54_0x0030") )) = { image_data_FontT54_0x0030, 28, 42};
+static const tImage FontT54_0x0031 __attribute__(( section(".upper_fonts.FontT54_0x0031") )) = { image_data_FontT54_0x0031, 28, 42};
+static const tImage FontT54_0x0032 __attribute__(( section(".upper_fonts.FontT54_0x0032") )) = { image_data_FontT54_0x0032, 28, 42};
+static const tImage FontT54_0x0033 __attribute__(( section(".upper_fonts.FontT54_0x0033") )) = { image_data_FontT54_0x0033, 28, 42};
+static const tImage FontT54_0x0034 __attribute__(( section(".upper_fonts.FontT54_0x0034") )) = { image_data_FontT54_0x0034, 28, 42};
+static const tImage FontT54_0x0035 __attribute__(( section(".upper_fonts.FontT54_0x0035") )) = { image_data_FontT54_0x0035, 28, 42};
+static const tImage FontT54_0x0036 __attribute__(( section(".upper_fonts.FontT54_0x0036") )) = { image_data_FontT54_0x0036, 28, 42};
+static const tImage FontT54_0x0037 __attribute__(( section(".upper_fonts.FontT54_0x0037") )) = { image_data_FontT54_0x0037, 28, 42};
+static const tImage FontT54_0x0038 __attribute__(( section(".upper_fonts.FontT54_0x0038") )) = { image_data_FontT54_0x0038, 28, 42};
+static const tImage FontT54_0x0039 __attribute__(( section(".upper_fonts.FontT54_0x0039") )) = { image_data_FontT54_0x0039, 28, 42};
+static const tImage FontT54_0x003a __attribute__(( section(".upper_fonts.FontT54_0x003a") )) = { image_data_FontT54_0x003a, 20, 42};
+static const tImage FontT54_0x0043 __attribute__(( section(".upper_fonts.FontT54_0x0043") )) = { image_data_FontT54_0x0043, 32, 42};
+static const tImage FontT54_0x0040 __attribute__(( section(".upper_fonts.FontT54_0x0040") )) = { image_data_FontT54_0x0040, 42, 42};
+static const tImage FontT54_0x0046 __attribute__(( section(".upper_fonts.FontT54_0x0046") )) = { image_data_FontT54_0x0046, 25, 40};
+static const tImage FontT54_0x006c __attribute__(( section(".upper_fonts.FontT54_0x006c") )) = { image_data_FontT54_0x006c, 16, 42};
+static const tImage FontT54_0x006d __attribute__(( section(".upper_fonts.FontT54_0x006d") )) = { image_data_FontT54_0x006d, 45, 42};
+static const tImage FontT54_0x00ba __attribute__(( section(".upper_fonts.FontT54_0x00ba") )) = { image_data_FontT54_0x00ba, 20, 42};
 
-static const tChar FontT54_array[] __attribute__(( section(".lower_fonts.FontT54_array") )) =
+static const tChar FontT54_array[] __attribute__(( section(".upper_fonts.FontT54_array") )) =
 {
   // character: '"'
   {0x0022, &FontT54_0x0022},
@@ -898,4 +900,4 @@
   {0x0060, &FontT54_0x00ba}
 };
 
-const tFont FontT54 UPPER_FONT_DIRECTORY = { 25, FontT54_array, 18, 28, 42 };
+const tFont FontT54 __attribute__ (( used, section(".upper_font_directory.FontT54") )) = { 25, FontT54_array, 18, 28, 42 };