Commit f106fb03 authored by Bodmer's avatar Bodmer

Fix #2080

Forgot to copy over updated file!
parent f94fb287
......@@ -13,7 +13,6 @@
Last update by Bodmer 20/03/20
****************************************************/
#include "TFT_eSPI.h"
#if defined (ESP32)
......@@ -991,14 +990,14 @@ uint8_t TFT_eSPI::readcommand8(uint8_t cmd_function, uint8_t index)
writecommand(cmd_function); // Sets DC and CS high
busDir(dir_mask, INPUT);
busDir(GPIO_DIR_MASK, INPUT);
CS_L;
// Read nth parameter (assumes caller discards 1st parameter or points index to 2nd)
while(index--) reg = readByte();
busDir(dir_mask, OUTPUT);
busDir(GPIO_DIR_MASK, OUTPUT);
CS_H;
......@@ -1076,7 +1075,7 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0)
readAddrWindow(x0, y0, 1, 1);
// Set masked pins D0- D7 to input
busDir(dir_mask, INPUT);
busDir(GPIO_DIR_MASK, INPUT);
#if !defined (SSD1963_DRIVER)
// Dummy read to throw away don't care value
......@@ -1094,7 +1093,7 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0)
if (!inTransaction) CS_H;
// Set masked pins D0- D7 to output
busDir(dir_mask, OUTPUT);
busDir(GPIO_DIR_MASK, OUTPUT);
return rgb;
......@@ -1106,7 +1105,7 @@ uint16_t TFT_eSPI::readPixel(int32_t x0, int32_t y0)
if (!inTransaction) CS_H;
// Set masked pins D0- D7 to output
busDir(dir_mask, OUTPUT);
busDir(GPIO_DIR_MASK, OUTPUT);
#ifdef ILI9486_DRIVER
return bgr;
......@@ -1202,7 +1201,7 @@ void TFT_eSPI::readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *da
data += dx + dy * w;
// Set masked pins D0- D7 to input
busDir(dir_mask, INPUT);
busDir(GPIO_DIR_MASK, INPUT);
#if defined (ILI9341_DRIVER) || defined(ILI9341_2_DRIVER) || defined (ILI9488_DRIVER) // Read 3 bytes
// Dummy read to throw away don't care value
......@@ -1267,7 +1266,7 @@ void TFT_eSPI::readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t *da
CS_H;
// Set masked pins D0- D7 to output
busDir(dir_mask, OUTPUT);
busDir(GPIO_DIR_MASK, OUTPUT);
#else // SPI interface
......@@ -3888,7 +3887,7 @@ void TFT_eSPI::drawWideLine(float ax, float ay, float bx, float by, float wd, ui
}
/***************************************************************************************
** Function name: drawWedgeLine
** Function name: drawWedgeLine - background colour specified or pixel read
** Description: draw an anti-aliased line with different width radiused ends
***************************************************************************************/
void TFT_eSPI::drawWedgeLine(float ax, float ay, float bx, float by, float ar, float br, uint32_t fg_color, uint32_t bg_color)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment