From 39ff5bbb96dbfcc6d61797ed2b348bbe7518d8d8 Mon Sep 17 00:00:00 2001 From: fa1ke5 <34861909+fa1ke5@users.noreply.github.com> Date: Thu, 14 Feb 2019 23:02:41 +0300 Subject: [PATCH 1/3] Update macros.h --- src/macros.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/macros.h b/src/macros.h index ddf6acfd..5351f11d 100644 --- a/src/macros.h +++ b/src/macros.h @@ -84,6 +84,7 @@ #define LIQUIDCRYSTAL_OUT(...) ON(LIQUIDCRYSTAL_OUT,__COUNTER__,__VA_ARGS__) #define LCD_OUT(...) ON(LCD_OUT,__COUNTER__,__VA_ARGS__) #define ADAGFX_OUT(...) ON(ADAGFX_OUT,__COUNTER__,__VA_ARGS__) +#define TFT_eSPIOut(...) ON(TFT_eSPIOut,__COUNTER__,__VA_ARGS__) #define TFT_OUT(...) ON(TFT_OUT,__COUNTER__,__VA_ARGS__) #define U8GLIB_OUT(...) ON(U8GLIB_OUT,__COUNTER__,__VA_ARGS__) #define U8G2_OUT(...) ON(U8G2_OUT,__COUNTER__,__VA_ARGS__) @@ -121,6 +122,11 @@ Menu::idx_t id##Tops##n[md];\ PANELS(id##Panels##n,__VA_ARGS__);\ Menu::adaGfxOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); +#define VAR_TFT_eSPIOut(id,md,n,gfx,color,fontW,fontH,...)\ +Menu::idx_t id##Tops##n[md];\ +PANELS(id##Panels##n,__VA_ARGS__);\ +Menu::adaGfxOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); + #define VAR_TFT_OUT(id,md,n,gfx,color,fontW,fontH,...)\ Menu::idx_t id##Tops##n[md];\ PANELS(id##Panels##n,__VA_ARGS__);\ @@ -162,6 +168,7 @@ Menu::utftOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); #define REF_LIQUIDCRYSTAL_OUT(id,md,n,...) &id##n, #define REF_LCD_OUT(id,md,n,...) &id##n, #define REF_ADAGFX_OUT(id,md,n,...) &id##n, +#define REF_TFT_eSPIOut(id,md,n,...) &id##n, #define REF_U8GLIB_OUT(id,md,n,...) &id##n, #define REF_U8G2_OUT(id,md,n,...) &id##n, #define REF_UART_OUT(id,md,n,...) &id##n, From 2af0004d62d82ad2d4b1d476f7e0ed2a7308d329 Mon Sep 17 00:00:00 2001 From: fa1ke5 <34861909+fa1ke5@users.noreply.github.com> Date: Fri, 15 Feb 2019 12:09:55 +0300 Subject: [PATCH 2/3] Update macros.h --- src/macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/macros.h b/src/macros.h index 5351f11d..70246e27 100644 --- a/src/macros.h +++ b/src/macros.h @@ -84,7 +84,7 @@ #define LIQUIDCRYSTAL_OUT(...) ON(LIQUIDCRYSTAL_OUT,__COUNTER__,__VA_ARGS__) #define LCD_OUT(...) ON(LCD_OUT,__COUNTER__,__VA_ARGS__) #define ADAGFX_OUT(...) ON(ADAGFX_OUT,__COUNTER__,__VA_ARGS__) -#define TFT_eSPIOut(...) ON(TFT_eSPIOut,__COUNTER__,__VA_ARGS__) +#define TFT_eSPI_OUT(...) ON(TFT_eSPI_OUT,__COUNTER__,__VA_ARGS__) #define TFT_OUT(...) ON(TFT_OUT,__COUNTER__,__VA_ARGS__) #define U8GLIB_OUT(...) ON(U8GLIB_OUT,__COUNTER__,__VA_ARGS__) #define U8G2_OUT(...) ON(U8G2_OUT,__COUNTER__,__VA_ARGS__) @@ -122,10 +122,10 @@ Menu::idx_t id##Tops##n[md];\ PANELS(id##Panels##n,__VA_ARGS__);\ Menu::adaGfxOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); -#define VAR_TFT_eSPIOut(id,md,n,gfx,color,fontW,fontH,...)\ +#define VAR_TFT_eSPI_OUT(id,md,n,gfx,color,fontW,fontH,...)\ Menu::idx_t id##Tops##n[md];\ PANELS(id##Panels##n,__VA_ARGS__);\ -Menu::adaGfxOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); +Menu::TFT_eSPIOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); #define VAR_TFT_OUT(id,md,n,gfx,color,fontW,fontH,...)\ Menu::idx_t id##Tops##n[md];\ @@ -168,7 +168,7 @@ Menu::utftOut id##n(gfx,color,id##Tops##n,id##Panels##n,fontW,fontH); #define REF_LIQUIDCRYSTAL_OUT(id,md,n,...) &id##n, #define REF_LCD_OUT(id,md,n,...) &id##n, #define REF_ADAGFX_OUT(id,md,n,...) &id##n, -#define REF_TFT_eSPIOut(id,md,n,...) &id##n, +#define REF_TFT_eSPI_OUT(id,md,n,...) &id##n, #define REF_U8GLIB_OUT(id,md,n,...) &id##n, #define REF_U8G2_OUT(id,md,n,...) &id##n, #define REF_UART_OUT(id,md,n,...) &id##n, From 5d6d2b6d1cdc192dbd94da90ebe0356cb908842f Mon Sep 17 00:00:00 2001 From: fa1ke5 <34861909+fa1ke5@users.noreply.github.com> Date: Fri, 15 Feb 2019 12:14:04 +0300 Subject: [PATCH 3/3] Update TFT_eSPIOut.h minor changes --- src/menuIO/TFT_eSPIOut.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menuIO/TFT_eSPIOut.h b/src/menuIO/TFT_eSPIOut.h index 021a8c23..758e6f4b 100644 --- a/src/menuIO/TFT_eSPIOut.h +++ b/src/menuIO/TFT_eSPIOut.h @@ -22,7 +22,7 @@ www.r-site.net // TFT_eSPI gfx = TFT_eSPI(); // #include // #include -// T_eSPI gfx = TFT_eSPI(); +// TTFT_eSPI gfx = TFT_eSPI(); namespace Menu {