Merge branch 'master' into actionci

This commit is contained in:
Eva Herrada 2022-06-29 11:38:00 -04:00 committed by GitHub
commit b3d5ba1771
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions

View file

@ -141,7 +141,6 @@ void Adafruit_TFTLCD::init(void) {
rotation = 0;
cursor_y = cursor_x = 0;
int textsize = 1;
textcolor = 0xFFFF;
_width = TFTWIDTH;
_height = TFTHEIGHT;
@ -373,7 +372,6 @@ void Adafruit_TFTLCD::begin(uint16_t id) {
} else if (id == 0x9341) {
uint16_t a, d;
driver = ID_9341;
CS_ACTIVE;
writeRegister8(ILI9341_SOFTRESET, 0);
@ -916,7 +914,7 @@ void Adafruit_TFTLCD::setRotation(uint8_t x) {
if (driver == ID_9341) {
// MEME, HX8357D uses same registers as 9341 but different values
uint16_t t;
uint16_t t = 0;
switch (rotation) {
case 2:
@ -940,7 +938,7 @@ void Adafruit_TFTLCD::setRotation(uint8_t x) {
if (driver == ID_HX8357D) {
// MEME, HX8357D uses same registers as 9341 but different values
uint16_t t;
uint16_t t = 0;
switch (rotation) {
case 2:
@ -1046,7 +1044,8 @@ uint16_t Adafruit_TFTLCD::readID(void) {
// retry a bunch!
for (int i = 0; i < 5; i++) {
id = readReg(0xD3);
id = (uint16_t)readReg(0xD3);
delayMicroseconds(50);
if (id == 0x9341) {
return id;
}

View file

@ -1,5 +1,5 @@
name=Adafruit TFTLCD Library
version=1.1.0
version=1.0.3
author=Adafruit
maintainer=Adafruit <info@adafruit.com>
sentence=Adafruit 2.8" TFT display Library