Bodmer/TFT_eSPI
1
0
Fork 1
mirror of https://github.com/Bodmer/TFT_eSPI.git synced 2025-08-11 00:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #606 inconsistency + others

Browse Source 
TFT_eFEX also needs updating so Rotated_Sprite_3 example renders correctly.

pushImage for FLASH images updated so partly off-screen images are correctly rendered.
This commit is contained in:
Bodmer
2020-04-26 17:05:19 +01:00
parent 353d80a78e
commit 90af737fa1
6 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Extensions/Sprite.cpp
View File

@@ -829,7 +829,7 @@ void TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_
for (int32_t xp = xo; xp < xo + ws; xp++) for (int32_t xp = xo; xp < xo + ws; xp++)
{ {
uint16_t color = data[xp + yp * w]; uint16_t color = data[xp + yp * w];
if(!_iswapBytes) color = color<<8 | color>>8; if(_iswapBytes) color = color<<8 | color>>8;
_img[x + ys * _iwidth] = color; _img[x + ys * _iwidth] = color;
x++; x++;
} }
@@ -934,7 +934,7 @@ void TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const u
for (int32_t xp = xo; xp < xo + ws; xp++) for (int32_t xp = xo; xp < xo + ws; xp++)
{ {
uint16_t color = pgm_read_word(data + xp + yp * w); uint16_t color = pgm_read_word(data + xp + yp * w);
if(!_iswapBytes) color = color<<8 | color>>8; if(_iswapBytes) color = color<<8 | color>>8;
_img[x + ys * _iwidth] = color; _img[x + ys * _iwidth] = color;
x++; x++;
} }

2
TFT_Drivers/ST7796_Init.h
View File

@@ -25,7 +25,7 @@
writedata(0x48); //X-Mirror, Top-Left to right-Buttom, RGB writedata(0x48); //X-Mirror, Top-Left to right-Buttom, RGB
writecommand(0x3A); //Interface Pixel Format writecommand(0x3A); //Interface Pixel Format
writedata(0x05); //Control interface color format set to 16 writedata(0x55); //Control interface color format set to 16
writecommand(0xB4); //Column inversion writecommand(0xB4); //Column inversion

29
TFT_eSPI.cpp
View File

@@ -989,7 +989,6 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *d
** Function name: pushImage - for FLASH (PROGMEM) stored images ** Function name: pushImage - for FLASH (PROGMEM) stored images
** Description: plot 16 bit image ** Description: plot 16 bit image
***************************************************************************************/ ***************************************************************************************/
#define PI_BUF_SIZE 128
void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data) void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data)
{ {
// Requires 32 bit aligned access, so use PROGMEM 16 bit word functions // Requires 32 bit aligned access, so use PROGMEM 16 bit word functions
@@ -1013,32 +1012,16 @@ void TFT_eSPI::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint1
data += dx + dy * w; data += dx + dy * w;
uint16_t buffer[PI_BUF_SIZE]; uint16_t buffer[dw];
uint16_t* pix_buffer = buffer;
setWindow(x, y, x + dw - 1, y + dh - 1); setWindow(x, y, x + dw - 1, y + dh - 1);
// Work out the number whole buffers to send // Fill and send line buffers to TFT
uint16_t nb = (dw * dh) / PI_BUF_SIZE; for (int32_t i = 0; i < dh; i++) {
for (int32_t j = 0; j < dw; j++) {
// Fill and send "nb" buffers to TFT buffer[j] = pgm_read_word(&data[i * w + j]);
for (int32_t i = 0; i < nb; i++) {
for (int32_t j = 0; j < PI_BUF_SIZE; j++) {
pix_buffer[j] = pgm_read_word(&data[i * PI_BUF_SIZE + j]);
} }
pushPixels(pix_buffer, PI_BUF_SIZE); pushPixels(buffer, dw);
}
// Work out number of pixels not yet sent
uint16_t np = (dw * dh) % PI_BUF_SIZE;
// Send any partial buffer left over
if (np) {
for (int32_t i = 0; i < np; i++)
{
pix_buffer[i] = pgm_read_word(&data[nb * PI_BUF_SIZE + i]);
}
pushPixels(pix_buffer, np);
} }
inTransaction = false; inTransaction = false;

2
TFT_eSPI.h
View File

@@ -16,7 +16,7 @@
#ifndef _TFT_eSPIH_ #ifndef _TFT_eSPIH_
#define _TFT_eSPIH_ #define _TFT_eSPIH_
#define TFT_ESPI_VERSION "2.2.1" #define TFT_ESPI_VERSION "2.2.2"
/*************************************************************************************** /***************************************************************************************
** Section 1: Load required header files ** Section 1: Load required header files

2
library.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "TFT_eSPI", "name": "TFT_eSPI",
"version": "2.2.1", "version": "2.2.2",
"keywords": "Arduino, tft, ePaper, display, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789, RM68140", "keywords": "Arduino, tft, ePaper, display, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789, RM68140",
"description": "A TFT and ePaper SPI graphics library with optimisation for ESP8266, ESP32 and STM32", "description": "A TFT and ePaper SPI graphics library with optimisation for ESP8266, ESP32 and STM32",
"repository": "repository":

2
library.properties
View File

@@ -1,5 +1,5 @@
name=TFT_eSPI name=TFT_eSPI
version=2.2.1 version=2.2.2
author=Bodmer author=Bodmer
maintainer=Bodmer maintainer=Bodmer
sentence=TFT graphics library for Arduino processors with performance optimisation for STM32, ESP8266 and ESP32 sentence=TFT graphics library for Arduino processors with performance optimisation for STM32, ESP8266 and ESP32