From 462491a5b28e1c5e7e8a827d414effdc4916bab8 Mon Sep 17 00:00:00 2001
From: yetanothercarbot <55005345+yetanothercarbot@users.noreply.github.com>
Date: Fri, 26 Apr 2024 00:11:54 +1000
Subject: [PATCH] Use SDK-provided define instead of own

---
 src/drv/tft/M5Stack.hpp              | 2 +-
 src/drv/tft/tft_driver_lovyangfx.cpp | 4 ++--
 user_setups/esp32c3/2424S012.ini     | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/drv/tft/M5Stack.hpp b/src/drv/tft/M5Stack.hpp
index 0bdc9ec0..83a8ccd9 100644
--- a/src/drv/tft/M5Stack.hpp
+++ b/src/drv/tft/M5Stack.hpp
@@ -17,7 +17,7 @@ Contributors:
 /----------------------------------------------------------------------------*/
 #pragma once
 
-#if defined(ARDUINO) && defined(LGFX_USE_V1) && !defined(ESP32C3)
+#if defined(ARDUINO) && defined(LGFX_USE_V1) && !defined(CONFIG_IDF_TARGET_ESP32C3)
 
 #include "Arduino.h"
 #include "LovyanGFX.hpp"
diff --git a/src/drv/tft/tft_driver_lovyangfx.cpp b/src/drv/tft/tft_driver_lovyangfx.cpp
index 62b5aac8..bc3854f9 100644
--- a/src/drv/tft/tft_driver_lovyangfx.cpp
+++ b/src/drv/tft/tft_driver_lovyangfx.cpp
@@ -94,12 +94,12 @@ static lgfx::Bus_Parallel8* init_parallel_8_bus(Preferences* prefs, int8_t data_
     cfg.pin_rd               = prefs->getInt("rd", TFT_RD);
     cfg.pin_wr               = prefs->getInt("wr", TFT_WR);
     cfg.pin_rs               = prefs->getInt("rs", TFT_DC);
-#ifndef ESP32C3
+#ifndef CONFIG_IDF_TARGET_ESP32C3
     cfg.freq_write           = prefs->getUInt("write_freq", SPI_FREQUENCY);
 #endif 
 
 
-#if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(ESP32C3)
+#if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C3)
     uint8_t port = prefs->getUInt("i2s_port", 0);
     switch(port) {
 #if SOC_I2S_NUM > 1
diff --git a/user_setups/esp32c3/2424S012.ini b/user_setups/esp32c3/2424S012.ini
index d05ac04c..c3179422 100644
--- a/user_setups/esp32c3/2424S012.ini
+++ b/user_setups/esp32c3/2424S012.ini
@@ -1,6 +1,6 @@
 [env:2424S012]
 extends = arduino_esp32c3_v2, flash_4mb
-; Close enough
+; Close enough, sets it up to use USB-CDC rather than uart
 board = seeed_xiao_esp32c3 
 
 build_flags =
@@ -9,7 +9,6 @@ build_flags =
     ${esp32c3.no_ps_ram}
 
 ; Display configuration
-    -D ESP32C3=1
     -D LGFX_USE_V1=1
     -D HASP_USE_LGFX_TOUCH=1
     ;CST816S driver
@@ -32,5 +31,4 @@ build_flags =
 
 lib_deps =
     ${arduino_esp32s3_v2.lib_deps}
-    ${lovyangfx.lib_deps}
-;    ${tft_espi.lib_deps}
\ No newline at end of file
+    ${lovyangfx.lib_deps}
\ No newline at end of file