From 07937b1bfcce75027f04dabe847dc25a3dbc8bc4 Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sat, 16 Mar 2024 16:08:44 +0100 Subject: [PATCH 1/5] TOUCH_MIRROR_XY => TOUCH_SWAP_XY --- README.md | 2 +- esp32-1732S019C.json | 2 +- esp32-2424S012C.json | 2 +- esp32-2432S022C.json | 2 +- esp32-2432S024C.json | 2 +- esp32-2432S024R.json | 2 +- esp32-2432S028R.json | 2 +- esp32-2432S028Rv2.json | 2 +- esp32-2432S028Rv3.json | 2 +- esp32-2432S032C.json | 2 +- esp32-2432S032R.json | 2 +- esp32-3248S035C.json | 2 +- esp32-3248S035R.json | 2 +- esp32-4827S043C.json | 2 +- esp32-4827S043R.json | 2 +- esp32-4848S040CIY1.json | 2 +- esp32-4848S040CIY3.json | 2 +- esp32-8048S043C.json | 2 +- esp32-8048S043R.json | 2 +- esp32-8048S050C.json | 2 +- esp32-8048S050R.json | 2 +- esp32-8048S070C.json | 2 +- esp32-8048S070R.json | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 38d74b2..a478b55 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ The table below provides some explanation of the variable names. These definitio | type_RST | GPIO for the Reset | | type_INT | GPIO for the INTerrupt | | | | -| TOUCH_MIRROR_XY | Swap horizontally and vertically | +| TOUCH_SWAP_XY | Swap horizontally and vertically | | TOUCH_MIRROR_X | Swap the touch horizontally | | TOUCH_MIRROR_Y | Swap the touch vertically | | | | diff --git a/esp32-1732S019C.json b/esp32-1732S019C.json index b6d4918..5ff674b 100644 --- a/esp32-1732S019C.json +++ b/esp32-1732S019C.json @@ -76,7 +76,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=8'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'" ], diff --git a/esp32-2424S012C.json b/esp32-2424S012C.json index ff83934..16706c3 100644 --- a/esp32-2424S012C.json +++ b/esp32-2424S012C.json @@ -73,7 +73,7 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'" ], diff --git a/esp32-2432S022C.json b/esp32-2432S022C.json index 3c9d54e..10c2b0b 100644 --- a/esp32-2432S022C.json +++ b/esp32-2432S022C.json @@ -76,7 +76,7 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S024C.json b/esp32-2432S024C.json index 137c9d9..dd236d8 100644 --- a/esp32-2432S024C.json +++ b/esp32-2432S024C.json @@ -67,7 +67,7 @@ "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S024R.json b/esp32-2432S024R.json index 5e7061f..15d8980 100644 --- a/esp32-2432S024R.json +++ b/esp32-2432S024R.json @@ -71,7 +71,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=true'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S028R.json b/esp32-2432S028R.json index 148b67c..a951fe6 100644 --- a/esp32-2432S028R.json +++ b/esp32-2432S028R.json @@ -71,7 +71,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=true'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S028Rv2.json b/esp32-2432S028Rv2.json index 4a54f6b..d5fdf62 100644 --- a/esp32-2432S028Rv2.json +++ b/esp32-2432S028Rv2.json @@ -71,7 +71,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=true'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S028Rv3.json b/esp32-2432S028Rv3.json index 7d331c5..d7b03ae 100644 --- a/esp32-2432S028Rv3.json +++ b/esp32-2432S028Rv3.json @@ -71,7 +71,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=true'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S032C.json b/esp32-2432S032C.json index a1b123b..ed0369c 100644 --- a/esp32-2432S032C.json +++ b/esp32-2432S032C.json @@ -67,7 +67,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-2432S032R.json b/esp32-2432S032R.json index 1fc54e8..ab1c2dd 100644 --- a/esp32-2432S032R.json +++ b/esp32-2432S032R.json @@ -72,7 +72,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-3248S035C.json b/esp32-3248S035C.json index 6ebfd02..4884ae5 100644 --- a/esp32-3248S035C.json +++ b/esp32-3248S035C.json @@ -66,7 +66,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-3248S035R.json b/esp32-3248S035R.json index 73b33cb..43ba536 100644 --- a/esp32-3248S035R.json +++ b/esp32-3248S035R.json @@ -71,7 +71,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=true'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-4827S043C.json b/esp32-4827S043C.json index 1431147..574593a 100644 --- a/esp32-4827S043C.json +++ b/esp32-4827S043C.json @@ -86,7 +86,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-4827S043R.json b/esp32-4827S043R.json index 8a82172..ae98a0e 100644 --- a/esp32-4827S043R.json +++ b/esp32-4827S043R.json @@ -91,7 +91,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-4848S040CIY1.json b/esp32-4848S040CIY1.json index bf72f14..a2cd598 100644 --- a/esp32-4848S040CIY1.json +++ b/esp32-4848S040CIY1.json @@ -103,7 +103,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_LED'", diff --git a/esp32-4848S040CIY3.json b/esp32-4848S040CIY3.json index 168a292..ccc5ac2 100644 --- a/esp32-4848S040CIY3.json +++ b/esp32-4848S040CIY3.json @@ -103,7 +103,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_LED'", diff --git a/esp32-8048S043C.json b/esp32-8048S043C.json index d602491..76eb111 100644 --- a/esp32-8048S043C.json +++ b/esp32-8048S043C.json @@ -86,7 +86,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-8048S043R.json b/esp32-8048S043R.json index 998d84d..e06b7eb 100644 --- a/esp32-8048S043R.json +++ b/esp32-8048S043R.json @@ -91,7 +91,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-8048S050C.json b/esp32-8048S050C.json index e229c8e..ecf030c 100644 --- a/esp32-8048S050C.json +++ b/esp32-8048S050C.json @@ -86,7 +86,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-8048S050R.json b/esp32-8048S050R.json index ead867d..8d4b3e2 100644 --- a/esp32-8048S050R.json +++ b/esp32-8048S050R.json @@ -91,7 +91,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-8048S070C.json b/esp32-8048S070C.json index a4f2670..80caa6e 100644 --- a/esp32-8048S070C.json +++ b/esp32-8048S070C.json @@ -86,7 +86,7 @@ "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", diff --git a/esp32-8048S070R.json b/esp32-8048S070R.json index 1bb1767..b06fdbf 100644 --- a/esp32-8048S070R.json +++ b/esp32-8048S070R.json @@ -91,7 +91,7 @@ "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", - "'-D TOUCH_MIRROR_XY=false'", + "'-D TOUCH_SWAP_XY=false'", "'-D TOUCH_MIRROR_X=false'", "'-D TOUCH_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", From 01c9ec49dda86a9b4d8cca59d5cfa1786843c1b1 Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sun, 17 Mar 2024 10:02:28 +0100 Subject: [PATCH 2/5] Added flags for LCD swap/mirror --- esp32-4827S043C.json | 3 +++ esp32-4827S043N.json | 3 +++ esp32-4827S043R.json | 3 +++ esp32-4848S040CIY1.json | 3 +++ esp32-4848S040CIY3.json | 3 +++ esp32-8048S043C.json | 4 +++- esp32-8048S043N.json | 3 +++ esp32-8048S043R.json | 3 +++ esp32-8048S050C.json | 3 +++ esp32-8048S050N.json | 3 +++ esp32-8048S050R.json | 3 +++ esp32-8048S070C.json | 3 +++ esp32-8048S070N.json | 3 +++ esp32-8048S070R.json | 3 +++ 14 files changed, 42 insertions(+), 1 deletion(-) diff --git a/esp32-4827S043C.json b/esp32-4827S043C.json index 574593a..9db9332 100644 --- a/esp32-4827S043C.json +++ b/esp32-4827S043C.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-4827S043N.json b/esp32-4827S043N.json index 3389957..0c5b4a3 100644 --- a/esp32-4827S043N.json +++ b/esp32-4827S043N.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-4827S043R.json b/esp32-4827S043R.json index ae98a0e..2a89150 100644 --- a/esp32-4827S043R.json +++ b/esp32-4827S043R.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-4848S040CIY1.json b/esp32-4848S040CIY1.json index a2cd598..7f569ac 100644 --- a/esp32-4848S040CIY1.json +++ b/esp32-4848S040CIY1.json @@ -79,6 +79,9 @@ "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-4848S040CIY3.json b/esp32-4848S040CIY3.json index ccc5ac2..6a8f544 100644 --- a/esp32-4848S040CIY3.json +++ b/esp32-4848S040CIY3.json @@ -79,6 +79,9 @@ "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S043C.json b/esp32-8048S043C.json index 76eb111..cc95701 100644 --- a/esp32-8048S043C.json +++ b/esp32-8048S043C.json @@ -61,7 +61,9 @@ "'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", - "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S043N.json b/esp32-8048S043N.json index e7eb712..f3aab4c 100644 --- a/esp32-8048S043N.json +++ b/esp32-8048S043N.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S043R.json b/esp32-8048S043R.json index e06b7eb..87b1c5e 100644 --- a/esp32-8048S043R.json +++ b/esp32-8048S043R.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S050C.json b/esp32-8048S050C.json index ecf030c..ad4cf24 100644 --- a/esp32-8048S050C.json +++ b/esp32-8048S050C.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S050N.json b/esp32-8048S050N.json index 31119eb..d2ff4e5 100644 --- a/esp32-8048S050N.json +++ b/esp32-8048S050N.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S050R.json b/esp32-8048S050R.json index 8d4b3e2..a2809ee 100644 --- a/esp32-8048S050R.json +++ b/esp32-8048S050R.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S070C.json b/esp32-8048S070C.json index 80caa6e..a391c3f 100644 --- a/esp32-8048S070C.json +++ b/esp32-8048S070C.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-8048S070N.json b/esp32-8048S070N.json index d6f4726..7dbbad5 100644 --- a/esp32-8048S070N.json +++ b/esp32-8048S070N.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S070R.json b/esp32-8048S070R.json index b06fdbf..1f8bd5d 100644 --- a/esp32-8048S070R.json +++ b/esp32-8048S070R.json @@ -62,6 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", From e1a5cdd10f12f492fce235eafbd695627b96cb16 Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sun, 17 Mar 2024 11:11:42 +0100 Subject: [PATCH 3/5] LCD->DISPLAY --- README.md | 24 ++++++++++++------------ esp32-1732S019C.json | 20 ++++++++++---------- esp32-1732S019N.json | 16 ++++++++-------- esp32-2424S012C.json | 20 ++++++++++---------- esp32-2424S012N.json | 16 ++++++++-------- esp32-2432S022C.json | 18 +++++++++--------- esp32-2432S022N.json | 14 +++++++------- esp32-2432S024C.json | 18 +++++++++--------- esp32-2432S024N.json | 14 +++++++------- esp32-2432S024R.json | 18 +++++++++--------- esp32-2432S028R.json | 18 +++++++++--------- esp32-2432S028Rv2.json | 18 +++++++++--------- esp32-2432S028Rv3.json | 18 +++++++++--------- esp32-2432S032C.json | 20 ++++++++++---------- esp32-2432S032N.json | 16 ++++++++-------- esp32-2432S032R.json | 20 ++++++++++---------- esp32-3248S035C.json | 18 +++++++++--------- esp32-3248S035R.json | 18 +++++++++--------- esp32-4827S043C.json | 22 +++++++++++----------- esp32-4827S043N.json | 18 +++++++++--------- esp32-4827S043R.json | 22 +++++++++++----------- esp32-4848S040CIY1.json | 22 +++++++++++----------- esp32-4848S040CIY3.json | 22 +++++++++++----------- esp32-8048S043C.json | 22 +++++++++++----------- esp32-8048S043N.json | 18 +++++++++--------- esp32-8048S043R.json | 22 +++++++++++----------- esp32-8048S050C.json | 22 +++++++++++----------- esp32-8048S050N.json | 18 +++++++++--------- esp32-8048S050R.json | 22 +++++++++++----------- esp32-8048S070C.json | 22 +++++++++++----------- esp32-8048S070N.json | 18 +++++++++--------- esp32-8048S070R.json | 22 +++++++++++----------- 32 files changed, 308 insertions(+), 308 deletions(-) diff --git a/README.md b/README.md index a478b55..f5df696 100644 --- a/README.md +++ b/README.md @@ -61,16 +61,16 @@ The table below provides some explanation of the variable names. These definitio | | | | BUTTON_BOOT | GPIO of the BOOT pushbutton | | | | -| LCD_ST7701_PAR | LCD uses the ST7701 display driver (Parallel) | -| LCD_ST7789_SPI | LCD uses the ST7789 display driver (SPI) | -| LCD_ST7789_I80 | LCD uses the ST7789 display driver (I80 mode) | -| LCD_ST7796_SPI | LCD uses the ST7796 display driver (SPI) | -| LCD_GC9A01_SPI | LCD uses the GC9A01 display driver (SPI) | -| LCD_ILI9341_SPI | LCD uses the ILI9341 display driver (SPI) | -| LCD_ST7262_PAR | LCD uses the ST7262 display driver (Parallel) | +| DISPLAY_ST7701_PAR | LCD uses the ST7701 display driver (Parallel) | +| DISPLAY_ST7789_SPI | LCD uses the ST7789 display driver (SPI) | +| DISPLAY_ST7789_I80 | LCD uses the ST7789 display driver (I80 mode) | +| DISPLAY_ST7796_SPI | LCD uses the ST7796 display driver (SPI) | +| DISPLAY_GC9A01_SPI | LCD uses the GC9A01 display driver (SPI) | +| DISPLAY_ILI9341_SPI | LCD uses the ILI9341 display driver (SPI) | +| DISPLAY_ST7262_PAR | LCD uses the ST7262 display driver (Parallel) | | | | -| LCD_WIDTH | The width of the LCD panel in pixels | -| LCD_HEIGHT | The height of the LCD panel in pixels | +| DISPLAY_WIDTH | The width of the LCD panel in pixels | +| DISPLAY_HEIGHT | The height of the LCD panel in pixels | | BCKL_GPIO | GPIO of the backlight | | type_SPI_HOST | The SPI host to use for the LCD driver, eg. ST7789_SPI_HOST | | type_SPI_MOSI | SPI MOSI | @@ -112,9 +112,9 @@ The table below provides some explanation of the variable names. These definitio | ST7262_B3 | GPIO for the blue bit 3 | | ST7262_B4 | GPIO for the blue bit 4 | | | | -| LCD_SWAP_XY | Swap the X and Y axes for the panel | -| LCD_MIRROR_X | Mirror the panel horizontally | -| LCD_MIRROR_Y | Mirror the panel vertically | +| DISPLAY_SWAP_XY | Swap the X and Y axes for the panel | +| DISPLAY_MIRROR_X | Mirror the panel horizontally | +| DISPLAY_MIRROR_Y | Mirror the panel vertically | | LCD_GAP_X | The horizontal gap in pixels before the panel | | LCD_GAP_Y | The vertical gap in pixels before the panel | | | | diff --git a/esp32-1732S019C.json b/esp32-1732S019C.json index 5ff674b..72ade79 100644 --- a/esp32-1732S019C.json +++ b/esp32-1732S019C.json @@ -14,13 +14,13 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_1732S019C'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", - "'-D LCD_WIDTH=170'", - "'-D LCD_HEIGHT=320'", + "'-D DISPLAY_WIDTH=170'", + "'-D DISPLAY_HEIGHT=320'", "'-D GPIO_BCKL=14'", - "'-D LCD_IPS'", - "'-D LCD_ST7789_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_ST7789_SPI'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -47,9 +47,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D LCD_GAP_X=35'", "'-D LCD_GAP_Y=0'", "'-D BOARD_HAS_TOUCH'", @@ -70,8 +70,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=3'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=8'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-1732S019N.json b/esp32-1732S019N.json index c9b707b..2a0872a 100644 --- a/esp32-1732S019N.json +++ b/esp32-1732S019N.json @@ -14,13 +14,13 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_1732S019N'", - "'-D LCD_WIDTH=170'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=170'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=14'", - "'-D LCD_IPS'", - "'-D LCD_ST7789_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_ST7789_SPI'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -47,9 +47,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D LCD_GAP_X=35'", "'-D LCD_GAP_Y=0'" ], diff --git a/esp32-2424S012C.json b/esp32-2424S012C.json index 16706c3..664e3ca 100644 --- a/esp32-2424S012C.json +++ b/esp32-2424S012C.json @@ -12,13 +12,13 @@ "'-D ARDUINO_USB_MODE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=1'", "'-D ESP32_2424S012C'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=240'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=240'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=3'", - "'-D LCD_IPS'", - "'-D LCD_GC9A01_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_GC9A01_SPI'", "'-D GC9A01_SPI_HOST=SPI2_HOST'", "'-D GC9A01_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D GC9A01_SPI_BUS_MOSI_IO_NUM=7'", @@ -45,9 +45,9 @@ "'-D GC9A01_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D GC9A01_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D GC9A01_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -67,8 +67,8 @@ "'-D CST816S_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D CST816S_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D CST816S_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D CST816S_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D CST816S_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D CST816S_TOUCH_CONFIG_RST_GPIO_NUM=1'", "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=0'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2424S012N.json b/esp32-2424S012N.json index 325b186..ceae6d3 100644 --- a/esp32-2424S012N.json +++ b/esp32-2424S012N.json @@ -12,13 +12,13 @@ "'-D ARDUINO_USB_MODE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=1'", "'-D ESP32_2424S012N'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=240'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=240'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=3'", - "'-D LCD_IPS'", - "'-D LCD_GC9A01_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_GC9A01_SPI'", "'-D GC9A01_SPI_HOST=SPI2_HOST'", "'-D GC9A01_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D GC9A01_SPI_BUS_MOSI_IO_NUM=7'", @@ -45,9 +45,9 @@ "'-D GC9A01_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D GC9A01_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D GC9A01_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'" + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'" ], "mcu": "esp32c3", "variant": "esp32c3" diff --git a/esp32-2432S022C.json b/esp32-2432S022C.json index 10c2b0b..7a9faa0 100644 --- a/esp32-2432S022C.json +++ b/esp32-2432S022C.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S022C'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/8)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/8)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=0'", - "'-D LCD_ST7789_I80'", + "'-D DISPLAY_ST7789_I80'", "'-D ST7789_I80_BUS_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7789_I80_BUS_CONFIG_DC=16'", "'-D ST7789_I80_BUS_CONFIG_WR=4'", @@ -48,9 +48,9 @@ "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", "'-D ST7789_RD_GPIO=2'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -70,8 +70,8 @@ "'-D CST816S_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D CST816S_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D CST816S_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D CST816S_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D CST816S_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D CST816S_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S022N.json b/esp32-2432S022N.json index 385f4c1..0ce634f 100644 --- a/esp32-2432S022N.json +++ b/esp32-2432S022N.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S022N'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/8)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/8)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=0'", - "'-D LCD_ST7789_I80'", + "'-D DISPLAY_ST7789_I80'", "'-D ST7789_I80_BUS_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7789_I80_BUS_CONFIG_DC=16'", "'-D ST7789_I80_BUS_CONFIG_WR=4'", @@ -48,9 +48,9 @@ "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", "'-D ST7789_RD_GPIO=2'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S024C.json b/esp32-2432S024C.json index dd236d8..72f32e5 100644 --- a/esp32-2432S024C.json +++ b/esp32-2432S024C.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S024C'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ILI9341_SPI'", + "'-D DISPLAY_ILI9341_SPI'", "'-D ILI9341_SPI_HOST=SPI2_HOST'", "'-D ILI9341_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ILI9341_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -61,8 +61,8 @@ "'-D CST816S_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D CST816S_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D CST816S_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D CST816S_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D CST816S_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D CST816S_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D CST816S_TOUCH_CONFIG_RST_GPIO_NUM=25'", "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S024N.json b/esp32-2432S024N.json index 05cd662..a72f834 100644 --- a/esp32-2432S024N.json +++ b/esp32-2432S024N.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S024N'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ILI9341_SPI'", + "'-D DISPLAY_ILI9341_SPI'", "'-D ILI9341_SPI_HOST=SPI2_HOST'", "'-D ILI9341_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ILI9341_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S024R.json b/esp32-2432S024R.json index 15d8980..daf0768 100644 --- a/esp32-2432S024R.json +++ b/esp32-2432S024R.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S024R'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ILI9341_SPI'", + "'-D DISPLAY_ILI9341_SPI'", "'-D ILI9341_SPI_HOST=SPI2_HOST'", "'-D ILI9341_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ILI9341_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -65,8 +65,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S028R.json b/esp32-2432S028R.json index a951fe6..1ae99bf 100644 --- a/esp32-2432S028R.json +++ b/esp32-2432S028R.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S028R'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=21'", - "'-D LCD_ILI9341_SPI'", + "'-D DISPLAY_ILI9341_SPI'", "'-D ILI9341_SPI_HOST=SPI2_HOST'", "'-D ILI9341_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ILI9341_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -65,8 +65,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S028Rv2.json b/esp32-2432S028Rv2.json index d5fdf62..f769e7d 100644 --- a/esp32-2432S028Rv2.json +++ b/esp32-2432S028Rv2.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S028Rv2'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=21'", - "'-D LCD_ILI9341_SPI'", + "'-D DISPLAY_ILI9341_SPI'", "'-D ILI9341_SPI_HOST=SPI2_HOST'", "'-D ILI9341_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ILI9341_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ILI9341_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ILI9341_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ILI9341_DEV_CONFIG_VENDOR_CONFIG=(ili9341_vendor_config_t[]){{.init_cmds=(lcd_init_cmd_t[]){{.cmd=0xCF,.data=(uint8_t[]){0x00,0xC1,0x30},.bytes=3},{.cmd=0xED,.data=(uint8_t[]){0x64,0x03,0x12,0x81},.bytes=4},{.cmd=0xE8,.data=(uint8_t[]){0x85,0x00,0x78},.bytes=3},{.cmd=0xCB,.data=(uint8_t[]){0x39,0x2C,0x00,0x34,0x02},.bytes=5},{.cmd=0xF7,.data=(uint8_t[]){0x20},.bytes=1},{.cmd=0xEA,.data=(uint8_t[]){0x00,0x00},.bytes=2},{.cmd=0xC0,.data=(uint8_t[]){0x10},.bytes=1},{.cmd=0xC1,.data=(uint8_t[]){0x00},.bytes=1},{.cmd=0xC5,.data=(uint8_t[]){0x30,0x30},.bytes=2,},{.cmd=0xC7,.data=(uint8_t[]){0xB7},.bytes=1},{.cmd=0x3A,.data=(uint8_t[]){0x55},.bytes=1},{.cmd=0x36,.data=(uint8_t[]){0x08},.bytes=1},{.cmd=0xB1,.data=(uint8_t[]){0x00,0x1A},.bytes=2},{.cmd=0xB6,.data=(uint8_t[]){0x08,0x82,0x27},.bytes=3},{.cmd=0xF2,.data=(uint8_t[]){0x00},.bytes=1},{.cmd=0x26,.data=(uint8_t[]){0x01},.bytes=1},{.cmd=0xE0,.data=(uint8_t[]){0x0F,0x2A,0x28,0x08,0x0E,0x08,0x54,0xA9,0x43,0x0A,0x0F,0x00,0x00,0x00,0x00},.bytes=15},{.cmd=0xE1,.data=(uint8_t[]){0x00,0x15,0x17,0x07,0x11,0x06,0x2B,0x56,0x3C,0x05,0x10,0x0F,0x3F,0x3F,0x0F},.bytes=15},{.cmd=0x2B,.data=(uint8_t[]){0x00,0x00,0x01,0x3F},.bytes=4},{.cmd=0x2A,.data=(uint8_t[]){0x00,0x00,0x00,0xEF},.bytes=4},{.cmd=0x21},{.cmd=0x11,.delay_ms=120},{.cmd=0x29,.delay_ms=1}},.init_cmds_size=23}}'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -65,8 +65,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S028Rv3.json b/esp32-2432S028Rv3.json index d7b03ae..81ec516 100644 --- a/esp32-2432S028Rv3.json +++ b/esp32-2432S028Rv3.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S028Rv3'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=21'", - "'-D LCD_ST7789_SPI'", + "'-D DISPLAY_ST7789_SPI'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -65,8 +65,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S032C.json b/esp32-2432S032C.json index ed0369c..166747b 100644 --- a/esp32-2432S032C.json +++ b/esp32-2432S032C.json @@ -7,13 +7,13 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S032C'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_IPS'", - "'-D LCD_ST7789_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_ST7789_SPI'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -40,9 +40,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -61,8 +61,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=25'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-2432S032N.json b/esp32-2432S032N.json index e68a05b..a7f6bc2 100644 --- a/esp32-2432S032N.json +++ b/esp32-2432S032N.json @@ -7,13 +7,13 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S032N'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_IPS'", - "'-D LCD_ST7789_SPI'", + "'-D DISPLAY_IPS'", + "'-D DISPLAY_ST7789_SPI'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -40,9 +40,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=5'", "'-D TF_SPI_MOSI=23'", diff --git a/esp32-2432S032R.json b/esp32-2432S032R.json index ab1c2dd..3d60841 100644 --- a/esp32-2432S032R.json +++ b/esp32-2432S032R.json @@ -7,13 +7,13 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_2432S032R'", - "'-D LCD_WIDTH=240'", - "'-D LCD_HEIGHT=320'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=240'", + "'-D DISPLAY_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ST7789_SPI'", - "'-D LCD_IPS'", + "'-D DISPLAY_ST7789_SPI'", + "'-D DISPLAY_IPS'", "'-D ST7789_SPI_HOST=SPI2_HOST'", "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", @@ -40,9 +40,9 @@ "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -66,8 +66,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-3248S035C.json b/esp32-3248S035C.json index 4884ae5..f6b9659 100644 --- a/esp32-3248S035C.json +++ b/esp32-3248S035C.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_3248S035C'", - "'-D LCD_WIDTH=320'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=320'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ST7796_SPI'", + "'-D DISPLAY_ST7796_SPI'", "'-D ST7796_SPI_HOST=SPI2_HOST'", "'-D ST7796_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7796_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ST7796_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7796_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7796_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -60,8 +60,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=25'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=21'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-3248S035R.json b/esp32-3248S035R.json index 43ba536..c200034 100644 --- a/esp32-3248S035R.json +++ b/esp32-3248S035R.json @@ -7,12 +7,12 @@ "extra_flags": [ "'-D ARDUINO_ESP32_DEV'", "'-D ESP32_3248S035R'", - "'-D LCD_WIDTH=320'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D DISPLAY_WIDTH=320'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT/4)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=27'", - "'-D LCD_ST7796_SPI'", + "'-D DISPLAY_ST7796_SPI'", "'-D ST7796_SPI_HOST=SPI2_HOST'", "'-D ST7796_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", "'-D ST7796_SPI_BUS_MOSI_IO_NUM=13'", @@ -39,9 +39,9 @@ "'-D ST7796_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7796_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7796_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=true'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=true'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -65,8 +65,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-4827S043C.json b/esp32-4827S043C.json index 9db9332..87d1dcd 100644 --- a/esp32-4827S043C.json +++ b/esp32-4827S043C.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_4827S043C'", - "'-D LCD_WIDTH=480'", - "'-D LCD_HEIGHT=272'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=480'", + "'-D DISPLAY_HEIGHT=272'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(8*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=43'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -83,8 +83,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=38'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-4827S043N.json b/esp32-4827S043N.json index 0c5b4a3..da9df8a 100644 --- a/esp32-4827S043N.json +++ b/esp32-4827S043N.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_4827S043N'", - "'-D LCD_WIDTH=480'", - "'-D LCD_HEIGHT=272'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=480'", + "'-D DISPLAY_HEIGHT=272'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(8*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=43'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-4827S043R.json b/esp32-4827S043R.json index 2a89150..67cefc7 100644 --- a/esp32-4827S043R.json +++ b/esp32-4827S043R.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_4827S043R'", - "'-D LCD_WIDTH=480'", - "'-D LCD_HEIGHT=272'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=480'", + "'-D DISPLAY_HEIGHT=272'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(8*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=43'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -88,8 +88,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-4848S040CIY1.json b/esp32-4848S040CIY1.json index 7f569ac..1638f67 100644 --- a/esp32-4848S040CIY1.json +++ b/esp32-4848S040CIY1.json @@ -14,12 +14,12 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_4848S040CIY1'", - "'-D LCD_WIDTH=480'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=480'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=38'", - "'-D LCD_ST7701_PAR'", + "'-D DISPLAY_ST7701_PAR'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_CS_GPIO_NUM=39'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_SCL_GPIO_NUM=48'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_SDA_GPIO_NUM=47'", @@ -34,8 +34,8 @@ "'-D ST7701_IO_3WIRE_SPI_FLAGS_DEL_KEEP_CS_INACTIVE=1'", "'-D ST7701_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7701_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7701_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7701_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7701_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7701_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=8'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=50'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=10'", @@ -79,9 +79,9 @@ "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -100,8 +100,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-4848S040CIY3.json b/esp32-4848S040CIY3.json index 6a8f544..3f497d8 100644 --- a/esp32-4848S040CIY3.json +++ b/esp32-4848S040CIY3.json @@ -14,12 +14,12 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_4848S040CIY3'", - "'-D LCD_WIDTH=480'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=480'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=38'", - "'-D LCD_ST7701_PAR'", + "'-D DISPLAY_ST7701_PAR'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_CS_GPIO_NUM=39'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_SCL_GPIO_NUM=48'", "'-D ST7701_IO_3WIRE_SPI_LINE_CONFIG_SDA_GPIO_NUM=47'", @@ -34,8 +34,8 @@ "'-D ST7701_IO_3WIRE_SPI_FLAGS_DEL_KEEP_CS_INACTIVE=1'", "'-D ST7701_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7701_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7701_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7701_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7701_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7701_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=8'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=50'", "'-D ST7701_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=10'", @@ -79,9 +79,9 @@ "'-D ST7701_DEV_CONFIG_BITS_PER_PIXEL=16'", "'-D ST7701_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", "'-D ST7701_DEV_CONFIG_VENDOR_CONFIG=NULL'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -100,8 +100,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S043C.json b/esp32-8048S043C.json index cc95701..937aa32 100644 --- a/esp32-8048S043C.json +++ b/esp32-8048S043C.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S043C'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -61,9 +61,9 @@ "'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'", "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -82,8 +82,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=38'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S043N.json b/esp32-8048S043N.json index f3aab4c..95c4f4c 100644 --- a/esp32-8048S043N.json +++ b/esp32-8048S043N.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S043N'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S043R.json b/esp32-8048S043R.json index 87b1c5e..1433e0c 100644 --- a/esp32-8048S043R.json +++ b/esp32-8048S043R.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S043R'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -88,8 +88,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S050C.json b/esp32-8048S050C.json index ad4cf24..03edd2f 100644 --- a/esp32-8048S050C.json +++ b/esp32-8048S050C.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S050C'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -83,8 +83,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=38'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S050N.json b/esp32-8048S050N.json index d2ff4e5..2a9875b 100644 --- a/esp32-8048S050N.json +++ b/esp32-8048S050N.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S050N'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S050R.json b/esp32-8048S050R.json index a2809ee..94a3bcf 100644 --- a/esp32-8048S050R.json +++ b/esp32-8048S050R.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S050R'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -88,8 +88,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S070C.json b/esp32-8048S070C.json index a391c3f..4b08637 100644 --- a/esp32-8048S070C.json +++ b/esp32-8048S070C.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S070C'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=30'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=16'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=210'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -83,8 +83,8 @@ "'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", - "'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D GT911_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D GT911_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=38'", "'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'", diff --git a/esp32-8048S070N.json b/esp32-8048S070N.json index 7dbbad5..a290be5 100644 --- a/esp32-8048S070N.json +++ b/esp32-8048S070N.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S070N'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=30'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=16'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=210'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TF'", "'-D TF_CS=10'", "'-D TF_SPI_MOSI=11'", diff --git a/esp32-8048S070R.json b/esp32-8048S070R.json index 1f8bd5d..0863565 100644 --- a/esp32-8048S070R.json +++ b/esp32-8048S070R.json @@ -14,16 +14,16 @@ "'-D ARDUINO_EVENT_RUNNING_CORE=1'", "'-D ARDUINO_USB_CDC_ON_BOOT=0'", "'-D ESP32_8048S070R'", - "'-D LCD_WIDTH=800'", - "'-D LCD_HEIGHT=480'", - "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'", + "'-D DISPLAY_WIDTH=800'", + "'-D DISPLAY_HEIGHT=480'", + "'-D LVGL_BUFFER_PIXELS=(DISPLAY_WIDTH*DISPLAY_HEIGHT)'", "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'", "'-D GPIO_BCKL=2'", - "'-D LCD_ST7262_PAR'", + "'-D DISPLAY_ST7262_PAR'", "'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", "'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(12.5*1000000)'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'", - "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=DISPLAY_WIDTH'", + "'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=DISPLAY_HEIGHT'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=30'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=16'", "'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=210'", @@ -62,9 +62,9 @@ "'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'", "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'", - "'-D LCD_SWAP_XY=false'", - "'-D LCD_MIRROR_X=false'", - "'-D LCD_MIRROR_Y=false'", + "'-D DISPLAY_SWAP_XY=false'", + "'-D DISPLAY_MIRROR_X=false'", + "'-D DISPLAY_MIRROR_Y=false'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", @@ -88,8 +88,8 @@ "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", - "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", - "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=DISPLAY_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=DISPLAY_HEIGHT'", "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=18'", "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", From 62b5c6bffbcd7c3286c8ac91dd318a0af36b018d Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sun, 17 Mar 2024 11:35:54 +0100 Subject: [PATCH 4/5] GAP_X/GAP_Y --- README.md | 4 ++-- esp32-1732S019C.json | 4 ++-- esp32-1732S019N.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f5df696..4078a2c 100644 --- a/README.md +++ b/README.md @@ -115,8 +115,8 @@ The table below provides some explanation of the variable names. These definitio | DISPLAY_SWAP_XY | Swap the X and Y axes for the panel | | DISPLAY_MIRROR_X | Mirror the panel horizontally | | DISPLAY_MIRROR_Y | Mirror the panel vertically | -| LCD_GAP_X | The horizontal gap in pixels before the panel | -| LCD_GAP_Y | The vertical gap in pixels before the panel | +| DISPLAY_GAP_X | The horizontal gap in pixels before the panel | +| DISPLAY_GAP_Y | The vertical gap in pixels before the panel | | | | | BOARD_HAS_TOUCH | The panel has a touch interface | | TOUCH_USES_GT911 | Touch uses the GT911 capacitive touch controller | diff --git a/esp32-1732S019C.json b/esp32-1732S019C.json index 72ade79..c3222ce 100644 --- a/esp32-1732S019C.json +++ b/esp32-1732S019C.json @@ -50,8 +50,8 @@ "'-D DISPLAY_SWAP_XY=false'", "'-D DISPLAY_MIRROR_X=false'", "'-D DISPLAY_MIRROR_Y=false'", - "'-D LCD_GAP_X=35'", - "'-D LCD_GAP_Y=0'", + "'-D DISPLAY_GAP_X=35'", + "'-D DISPLAY_GAP_Y=0'", "'-D BOARD_HAS_TOUCH'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_POINTS=1'", "'-D CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS=0'", diff --git a/esp32-1732S019N.json b/esp32-1732S019N.json index 2a0872a..e588ef8 100644 --- a/esp32-1732S019N.json +++ b/esp32-1732S019N.json @@ -50,8 +50,8 @@ "'-D DISPLAY_SWAP_XY=false'", "'-D DISPLAY_MIRROR_X=false'", "'-D DISPLAY_MIRROR_Y=false'", - "'-D LCD_GAP_X=35'", - "'-D LCD_GAP_Y=0'" + "'-D DISPLAY_GAP_X=35'", + "'-D DISPLAY_GAP_Y=0'" ], "f_cpu": "240000000L", "f_flash": "80000000L", From 11a99bec8aaef2d14daac82347106ec257ae2bc1 Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Sun, 17 Mar 2024 11:39:44 +0100 Subject: [PATCH 5/5] Updated md --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4078a2c..16401b1 100644 --- a/README.md +++ b/README.md @@ -61,18 +61,18 @@ The table below provides some explanation of the variable names. These definitio | | | | BUTTON_BOOT | GPIO of the BOOT pushbutton | | | | -| DISPLAY_ST7701_PAR | LCD uses the ST7701 display driver (Parallel) | -| DISPLAY_ST7789_SPI | LCD uses the ST7789 display driver (SPI) | -| DISPLAY_ST7789_I80 | LCD uses the ST7789 display driver (I80 mode) | -| DISPLAY_ST7796_SPI | LCD uses the ST7796 display driver (SPI) | -| DISPLAY_GC9A01_SPI | LCD uses the GC9A01 display driver (SPI) | -| DISPLAY_ILI9341_SPI | LCD uses the ILI9341 display driver (SPI) | -| DISPLAY_ST7262_PAR | LCD uses the ST7262 display driver (Parallel) | +| DISPLAY_ST7701_PAR | Display uses the ST7701 driver (Parallel) | +| DISPLAY_ST7789_SPI | Display uses the ST7789 driver (SPI) | +| DISPLAY_ST7789_I80 | Display uses the ST7789 driver (I80 mode) | +| DISPLAY_ST7796_SPI | Display uses the ST7796 driver (SPI) | +| DISPLAY_GC9A01_SPI | Display uses the GC9A01 driver (SPI) | +| DISPLAY_ILI9341_SPI | Display uses the ILI9341 driver (SPI) | +| DISPLAY_ST7262_PAR | Display uses the ST7262 driver (Parallel) | | | | -| DISPLAY_WIDTH | The width of the LCD panel in pixels | -| DISPLAY_HEIGHT | The height of the LCD panel in pixels | +| DISPLAY_WIDTH | The width of the display panel in pixels | +| DISPLAY_HEIGHT | The height of the display panel in pixels | | BCKL_GPIO | GPIO of the backlight | -| type_SPI_HOST | The SPI host to use for the LCD driver, eg. ST7789_SPI_HOST | +| type_SPI_HOST | The SPI host to use for the display driver, eg. ST7789_SPI_HOST | | type_SPI_MOSI | SPI MOSI | | type_SPI_MISO | SPI MISO | | type_SPI_SCLK | SPI SCLK | @@ -112,11 +112,11 @@ The table below provides some explanation of the variable names. These definitio | ST7262_B3 | GPIO for the blue bit 3 | | ST7262_B4 | GPIO for the blue bit 4 | | | | -| DISPLAY_SWAP_XY | Swap the X and Y axes for the panel | -| DISPLAY_MIRROR_X | Mirror the panel horizontally | -| DISPLAY_MIRROR_Y | Mirror the panel vertically | -| DISPLAY_GAP_X | The horizontal gap in pixels before the panel | -| DISPLAY_GAP_Y | The vertical gap in pixels before the panel | +| DISPLAY_SWAP_XY | Swap the X and Y axes for the panel | +| DISPLAY_MIRROR_X | Mirror the panel horizontally | +| DISPLAY_MIRROR_Y | Mirror the panel vertically | +| DISPLAY_GAP_X | The horizontal gap in pixels before the panel | +| DISPLAY_GAP_Y | The vertical gap in pixels before the panel | | | | | BOARD_HAS_TOUCH | The panel has a touch interface | | TOUCH_USES_GT911 | Touch uses the GT911 capacitive touch controller | @@ -139,7 +139,7 @@ The table below provides some explanation of the variable names. These definitio | type_RST | GPIO for the Reset | | type_INT | GPIO for the INTerrupt | | | | -| TOUCH_SWAP_XY | Swap horizontally and vertically | +| TOUCH_SWAP_XY | Swap horizontally and vertically | | TOUCH_MIRROR_X | Swap the touch horizontally | | TOUCH_MIRROR_Y | Swap the touch vertically | | | |