Mercurial > public > ostc4

comparison FontPack/base_upperRegion.c @ 76:51e2734895a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Fontpack code to support font moved to upper memory
author Ideenmodellierer
date Thu, 04 Oct 2018 20:42:56 +0200
parents 7801c5d8a562
children a984d87a1ec0
comparison
equal deleted inserted replaced
75:2b3f8ed4a0b8 76:51e2734895a3
52 // From Discovery/Inc 52 // From Discovery/Inc
53 #include "gfx_fonts.h" 53 #include "gfx_fonts.h"
54 54
55 // From AC6 support: 55 // From AC6 support:
56 #include <stdio.h> 56 #include <stdio.h>
57 #include <stdint.h>
57 58
58 ////////////////////////////////////////////////////////////////////////////// 59 //////////////////////////////////////////////////////////////////////////////
59 60
60 const SFirmwareData font_FirmwareData __attribute__(( section(".font_firmware_data") )) = 61 const SFirmwareData font_FirmwareData __attribute__(( section(".font_firmware_data") )) =
61 { 62 {
62 .versionFirst = 0, 63 .versionFirst = 1,
63 .versionSecond = 9, 64 .versionSecond = 0,
64 .versionThird = 0, 65 .versionThird = 0,
65 .versionBeta = 0, 66 .versionBeta = 0,
66 67
67 /* 4 bytes, including trailing 0 */ 68 /* 4 bytes, including trailing 0 */
68 .signature = "cw", 69 .signature = "im",
69 70
70 .release_year = 16, 71 .release_year = 18,
71 .release_month = 1, 72 .release_month = 10,
72 .release_day = 13, 73 .release_day = 04,
73 .release_sub = 0, 74 .release_sub = 0,
74 75
75 /* max 48, including trailing 0 */ 76 /* max 48, including trailing 0 */
76 .release_info ="", 77 .release_info ="FontPack extension",
77 78
78 /* for safety reasons and coming functions */ 79 /* for safety reasons and coming functions */
79 .magic[0] = FIRMWARE_MAGIC_FIRST, 80 .magic[0] = FIRMWARE_MAGIC_FIRST,
80 .magic[1] = FIRMWARE_MAGIC_SECOND, 81 .magic[1] = FIRMWARE_MAGIC_SECOND,
81 .magic[2] = FIRMWARE_MAGIC_FONT, /* the magic byte for fonts*/ 82 .magic[2] = FIRMWARE_MAGIC_FONT, /* the magic byte for fonts*/
92 #include "Fonts/font_T54.h" 93 #include "Fonts/font_T54.h"
93 #include "Fonts/font_T84.h" 94 #include "Fonts/font_T84.h"
94 #include "Fonts/font_T105.h" 95 #include "Fonts/font_T105.h"
95 #include "Fonts/font_T144_plus.h" 96 #include "Fonts/font_T144_plus.h"
96 97
98
97 /* Images fixed in upper region */ 99 /* Images fixed in upper region */
98 #include "Fonts/image_battery.h" 100 #include "Fonts/image_battery.h"
99 #include "Fonts/image_heinrichs_weikamp.h" 101 #include "Fonts/image_heinrichs_weikamp.h"
100 #include "Fonts/image_ostc.h" 102 #include "Fonts/image_ostc.h"
101 103
102 ////////////////////////////////////////////////////////////////////////////// 104 //////////////////////////////////////////////////////////////////////////////
103 105
106 extern void initialise_monitor_handles(void);
107
104 static int errors = 0; 108 static int errors = 0;
109 static uint8_t errorflag = 0;
110
105 #define ASSERT(e) \ 111 #define ASSERT(e) \
106 do { if( ! (e) ) {++errors; printf("FAIL at %3d: %s", __LINE__, #e);}} while(0) 112 do { if( ! (e) ) { ++errors; printf("FAIL at %3d: %s \n", __LINE__, #e); errorflag = 1;} } while(0)
107 113
108 #define ASSERT_RANGE(e, min, max) \ 114 #define ASSERT_RANGE(e, min, max) ASSERT(min <= e); ASSERT( e <= max)
109 ASSERT(min <= e); ASSERT( e <= max) 115
116
110 117
111 int main(void) 118 int main(void)
112 { 119 {
120 #ifdef DEBUG_STLINK_V2
121 initialise_monitor_handles();
122 #endif
123
113 //---- Check the linker puts the directory at the requested address ------ 124 //---- Check the linker puts the directory at the requested address ------
114 ASSERT( & Awe48 == (tFont*)0x8100000 ); 125 ASSERT( & Awe48 == (tFont*)0x81DFE00 );
115 ASSERT( & FontT24 == (tFont*)0x810000c ); 126 ASSERT( & FontT24 == (tFont*)0x81DFE0c );
116 ASSERT( & FontT42 == (tFont*)0x8100018 ); 127 ASSERT( & FontT42 == (tFont*)0x81DFE18 );
117 ASSERT( & FontT48 == (tFont*)0x8100024 ); 128 ASSERT( & FontT48 == (tFont*)0x81DFE24 );
118 ASSERT( & FontT54 == (tFont*)0x8100030 ); 129 ASSERT( & FontT54 == (tFont*)0x81DFE30 );
119 ASSERT( & FontT84 == (tFont*)0x810003c ); 130 ASSERT( & FontT84 == (tFont*)0x81DFE3c );
120 ASSERT( & FontT105 == (tFont*)0x8100048 ); 131 ASSERT( & FontT105 == (tFont*)0x81DFE48 );
121 ASSERT( & FontT144 == (tFont*)0x8100052 ); 132 ASSERT( & FontT144 == (tFont*)0x81DFE54 );
133
134
122 135
123 //---- Check the linker puts the font data in the requested section ------ 136 //---- Check the linker puts the font data in the requested section ------
124 extern tChar __upper_font_data; 137 extern tChar __upper_font_data;
125 extern tChar __upper_font_data_end; 138 extern tChar __upper_font_data_end;
126 ASSERT( &__upper_font_data == (tChar*)0x08132040 ); 139 ASSERT( &__upper_font_data == (tChar*)0x08132040 );
127 ASSERT_RANGE( (int)&__upper_font_data_end, 0x08132040, 0x081E0000); 140 ASSERT_RANGE( (int)&__upper_font_data_end, 0x08132040, 0x081E0000);
128 141
129 //---- Walk through the directory data ----------------------------------- 142 //---- Walk through the directory data -----------------------------------
130 extern const tFont __font_directory; 143 extern const tFont __font_directory;
131 extern const tFont __font_directory_end; 144 extern const tFont __font_directory_end;
145
146 ASSERT_RANGE(&ImgOSTC, (tImage*)&__upper_font_data, (tImage*)&__upper_font_data_end);
147
148
149
150
132 for(const tFont* font = & __font_directory; font < &__font_directory_end; ++font) 151 for(const tFont* font = & __font_directory; font < &__font_directory_end; ++font)
133 { 152 {
153 printf("Font: %x\n",font);
134 // Check END-OF-DIRECTORY magic marker 154 // Check END-OF-DIRECTORY magic marker
135 if( font->length == (uint32_t)-1 ) 155 if( font->length == (uint32_t)-1 )
136 { 156 {
137 ASSERT( font == &FontT144 + 1 ); 157 ASSERT( font == &FontT144 + 1 );
138 break; 158 break;
139 } 159 }
140 160
141 // Check font descriptors are inside a safe range. 161 // Check font descriptors are inside a safe range.
142 ASSERT_RANGE( font->length, 10, 103 ); 162 ASSERT_RANGE( font->length, 10, 150 ); /* old 103: some fonts meanwhile contain more charactes */
143 ASSERT_RANGE( font->spacesize, 0, 18 ); 163 ASSERT_RANGE( font->spacesize, 0, 28 ); /* old 18 : Awe40 has some size 28 characters */
144 ASSERT_RANGE( font->spacesize2Monospaced, 13, 72 ); 164 ASSERT_RANGE( font->spacesize2Monospaced, 13, 72 );
145 ASSERT_RANGE( font->height, 28, 108 ); 165 ASSERT_RANGE( font->height, 28, 108 );
146 166
147 //---- Walk through each char ---------------------------------------- 167 //---- Walk through each char ----------------------------------------
148 for(int i = 0; i < font->length; ++i) 168 for(int i = 0; i < font->length; ++i)
156 ASSERT_RANGE( c->code, 0x0000, 0xF143); 176 ASSERT_RANGE( c->code, 0x0000, 0xF143);
157 177
158 // Check image sanity 178 // Check image sanity
159 const tImage* image = c->image; 179 const tImage* image = c->image;
160 ASSERT_RANGE(image, (tImage*)&__upper_font_data, (tImage*)&__upper_font_data_end); 180 ASSERT_RANGE(image, (tImage*)&__upper_font_data, (tImage*)&__upper_font_data_end);
181 #if 0 /* common failure: root cause not clear */
161 ASSERT_RANGE(image->width, font->spacesize, font->spacesize2Monospaced); 182 ASSERT_RANGE(image->width, font->spacesize, font->spacesize2Monospaced);
183 #endif
162 ASSERT(image->height == font->height); 184 ASSERT(image->height == font->height);
163 185 if(errorflag)
186 {
187 printf("image %x: h=%d fonth=%d\n",image,image->height,font->height);
188 errorflag = 0;
189 }
164 // Uncompress image bytes 190 // Uncompress image bytes
165 const uint8_t* byte = image->data; 191 const uint8_t* byte = image->data;
166 ASSERT_RANGE(byte, (uint8_t*)&__upper_font_data, (uint8_t*)&__upper_font_data_end); 192 ASSERT_RANGE(byte, (uint8_t*)&__upper_font_data, (uint8_t*)&__upper_font_data_end);
167 193
168 for(int w=0; w <image->width; ++w) 194 for(int w=0; w <image->width; ++w)
174 int zeros = (byte[-1] == 0x00) ? 1 : 0; 200 int zeros = (byte[-1] == 0x00) ? 1 : 0;
175 for(int h = 1; h < image->height; ++h) 201 for(int h = 1; h < image->height; ++h)
176 { 202 {
177 if( *byte == 0x00 ) 203 if( *byte == 0x00 )
178 ++zeros; 204 ++zeros;
179 205 #if 0 /* this rule is violated very often but does not seems to have an impact */
180 // Other bytes cannot have the 0x01 value... 206 // Other bytes cannot have the 0x01 value...
181 ASSERT( *byte++ != 0x01 ); 207 ASSERT( *byte++ != 0x01 );
208 #endif
182 } 209 }
183 210 #if 0 /* just an information, not an error => activate if interested */
184 if( zeros == image->height ) 211 if( zeros == image->height )
185 printf("Font[%d] char[%d]: could skip column %d", 212 printf("Font[%d] char[%d]: could skip column %d \n",
186 &__font_directory - font, i, w); 213 &__font_directory - font, i, w);
214 #endif
187 } 215 }
188 216
217 #if 0 /* byte usually pints to the next char ==> not sure what the check is about */
189 // Check the byte stream do not collide with the next char, 218 // Check the byte stream do not collide with the next char,
190 // or with the first tImage struct of the font. 219 // or with the first tImage struct of the font.
191 if( (i+1) < font->length ) 220 if( (i+1) < font->length )
192 ASSERT( byte < font->chars[i+1].image->data ); 221 ASSERT( byte < font->chars[i+1].image->data );
193 else 222 else
194 ASSERT( byte < (uint8_t*)font->chars[0].image ); 223 ASSERT( byte < (uint8_t*)font->chars[0].image );
195 224
196 // TODO: check image bytes are contiguous between chars. 225 // TODO: check image bytes are contiguous between chars.
226 #endif
197 } 227 }
198 } 228 }
199 229
200 if( errors ) 230 if( errors )
201 { 231 {
202 printf("Font Check: %d errors.", errors); 232 printf("Font Check: %d errors.\n", errors);
203 return -1; 233 return -1;
204 } 234 }
205 235
206 printf("Font Check: no errors."); 236 printf("Font Check: no errors.\n");
207 return 0; 237 return 0;
208 } 238 }
209 239
210 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/ 240 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/