diff --git a/boards.txt b/boards.txt
index 817c7b7441c..d7fc48820d1 100644
--- a/boards.txt
+++ b/boards.txt
@@ -47051,3 +47051,457 @@ waveshare_esp32_s3_touch_amoled_191.menu.EraseFlash.all=Enabled
 waveshare_esp32_s3_touch_amoled_191.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
+
+
+Pcbcupid_GLYPH_C3.name=Pcbcupid GLYPH C3
+Pcbcupid_GLYPH_C3.vid.0=0x2886
+Pcbcupid_GLYPH_C3.pid.0=0x0046
+
+Pcbcupid_GLYPH_C3.bootloader.tool=esptool_py
+Pcbcupid_GLYPH_C3.bootloader.tool.default=esptool_py
+
+Pcbcupid_GLYPH_C3.upload.tool=esptool_py
+Pcbcupid_GLYPH_C3.upload.tool.default=esptool_py
+Pcbcupid_GLYPH_C3.upload.tool.network=esp_ota
+
+Pcbcupid_GLYPH_C3.upload.maximum_size=1310720
+Pcbcupid_GLYPH_C3.upload.maximum_data_size=327680
+Pcbcupid_GLYPH_C3.upload.flags=
+Pcbcupid_GLYPH_C3.upload.extra_flags=
+Pcbcupid_GLYPH_C3.upload.use_1200bps_touch=false
+Pcbcupid_GLYPH_C3.upload.wait_for_upload_port=false
+
+Pcbcupid_GLYPH_C3.serial.disableDTR=false
+Pcbcupid_GLYPH_C3.serial.disableRTS=false
+
+Pcbcupid_GLYPH_C3.build.tarch=riscv32
+Pcbcupid_GLYPH_C3.build.target=esp
+Pcbcupid_GLYPH_C3.build.mcu=esp32c3
+Pcbcupid_GLYPH_C3.build.core=esp32
+Pcbcupid_GLYPH_C3.build.variant=Pcbcupid_GLYPH_C3
+Pcbcupid_GLYPH_C3.build.board=PCBCUPID_GLYPHC3
+Pcbcupid_GLYPH_C3.build.bootloader_addr=0x0
+
+Pcbcupid_GLYPH_C3.build.cdc_on_boot=1
+Pcbcupid_GLYPH_C3.build.f_cpu=160000000L
+Pcbcupid_GLYPH_C3.build.flash_size=4MB
+Pcbcupid_GLYPH_C3.build.flash_freq=80m
+Pcbcupid_GLYPH_C3.build.flash_mode=qio
+Pcbcupid_GLYPH_C3.build.boot=qio
+Pcbcupid_GLYPH_C3.build.partitions=default
+Pcbcupid_GLYPH_C3.build.defines=
+
+Pcbcupid_GLYPH_C3.menu.CDCOnBoot.default=Enabled
+Pcbcupid_GLYPH_C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
+Pcbcupid_GLYPH_C3.menu.CDCOnBoot.cdc=Disabled
+Pcbcupid_GLYPH_C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.default.build.partitions=default
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.minimal.build.partitions=minimal
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker=RainMaker 4MB
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker_4MB=RainMaker 4MB No OTA
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker_4MB.build.partitions=rainmaker_4MB_no_ota
+Pcbcupid_GLYPH_C3.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656
+
+Pcbcupid_GLYPH_C3.menu.CPUFreq.160=160MHz (WiFi)
+Pcbcupid_GLYPH_C3.menu.CPUFreq.160.build.f_cpu=160000000L
+Pcbcupid_GLYPH_C3.menu.CPUFreq.80=80MHz (WiFi)
+Pcbcupid_GLYPH_C3.menu.CPUFreq.80.build.f_cpu=80000000L
+Pcbcupid_GLYPH_C3.menu.CPUFreq.40=40MHz
+Pcbcupid_GLYPH_C3.menu.CPUFreq.40.build.f_cpu=40000000L
+Pcbcupid_GLYPH_C3.menu.CPUFreq.20=20MHz
+Pcbcupid_GLYPH_C3.menu.CPUFreq.20.build.f_cpu=20000000L
+Pcbcupid_GLYPH_C3.menu.CPUFreq.10=10MHz
+Pcbcupid_GLYPH_C3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+Pcbcupid_GLYPH_C3.menu.FlashMode.qio=QIO
+Pcbcupid_GLYPH_C3.menu.FlashMode.qio.build.flash_mode=dio
+Pcbcupid_GLYPH_C3.menu.FlashMode.qio.build.boot=qio
+Pcbcupid_GLYPH_C3.menu.FlashMode.dio=DIO
+Pcbcupid_GLYPH_C3.menu.FlashMode.dio.build.flash_mode=dio
+Pcbcupid_GLYPH_C3.menu.FlashMode.dio.build.boot=dio
+
+Pcbcupid_GLYPH_C3.menu.FlashFreq.80=80MHz
+Pcbcupid_GLYPH_C3.menu.FlashFreq.80.build.flash_freq=80m
+Pcbcupid_GLYPH_C3.menu.FlashFreq.40=40MHz
+Pcbcupid_GLYPH_C3.menu.FlashFreq.40.build.flash_freq=40m
+
+Pcbcupid_GLYPH_C3.menu.FlashSize.4M=4MB (32Mb)
+Pcbcupid_GLYPH_C3.menu.FlashSize.4M.build.flash_size=4MB
+
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.921600=921600
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.921600.upload.speed=921600
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.115200=115200
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.115200.upload.speed=115200
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.256000.windows=256000
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.256000.upload.speed=256000
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.230400.windows.upload.speed=256000
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.230400=230400
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.230400.upload.speed=230400
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.460800.linux=460800
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.460800.macosx=460800
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.460800.upload.speed=460800
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.512000.windows=512000
+Pcbcupid_GLYPH_C3.menu.UploadSpeed.512000.upload.speed=512000
+
+Pcbcupid_GLYPH_C3.menu.DebugLevel.none=None
+Pcbcupid_GLYPH_C3.menu.DebugLevel.none.build.code_debug=0
+Pcbcupid_GLYPH_C3.menu.DebugLevel.error=Error
+Pcbcupid_GLYPH_C3.menu.DebugLevel.error.build.code_debug=1
+Pcbcupid_GLYPH_C3.menu.DebugLevel.warn=Warn
+Pcbcupid_GLYPH_C3.menu.DebugLevel.warn.build.code_debug=2
+Pcbcupid_GLYPH_C3.menu.DebugLevel.info=Info
+Pcbcupid_GLYPH_C3.menu.DebugLevel.info.build.code_debug=3
+Pcbcupid_GLYPH_C3.menu.DebugLevel.debug=Debug
+Pcbcupid_GLYPH_C3.menu.DebugLevel.debug.build.code_debug=4
+Pcbcupid_GLYPH_C3.menu.DebugLevel.verbose=Verbose
+Pcbcupid_GLYPH_C3.menu.DebugLevel.verbose.build.code_debug=5
+
+Pcbcupid_GLYPH_C3.menu.EraseFlash.none=Disabled
+Pcbcupid_GLYPH_C3.menu.EraseFlash.none.upload.erase_cmd=
+Pcbcupid_GLYPH_C3.menu.EraseFlash.all=Enabled
+Pcbcupid_GLYPH_C3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
+
+Pcbcupid_GLYPH_H2.name=Pcbcupid GLYPH H2
+
+Pcbcupid_GLYPH_H2.bootloader.tool=esptool_py
+Pcbcupid_GLYPH_H2.bootloader.tool.default=esptool_py
+
+Pcbcupid_GLYPH_H2.upload.tool=esptool_py
+Pcbcupid_GLYPH_H2.upload.tool.default=esptool_py
+Pcbcupid_GLYPH_H2.upload.tool.network=esp_ota
+
+Pcbcupid_GLYPH_H2.upload.maximum_size=1310720
+Pcbcupid_GLYPH_H2.upload.maximum_data_size=327680
+Pcbcupid_GLYPH_H2.upload.flags=
+Pcbcupid_GLYPH_H2.upload.extra_flags=
+Pcbcupid_GLYPH_H2.upload.use_1200bps_touch=false
+Pcbcupid_GLYPH_H2.upload.wait_for_upload_port=false
+
+Pcbcupid_GLYPH_H2.serial.disableDTR=false
+Pcbcupid_GLYPH_H2.serial.disableRTS=false
+
+Pcbcupid_GLYPH_H2.build.tarch=riscv32
+Pcbcupid_GLYPH_H2.build.target=esp
+Pcbcupid_GLYPH_H2.build.mcu=esp32h2
+Pcbcupid_GLYPH_H2.build.core=esp32
+Pcbcupid_GLYPH_H2.build.variant=Pcbcupid_GLYPH_H2
+Pcbcupid_GLYPH_H2.build.board=PCBCUPID_GLYPHH2
+Pcbcupid_GLYPH_H2.build.bootloader_addr=0x0
+
+Pcbcupid_GLYPH_H2.build.cdc_on_boot=1
+Pcbcupid_GLYPH_H2.build.f_cpu=96000000L
+Pcbcupid_GLYPH_H2.build.flash_size=4MB
+Pcbcupid_GLYPH_H2.build.flash_freq=64m
+Pcbcupid_GLYPH_H2.build.img_freq=48m
+Pcbcupid_GLYPH_H2.build.flash_mode=qio
+Pcbcupid_GLYPH_H2.build.boot=qio
+Pcbcupid_GLYPH_H2.build.partitions=default
+Pcbcupid_GLYPH_H2.build.defines=
+
+## IDE 2.0 Seems to not update the value
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.default=Disabled
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.default.build.copy_jtag_files=0
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.builtin=Integrated USB JTAG
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.builtin.build.openocdscript=esp32h2-builtin.cfg
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.external=FTDI Adapter
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.external.build.openocdscript=esp32h2-ftdi.cfg
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.external.build.copy_jtag_files=1
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.bridge=ESP USB Bridge
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.bridge.build.openocdscript=esp32h2-bridge.cfg
+Pcbcupid_GLYPH_H2.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+Pcbcupid_GLYPH_H2.menu.CDCOnBoot.default=Enabled
+Pcbcupid_GLYPH_H2.menu.CDCOnBoot.default.build.cdc_on_boot=1
+Pcbcupid_GLYPH_H2.menu.CDCOnBoot.cdc=Disabled
+Pcbcupid_GLYPH_H2.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.default.build.partitions=default
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.minimal.build.partitions=minimal
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_fs=No FS 4MB (2MB APP x2)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_fs.build.partitions=no_fs
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_fs.upload.maximum_size=2031616
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_ota.build.partitions=no_ota
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.huge_app.build.partitions=huge_app
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee.build.partitions=zigbee
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.custom=Custom
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.custom.build.partitions=
+Pcbcupid_GLYPH_H2.menu.PartitionScheme.custom.upload.maximum_size=16777216
+
+Pcbcupid_GLYPH_H2.menu.FlashMode.qio=QIO
+Pcbcupid_GLYPH_H2.menu.FlashMode.qio.build.flash_mode=dio
+Pcbcupid_GLYPH_H2.menu.FlashMode.qio.build.boot=qio
+Pcbcupid_GLYPH_H2.menu.FlashMode.dio=DIO
+Pcbcupid_GLYPH_H2.menu.FlashMode.dio.build.flash_mode=dio
+Pcbcupid_GLYPH_H2.menu.FlashMode.dio.build.boot=dio
+
+Pcbcupid_GLYPH_H2.menu.FlashFreq.64=64MHz
+Pcbcupid_GLYPH_H2.menu.FlashFreq.64.build.flash_freq=64m
+Pcbcupid_GLYPH_H2.menu.FlashFreq.64.build.img_freq=48m
+#Pcbcupid_GLYPH_H2.menu.FlashFreq.32=32MHz
+#Pcbcupid_GLYPH_H2.menu.FlashFreq.32.build.flash_freq=32m
+#Pcbcupid_GLYPH_H2.menu.FlashFreq.32.build.img_freq=24m
+Pcbcupid_GLYPH_H2.menu.FlashFreq.16=16MHz
+Pcbcupid_GLYPH_H2.menu.FlashFreq.16.build.flash_freq=16m
+Pcbcupid_GLYPH_H2.menu.FlashFreq.16.build.img_freq=12m
+
+Pcbcupid_GLYPH_H2.menu.FlashSize.2M=2MB (16Mb)
+Pcbcupid_GLYPH_H2.menu.FlashSize.2M.build.flash_size=2MB
+Pcbcupid_GLYPH_H2.menu.FlashSize.4M=4MB (32Mb)
+Pcbcupid_GLYPH_H2.menu.FlashSize.4M.build.flash_size=4MB
+
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.921600=921600
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.921600.upload.speed=921600
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.115200=115200
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.115200.upload.speed=115200
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.256000.windows=256000
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.256000.upload.speed=256000
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.230400.windows.upload.speed=256000
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.230400=230400
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.230400.upload.speed=230400
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.460800.linux=460800
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.460800.macosx=460800
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.460800.upload.speed=460800
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.512000.windows=512000
+Pcbcupid_GLYPH_H2.menu.UploadSpeed.512000.upload.speed=512000
+
+Pcbcupid_GLYPH_H2.menu.DebugLevel.none=None
+Pcbcupid_GLYPH_H2.menu.DebugLevel.none.build.code_debug=0
+Pcbcupid_GLYPH_H2.menu.DebugLevel.error=Error
+Pcbcupid_GLYPH_H2.menu.DebugLevel.error.build.code_debug=1
+Pcbcupid_GLYPH_H2.menu.DebugLevel.warn=Warn
+Pcbcupid_GLYPH_H2.menu.DebugLevel.warn.build.code_debug=2
+Pcbcupid_GLYPH_H2.menu.DebugLevel.info=Info
+Pcbcupid_GLYPH_H2.menu.DebugLevel.info.build.code_debug=3
+Pcbcupid_GLYPH_H2.menu.DebugLevel.debug=Debug
+Pcbcupid_GLYPH_H2.menu.DebugLevel.debug.build.code_debug=4
+Pcbcupid_GLYPH_H2.menu.DebugLevel.verbose=Verbose
+Pcbcupid_GLYPH_H2.menu.DebugLevel.verbose.build.code_debug=5
+
+Pcbcupid_GLYPH_H2.menu.EraseFlash.none=Disabled
+Pcbcupid_GLYPH_H2.menu.EraseFlash.none.upload.erase_cmd=
+Pcbcupid_GLYPH_H2.menu.EraseFlash.all=Enabled
+Pcbcupid_GLYPH_H2.menu.EraseFlash.all.upload.erase_cmd=-e
+
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.default=Disabled
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.default.build.zigbee_mode=
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.default.build.zigbee_libs=
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.ed=Zigbee ED (end device)
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed -lzboss_port
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
+Pcbcupid_GLYPH_H2.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
+
+##############################################################
+
+
+Pcbcupid_GLYPH_C6.name=Pcbcupid GLYPH C6
+
+Pcbcupid_GLYPH_C6.bootloader.tool=esptool_py
+Pcbcupid_GLYPH_C6.bootloader.tool.default=esptool_py
+
+Pcbcupid_GLYPH_C6.upload.tool=esptool_py
+Pcbcupid_GLYPH_C6.upload.tool.default=esptool_py
+Pcbcupid_GLYPH_C6.upload.tool.network=esp_ota
+
+Pcbcupid_GLYPH_C6.upload.maximum_size=1310720
+Pcbcupid_GLYPH_C6.upload.maximum_data_size=327680
+Pcbcupid_GLYPH_C6.upload.flags=
+Pcbcupid_GLYPH_C6.upload.extra_flags=
+Pcbcupid_GLYPH_C6.upload.use_1200bps_touch=false
+Pcbcupid_GLYPH_C6.upload.wait_for_upload_port=false
+
+Pcbcupid_GLYPH_C6.serial.disableDTR=false
+Pcbcupid_GLYPH_C6.serial.disableRTS=false
+
+Pcbcupid_GLYPH_C6.build.tarch=riscv32
+Pcbcupid_GLYPH_C6.build.target=esp
+Pcbcupid_GLYPH_C6.build.mcu=esp32c6
+Pcbcupid_GLYPH_C6.build.core=esp32
+Pcbcupid_GLYPH_C6.build.variant=Pcbcupid_GLYPH_C6
+Pcbcupid_GLYPH_C6.build.board=PCBCUPID_GLYPHC6
+Pcbcupid_GLYPH_C6.build.bootloader_addr=0x0
+
+Pcbcupid_GLYPH_C6.build.cdc_on_boot=1
+Pcbcupid_GLYPH_C6.build.f_cpu=160000000L
+Pcbcupid_GLYPH_C6.build.flash_size=4MB
+Pcbcupid_GLYPH_C6.build.flash_freq=80m
+Pcbcupid_GLYPH_C6.build.flash_mode=qio
+Pcbcupid_GLYPH_C6.build.boot=qio
+Pcbcupid_GLYPH_C6.build.partitions=default
+Pcbcupid_GLYPH_C6.build.defines=
+
+## IDE 2.0 Seems to not update the value
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.default=Disabled
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.default.build.copy_jtag_files=0
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.builtin=Integrated USB JTAG
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.external=FTDI Adapter
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.external.build.copy_jtag_files=1
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.bridge=ESP USB Bridge
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
+Pcbcupid_GLYPH_C6.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+Pcbcupid_GLYPH_C6.menu.CDCOnBoot.cdc=Enabled
+Pcbcupid_GLYPH_C6.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+Pcbcupid_GLYPH_C6.menu.CDCOnBoot.default=Disabled
+Pcbcupid_GLYPH_C6.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.default.build.partitions=default
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.no_ota.build.partitions=no_ota
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.huge_app.build.partitions=huge_app
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee.build.partitions=zigbee
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+Pcbcupid_GLYPH_C6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+
+Pcbcupid_GLYPH_C6.menu.CPUFreq.160=160MHz (WiFi)
+Pcbcupid_GLYPH_C6.menu.CPUFreq.160.build.f_cpu=160000000L
+Pcbcupid_GLYPH_C6.menu.CPUFreq.80=80MHz (WiFi)
+Pcbcupid_GLYPH_C6.menu.CPUFreq.80.build.f_cpu=80000000L
+Pcbcupid_GLYPH_C6.menu.CPUFreq.40=40MHz
+Pcbcupid_GLYPH_C6.menu.CPUFreq.40.build.f_cpu=40000000L
+Pcbcupid_GLYPH_C6.menu.CPUFreq.20=20MHz
+Pcbcupid_GLYPH_C6.menu.CPUFreq.20.build.f_cpu=20000000L
+Pcbcupid_GLYPH_C6.menu.CPUFreq.10=10MHz
+Pcbcupid_GLYPH_C6.menu.CPUFreq.10.build.f_cpu=10000000L
+
+Pcbcupid_GLYPH_C6.menu.FlashMode.qio=QIO
+Pcbcupid_GLYPH_C6.menu.FlashMode.qio.build.flash_mode=dio
+Pcbcupid_GLYPH_C6.menu.FlashMode.qio.build.boot=qio
+Pcbcupid_GLYPH_C6.menu.FlashMode.dio=DIO
+Pcbcupid_GLYPH_C6.menu.FlashMode.dio.build.flash_mode=dio
+Pcbcupid_GLYPH_C6.menu.FlashMode.dio.build.boot=dio
+
+Pcbcupid_GLYPH_C6.menu.FlashFreq.80=80MHz
+Pcbcupid_GLYPH_C6.menu.FlashFreq.80.build.flash_freq=80m
+Pcbcupid_GLYPH_C6.menu.FlashFreq.40=40MHz
+Pcbcupid_GLYPH_C6.menu.FlashFreq.40.build.flash_freq=40m
+
+Pcbcupid_GLYPH_C6.menu.FlashSize.4M=4MB (32Mb)
+Pcbcupid_GLYPH_C6.menu.FlashSize.4M.build.flash_size=4MB
+
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.921600=921600
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.921600.upload.speed=921600
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.115200=115200
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.115200.upload.speed=115200
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.256000.windows=256000
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.256000.upload.speed=256000
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.230400.windows.upload.speed=256000
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.230400=230400
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.230400.upload.speed=230400
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.460800.linux=460800
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.460800.macosx=460800
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.460800.upload.speed=460800
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.512000.windows=512000
+Pcbcupid_GLYPH_C6.menu.UploadSpeed.512000.upload.speed=512000
+
+Pcbcupid_GLYPH_C6.menu.DebugLevel.none=None
+Pcbcupid_GLYPH_C6.menu.DebugLevel.none.build.code_debug=0
+Pcbcupid_GLYPH_C6.menu.DebugLevel.error=Error
+Pcbcupid_GLYPH_C6.menu.DebugLevel.error.build.code_debug=1
+Pcbcupid_GLYPH_C6.menu.DebugLevel.warn=Warn
+Pcbcupid_GLYPH_C6.menu.DebugLevel.warn.build.code_debug=2
+Pcbcupid_GLYPH_C6.menu.DebugLevel.info=Info
+Pcbcupid_GLYPH_C6.menu.DebugLevel.info.build.code_debug=3
+Pcbcupid_GLYPH_C6.menu.DebugLevel.debug=Debug
+Pcbcupid_GLYPH_C6.menu.DebugLevel.debug.build.code_debug=4
+Pcbcupid_GLYPH_C6.menu.DebugLevel.verbose=Verbose
+Pcbcupid_GLYPH_C6.menu.DebugLevel.verbose.build.code_debug=5
+
+Pcbcupid_GLYPH_C6.menu.EraseFlash.none=Disabled
+Pcbcupid_GLYPH_C6.menu.EraseFlash.none.upload.erase_cmd=
+Pcbcupid_GLYPH_C6.menu.EraseFlash.all=Enabled
+Pcbcupid_GLYPH_C6.menu.EraseFlash.all.upload.erase_cmd=-e
+
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.default=Disabled
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.default.build.zigbee_mode=
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.default.build.zigbee_libs=
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.ed=Zigbee ED (end device)
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed -lzboss_port
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
+Pcbcupid_GLYPH_C6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
+
+##############################################################
diff --git a/variants/Pcbcupid_GLYPH_C3/pins_arduino.h b/variants/Pcbcupid_GLYPH_C3/pins_arduino.h
new file mode 100644
index 00000000000..653c2c48828
--- /dev/null
+++ b/variants/Pcbcupid_GLYPH_C3/pins_arduino.h
@@ -0,0 +1,43 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = 1;
+#define BUILTIN_LED LED_BUILTIN  // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
+//MSR Used in on-board battery measurement
+static const uint8_t BAT_MEASURE = 0;
+#define MSR BAT_MEASURE
+
+static const uint8_t TX = 21;
+static const uint8_t RX = 20;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS = 3;
+static const uint8_t MOSI = 6;
+static const uint8_t MISO = 7;
+static const uint8_t SCK = 10;
+
+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 D0 = 0;
+static const uint8_t D1 = 1;
+static const uint8_t D2 = 2;
+static const uint8_t D3 = 3;
+static const uint8_t D4 = 4;
+static const uint8_t D5 = 5;
+static const uint8_t D6 = 6;
+static const uint8_t D7 = 7;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D10 = 10;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/Pcbcupid_GLYPH_C6/pins_arduino.h b/variants/Pcbcupid_GLYPH_C6/pins_arduino.h
new file mode 100644
index 00000000000..f06fb151244
--- /dev/null
+++ b/variants/Pcbcupid_GLYPH_C6/pins_arduino.h
@@ -0,0 +1,52 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = 14;
+#define BUILTIN_LED LED_BUILTIN  // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
+//MSR Used in on-board battery measurement
+static const uint8_t BAT_MEASURE = 0;
+#define MSR BAT_MEASURE
+
+static const uint8_t TX = 16;
+static const uint8_t RX = 17;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS = 20;
+static const uint8_t MOSI = 22;
+static const uint8_t MISO = 23;
+static const uint8_t SCK = 21;
+
+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 D0 = 0;
+static const uint8_t D1 = 1;
+static const uint8_t D2 = 2;
+static const uint8_t D3 = 3;
+static const uint8_t D4 = 4;
+static const uint8_t D5 = 5;
+static const uint8_t D6 = 6;
+static const uint8_t D7 = 7;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D14 = 14;
+static const uint8_t D15 = 15;
+static const uint8_t D16 = 16;
+static const uint8_t D17 = 17;
+static const uint8_t D18 = 18;
+static const uint8_t D19 = 19;
+static const uint8_t D20 = 20;
+static const uint8_t D21 = 21;
+static const uint8_t D22 = 22;
+static const uint8_t D23 = 23;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/Pcbcupid_GLYPH_H2/pins_arduino.h b/variants/Pcbcupid_GLYPH_H2/pins_arduino.h
new file mode 100644
index 00000000000..20a385a9817
--- /dev/null
+++ b/variants/Pcbcupid_GLYPH_H2/pins_arduino.h
@@ -0,0 +1,44 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = 0;
+#define BUILTIN_LED LED_BUILTIN  // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+
+//MSR Used in on-board battery measurement
+static const uint8_t BAT_MEASURE = 1;
+#define MSR BAT_MEASURE
+
+static const uint8_t TX = 24;
+static const uint8_t RX = 23;
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS = 3;
+static const uint8_t MOSI = 22;
+static const uint8_t MISO = 25;
+static const uint8_t SCK = 11;
+
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+
+static const uint8_t D0 = 0;
+static const uint8_t D1 = 1;
+static const uint8_t D2 = 2;
+static const uint8_t D3 = 3;
+static const uint8_t D4 = 4;
+static const uint8_t D5 = 5;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D10 = 10;
+static const uint8_t D11 = 11;
+static const uint8_t D12 = 12;
+static const uint8_t D13 = 13;
+static const uint8_t D14 = 14;
+
+#endif /* Pins_Arduino_h */