From 5131e2b1e5df8046af74883592854d2f00c62d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 11 May 2024 19:26:06 +0200
Subject: [PATCH] ESP32-C3 is not supported for USBHOST

---
 arch/esp32/esp32c3.ini                 | 3 ---
 src/input/kbUsbBase.cpp                | 2 +-
 src/input/kbUsbBase.h                  | 2 +-
 src/input/kbUsbImpl.cpp                | 2 +-
 src/input/kbUsbImpl.h                  | 2 +-
 src/modules/Modules.cpp                | 2 +-
 variants/heltec_esp32c3/platformio.ini | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/esp32/esp32c3.ini b/arch/esp32/esp32c3.ini
index 295c9c2ce..619fdb28a 100644
--- a/arch/esp32/esp32c3.ini
+++ b/arch/esp32/esp32c3.ini
@@ -3,6 +3,3 @@ extends = esp32_base
 
 monitor_speed = 115200
 monitor_filters = esp32_c3_exception_decoder
-
-lib_deps = ${esp32_base.lib_deps}
-  tanakamasayuki/EspUsbHost@^1.0.2
\ No newline at end of file
diff --git a/src/input/kbUsbBase.cpp b/src/input/kbUsbBase.cpp
index 7c0de4a1d..9aedbf70c 100644
--- a/src/input/kbUsbBase.cpp
+++ b/src/input/kbUsbBase.cpp
@@ -1,7 +1,7 @@
 #include "kbUsbBase.h"
 #include "configuration.h"
 
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
 
 KbUsbBase::KbUsbBase(const char *name) : concurrency::OSThread(name)
 {
diff --git a/src/input/kbUsbBase.h b/src/input/kbUsbBase.h
index ee7ca5e72..15194c035 100644
--- a/src/input/kbUsbBase.h
+++ b/src/input/kbUsbBase.h
@@ -2,7 +2,7 @@
 
 #include "InputBroker.h"
 #include "concurrency/OSThread.h"
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
 #include "EspUsbHost.h"
 
 class KbUsbBase : public Observable<const InputEvent *>, public concurrency::OSThread, public EspUsbHost
diff --git a/src/input/kbUsbImpl.cpp b/src/input/kbUsbImpl.cpp
index 6c78ced75..2d1608893 100644
--- a/src/input/kbUsbImpl.cpp
+++ b/src/input/kbUsbImpl.cpp
@@ -1,7 +1,7 @@
 #include "kbUsbImpl.h"
 #include "InputBroker.h"
 
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
 
 KbUsbImpl *kbUsbImpl;
 
diff --git a/src/input/kbUsbImpl.h b/src/input/kbUsbImpl.h
index 63c97fbb0..6715d60a3 100644
--- a/src/input/kbUsbImpl.h
+++ b/src/input/kbUsbImpl.h
@@ -2,7 +2,7 @@
 #include "kbUsbBase.h"
 #include "main.h"
 
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
 
 /**
  * @brief The idea behind this class to have static methods for the event handlers.
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 401ae2209..5f7ab3975 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -127,7 +127,7 @@ void setupModules()
         kbMatrixImpl = new KbMatrixImpl();
         kbMatrixImpl->init();
 #endif // INPUTBROKER_MATRIX_TYPE
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
         kbUsbImpl = new KbUsbImpl();
         kbUsbImpl->init();
 #endif // INPUTBROKER_MATRIX_TYPE
diff --git a/variants/heltec_esp32c3/platformio.ini b/variants/heltec_esp32c3/platformio.ini
index c9c80213e..d6143c194 100644
--- a/variants/heltec_esp32c3/platformio.ini
+++ b/variants/heltec_esp32c3/platformio.ini
@@ -3,7 +3,7 @@ extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = extra
 build_flags = 
-  ${esp32_base.build_flags}
+  ${esp32c3_base.build_flags}
   -D HELTEC_HT62
   -I variants/heltec_esp32c3
 monitor_speed = 115200