Skip to content

Commit

Permalink
Fix I2C touch pins and SDMMC
Browse files Browse the repository at this point in the history
- Fix incorrect I2C pins for touch in SPI variants
- Ignore INT pin in touch detection for SPI variants
- Fix SDMMC path construction
  • Loading branch information
cruzjuniel committed Aug 1, 2024
1 parent d91c5e7 commit bf6c7e6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=GFX4dESP32
version=1.1.0
version=1.1.1
author=4D Systems Pty Ltd
maintainer=4D Systems Pty Ltd <[email protected]>
sentence=Graphics Library for the gen4-ESP32 displays by 4D Systems
Expand Down
4 changes: 2 additions & 2 deletions src/gfx4desp32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ void gfx4desp32::Open4dGFXtoPSRAM(String file4d) {
userDat = LittleFS.open((char*)dat4d.c_str(), "r");
#else
#ifdef USE_SDMMC_FILE_SYSTEM
userDat = SD_MMC.open(dat4d);
userDat = SD_MMC.open("/" + dat4d);
#else
userDat = uSD.open(dat4d);
#endif
Expand All @@ -1551,7 +1551,7 @@ void gfx4desp32::Open4dGFXtoPSRAM(String file4d) {
userImag = LittleFS.open((char*)gci4d.c_str(), "r");
#else
#ifdef USE_SDMMC_FILE_SYSTEM
userImag = SD_MMC.open(gci4d);
userImag = SD_MMC.open("/" + gci4d);
#else
userImag = uSD.open(gci4d);
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/gfx4desp32_spi_panel.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
#define GEN4_35CT_INVERT_COLOR true
#define GEN4_35CT_SWAP_XY true

#define GFX4d_TOUCH_RESET 0x0b
#define GFX4d_TOUCH_INT 0x06
#define GFX4d_TOUCH_RESET 8
#define GFX4d_TOUCH_INT 11
#define GFX4d_QSPI_TOUCH_RESET 41
#define GFX4d_QSPI_TOUCH_INT 42

Expand Down
2 changes: 1 addition & 1 deletion src/gfx4desp32_spi_panel_t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void gfx4desp32_spi_panel_t::touch_Set(uint8_t mode) {
*/
/****************************************************************************/
bool gfx4desp32_spi_panel_t::touch_Update() {
if (!_TouchEnable || digitalRead(GFX4d_TOUCH_INT))
if (!_TouchEnable /*|| digitalRead(GFX4d_TOUCH_INT)*/ )
return false;
bool update = false;
//int n = -1;
Expand Down

0 comments on commit bf6c7e6

Please sign in to comment.