diff --git a/boards.txt b/boards.txt
index 5cc2bf42d81..54aaa3b5297 100644
--- a/boards.txt
+++ b/boards.txt
@@ -5805,6 +5805,171 @@ sparkfun_esp32s2_thing_plus.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+sparkfun_esp32c6_thing_plus.name=SparkFun ESP32-C6 Thing Plus
+sparkfun_esp32c6_thing_plus.vid.0=0x303a
+sparkfun_esp32c6_thing_plus.pid.0=0x1001
+
+sparkfun_esp32c6_thing_plus.bootloader.tool=esptool_py
+sparkfun_esp32c6_thing_plus.bootloader.tool.default=esptool_py
+
+sparkfun_esp32c6_thing_plus.upload.tool=esptool_py
+sparkfun_esp32c6_thing_plus.upload.tool.default=esptool_py
+sparkfun_esp32c6_thing_plus.upload.tool.network=esp_ota
+
+sparkfun_esp32c6_thing_plus.upload.maximum_size=1310720
+sparkfun_esp32c6_thing_plus.upload.maximum_data_size=327680
+sparkfun_esp32c6_thing_plus.upload.flags=
+sparkfun_esp32c6_thing_plus.upload.extra_flags=
+sparkfun_esp32c6_thing_plus.upload.use_1200bps_touch=false
+sparkfun_esp32c6_thing_plus.upload.wait_for_upload_port=false
+
+sparkfun_esp32c6_thing_plus.serial.disableDTR=false
+sparkfun_esp32c6_thing_plus.serial.disableRTS=false
+
+sparkfun_esp32c6_thing_plus.build.tarch=riscv32
+sparkfun_esp32c6_thing_plus.build.target=esp
+sparkfun_esp32c6_thing_plus.build.mcu=esp32c6
+sparkfun_esp32c6_thing_plus.build.core=esp32
+sparkfun_esp32c6_thing_plus.build.variant=sparkfun_esp32c6_thing_plus
+sparkfun_esp32c6_thing_plus.build.board=ESP32C6_THING_PLUS
+sparkfun_esp32c6_thing_plus.build.bootloader_addr=0x0
+
+sparkfun_esp32c6_thing_plus.build.cdc_on_boot=0
+sparkfun_esp32c6_thing_plus.build.f_cpu=160000000L
+sparkfun_esp32c6_thing_plus.build.flash_size=4MB
+sparkfun_esp32c6_thing_plus.build.flash_freq=80m
+sparkfun_esp32c6_thing_plus.build.flash_mode=qio
+sparkfun_esp32c6_thing_plus.build.boot=qio
+sparkfun_esp32c6_thing_plus.build.partitions=default
+sparkfun_esp32c6_thing_plus.build.defines=
+
+## IDE 2.0 Seems to not update the value
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.default=Disabled
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.default.build.copy_jtag_files=0
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.builtin=Integrated USB JTAG
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.external=FTDI Adapter
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.external.build.copy_jtag_files=1
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.bridge=ESP USB Bridge
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
+sparkfun_esp32c6_thing_plus.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+sparkfun_esp32c6_thing_plus.menu.CDCOnBoot.default=Enabled
+sparkfun_esp32c6_thing_plus.menu.CDCOnBoot.default.build.cdc_on_boot=1
+sparkfun_esp32c6_thing_plus.menu.CDCOnBoot.cdc=Disabled
+sparkfun_esp32c6_thing_plus.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.default.build.partitions=default
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.minimal.build.partitions=minimal
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.no_ota.build.partitions=no_ota
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.huge_app.build.partitions=huge_app
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.fatflash.build.partitions=ffat
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.rainmaker=RainMaker
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.custom=Custom
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.custom.build.partitions=
+sparkfun_esp32c6_thing_plus.menu.PartitionScheme.custom.upload.maximum_size=16777216
+
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.160=160MHz (WiFi)
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.160.build.f_cpu=160000000L
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.80=80MHz (WiFi)
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.80.build.f_cpu=80000000L
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.40=40MHz
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.40.build.f_cpu=40000000L
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.20=20MHz
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.20.build.f_cpu=20000000L
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.10=10MHz
+sparkfun_esp32c6_thing_plus.menu.CPUFreq.10.build.f_cpu=10000000L
+
+sparkfun_esp32c6_thing_plus.menu.FlashMode.qio=QIO
+sparkfun_esp32c6_thing_plus.menu.FlashMode.qio.build.flash_mode=dio
+sparkfun_esp32c6_thing_plus.menu.FlashMode.qio.build.boot=qio
+sparkfun_esp32c6_thing_plus.menu.FlashMode.dio=DIO
+sparkfun_esp32c6_thing_plus.menu.FlashMode.dio.build.flash_mode=dio
+sparkfun_esp32c6_thing_plus.menu.FlashMode.dio.build.boot=dio
+
+sparkfun_esp32c6_thing_plus.menu.FlashFreq.80=80MHz
+sparkfun_esp32c6_thing_plus.menu.FlashFreq.80.build.flash_freq=80m
+sparkfun_esp32c6_thing_plus.menu.FlashFreq.40=40MHz
+sparkfun_esp32c6_thing_plus.menu.FlashFreq.40.build.flash_freq=40m
+
+sparkfun_esp32c6_thing_plus.menu.FlashSize.4M=4MB (32Mb)
+sparkfun_esp32c6_thing_plus.menu.FlashSize.4M.build.flash_size=4MB
+sparkfun_esp32c6_thing_plus.menu.FlashSize.8M=8MB (64Mb)
+sparkfun_esp32c6_thing_plus.menu.FlashSize.8M.build.flash_size=8MB
+sparkfun_esp32c6_thing_plus.menu.FlashSize.8M.build.partitions=default_8MB
+sparkfun_esp32c6_thing_plus.menu.FlashSize.2M=2MB (16Mb)
+sparkfun_esp32c6_thing_plus.menu.FlashSize.2M.build.flash_size=2MB
+sparkfun_esp32c6_thing_plus.menu.FlashSize.2M.build.partitions=minimal
+sparkfun_esp32c6_thing_plus.menu.FlashSize.16M=16MB (128Mb)
+sparkfun_esp32c6_thing_plus.menu.FlashSize.16M.build.flash_size=16MB
+
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.921600=921600
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.921600.upload.speed=921600
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.115200=115200
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.115200.upload.speed=115200
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.256000.windows=256000
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.256000.upload.speed=256000
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.230400.windows.upload.speed=256000
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.230400=230400
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.230400.upload.speed=230400
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.460800.linux=460800
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.460800.macosx=460800
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.460800.upload.speed=460800
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.512000.windows=512000
+sparkfun_esp32c6_thing_plus.menu.UploadSpeed.512000.upload.speed=512000
+
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.none=None
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.none.build.code_debug=0
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.error=Error
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.error.build.code_debug=1
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.warn=Warn
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.warn.build.code_debug=2
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.info=Info
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.info.build.code_debug=3
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.debug=Debug
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.debug.build.code_debug=4
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.verbose=Verbose
+sparkfun_esp32c6_thing_plus.menu.DebugLevel.verbose.build.code_debug=5
+
+sparkfun_esp32c6_thing_plus.menu.EraseFlash.none=Disabled
+sparkfun_esp32c6_thing_plus.menu.EraseFlash.none.upload.erase_cmd=
+sparkfun_esp32c6_thing_plus.menu.EraseFlash.all=Enabled
+sparkfun_esp32c6_thing_plus.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 esp32micromod.name=SparkFun ESP32 MicroMod
 
 esp32micromod.bootloader.tool=esptool_py
@@ -32898,4 +33063,4 @@ makergo_c3_supermini.menu.EraseFlash.none.upload.erase_cmd=
 makergo_c3_supermini.menu.EraseFlash.all=Enabled
 makergo_c3_supermini.menu.EraseFlash.all.upload.erase_cmd=-e
 
-##############################################################
\ No newline at end of file
+##############################################################
diff --git a/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
new file mode 100644
index 00000000000..60bd42884d1
--- /dev/null
+++ b/variants/sparkfun_esp32c6_thing_plus/pins_arduino.h
@@ -0,0 +1,35 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define PIN_NEOPIXEL        23
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t TX = 16;
+static const uint8_t RX = 17;
+
+static const uint8_t SDA = 6;
+static const uint8_t SCL = 7;
+
+static const uint8_t SS   = 5;
+static const uint8_t MOSI = 20;
+static const uint8_t MISO = 21;
+static const uint8_t SCK  = 19;
+
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
+static const uint8_t A6 = 6;
+
+#endif /* Pins_Arduino_h */