Skip to content

Commit ca9e81e

Browse files
authored
Merge pull request #233 from fa1ke5/master
Add correct support TFT_eSPI lib
2 parents 205d9b5 + 5d6d2b6 commit ca9e81e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/macros.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
#define LIQUIDCRYSTAL_OUT(...) ON(LIQUIDCRYSTAL_OUT,__COUNTER__,__VA_ARGS__)
8585
#define LCD_OUT(...) ON(LCD_OUT,__COUNTER__,__VA_ARGS__)
8686
#define ADAGFX_OUT(...) ON(ADAGFX_OUT,__COUNTER__,__VA_ARGS__)
87+
#define TFT_eSPI_OUT(...) ON(TFT_eSPI_OUT,__COUNTER__,__VA_ARGS__)
8788
#define TFT_OUT(...) ON(TFT_OUT,__COUNTER__,__VA_ARGS__)
8889
#define U8GLIB_OUT(...) ON(U8GLIB_OUT,__COUNTER__,__VA_ARGS__)
8990
#define U8G2_OUT(...) ON(U8G2_OUT,__COUNTER__,__VA_ARGS__)
@@ -121,6 +122,11 @@ Menu::idx_t id##Tops##n[md];\
121122
PANELS(id##Panels##n,__VA_ARGS__);\
122123
Menu::adaGfxOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH);
123124

125+
#define VAR_TFT_eSPI_OUT(id,md,n,gfx,color,fontW,fontH,...)\
126+
Menu::idx_t id##Tops##n[md];\
127+
PANELS(id##Panels##n,__VA_ARGS__);\
128+
Menu::TFT_eSPIOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH);
129+
124130
#define VAR_TFT_OUT(id,md,n,gfx,color,fontW,fontH,...)\
125131
Menu::idx_t id##Tops##n[md];\
126132
PANELS(id##Panels##n,__VA_ARGS__);\
@@ -162,6 +168,7 @@ Menu::utftOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH);
162168
#define REF_LIQUIDCRYSTAL_OUT(id,md,n,...) &id##n,
163169
#define REF_LCD_OUT(id,md,n,...) &id##n,
164170
#define REF_ADAGFX_OUT(id,md,n,...) &id##n,
171+
#define REF_TFT_eSPI_OUT(id,md,n,...) &id##n,
165172
#define REF_U8GLIB_OUT(id,md,n,...) &id##n,
166173
#define REF_U8G2_OUT(id,md,n,...) &id##n,
167174
#define REF_UART_OUT(id,md,n,...) &id##n,

src/menuIO/TFT_eSPIOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ www.r-site.net
2222
// TFT_eSPI gfx = TFT_eSPI();
2323
// #include <menu.h>
2424
// #include <menuIO/TFT_eSPIOut.h>
25-
// T_eSPI gfx = TFT_eSPI();
25+
// TTFT_eSPI gfx = TFT_eSPI();
2626

2727
namespace Menu {
2828

0 commit comments

Comments
 (0)