From 9418a61bac379d1690100075f2ea2e50d59a5e8a Mon Sep 17 00:00:00 2001 From: Bodmer Date: Wed, 26 Apr 2023 13:40:40 +0100 Subject: [PATCH] Fix inline issue with some processors Remove inline Other tweaks for compatibility --- TFT_eSPI.h | 2 +- .../Create_font/Create_font.pde | 2 +- .../Create_font/FontFiles/Final-Frontier28.vlw | Bin 25339 -> 0 bytes User_Setup.h | 16 +++++++++++----- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw diff --git a/TFT_eSPI.h b/TFT_eSPI.h index 02348d8..82fe8e0 100644 --- a/TFT_eSPI.h +++ b/TFT_eSPI.h @@ -731,7 +731,7 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac // Alpha blend 2 colours, see generic "alphaBlend_Test" example // alpha = 0 = 100% background colour // alpha = 255 = 100% foreground colour - inline uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc); + uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc); // 16 bit colour alphaBlend with alpha dither (dither reduces colour banding) uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither); // 24 bit colour alphaBlend with optional alpha dither diff --git a/Tools/Create_Smooth_Font/Create_font/Create_font.pde b/Tools/Create_Smooth_Font/Create_font/Create_font.pde index a250171..9771bfb 100644 --- a/Tools/Create_Smooth_Font/Create_font/Create_font.pde +++ b/Tools/Create_Smooth_Font/Create_font/Create_font.pde @@ -143,7 +143,7 @@ int displayFontSize = 28; boolean createHeaderFile = true; // Automaticely open the folder with created files when done -boolean openFolder = false; +boolean openFolder = true; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Next we specify which unicode blocks from the the Basic Multilingual Plane (BMP) are included in the final font file. // diff --git a/Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw b/Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw deleted file mode 100644 index 3c8a5b01d8cdf2c35690b7892540211e1b28d21f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25339 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

|Ocm$1oF3c^{K{Wt_)q*?UzTKGz zs$@X}1^@qld$0mLVGmRGeQ;Dk1#Ok)*J*aEdB*vs}1U51a0^a?oxn5gn=Op+}40{7_R((0b?>SZ2kWi90p(q zfcE0U7$6#?4C-Q|uOJSC)D!UjQ87@?T3{v(o~3=q-2fU6+6dZ%^Z);UM$jlOETqV! zLF;QB85m$821>lph6yb8Q4A)B13L@`toJFj&j#jfg7(_LoZ$ce?^?6N5(CJepnw6b z$6{biKJwxJ|5cy<|F^yN|3ByeR0hy#a@Qh23qnDm%e_%%&Fr5AW6KW)6 z=Qi|+2atuQK}$M73=sB$4Kjf^43KF%hHLN~3|#^5`v3p6aOg}6gC6uGGu!|F!x%3^ zr^yyW&mP$b@<8za|DcglnP30^sxUAxsQm*SYruFO+=~L8?gBc{W#<2Lp!THS|3C5! zydVBA`~O3NLG(NL)HSC_CM&P1Be1IltpsTfM5X6 zY%nm0-G?2rapM2~JE9Dl@Bcpo?;z(g@?8L(Y~%g= z|2@!H7bz z3{#-9a3Eb?-(e>sFd4pY$S<3A1vItIz`$44)xpT1e5wL++(d}^gK4(WBPP$R;?VDe}d zHv`YQqm2v<6B!tSK7iw2>El)gh6xODA0VAPhSH}D43i^1z)omjy(1*H|1)T24dU}? zV*^-90|_wccpxnYW?*2@fu{!3cD=s!$aJhhJN~1OvkrAqIwUP`+be(C1@ljAdZx26rCq4!kR} zSpwO`&o<$toy39k8{l31qDOjI7#IYv-BdD6WRSlB-mJmk`#&VoO#Ut`k?d-2)VK{g zcopPc29tHOPQ$nKGcdFsS_3M7!BPwiIy>MAA0&dda0(