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

Merge branch 'master' of https://github.com/Bodmer/TFT_eSPI

Browse Source
This commit is contained in:
Bodmer
2022-03-22 23:10:24 +00:00
parent 0b7c57fe0a 810aa98fc0
commit ba67e95f7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Extensions/Sprite.cpp
View File

@@ -405,7 +405,7 @@ bool TFT_eSprite::pushRotated(int16_t angle, uint32_t transp)
int32_t yt = min_y - _tft->_yPivot; int32_t yt = min_y - _tft->_yPivot;
uint32_t xe = _dwidth << FP_SCALE; uint32_t xe = _dwidth << FP_SCALE;
uint32_t ye = _dheight << FP_SCALE; uint32_t ye = _dheight << FP_SCALE;
uint32_t tpcolor = transp; uint16_t tpcolor = (uint16_t)transp;
if (transp != 0x00FFFFFF) { if (transp != 0x00FFFFFF) {
if (_bpp == 4) tpcolor = _colorMap[transp & 0x0F]; if (_bpp == 4) tpcolor = _colorMap[transp & 0x0F];
@@ -479,7 +479,7 @@ bool TFT_eSprite::pushRotated(TFT_eSprite *spr, int16_t angle, uint32_t transp)
int32_t yt = min_y - spr->_yPivot; int32_t yt = min_y - spr->_yPivot;
uint32_t xe = _dwidth << FP_SCALE; uint32_t xe = _dwidth << FP_SCALE;
uint32_t ye = _dheight << FP_SCALE; uint32_t ye = _dheight << FP_SCALE;
uint32_t tpcolor = transp; uint16_t tpcolor = (uint16_t)transp;
if (transp != 0x00FFFFFF) { if (transp != 0x00FFFFFF) {
if (_bpp == 4) tpcolor = _colorMap[transp & 0x0F]; if (_bpp == 4) tpcolor = _colorMap[transp & 0x0F];

2
Processors/TFT_eSPI_ESP32.h
View File

@@ -12,7 +12,7 @@
#include "soc/spi_reg.h" #include "soc/spi_reg.h"
#include "driver/spi_master.h" #include "driver/spi_master.h"
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32)
#define CONFIG_IDF_TARGET_ESP32 #define CONFIG_IDF_TARGET_ESP32
#endif #endif