Skip to content

Commit

Permalink
fix compile
Browse files Browse the repository at this point in the history
  • Loading branch information
gemu2015 committed Jan 17, 2024
1 parent 94ea92a commit 67e36fb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
16 changes: 9 additions & 7 deletions lib/lib_display/UDisplay/uDisplay.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
#endif // ESP_IDF_VERSION_MAJOR >= 5
#endif

enum {
UT_RD,UT_RDM,UT_CP,UT_RTF,UT_MV,UT_RT,UT_RTT,UT_RDW,UT_RDWM,UT_WR,UT_WRW,UT_CPR,UT_AND,UT_DBG,UT_GSRT,UT_END
};

#define SIMPLERS_XP par_dbl[1]
#define SIMPLERS_XM par_cs
#define SIMPLERS_YP par_rs
#define SIMPLERS_YM par_dbl[0]

#ifdef USE_ESP32_S3
#include <esp_lcd_panel_io.h>
#include "esp_private/gdma.h"
Expand Down Expand Up @@ -101,14 +110,7 @@ enum uColorType { uCOLOR_BW, uCOLOR_COLOR };
#define GPIO_SET(A) GPIO.out_w1ts = (1 << A)
#endif

enum {
UT_RD,UT_RDM,UT_CP,UT_RTF,UT_MV,UT_RT,UT_RTT,UT_RDW,UT_RDWM,UT_WR,UT_WRW,UT_CPR,UT_AND,UT_DBG,UT_GSRT,UT_END
};

#define SIMPLERS_XP par_dbl[1]
#define SIMPLERS_XM par_cs
#define SIMPLERS_YP par_rs
#define SIMPLERS_YM par_dbl[0]


#define GPIO_CLR_SLOW(A) digitalWrite(A, LOW)
Expand Down
1 change: 1 addition & 0 deletions tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ bool utouch_touched() {
if (renderer) {
return renderer->touched();
}
return false;
}
int16_t utouch_x() {
if (renderer) {
Expand Down

0 comments on commit 67e36fb

Please sign in to comment.