You've already forked TEF6686_ESP32
simplyfy the font logic and also fix the bug where it loaded the chinese font for both chinese and latin
This commit is contained in:
@@ -498,7 +498,6 @@ TFT_eSPI::TFT_eSPI(int16_t w, int16_t h)
|
||||
_fillbg = isDigits = textwrapY = false;
|
||||
textwrapX = true;
|
||||
textdatum = TL_DATUM;
|
||||
fontsloaded = 0;
|
||||
|
||||
_swapBytes = false;
|
||||
|
||||
@@ -507,17 +506,12 @@ TFT_eSPI::TFT_eSPI(int16_t w, int16_t h)
|
||||
lockTransaction = false;
|
||||
|
||||
_booted = true;
|
||||
_cp437 = false;
|
||||
_utf8 = true;
|
||||
|
||||
addr_row = 0xFFFF;
|
||||
addr_col = 0xFFFF;
|
||||
|
||||
_xPivot = 0;
|
||||
_yPivot = 0;
|
||||
|
||||
fontsloaded = 0x0002; // Bit 1 set
|
||||
fontsloaded |= 0x8000; // Bit 15 set
|
||||
}
|
||||
|
||||
void TFT_eSPI::initBus(void) {
|
||||
@@ -2139,10 +2133,6 @@ int16_t TFT_eSPI::textWidth(const char *string, uint8_t font) {
|
||||
return str_width;
|
||||
}
|
||||
|
||||
uint16_t TFT_eSPI::fontsLoaded() {
|
||||
return fontsloaded;
|
||||
}
|
||||
|
||||
int16_t TFT_eSPI::fontHeight(uint8_t font) {
|
||||
if (font > 8) return 0;
|
||||
|
||||
@@ -2948,8 +2938,6 @@ void TFT_eSPI::invertDisplay(bool i) {
|
||||
}
|
||||
|
||||
uint16_t TFT_eSPI::decodeUTF8(uint8_t c) {
|
||||
if (!_utf8) return c;
|
||||
|
||||
if ((c & 0x80) == 0x00) {
|
||||
decoderState = 0;
|
||||
return c;
|
||||
@@ -2989,8 +2977,6 @@ uint16_t TFT_eSPI::decodeUTF8(uint8_t *buf, uint16_t *index, uint16_t remaining)
|
||||
{
|
||||
uint16_t c = buf[(*index)++];
|
||||
|
||||
if (!_utf8) return c;
|
||||
|
||||
if ((c & 0x80) == 0x00) return c;
|
||||
|
||||
if (((c & 0xE0) == 0xC0) && (remaining > 1))
|
||||
|
||||
@@ -277,9 +277,6 @@ class TFT_eSPI { friend class TFT_eSprite;
|
||||
// Used by Smooth font class to fetch a pixel colour for the anti-aliasing
|
||||
void setCallback(getColorCallback getCol);
|
||||
|
||||
uint16_t fontsLoaded(void); // Each bit in returned value represents a font type that is loaded - used for debug/error handling only
|
||||
|
||||
|
||||
void spiwrite(uint8_t); // legacy support only
|
||||
void writecommand(uint8_t c); // Send an 8-bit command, function resets DC/RS high ready for data
|
||||
void writedata(uint8_t d); // Send data with DC/RS set high
|
||||
@@ -440,17 +437,12 @@ uint8_t spi_write_speed;
|
||||
int32_t bg_cursor_x;
|
||||
int32_t last_cursor_x;
|
||||
|
||||
uint32_t fontsloaded;
|
||||
|
||||
bool isDigits;
|
||||
bool textwrapX, textwrapY;
|
||||
bool _swapBytes;
|
||||
|
||||
bool _booted;
|
||||
|
||||
bool _cp437;
|
||||
bool _utf8;
|
||||
|
||||
uint32_t _lastColor;
|
||||
|
||||
bool _fillbg;
|
||||
|
||||
Reference in New Issue
Block a user