From 669bbf0f5613a6a9116b2a8e4ea3a23365416e75 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Jul 2021 13:45:07 +0200
Subject: [PATCH 1/2] OpenOCD

---
 boards/esp32-m5core2.json | 3 +++
 boards/esp32-odroid.json  | 3 +++
 boards/esp32c3.json       | 8 ++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json
index c5055333a..73ad9d913 100644
--- a/boards/esp32-m5core2.json
+++ b/boards/esp32-m5core2.json
@@ -18,6 +18,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks": [
     "arduino",
     "espidf"
diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json
index 690119675..37c1a4ffa 100644
--- a/boards/esp32-odroid.json
+++ b/boards/esp32-odroid.json
@@ -18,6 +18,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks": [
     "arduino",
     "espidf"
diff --git a/boards/esp32c3.json b/boards/esp32c3.json
index e4ce02579..cedcf1500 100644
--- a/boards/esp32c3.json
+++ b/boards/esp32c3.json
@@ -14,8 +14,12 @@
   "connectivity": [
     "wifi"
   ],
+  "debug": {
+    "openocd_target": "esp32c3.cfg"
+  },
   "frameworks": [
-    "arduino"
+    "arduino",
+    "espidf"
   ],
   "name": "Espressif Generic ESP32-C3 4M Flash, Tasmota 1856k Code/OTA, 320k SPIFFS",
   "upload": {
@@ -25,6 +29,6 @@
     "require_upload_port": true,
     "speed": 460800
   },
-  "url": "https://docs.espressif.com/projects/esp-idf/en/latest",
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html",
   "vendor": "Espressif"
 }

From 756fdcf5909db6515296d65b0517ab3ee655585a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Jul 2021 13:51:00 +0200
Subject: [PATCH 2/2] Use latest OpenOCD def files

---
 boards/esp32-cam.json     | 2 +-
 boards/esp32-m5core2.json | 2 +-
 boards/esp32-odroid.json  | 2 +-
 boards/esp32_16M.json     | 2 +-
 boards/esp32_4M.json      | 2 +-
 boards/esp32_8M.json      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json
index ce02822f5..563f6edd0 100644
--- a/boards/esp32-cam.json
+++ b/boards/esp32-cam.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",
diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json
index 73ad9d913..a8624c04f 100644
--- a/boards/esp32-m5core2.json
+++ b/boards/esp32-m5core2.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",
diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json
index 37c1a4ffa..76ba5ed47 100644
--- a/boards/esp32-odroid.json
+++ b/boards/esp32-odroid.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",
diff --git a/boards/esp32_16M.json b/boards/esp32_16M.json
index 6ebd73c76..ce7189206 100644
--- a/boards/esp32_16M.json
+++ b/boards/esp32_16M.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",
diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json
index 91ee508ea..f6cd41545 100644
--- a/boards/esp32_4M.json
+++ b/boards/esp32_4M.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",
diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json
index ad13a394f..673d21427 100644
--- a/boards/esp32_8M.json
+++ b/boards/esp32_8M.json
@@ -19,7 +19,7 @@
     "can"
   ],
   "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
+    "openocd_board": "esp32.cfg"
   },
   "frameworks": [
     "arduino",