Mercurial > public > ostc4

diff BootLoader/Src/gfx_engine_mini.c @ 1002:23e94766d00a BootloaderOstc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bootloader remove not needed fonts: Only font48 and 24 are used by the bootloader. To reduce bootloader size the other fonts have been removed and the character set of font24 was reduce (no special characters)
author Ideenmodellierer
date Thu, 01 May 2025 17:48:25 +0200
parents 45a2bd04b156
children 0dd92e9b70a2
line wrap: on
line diff
--- a/BootLoader/Src/gfx_engine_mini.c	Tue Apr 15 21:49:42 2025 +0200
+++ b/BootLoader/Src/gfx_engine_mini.c	Thu May 01 17:48:25 2025 +0200
@@ -1524,8 +1524,6 @@
 		if(found)
 		{
 			distance += (uint16_t)(Font->chars[i].image->width);
-			if(Font == &FontT105)
-				distance += 2;
 		}
 	}
 	return distance;
@@ -1534,8 +1532,6 @@
 	if(*pText < ' ')
 	if((*pText) & 0x80)
 
-	if(((tFont *)settings.font == &FontT105) && settings.dualFont && ((*pText == '.') || (*pText == ':')))
-		settings.font = (uint32_t)&FontT54;
 	*/
 }
 
@@ -1660,26 +1656,11 @@
 	else
 		minimal = 0;
 
-	if(Font == &FontT105)
-		settings.TinyFont = (uint32_t)&FontT54;
-	else
-	if(Font == &FontT54)
-	{
-		settings.TinyFont = (uint32_t)&FontT48;
-		settings.TinyFontExtraYdelta = -9;
-	}
-	else
 	if(Font == &FontT48)
 	{
 		settings.TinyFont = (uint32_t)&FontT24;
 		settings.TinyFontExtraYdelta = 6;
 	}
-	else
-	if(Font == &FontT42)
-	{
-		settings.TinyFont = (uint32_t)&FontT24;
-		settings.TinyFontExtraYdelta = 2;
-	}
 
 	settings.actualFont = (tFont *)settings.font;
 
@@ -1785,9 +1766,6 @@
 				settings.Xdelta += ((tFont *)settings.font)->spacesize2Monospaced;
 		else
 		{
-			if(((tFont *)settings.font == &FontT105) && settings.dualFont && ((*pText == '.') || (*pText == ':')))
-					settings.actualFont = (tFont *)settings.TinyFont;
-
 			if(settings.actualFont == (tFont *)settings.TinyFont)
 				settings.Ydelta += settings.TinyFontExtraYdelta;
 
@@ -2229,10 +2207,6 @@
 		}
 	}
 
-// -----------------------------
-
-	if(Font == &FontT105)
-		width += 4;
 
 // -----------------------------
 
@@ -2521,9 +2495,7 @@
 		}
 	}
 
-// -----------------------------
-	if(Font == &FontT105)
-		width += 2;
+
 /*
 	else
 	if(Font == &Font144)
@@ -2580,11 +2552,6 @@
 			tinyState = 0;
 		}
 
-		if((ptargetFont == &FontT105) && ((*(char*)pText == '.') || (*(char*)pText == ':')))
-		{
-			tinyState++;
-		}
-
 		if(tinyState > 1)
 		{
 			ptargetFont = (tFont *)cfg->TinyFont;
@@ -2616,8 +2583,6 @@
 
 		pText++;
 		j++;
-		if((ptargetFont == &FontT105) && (*(char*)pText != 0))
-			Xsum += 2;
 	}
 	pText -= j;
 
@@ -2668,11 +2633,6 @@
 			tinyState = 0;
 		}
 
-		if((font == &FontT105) && ((*(char*)pText == '.') || (*(char*)pText == ':')))
-		{
-			tinyState++;
-		}
-
 		if(tinyState > 1)
 		{
 			font = (tFont *)cfg->TinyFont;
@@ -2707,9 +2667,6 @@
 		}
 		pText++;
 		j++;
-
-		if((font == &FontT105) && (*(char*)pText != 0))
-			Xsum += 2;
 	}
 	pText -= j;