diff --git a/Extensions/Sprite.cpp b/Extensions/Sprite.cpp index cadd1118..832abb99 100644 --- a/Extensions/Sprite.cpp +++ b/Extensions/Sprite.cpp @@ -1679,7 +1679,6 @@ int16_t TFT_eSprite::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t fo if ((font>2) && (font<9)) { // This is slower than above but is more convenient for the RLE fonts - // flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) ); flash_address = pgm_read_dword( (const void*)pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) ); width = pgm_read_byte( (uint8_t *)pgm_read_dword( &(fontdata[font].widthtbl ) ) + uniCode ); height= pgm_read_byte( &fontdata[font].height ); diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp index 3c7e7117..ad27dcb7 100644 --- a/TFT_eSPI.cpp +++ b/TFT_eSPI.cpp @@ -3389,7 +3389,7 @@ void TFT_eSPI::pushColors(uint8_t *data, uint32_t len) while (len--) {tft_Write_8(*data); data++;} #elif defined (ILI9488_DRIVER) uint16_t color; - while (len>1) {color = (*data++) | ((*data++)<<8); tft_Write_16(color); len-=2;} + while (len>1) {color = (*data++); color |= ((*data++)<<8); tft_Write_16(color); len-=2;} #else #if (SPI_FREQUENCY == 80000000) while ( len >=64 ) {spi.writePattern(data, 64, 1); data += 64; len -= 64; } @@ -4270,7 +4270,6 @@ int16_t TFT_eSPI::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font) { if ((font>2) && (font<9)) { - //flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) ); flash_address = pgm_read_dword( (const void*)pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) ); width = pgm_read_byte( (uint8_t *)pgm_read_dword( &(fontdata[font].widthtbl ) ) + uniCode ); height= pgm_read_byte( &fontdata[font].height ); diff --git a/examples/Test and diagnostics/Read_User_Setup/Read_User_Setup.ino b/examples/Test and diagnostics/Read_User_Setup/Read_User_Setup.ino index f13cb169..64855687 100644 --- a/examples/Test and diagnostics/Read_User_Setup/Read_User_Setup.ino +++ b/examples/Test and diagnostics/Read_User_Setup/Read_User_Setup.ino @@ -149,5 +149,7 @@ int8_t getPinName(int8_t pin) if (pin == 1) return 10; if (pin == 9) return 11; if (pin == 10) return 12; + + return -1; // Invalid pin } diff --git a/library.json b/library.json index b3b40391..c264ba96 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "TFT_eSPI", - "version": "1.4.10", + "version": "1.4.11", "keywords": "tft, ePaper, display, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789", "description": "A TFT and ePaper SPI graphics library for ESP8266 and ESP32", "repository": diff --git a/library.properties b/library.properties index 43cc01e2..be98ae8a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=TFT_eSPI -version=1.4.10 +version=1.4.11 author=Bodmer maintainer=Bodmer sentence=A fast TFT graphics library for ESP8266 and ESP32 processors for the Arduino IDE