From cdf81ecab144134694a9f9beb1b05bca42c1eda5 Mon Sep 17 00:00:00 2001
From: Bodmer <bodmer@anola.net>
Date: Wed, 15 Feb 2023 16:56:47 +0000
Subject: [PATCH] Revert "Fix #2408"

This reverts commit 94d7dfc6915a158b96cd3e692e0123c2d25051fc.
---
 TFT_eSPI.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp
index 1edf59f..2608042 100644
--- a/TFT_eSPI.cpp
+++ b/TFT_eSPI.cpp
@@ -3166,15 +3166,14 @@ void TFT_eSPI::drawChar(int32_t x, int32_t y, uint16_t c, uint32_t color, uint32
 {
   if (_vpOoB) return;
 
+  if (c < 32) return;
 #ifdef LOAD_GLCD
 //>>>>>>>>>>>>>>>>>>
   #ifdef LOAD_GFXFF
-  if(!gfxFont) { // 'Classic' built-in GLCD font
+  if(!gfxFont) { // 'Classic' built-in font
   #endif
 //>>>>>>>>>>>>>>>>>>
 
-  if (c > 255) return;
-
   int32_t xd = x + _xDatum;
   int32_t yd = y + _yDatum;
 
@@ -5022,6 +5021,7 @@ size_t TFT_eSPI::write(uint8_t utf8)
 #endif
 
   if (uniCode == '\n') uniCode+=22; // Make it a valid space character to stop errors
+  else if (uniCode < 32) return 1;
 
   uint16_t cwidth = 0;
   uint16_t cheight = 0;
@@ -5040,7 +5040,7 @@ size_t TFT_eSPI::write(uint8_t utf8)
 
 #ifdef LOAD_FONT2
   if (textfont == 2) {
-    if (uniCode < 32 || uniCode > 127) return 1;
+    if (uniCode > 127) return 1;
 
     cwidth = pgm_read_byte(widtbl_f16 + uniCode-32);
     cheight = chr_hgt_f16;
@@ -5056,7 +5056,7 @@ size_t TFT_eSPI::write(uint8_t utf8)
 #ifdef LOAD_RLE
   {
     if ((textfont>2) && (textfont<9)) {
-      if (uniCode < 32 || uniCode > 127) return 1;
+      if (uniCode > 127) return 1;
       // Uses the fontinfo struct array to avoid lots of 'if' or 'switch' statements
       cwidth = pgm_read_byte( (uint8_t *)pgm_read_dword( &(fontdata[textfont].widthtbl ) ) + uniCode-32 );
       cheight= pgm_read_byte( &fontdata[textfont].height );