Mercurial > public > ostc4

changeset 987:45a2bd04b156 BootloaderOstc5 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed Font144 references because Font cause a linker problem and is not used by Bootloader
author Ideenmodellierer
date Sun, 30 Mar 2025 21:39:52 +0200 (24 hours ago)
parents 5e7ad81e9ac2
children
files BootLoader/Src/base_bootlader.c BootLoader/Src/gfx_engine_mini.c
diffstat 2 files changed, 2 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/BootLoader/Src/base_bootlader.c	Sun Mar 30 21:33:18 2025 +0200
+++ b/BootLoader/Src/base_bootlader.c	Sun Mar 30 21:39:52 2025 +0200
@@ -223,7 +223,7 @@
 #include "stm32f4xx_hal_flash_ex.h"
 #include "stm32f4xx_hal_wwdg.h"
 
-#include "Fonts/Font_T144_plus.h"
+//#include "Fonts/Font_T144_plus.h"
 #include "Fonts/Font_T84.h"
 #include "Fonts/Font_T105.h"
 #include "Fonts/Font_T54.h"
--- a/BootLoader/Src/gfx_engine_mini.c	Sun Mar 30 21:33:18 2025 +0200
+++ b/BootLoader/Src/gfx_engine_mini.c	Sun Mar 30 21:39:52 2025 +0200
@@ -1524,9 +1524,6 @@
 		if(found)
 		{
 			distance += (uint16_t)(Font->chars[i].image->width);
-			if(Font == &FontT144)
-				distance += 3;
-			else
 			if(Font == &FontT105)
 				distance += 2;
 		}
@@ -1663,12 +1660,6 @@
 	else
 		minimal = 0;
 
-	if(Font == &FontT144)
-	{
-		settings.TinyFont = (uint32_t)&FontT84;
-		settings.Ydelta = 12;
-	}
-	else
 	if(Font == &FontT105)
 		settings.TinyFont = (uint32_t)&FontT54;
 	else
@@ -1794,9 +1785,6 @@
 				settings.Xdelta += ((tFont *)settings.font)->spacesize2Monospaced;
 		else
 		{
-			if(((tFont *)settings.font == &FontT144) && ((*pText == '.') || (*pText == ':')))
-					settings.actualFont = (tFont *)settings.TinyFont;
-			else
 			if(((tFont *)settings.font == &FontT105) && settings.dualFont && ((*pText == '.') || (*pText == ':')))
 					settings.actualFont = (tFont *)settings.TinyFont;
 
@@ -2243,9 +2231,6 @@
 
 // -----------------------------
 
-	if(Font == &FontT144)
-		width += 6;
-	else
 	if(Font == &FontT105)
 		width += 4;
 
@@ -2537,10 +2522,6 @@
 	}
 
 // -----------------------------
-
-	if(Font == &FontT144)
-		width += 3;
-	else
 	if(Font == &FontT105)
 		width += 2;
 /*
@@ -2635,9 +2616,6 @@
 
 		pText++;
 		j++;
-		if((ptargetFont == &FontT144) && (*(char*)pText != 0))
-			Xsum += 3;
-		else
 		if((ptargetFont == &FontT105) && (*(char*)pText != 0))
 			Xsum += 2;
 	}
@@ -2690,10 +2668,6 @@
 			tinyState = 0;
 		}
 
-		if((font == &FontT144) && (*(char*)pText == '.'))
-		{
-			tinyState++;
-		}
 		if((font == &FontT105) && ((*(char*)pText == '.') || (*(char*)pText == ':')))
 		{
 			tinyState++;
@@ -2733,9 +2707,7 @@
 		}
 		pText++;
 		j++;
-		if((font == &FontT144) && (*(char*)pText != 0))
-			Xsum += 3;
-		else
+
 		if((font == &FontT105) && (*(char*)pText != 0))
 			Xsum += 2;
 	}