Develop (#50)

* TOUCH_MIRROR_XY => TOUCH_SWAP_XY (#49)

* TOUCH_MIRROR_XY => TOUCH_SWAP_XY

* Added flags for LCD swap/mirror

* LCD->DISPLAY

* GAP_X/GAP_Y

* Updated md

* Missing "'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'",

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                                     |
 |                          |                                                                 |
-| 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       | 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)                       |
 |                          |                                                                 |
-| 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 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                                         |
 |                          |                                                                 |
-| 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                                     |
-| LCD_GAP_X                | The horizontal gap in pixels before the panel                   |
-| LCD_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_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                                       |
 |                          |                                                                 |

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,11 +47,11 @@
       "'-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 LCD_GAP_X=35'",
-      "'-D LCD_GAP_Y=0'",
+      "'-D DISPLAY_SWAP_XY=false'",
+      "'-D DISPLAY_MIRROR_X=false'",
+      "'-D DISPLAY_MIRROR_Y=false'",
+      "'-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'",
@@ -70,13 +70,13 @@
       "'-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'",
       "'-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'"
     ],

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,11 +47,11 @@
       "'-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 LCD_GAP_X=35'",
-      "'-D LCD_GAP_Y=0'"
+      "'-D DISPLAY_SWAP_XY=false'",
+      "'-D DISPLAY_MIRROR_X=false'",
+      "'-D DISPLAY_MIRROR_Y=false'",
+      "'-D DISPLAY_GAP_X=35'",
+      "'-D DISPLAY_GAP_Y=0'"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

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,13 +67,13 @@
       "'-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'",
       "'-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'"
     ],

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"

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,13 +70,13 @@
       "'-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'",
       "'-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'",

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'",

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,13 +61,13 @@
       "'-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'",
       "'-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'",

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'",