From c650e7d273500a90e610dcc54997a580ab578423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 28 Sep 2024 13:42:32 +0200
Subject: [PATCH] finish TLora C6 Support, without bluetooth for now

---
 arch/esp32/esp32c6.ini            | 2 +-
 src/SerialConsole.cpp             | 3 ++-
 src/platform/esp32/architecture.h | 2 ++
 variants/tlora_c6/platformio.ini  | 1 -
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
index fad9f3865..3c2165642 100644
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -1,6 +1,6 @@
 [esp32c6_base]
 extends = esp32_base
-platform = https://github.com/Jason2866/platform-espressif32.git#92cd8e2ed8ec8392b32adc89451aecfcbbaa1726
+platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
 build_flags =
   ${arduino_base.build_flags}
   -Wall
diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp
index 15366d222..fe6ccdefe 100644
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -46,7 +46,8 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
     Port.setRX(SERIAL2_RX);
 #endif
     Port.begin(SERIAL_BAUD);
-#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040)
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040) ||   \
+    defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
     time_t timeout = millis();
     while (!Port) {
         if (Throttle::isWithinTimespanMs(timeout, FIVE_SECONDS_MS)) {
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index a2e7dfc4e..01f416629 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -90,6 +90,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6
 #elif defined(TLORA_V2_1_18)
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8
+#elif defined(TLORA_C6)
+#define HW_VENDOR meshtastic_HardwareModel_TLORA_C6
 #elif defined(T_DECK)
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK
 #elif defined(T_WATCH_S3)
diff --git a/variants/tlora_c6/platformio.ini b/variants/tlora_c6/platformio.ini
index 3a8fd2c19..d042cd78b 100644
--- a/variants/tlora_c6/platformio.ini
+++ b/variants/tlora_c6/platformio.ini
@@ -3,7 +3,6 @@ extends = esp32c6_base
 board = esp32-c6-devkitm-1
 build_flags = 
   ${esp32c6_base.build_flags}
-  -D PRIVATE_HW
   -D TLORA_C6
   -I variants/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1