Feature/renamedefs (#1)

* Renamed defines * Corrected touch in 8048S070C
rzeldent · Dec 17, 2023 · 43165bd · 43165bd
1 parent fdae321
commit 43165bd
Show file tree

Hide file tree

Showing 24 changed files with 532 additions and 539 deletions.
diff --git a/esp32-1732S019C.json b/esp32-1732S019C.json
@@ -14,28 +14,28 @@
       "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DARDUINO_USB_CDC_ON_BOOT=0",
       "-DESP32_1732S019C",
-      "-DTFT_WIDTH=170",
-      "-DTFT_HEIGHT=320",
-      "-DPIN_BCKL=14",
-      "-DUSES_ST7789",
-      "-DST7789_SPI_HOST=SPI2_HOST",
-      "-DST7789_SPI_BUS_CONFIG={.mosi_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DST7789_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=11,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DST7789_PANEL_DEV_CONFIG={.reset_gpio_num=1,.color_space=ESP_LCD_COLOR_SPACE_RGB,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=false",
-      "-DPANEL_MIRROR_Y=false",
-      "-DPANEL_GAP_X=35",
-      "-DPANEL_GAP_Y=0",
-      "-DHAS_TOUCH",
-      "-DUSES_GT911",
-      "-DGT911_I2C_HOST=0",
-      "-DGT911_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=9,.scl_io_num=46,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
-      "-DGT911_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=16,.flags={.disable_control_phase=1}}",
-      "-DGT911_TOUCH_CONFIG={.x_max=TFT_WIDTH,.y_max=TFT_HEIGHT,.rst_gpio_num=GPIO_NUM_3,.int_gpio_num=GPIO_NUM_8}",
-      "-DTOUCH_ROT_SWAP_X=false",
-      "-DTOUCH_ROT_SWAP_Y=false",
-      "-DBUTTON_BOOT=0"
+      "-DLCD_WIDTH=170",
+      "-DLCD_HEIGHT=320",
+      "-DLCD_BCKL_GPIO=14",
+      "-DLCD_USES_ST7789",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=11,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=1,.color_space=ESP_LCD_COLOR_SPACE_RGB,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=false",
+      "-DLCD_MIRROR_Y=false",
+      "-DLCD_GAP_X=35",
+      "-DLCD_GAP_Y=0",
+      "-DBOARD_HAS_TOUCH",
+      "-DTOUCH_USES_GT911",
+      "-DTOUCH_I2C_HOST=0",
+      "-DTOUCH_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=9,.scl_io_num=46,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
+      "-DTOUCH_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=16,.flags={.disable_control_phase=1}}",
+      "-DTOUCH_DEV_CONFIG={.x_max=LCD_WIDTH,.y_max=LCD_HEIGHT,.rst_gpio_num=GPIO_NUM_3,.int_gpio_num=GPIO_NUM_8}",
+      "-DTOUCH_SWAP_X=false",
+      "-DTOUCH_SWAP_Y=false",
+      "-DBUTTON_BOOT_GPIO=0"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/esp32-1732S019N.json b/esp32-1732S019N.json
@@ -14,20 +14,20 @@
       "-DARDUINO_EVENT_RUNNING_CORE=1",
       "-DARDUINO_USB_CDC_ON_BOOT=0",
       "-DESP32_1732S019N",
-      "-DTFT_WIDTH=170",
-      "-DTFT_HEIGHT=320",
-      "-DPIN_BCKL=14",
-      "-DUSES_ST7789",
-      "-DST7789_SPI_HOST=SPI2_HOST",
-      "-DST7789_SPI_BUS_CONFIG={.mosi_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DST7789_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=11,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DST7789_PANEL_DEV_CONFIG={.reset_gpio_num=1,.color_space=ESP_LCD_COLOR_SPACE_RGB,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=false",
-      "-DPANEL_MIRROR_Y=false",
-      "-DPANEL_GAP_X=35",
-      "-DPANEL_GAP_Y=0",
-      "-DBUTTON_BOOT=0"
+      "-DLCD_WIDTH=170",
+      "-DLCD_HEIGHT=320",
+      "-DLCD_BCKL_GPIO=14",
+      "-DLCD_USES_ST7789",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=13,.sclk_io_num=12,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=11,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=1,.color_space=ESP_LCD_COLOR_SPACE_RGB,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=false",
+      "-DLCD_MIRROR_Y=false",
+      "-DLCD_GAP_X=35",
+      "-DLCD_GAP_Y=0",
+      "-DBUTTON_BOOT_GPIO=0"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",

diff --git a/esp32-2424S012C.json b/esp32-2424S012C.json
@@ -10,26 +10,26 @@
     "extra_flags": [
       "-DARDUINO_ESP32C3_DEV",
       "-DESP32_2424S012C",
-      "-DTFT_WIDTH=240",
-      "-DTFT_HEIGHT=240",
-      "-DPIN_BCKL=3",
-      "-DUSES_GC9A01",
-      "-DGC9A01_SPI_HOST=SPI2_HOST",
-      "-DGC9A01_SPI_BUS_CONFIG={.mosi_io_num=7,.miso_io_num=-1,.sclk_io_num=6,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DGC9A01_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=80000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DGC9A01_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=true",
-      "-DPANEL_MIRROR_Y=false",
-      "-DHAS_TOUCH",
-      "-DUSES_CST816S",
-      "-DCST816S_I2C_HOST=0",
-      "-DCST816S_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=4,.scl_io_num=5,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
-      "-DCST816S_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=8,.flags={.disable_control_phase=1}}",
-      "-DCST816S_TOUCH_CONFIG={.x_max=TFT_WIDTH,.y_max=TFT_HEIGHT,.rst_gpio_num=GPIO_NUM_1,.int_gpio_num=GPIO_NUM_0}",
-      "-DTOUCH_ROT_SWAP_X=false",
-      "-DTOUCH_ROT_SWAP_Y=false",
-      "-DBUTTON_BOOT=0"
+      "-DLCD_WIDTH=240",
+      "-DLCD_HEIGHT=240",
+      "-DLCD_BCKL_GPIO=3",
+      "-DLCD_USES_GC9A01",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=7,.miso_io_num=-1,.sclk_io_num=6,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=80000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=true",
+      "-DLCD_MIRROR_Y=false",
+      "-DBOARD_HAS_TOUCH",
+      "-DTOUCH_USES_CST816S",
+      "-DTOUCH_I2C_HOST=0",
+      "-DTOUCH_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=4,.scl_io_num=5,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
+      "-DTOUCH_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=8,.flags={.disable_control_phase=1}}",
+      "-DTOUCH_DEV_CONFIG={.x_max=LCD_WIDTH,.y_max=LCD_HEIGHT,.rst_gpio_num=GPIO_NUM_1,.int_gpio_num=GPIO_NUM_0}",
+      "-DTOUCH_SWAP_X=false",
+      "-DTOUCH_SWAP_Y=false",
+      "-DBUTTON_BOOT_GPIO=0"
     ],
     "mcu": "esp32c3",
     "variant": "esp32c3"

diff --git a/esp32-2424S012N.json b/esp32-2424S012N.json
@@ -10,18 +10,18 @@
     "extra_flags": [
       "-DARDUINO_ESP32C3_DEV",
       "-DESP32_2424S012N",
-      "-DTFT_WIDTH=240",
-      "-DTFT_HEIGHT=240",
-      "-DPIN_BCKL=3",
-      "-DUSES_GC9A01",
-      "-DGC9A01_SPI_HOST=SPI2_HOST",
-      "-DGC9A01_SPI_BUS_CONFIG={.mosi_io_num=7,.miso_io_num=-1,.sclk_io_num=6,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DGC9A01_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=80000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DGC9A01_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=true",
-      "-DPANEL_MIRROR_Y=false",
-      "-DBUTTON_BOOT=0"
+      "-DLCD_WIDTH=240",
+      "-DLCD_HEIGHT=240",
+      "-DLCD_BCKL_GPIO=3",
+      "-DLCD_USES_GC9A01",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=7,.miso_io_num=-1,.sclk_io_num=6,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=10,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=80000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=true",
+      "-DLCD_MIRROR_Y=false",
+      "-DBUTTON_BOOT_GPIO=0"
     ],
     "mcu": "esp32c3",
     "variant": "esp32c3"

diff --git a/esp32-2432S024C.json b/esp32-2432S024C.json
@@ -7,39 +7,39 @@
     "extra_flags": [
       "-DARDUINO_ESP32_DEV",
       "-DESP32_2432S024C",
-      "-DTFT_WIDTH=240",
-      "-DTFT_HEIGHT=320",
-      "-DPIN_BCKL=27",
-      "-DUSES_ILI9341",
-      "-DILI9341_SPI_HOST=SPI2_HOST",
-      "-DILI9341_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DILI9341_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DILI9341_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=true",
-      "-DPANEL_MIRROR_Y=false",
-      "-DHAS_TOUCH",
-      "-DUSES_CST816S",
-      "-DCST816S_I2C_HOST=0",
-      "-DCST816S_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=33,.scl_io_num=32,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
-      "-DCST816S_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=8,.flags={.disable_control_phase=1}}",
-      "-DCST816S_TOUCH_CONFIG={.x_max=TFT_WIDTH,.y_max=TFT_HEIGHT,.rst_gpio_num=GPIO_NUM_25,.int_gpio_num=GPIO_NUM_NC}",
-      "-DTOUCH_ROT_SWAP_X=false",
-      "-DTOUCH_ROT_SWAP_Y=false",
-      "-DBUTTON_BOOT=0",
-      "-DHAS_TF",
-      "-DTF_CS=5",
-      "-DTF_MOSI=23",
-      "-DTF_SCLK=18",
-      "-DTF_MISO=19",
-      "-DHAS_RGB_LED",
-      "-DLED_R=4",
-      "-DLED_G=16",
-      "-DLED_B=17",
-      "-DHAS_CDR",
-      "-DCDR_IN=34",
-      "-DHAS_SPEAK",
-      "-DSPEAKER=26"
+      "-DLCD_WIDTH=240",
+      "-DLCD_HEIGHT=320",
+      "-DLCD_BCKL_GPIO=27",
+      "-DLCD_USES_ILI9341",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=true",
+      "-DLCD_MIRROR_Y=false",
+      "-DBOARD_HAS_TOUCH",
+      "-DTOUCH_USES_CST816S",
+      "-DTOUCH_I2C_HOST=0",
+      "-DTOUCH_I2C_CONFIG={.mode=I2C_MODE_MASTER,.sda_io_num=33,.scl_io_num=32,.sda_pullup_en=GPIO_PULLUP_ENABLE,.scl_pullup_en=GPIO_PULLUP_ENABLE,.master={.clk_speed=400000}}",
+      "-DTOUCH_IO_I2C_CONFIG={.dev_addr=ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS,.control_phase_bytes=1,.lcd_cmd_bits=8,.flags={.disable_control_phase=1}}",
+      "-DTOUCH_DEV_CONFIG={.x_max=LCD_WIDTH,.y_max=LCD_HEIGHT,.rst_gpio_num=GPIO_NUM_25,.int_gpio_num=GPIO_NUM_NC}",
+      "-DTOUCH_SWAP_X=false",
+      "-DTOUCH_SWAP_Y=false",
+      "-DBUTTON_BOOT_GPIO=0",
+      "-DBOARD_HAS_TF",
+      "-DTF_CS_GPIO=5",
+      "-DTF_MOSI_GPIO=23",
+      "-DTF_SCLK_GPIO=18",
+      "-DTF_MISO_GPIO=19",
+      "-DBOARD_HAS_RGB_LED",
+      "-DLED_R_GPIO=4",
+      "-DLED_G_GPIO=16",
+      "-DLED_B_GPIO=17",
+      "-DBOARD_HAS_CDS",
+      "-DCDS_GPIO=34",
+      "-DBOARD_HAS_SPEAK_GPIO",
+      "-DSPEAK_GPIO=26"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",

diff --git a/esp32-2432S024N.json b/esp32-2432S024N.json
@@ -7,31 +7,31 @@
     "extra_flags": [
       "-DARDUINO_ESP32_DEV",
       "-DESP32_2432S024N",
-      "-DTFT_WIDTH=240",
-      "-DTFT_HEIGHT=320",
-      "-DPIN_BCKL=27",
-      "-DUSES_ILI9341",
-      "-DILI9341_SPI_HOST=SPI2_HOST",
-      "-DILI9341_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DILI9341_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DILI9341_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=true",
-      "-DPANEL_MIRROR_Y=false",
-      "-DBUTTON_BOOT=0",
-      "-DHAS_TF",
-      "-DTF_CS=5",
-      "-DTF_MOSI=23",
-      "-DTF_SCLK=18",
-      "-DTF_MISO=19",
-      "-DHAS_RGB_LED",
-      "-DLED_R=4",
-      "-DLED_G=16",
-      "-DLED_B=17",
-      "-DHAS_CDR",
-      "-DCDR_IN=34",
-      "-DHAS_SPEAK",
-      "-DSPEAKER=26"
+      "-DLCD_WIDTH=240",
+      "-DLCD_HEIGHT=320",
+      "-DLCD_BCKL_GPIO=27",
+      "-DLCD_USES_ILI9341",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=true",
+      "-DLCD_MIRROR_Y=false",
+      "-DBUTTON_BOOT_GPIO=0",
+      "-DBOARD_HAS_TF",
+      "-DTF_CS_GPIO=5",
+      "-DTF_MOSI_GPIO=23",
+      "-DTF_SCLK_GPIO=18",
+      "-DTF_MISO_GPIO=19",
+      "-DBOARD_HAS_RGB_LED",
+      "-DLED_R_GPIO=4",
+      "-DLED_G_GPIO=16",
+      "-DLED_B_GPIO=17",
+      "-DBOARD_HAS_CDS",
+      "-DCDS_GPIO=34",
+      "-DBOARD_HAS_SPEAK_GPIO",
+      "-DSPEAK_GPIO=26"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",

diff --git a/esp32-2432S024R.json b/esp32-2432S024R.json
@@ -7,39 +7,39 @@
     "extra_flags": [
       "-DARDUINO_ESP32_DEV",
       "-DESP32_2432S024R",
-      "-DTFT_WIDTH=240",
-      "-DTFT_HEIGHT=320",
-      "-DPIN_BCKL=27",
-      "-DUSES_ILI9341",
-      "-DILI9341_SPI_HOST=SPI2_HOST",
-      "-DILI9341_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DILI9341_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DILI9341_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
-      "-DPANEL_SWAP_XY=false",
-      "-DPANEL_MIRROR_X=true",
-      "-DPANEL_MIRROR_Y=false",
-      "-DHAS_TOUCH",
-      "-DUSES_XPT2046",
-      "-DXPT2046_SPI_HOST=SPI2_HOST",
-      "-DXPT2046_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
-      "-DXPT2046_IO_SPI_CONFIG={.cs_gpio_num=33,.dc_gpio_num=-1,.spi_mode=SPI_MODE0,.pclk_hz=2000000,.trans_queue_depth=3,.lcd_cmd_bits=8,.lcd_param_bits=8}",
-      "-DXPT2046_TOUCH_CONFIG={.x_max=TFT_WIDTH,.y_max=TFT_HEIGHT,.rst_gpio_num=GPIO_NUM_NC,.int_gpio_num=GPIO_NUM_36}",
-      "-DTOUCH_ROT_SWAP_X=true",
-      "-DTOUCH_ROT_SWAP_Y=false",
-      "-DBUTTON_BOOT=0",
-      "-DHAS_TF",
-      "-DTF_CS=5",
-      "-DTF_MOSI=23",
-      "-DTF_SCLK=18",
-      "-DTF_MISO=19",
-      "-DHAS_RGB_LED",
-      "-DLED_R=4",
-      "-DLED_G=16",
-      "-DLED_B=17",
-      "-DHAS_CDR",
-      "-DCDR_IN=34",
-      "-DHAS_SPEAK",
-      "-DSPEAKER=26"
+      "-DLCD_WIDTH=240",
+      "-DLCD_HEIGHT=320",
+      "-DLCD_BCKL_GPIO=27",
+      "-DLCD_USES_ILI9341",
+      "-DLCD_SPI_HOST=SPI2_HOST",
+      "-DLCD_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DLCD_IO_SPI_CONFIG={.cs_gpio_num=15,.dc_gpio_num=2,.spi_mode=SPI_MODE0,.pclk_hz=24000000,.trans_queue_depth=10,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DLCD_PANEL_DEV_CONFIG={.reset_gpio_num=-1,.color_space=ESP_LCD_COLOR_SPACE_BGR,.bits_per_pixel=16}",
+      "-DLCD_SWAP_XY=false",
+      "-DLCD_MIRROR_X=true",
+      "-DLCD_MIRROR_Y=false",
+      "-DBOARD_HAS_TOUCH",
+      "-DTOUCH_USES_XPT2046",
+      "-DTOUCH_SPI_HOST=SPI2_HOST",
+      "-DTOUCH_SPI_BUS_CONFIG={.mosi_io_num=13,.miso_io_num=12,.sclk_io_num=14,.quadwp_io_num=-1,.quadhd_io_num=-1}",
+      "-DTOUCH_IO_SPI_CONFIG={.cs_gpio_num=33,.dc_gpio_num=-1,.spi_mode=SPI_MODE0,.pclk_hz=2000000,.trans_queue_depth=3,.lcd_cmd_bits=8,.lcd_param_bits=8}",
+      "-DTOUCH_DEV_CONFIG={.x_max=LCD_WIDTH,.y_max=LCD_HEIGHT,.rst_gpio_num=GPIO_NUM_NC,.int_gpio_num=GPIO_NUM_36}",
+      "-DTOUCH_SWAP_X=true",
+      "-DTOUCH_SWAP_Y=false",
+      "-DBUTTON_BOOT_GPIO=0",
+      "-DBOARD_HAS_TF",
+      "-DTF_CS_GPIO=5",
+      "-DTF_MOSI_GPIO=23",
+      "-DTF_SCLK_GPIO=18",
+      "-DTF_MISO_GPIO=19",
+      "-DBOARD_HAS_RGB_LED",
+      "-DLED_R_GPIO=4",
+      "-DLED_G_GPIO=16",
+      "-DLED_B_GPIO=17",
+      "-DBOARD_HAS_CDS",
+      "-DCDS_GPIO=34",
+      "-DBOARD_HAS_SPEAK_GPIO",
+      "-DSPEAK_GPIO=26"
     ],
     "f_cpu": "240000000L",
     "f_flash": "40000000L",