From 983ccb11b30a293f86812fcbea74ac44058230e3 Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Mon, 11 Sep 2023 16:21:19 +0200 Subject: [PATCH 01/14] Add uPesy EDU ESP32 board variant --- boards.txt | 112 +++++++++++++++++++++++- variants/uPesy_edu_esp32/pins_arduino.h | 62 +++++++++++++ 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 variants/uPesy_edu_esp32/pins_arduino.h diff --git a/boards.txt b/boards.txt index 55ccc5968dc..6f9dd4498bf 100644 --- a/boards.txt +++ b/boards.txt @@ -19059,6 +19059,116 @@ uPesy_wroom.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## +uPesy_edu_esp32.name=uPesy EDU ESP32 + +uPesy_edu_esp32.bootloader.tool=esptool_py +uPesy_edu_esp32.bootloader.tool.default=esptool_py + +uPesy_edu_esp32.upload.tool=esptool_py +uPesy_edu_esp32.upload.tool.default=esptool_py +uPesy_edu_esp32.upload.tool.network=esp_ota + +uPesy_edu_esp32.upload.maximum_size=1310720 +uPesy_edu_esp32.upload.maximum_data_size=327680 +uPesy_edu_esp32.upload.flags= +uPesy_edu_esp32.upload.extra_flags= + +uPesy_edu_esp32.serial.disableDTR=true +uPesy_edu_esp32.serial.disableRTS=true + +uPesy_edu_esp32.build.tarch=xtensa +uPesy_edu_esp32.build.bootloader_addr=0x1000 +uPesy_edu_esp32.build.target=esp32 +uPesy_edu_esp32.build.mcu=esp32 +uPesy_edu_esp32.build.core=esp32 +uPesy_edu_esp32.build.variant=uPesy_edu_esp32 +uPesy_edu_esp32.build.board=uPesy_EDU_ESP32 + +uPesy_edu_esp32.build.f_cpu=240000000L +uPesy_edu_esp32.build.flash_size=4MB +uPesy_edu_esp32.build.flash_freq=80m +uPesy_edu_esp32.build.flash_mode=dio +uPesy_edu_esp32.build.boot=dio +uPesy_edu_esp32.build.partitions=default +uPesy_edu_esp32.build.defines= + +uPesy_edu_esp32.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.default.build.partitions=default +uPesy_edu_esp32.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +uPesy_edu_esp32.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +uPesy_edu_esp32.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.minimal.build.partitions=minimal +uPesy_edu_esp32.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota +uPesy_edu_esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +uPesy_edu_esp32.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +uPesy_edu_esp32.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +uPesy_edu_esp32.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +uPesy_edu_esp32.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +uPesy_edu_esp32.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +uPesy_edu_esp32.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +uPesy_edu_esp32.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +uPesy_edu_esp32.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +uPesy_edu_esp32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.huge_app.build.partitions=huge_app +uPesy_edu_esp32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 +uPesy_edu_esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) +uPesy_edu_esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +uPesy_edu_esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +uPesy_edu_esp32.menu.CPUFreq.240=240MHz +uPesy_edu_esp32.menu.CPUFreq.240.build.f_cpu=240000000L +uPesy_edu_esp32.menu.CPUFreq.160=160MHz +uPesy_edu_esp32.menu.CPUFreq.160.build.f_cpu=160000000L + +uPesy_edu_esp32.menu.UploadSpeed.921600=921600 +uPesy_edu_esp32.menu.UploadSpeed.921600.upload.speed=921600 +uPesy_edu_esp32.menu.UploadSpeed.512000.windows=512000 +uPesy_edu_esp32.menu.UploadSpeed.512000.upload.speed=512000 +uPesy_edu_esp32.menu.UploadSpeed.460800.linux=460800 +uPesy_edu_esp32.menu.UploadSpeed.460800.macosx=460800 +uPesy_edu_esp32.menu.UploadSpeed.460800.upload.speed=460800 +uPesy_edu_esp32.menu.UploadSpeed.256000.windows=256000 +uPesy_edu_esp32.menu.UploadSpeed.256000.upload.speed=256000 +uPesy_edu_esp32.menu.UploadSpeed.230400.windows.upload.speed=256000 +uPesy_edu_esp32.menu.UploadSpeed.230400=230400 +uPesy_edu_esp32.menu.UploadSpeed.230400.upload.speed=230400 +uPesy_edu_esp32.menu.UploadSpeed.115200=115200 +uPesy_edu_esp32.menu.UploadSpeed.115200.upload.speed=115200 + +uPesy_edu_esp32.menu.FlashMode.qio=QIO +uPesy_edu_esp32.menu.FlashMode.qio.build.flash_mode=dio +uPesy_edu_esp32.menu.FlashMode.qio.build.boot=qio +uPesy_edu_esp32.menu.FlashMode.dio=DIO +uPesy_edu_esp32.menu.FlashMode.dio.build.flash_mode=dio +uPesy_edu_esp32.menu.FlashMode.dio.build.boot=dio + +uPesy_edu_esp32.menu.FlashFreq.80=80MHz +uPesy_edu_esp32.menu.FlashFreq.80.build.flash_freq=80m +uPesy_edu_esp32.menu.FlashFreq.40=40MHz +uPesy_edu_esp32.menu.FlashFreq.40.build.flash_freq=40m + +uPesy_edu_esp32.menu.DebugLevel.none=None +uPesy_edu_esp32.menu.DebugLevel.none.build.code_debug=0 +uPesy_edu_esp32.menu.DebugLevel.error=Error +uPesy_edu_esp32.menu.DebugLevel.error.build.code_debug=1 +uPesy_edu_esp32.menu.DebugLevel.warn=Warn +uPesy_edu_esp32.menu.DebugLevel.warn.build.code_debug=2 +uPesy_edu_esp32.menu.DebugLevel.info=Info +uPesy_edu_esp32.menu.DebugLevel.info.build.code_debug=3 +uPesy_edu_esp32.menu.DebugLevel.debug=Debug +uPesy_edu_esp32.menu.DebugLevel.debug.build.code_debug=4 +uPesy_edu_esp32.menu.DebugLevel.verbose=Verbose +uPesy_edu_esp32.menu.DebugLevel.verbose.build.code_debug=5 + +uPesy_edu_esp32.menu.EraseFlash.none=Disabled +uPesy_edu_esp32.menu.EraseFlash.none.upload.erase_cmd= +uPesy_edu_esp32.menu.EraseFlash.all=Enabled +uPesy_edu_esp32.menu.EraseFlash.all.upload.erase_cmd=-e + +############################################################## + kb32.name=KB32-FT kb32.bootloader.tool=esptool_py @@ -25612,4 +25722,4 @@ namino_arancio.menu.EraseFlash.all=Enabled namino_arancio.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## - + diff --git a/variants/uPesy_edu_esp32/pins_arduino.h b/variants/uPesy_edu_esp32/pins_arduino.h new file mode 100644 index 00000000000..a6b2e937ce3 --- /dev/null +++ b/variants/uPesy_edu_esp32/pins_arduino.h @@ -0,0 +1,62 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 5; +static const uint8_t MOSI = 23; +static const uint8_t MISO = 19; +static const uint8_t SCK = 18; + +static const uint8_t A0 = 33; +static const uint8_t A1 = 32; +static const uint8_t A2 = 35; +static const uint8_t A3 = 34; +static const uint8_t A4 = 36; +static const uint8_t A5 = 39; + +static const uint8_t LED_BUILTIN = 2; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +#define LED_BUILTIN LED_BUILTIN + +#define PIN_WIRE_SDA SDA // backward compatibility +#define PIN_WIRE_SCL SCL // backward compatibility + +static const uint8_t D0 = 3; +static const uint8_t D1 = 1; +static const uint8_t D2 = 26; +static const uint8_t D3 = 25; +static const uint8_t D4 = 17; +static const uint8_t D5 = 16; +static const uint8_t D6 = 27; +static const uint8_t D7 = 14; +static const uint8_t D8 = 12; +static const uint8_t D9 = 13; +static const uint8_t D10 = 5; +static const uint8_t D11 = 23; +static const uint8_t D12 = 19; +static const uint8_t D13 = 18; + +#define PIN_SPI_SS SS // backward compatibility +#define PIN_SPI_MOSI MOSI // backward compatibility +#define PIN_SPI_MISO MISO // backward compatibility +#define PIN_SPI_SCK SCK // backward compatibility + +#define PIN_A0 A0 // backward compatibility + +#endif /* Pins_Arduino_h */ From 197138b7d66d229857798778a6557e94d41d17ee Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Mon, 11 Sep 2023 17:05:30 +0200 Subject: [PATCH 02/14] Add uPesy ESP32C3 Basic board variant --- boards.txt | 117 +++++++++++++++++++++++++ variants/uPesy_c3_basic/pins_arduino.h | 32 +++++++ 2 files changed, 149 insertions(+) create mode 100644 variants/uPesy_c3_basic/pins_arduino.h diff --git a/boards.txt b/boards.txt index 6f9dd4498bf..b1ad127f85f 100644 --- a/boards.txt +++ b/boards.txt @@ -19169,6 +19169,123 @@ uPesy_edu_esp32.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## +upesy_c3_basic.name=LOLIN C3 Mini +upesy_c3_basic.vid.0=0x303a +upesy_c3_basic.pid.0=0x1001 + +upesy_c3_basic.bootloader.tool=esptool_py +upesy_c3_basic.bootloader.tool.default=esptool_py + +upesy_c3_basic.upload.tool=esptool_py +upesy_c3_basic.upload.tool.default=esptool_py +upesy_c3_basic.upload.tool.network=esp_ota + +upesy_c3_basic.upload.maximum_size=1310720 +upesy_c3_basic.upload.maximum_data_size=327680 +upesy_c3_basic.upload.flags= +upesy_c3_basic.upload.extra_flags= +upesy_c3_basic.upload.use_1200bps_touch=false +upesy_c3_basic.upload.wait_for_upload_port=false + +upesy_c3_basic.serial.disableDTR=true +upesy_c3_basic.serial.disableRTS=true + +upesy_c3_basic.build.tarch=riscv32 +upesy_c3_basic.build.target=esp +upesy_c3_basic.build.mcu=esp32c3 +upesy_c3_basic.build.core=esp32 +upesy_c3_basic.build.variant=uPesy_c3_basic +upesy_c3_basic.build.board=uPesy_C3_BASIC +upesy_c3_basic.build.bootloader_addr=0x0 + +upesy_c3_basic.build.cdc_on_boot=1 +upesy_c3_basic.build.f_cpu=160000000L +upesy_c3_basic.build.flash_size=4MB +upesy_c3_basic.build.flash_freq=80m +upesy_c3_basic.build.flash_mode=dio +upesy_c3_basic.build.boot=qio +upesy_c3_basic.build.partitions=default +upesy_c3_basic.build.defines= + +upesy_c3_basic.menu.CDCOnBoot.default=Enabled +upesy_c3_basic.menu.CDCOnBoot.default.build.cdc_on_boot=1 +upesy_c3_basic.menu.CDCOnBoot.dis_cdc=Disabled +upesy_c3_basic.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0 + +upesy_c3_basic.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +upesy_c3_basic.menu.PartitionScheme.default.build.partitions=default +upesy_c3_basic.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +upesy_c3_basic.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +upesy_c3_basic.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +upesy_c3_basic.menu.PartitionScheme.no_ota.build.partitions=no_ota +upesy_c3_basic.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +upesy_c3_basic.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +upesy_c3_basic.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +upesy_c3_basic.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +upesy_c3_basic.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +upesy_c3_basic.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +upesy_c3_basic.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +upesy_c3_basic.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +upesy_c3_basic.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +upesy_c3_basic.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +upesy_c3_basic.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +upesy_c3_basic.menu.PartitionScheme.huge_app.build.partitions=huge_app +upesy_c3_basic.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 + + +upesy_c3_basic.menu.CPUFreq.160=160MHz (WiFi) +upesy_c3_basic.menu.CPUFreq.160.build.f_cpu=160000000L +upesy_c3_basic.menu.CPUFreq.80=80MHz (WiFi) +upesy_c3_basic.menu.CPUFreq.80.build.f_cpu=80000000L +upesy_c3_basic.menu.CPUFreq.40=40MHz +upesy_c3_basic.menu.CPUFreq.40.build.f_cpu=40000000L +upesy_c3_basic.menu.CPUFreq.20=20MHz +upesy_c3_basic.menu.CPUFreq.20.build.f_cpu=20000000L +upesy_c3_basic.menu.CPUFreq.10=10MHz +upesy_c3_basic.menu.CPUFreq.10.build.f_cpu=10000000L + + + +upesy_c3_basic.menu.FlashFreq.80=80MHz +upesy_c3_basic.menu.FlashFreq.80.build.flash_freq=80m +upesy_c3_basic.menu.FlashFreq.40=40MHz +upesy_c3_basic.menu.FlashFreq.40.build.flash_freq=40m + +upesy_c3_basic.menu.UploadSpeed.921600=921600 +upesy_c3_basic.menu.UploadSpeed.921600.upload.speed=921600 +upesy_c3_basic.menu.UploadSpeed.115200=115200 +upesy_c3_basic.menu.UploadSpeed.115200.upload.speed=115200 +upesy_c3_basic.menu.UploadSpeed.256000.windows=256000 +upesy_c3_basic.menu.UploadSpeed.256000.upload.speed=256000 +upesy_c3_basic.menu.UploadSpeed.230400.windows.upload.speed=256000 +upesy_c3_basic.menu.UploadSpeed.230400=230400 +upesy_c3_basic.menu.UploadSpeed.230400.upload.speed=230400 +upesy_c3_basic.menu.UploadSpeed.460800.linux=460800 +upesy_c3_basic.menu.UploadSpeed.460800.macosx=460800 +upesy_c3_basic.menu.UploadSpeed.460800.upload.speed=460800 +upesy_c3_basic.menu.UploadSpeed.512000.windows=512000 +upesy_c3_basic.menu.UploadSpeed.512000.upload.speed=512000 + +upesy_c3_basic.menu.DebugLevel.none=None +upesy_c3_basic.menu.DebugLevel.none.build.code_debug=0 +upesy_c3_basic.menu.DebugLevel.error=Error +upesy_c3_basic.menu.DebugLevel.error.build.code_debug=1 +upesy_c3_basic.menu.DebugLevel.warn=Warn +upesy_c3_basic.menu.DebugLevel.warn.build.code_debug=2 +upesy_c3_basic.menu.DebugLevel.info=Info +upesy_c3_basic.menu.DebugLevel.info.build.code_debug=3 +upesy_c3_basic.menu.DebugLevel.debug=Debug +upesy_c3_basic.menu.DebugLevel.debug.build.code_debug=4 +upesy_c3_basic.menu.DebugLevel.verbose=Verbose +upesy_c3_basic.menu.DebugLevel.verbose.build.code_debug=5 + +upesy_c3_basic.menu.EraseFlash.none=Disabled +upesy_c3_basic.menu.EraseFlash.none.upload.erase_cmd= +upesy_c3_basic.menu.EraseFlash.all=Enabled +upesy_c3_basic.menu.EraseFlash.all.upload.erase_cmd=-e + +############################################################## + kb32.name=KB32-FT kb32.bootloader.tool=esptool_py diff --git a/variants/uPesy_c3_basic/pins_arduino.h b/variants/uPesy_c3_basic/pins_arduino.h new file mode 100644 index 00000000000..8ce191ad23a --- /dev/null +++ b/variants/uPesy_c3_basic/pins_arduino.h @@ -0,0 +1,32 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 22 +#define NUM_DIGITAL_PINS 22 +#define NUM_ANALOG_INPUTS 6 + +#define analogInputToDigitalPin(p) (((p) Date: Mon, 11 Sep 2023 17:12:39 +0200 Subject: [PATCH 03/14] Add uPesy ESP32C3 Basic board variant --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index b1ad127f85f..8edb98a853d 100644 --- a/boards.txt +++ b/boards.txt @@ -19169,9 +19169,9 @@ uPesy_edu_esp32.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## -upesy_c3_basic.name=LOLIN C3 Mini +upesy_c3_basic.name=uPesy ESP32C3 Basic upesy_c3_basic.vid.0=0x303a -upesy_c3_basic.pid.0=0x1001 +upesy_c3_basic.pid.0=0x8195 upesy_c3_basic.bootloader.tool=esptool_py upesy_c3_basic.bootloader.tool.default=esptool_py From 5cfd599e9e65fd621852cad62f3af3ceda4e399a Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Mon, 11 Sep 2023 17:20:19 +0200 Subject: [PATCH 04/14] Add uPesy ESP32C3 Mini board variant + some tweak --- boards.txt | 345 ++++++++++++------ .../pins_arduino.h | 0 variants/uPesy_esp32c3_mini/pins_arduino.h | 32 ++ 3 files changed, 263 insertions(+), 114 deletions(-) rename variants/{uPesy_c3_basic => uPesy_esp32c3_basic}/pins_arduino.h (100%) create mode 100644 variants/uPesy_esp32c3_mini/pins_arduino.h diff --git a/boards.txt b/boards.txt index 8edb98a853d..00fc47b275c 100644 --- a/boards.txt +++ b/boards.txt @@ -19169,120 +19169,237 @@ uPesy_edu_esp32.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## -upesy_c3_basic.name=uPesy ESP32C3 Basic -upesy_c3_basic.vid.0=0x303a -upesy_c3_basic.pid.0=0x8195 - -upesy_c3_basic.bootloader.tool=esptool_py -upesy_c3_basic.bootloader.tool.default=esptool_py - -upesy_c3_basic.upload.tool=esptool_py -upesy_c3_basic.upload.tool.default=esptool_py -upesy_c3_basic.upload.tool.network=esp_ota - -upesy_c3_basic.upload.maximum_size=1310720 -upesy_c3_basic.upload.maximum_data_size=327680 -upesy_c3_basic.upload.flags= -upesy_c3_basic.upload.extra_flags= -upesy_c3_basic.upload.use_1200bps_touch=false -upesy_c3_basic.upload.wait_for_upload_port=false - -upesy_c3_basic.serial.disableDTR=true -upesy_c3_basic.serial.disableRTS=true - -upesy_c3_basic.build.tarch=riscv32 -upesy_c3_basic.build.target=esp -upesy_c3_basic.build.mcu=esp32c3 -upesy_c3_basic.build.core=esp32 -upesy_c3_basic.build.variant=uPesy_c3_basic -upesy_c3_basic.build.board=uPesy_C3_BASIC -upesy_c3_basic.build.bootloader_addr=0x0 - -upesy_c3_basic.build.cdc_on_boot=1 -upesy_c3_basic.build.f_cpu=160000000L -upesy_c3_basic.build.flash_size=4MB -upesy_c3_basic.build.flash_freq=80m -upesy_c3_basic.build.flash_mode=dio -upesy_c3_basic.build.boot=qio -upesy_c3_basic.build.partitions=default -upesy_c3_basic.build.defines= - -upesy_c3_basic.menu.CDCOnBoot.default=Enabled -upesy_c3_basic.menu.CDCOnBoot.default.build.cdc_on_boot=1 -upesy_c3_basic.menu.CDCOnBoot.dis_cdc=Disabled -upesy_c3_basic.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0 - -upesy_c3_basic.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) -upesy_c3_basic.menu.PartitionScheme.default.build.partitions=default -upesy_c3_basic.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) -upesy_c3_basic.menu.PartitionScheme.defaultffat.build.partitions=default_ffat -upesy_c3_basic.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) -upesy_c3_basic.menu.PartitionScheme.no_ota.build.partitions=no_ota -upesy_c3_basic.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -upesy_c3_basic.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) -upesy_c3_basic.menu.PartitionScheme.noota_3g.build.partitions=noota_3g -upesy_c3_basic.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 -upesy_c3_basic.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) -upesy_c3_basic.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat -upesy_c3_basic.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 -upesy_c3_basic.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) -upesy_c3_basic.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat -upesy_c3_basic.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 -upesy_c3_basic.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) -upesy_c3_basic.menu.PartitionScheme.huge_app.build.partitions=huge_app -upesy_c3_basic.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 - - -upesy_c3_basic.menu.CPUFreq.160=160MHz (WiFi) -upesy_c3_basic.menu.CPUFreq.160.build.f_cpu=160000000L -upesy_c3_basic.menu.CPUFreq.80=80MHz (WiFi) -upesy_c3_basic.menu.CPUFreq.80.build.f_cpu=80000000L -upesy_c3_basic.menu.CPUFreq.40=40MHz -upesy_c3_basic.menu.CPUFreq.40.build.f_cpu=40000000L -upesy_c3_basic.menu.CPUFreq.20=20MHz -upesy_c3_basic.menu.CPUFreq.20.build.f_cpu=20000000L -upesy_c3_basic.menu.CPUFreq.10=10MHz -upesy_c3_basic.menu.CPUFreq.10.build.f_cpu=10000000L - - - -upesy_c3_basic.menu.FlashFreq.80=80MHz -upesy_c3_basic.menu.FlashFreq.80.build.flash_freq=80m -upesy_c3_basic.menu.FlashFreq.40=40MHz -upesy_c3_basic.menu.FlashFreq.40.build.flash_freq=40m - -upesy_c3_basic.menu.UploadSpeed.921600=921600 -upesy_c3_basic.menu.UploadSpeed.921600.upload.speed=921600 -upesy_c3_basic.menu.UploadSpeed.115200=115200 -upesy_c3_basic.menu.UploadSpeed.115200.upload.speed=115200 -upesy_c3_basic.menu.UploadSpeed.256000.windows=256000 -upesy_c3_basic.menu.UploadSpeed.256000.upload.speed=256000 -upesy_c3_basic.menu.UploadSpeed.230400.windows.upload.speed=256000 -upesy_c3_basic.menu.UploadSpeed.230400=230400 -upesy_c3_basic.menu.UploadSpeed.230400.upload.speed=230400 -upesy_c3_basic.menu.UploadSpeed.460800.linux=460800 -upesy_c3_basic.menu.UploadSpeed.460800.macosx=460800 -upesy_c3_basic.menu.UploadSpeed.460800.upload.speed=460800 -upesy_c3_basic.menu.UploadSpeed.512000.windows=512000 -upesy_c3_basic.menu.UploadSpeed.512000.upload.speed=512000 - -upesy_c3_basic.menu.DebugLevel.none=None -upesy_c3_basic.menu.DebugLevel.none.build.code_debug=0 -upesy_c3_basic.menu.DebugLevel.error=Error -upesy_c3_basic.menu.DebugLevel.error.build.code_debug=1 -upesy_c3_basic.menu.DebugLevel.warn=Warn -upesy_c3_basic.menu.DebugLevel.warn.build.code_debug=2 -upesy_c3_basic.menu.DebugLevel.info=Info -upesy_c3_basic.menu.DebugLevel.info.build.code_debug=3 -upesy_c3_basic.menu.DebugLevel.debug=Debug -upesy_c3_basic.menu.DebugLevel.debug.build.code_debug=4 -upesy_c3_basic.menu.DebugLevel.verbose=Verbose -upesy_c3_basic.menu.DebugLevel.verbose.build.code_debug=5 - -upesy_c3_basic.menu.EraseFlash.none=Disabled -upesy_c3_basic.menu.EraseFlash.none.upload.erase_cmd= -upesy_c3_basic.menu.EraseFlash.all=Enabled -upesy_c3_basic.menu.EraseFlash.all.upload.erase_cmd=-e +upesy_esp32c3_basic.name=uPesy ESP32C3 Basic +upesy_esp32c3_basic.vid.0=0x303a +upesy_esp32c3_basic.pid.0=0x8195 + +upesy_esp32c3_basic.bootloader.tool=esptool_py +upesy_esp32c3_basic.bootloader.tool.default=esptool_py + +upesy_esp32c3_basic.upload.tool=esptool_py +upesy_esp32c3_basic.upload.tool.default=esptool_py +upesy_esp32c3_basic.upload.tool.network=esp_ota + +upesy_esp32c3_basic.upload.maximum_size=1310720 +upesy_esp32c3_basic.upload.maximum_data_size=327680 +upesy_esp32c3_basic.upload.flags= +upesy_esp32c3_basic.upload.extra_flags= +upesy_esp32c3_basic.upload.use_1200bps_touch=false +upesy_esp32c3_basic.upload.wait_for_upload_port=false + +upesy_esp32c3_basic.serial.disableDTR=true +upesy_esp32c3_basic.serial.disableRTS=true + +upesy_esp32c3_basic.build.tarch=riscv32 +upesy_esp32c3_basic.build.target=esp +upesy_esp32c3_basic.build.mcu=esp32c3 +upesy_esp32c3_basic.build.core=esp32 +upesy_esp32c3_basic.build.variant=upesy_esp32c3_basic +upesy_esp32c3_basic.build.board=uPesy_ESP32C3_basic +upesy_esp32c3_basic.build.bootloader_addr=0x0 + +upesy_esp32c3_basic.build.cdc_on_boot=1 +upesy_esp32c3_basic.build.f_cpu=160000000L +upesy_esp32c3_basic.build.flash_size=4MB +upesy_esp32c3_basic.build.flash_freq=80m +upesy_esp32c3_basic.build.flash_mode=dio +upesy_esp32c3_basic.build.boot=qio +upesy_esp32c3_basic.build.partitions=default +upesy_esp32c3_basic.build.defines= + +upesy_esp32c3_basic.menu.CDCOnBoot.default=Enabled +upesy_esp32c3_basic.menu.CDCOnBoot.default.build.cdc_on_boot=1 +upesy_esp32c3_basic.menu.CDCOnBoot.dis_cdc=Disabled +upesy_esp32c3_basic.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0 + +upesy_esp32c3_basic.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +upesy_esp32c3_basic.menu.PartitionScheme.default.build.partitions=default +upesy_esp32c3_basic.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +upesy_esp32c3_basic.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +upesy_esp32c3_basic.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +upesy_esp32c3_basic.menu.PartitionScheme.no_ota.build.partitions=no_ota +upesy_esp32c3_basic.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +upesy_esp32c3_basic.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +upesy_esp32c3_basic.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +upesy_esp32c3_basic.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +upesy_esp32c3_basic.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +upesy_esp32c3_basic.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +upesy_esp32c3_basic.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +upesy_esp32c3_basic.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +upesy_esp32c3_basic.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +upesy_esp32c3_basic.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +upesy_esp32c3_basic.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +upesy_esp32c3_basic.menu.PartitionScheme.huge_app.build.partitions=huge_app +upesy_esp32c3_basic.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 + + +upesy_esp32c3_basic.menu.CPUFreq.160=160MHz (WiFi) +upesy_esp32c3_basic.menu.CPUFreq.160.build.f_cpu=160000000L +upesy_esp32c3_basic.menu.CPUFreq.80=80MHz (WiFi) +upesy_esp32c3_basic.menu.CPUFreq.80.build.f_cpu=80000000L +upesy_esp32c3_basic.menu.CPUFreq.40=40MHz +upesy_esp32c3_basic.menu.CPUFreq.40.build.f_cpu=40000000L +upesy_esp32c3_basic.menu.CPUFreq.20=20MHz +upesy_esp32c3_basic.menu.CPUFreq.20.build.f_cpu=20000000L +upesy_esp32c3_basic.menu.CPUFreq.10=10MHz +upesy_esp32c3_basic.menu.CPUFreq.10.build.f_cpu=10000000L + + + +upesy_esp32c3_basic.menu.FlashFreq.80=80MHz +upesy_esp32c3_basic.menu.FlashFreq.80.build.flash_freq=80m +upesy_esp32c3_basic.menu.FlashFreq.40=40MHz +upesy_esp32c3_basic.menu.FlashFreq.40.build.flash_freq=40m + +upesy_esp32c3_basic.menu.UploadSpeed.921600=921600 +upesy_esp32c3_basic.menu.UploadSpeed.921600.upload.speed=921600 +upesy_esp32c3_basic.menu.UploadSpeed.115200=115200 +upesy_esp32c3_basic.menu.UploadSpeed.115200.upload.speed=115200 +upesy_esp32c3_basic.menu.UploadSpeed.256000.windows=256000 +upesy_esp32c3_basic.menu.UploadSpeed.256000.upload.speed=256000 +upesy_esp32c3_basic.menu.UploadSpeed.230400.windows.upload.speed=256000 +upesy_esp32c3_basic.menu.UploadSpeed.230400=230400 +upesy_esp32c3_basic.menu.UploadSpeed.230400.upload.speed=230400 +upesy_esp32c3_basic.menu.UploadSpeed.460800.linux=460800 +upesy_esp32c3_basic.menu.UploadSpeed.460800.macosx=460800 +upesy_esp32c3_basic.menu.UploadSpeed.460800.upload.speed=460800 +upesy_esp32c3_basic.menu.UploadSpeed.512000.windows=512000 +upesy_esp32c3_basic.menu.UploadSpeed.512000.upload.speed=512000 + +upesy_esp32c3_basic.menu.DebugLevel.none=None +upesy_esp32c3_basic.menu.DebugLevel.none.build.code_debug=0 +upesy_esp32c3_basic.menu.DebugLevel.error=Error +upesy_esp32c3_basic.menu.DebugLevel.error.build.code_debug=1 +upesy_esp32c3_basic.menu.DebugLevel.warn=Warn +upesy_esp32c3_basic.menu.DebugLevel.warn.build.code_debug=2 +upesy_esp32c3_basic.menu.DebugLevel.info=Info +upesy_esp32c3_basic.menu.DebugLevel.info.build.code_debug=3 +upesy_esp32c3_basic.menu.DebugLevel.debug=Debug +upesy_esp32c3_basic.menu.DebugLevel.debug.build.code_debug=4 +upesy_esp32c3_basic.menu.DebugLevel.verbose=Verbose +upesy_esp32c3_basic.menu.DebugLevel.verbose.build.code_debug=5 + +upesy_esp32c3_basic.menu.EraseFlash.none=Disabled +upesy_esp32c3_basic.menu.EraseFlash.none.upload.erase_cmd= +upesy_esp32c3_basic.menu.EraseFlash.all=Enabled +upesy_esp32c3_basic.menu.EraseFlash.all.upload.erase_cmd=-e + +############################################################## + +upesy_esp32c3_mini.name=uPesy ESP32C3 Mini +upesy_esp32c3_mini.vid.0=0x303a +upesy_esp32c3_mini.pid.0=0x819B + +upesy_esp32c3_mini.bootloader.tool=esptool_py +upesy_esp32c3_mini.bootloader.tool.default=esptool_py + +upesy_esp32c3_mini.upload.tool=esptool_py +upesy_esp32c3_mini.upload.tool.default=esptool_py +upesy_esp32c3_mini.upload.tool.network=esp_ota + +upesy_esp32c3_mini.upload.maximum_size=1310720 +upesy_esp32c3_mini.upload.maximum_data_size=327680 +upesy_esp32c3_mini.upload.flags= +upesy_esp32c3_mini.upload.extra_flags= +upesy_esp32c3_mini.upload.use_1200bps_touch=false +upesy_esp32c3_mini.upload.wait_for_upload_port=false + +upesy_esp32c3_mini.serial.disableDTR=true +upesy_esp32c3_mini.serial.disableRTS=true + +upesy_esp32c3_mini.build.tarch=riscv32 +upesy_esp32c3_mini.build.target=esp +upesy_esp32c3_mini.build.mcu=esp32c3 +upesy_esp32c3_mini.build.core=esp32 +upesy_esp32c3_mini.build.variant=uPesy_esp32c3_mini +upesy_esp32c3_mini.build.board=uPesy_ESP32C3_MINI +upesy_esp32c3_mini.build.bootloader_addr=0x0 + +upesy_esp32c3_mini.build.cdc_on_boot=1 +upesy_esp32c3_mini.build.f_cpu=160000000L +upesy_esp32c3_mini.build.flash_size=4MB +upesy_esp32c3_mini.build.flash_freq=80m +upesy_esp32c3_mini.build.flash_mode=dio +upesy_esp32c3_mini.build.boot=qio +upesy_esp32c3_mini.build.partitions=default +upesy_esp32c3_mini.build.defines= + +upesy_esp32c3_mini.menu.CDCOnBoot.default=Enabled +upesy_esp32c3_mini.menu.CDCOnBoot.default.build.cdc_on_boot=1 +upesy_esp32c3_mini.menu.CDCOnBoot.dis_cdc=Disabled +upesy_esp32c3_mini.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0 + +upesy_esp32c3_mini.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +upesy_esp32c3_mini.menu.PartitionScheme.default.build.partitions=default +upesy_esp32c3_mini.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +upesy_esp32c3_mini.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +upesy_esp32c3_mini.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +upesy_esp32c3_mini.menu.PartitionScheme.no_ota.build.partitions=no_ota +upesy_esp32c3_mini.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +upesy_esp32c3_mini.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +upesy_esp32c3_mini.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +upesy_esp32c3_mini.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +upesy_esp32c3_mini.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +upesy_esp32c3_mini.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +upesy_esp32c3_mini.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +upesy_esp32c3_mini.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +upesy_esp32c3_mini.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +upesy_esp32c3_mini.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +upesy_esp32c3_mini.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +upesy_esp32c3_mini.menu.PartitionScheme.huge_app.build.partitions=huge_app +upesy_esp32c3_mini.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 + + +upesy_esp32c3_mini.menu.CPUFreq.160=160MHz (WiFi) +upesy_esp32c3_mini.menu.CPUFreq.160.build.f_cpu=160000000L +upesy_esp32c3_mini.menu.CPUFreq.80=80MHz (WiFi) +upesy_esp32c3_mini.menu.CPUFreq.80.build.f_cpu=80000000L +upesy_esp32c3_mini.menu.CPUFreq.40=40MHz +upesy_esp32c3_mini.menu.CPUFreq.40.build.f_cpu=40000000L +upesy_esp32c3_mini.menu.CPUFreq.20=20MHz +upesy_esp32c3_mini.menu.CPUFreq.20.build.f_cpu=20000000L +upesy_esp32c3_mini.menu.CPUFreq.10=10MHz +upesy_esp32c3_mini.menu.CPUFreq.10.build.f_cpu=10000000L + + + +upesy_esp32c3_mini.menu.FlashFreq.80=80MHz +upesy_esp32c3_mini.menu.FlashFreq.80.build.flash_freq=80m +upesy_esp32c3_mini.menu.FlashFreq.40=40MHz +upesy_esp32c3_mini.menu.FlashFreq.40.build.flash_freq=40m + +upesy_esp32c3_mini.menu.UploadSpeed.921600=921600 +upesy_esp32c3_mini.menu.UploadSpeed.921600.upload.speed=921600 +upesy_esp32c3_mini.menu.UploadSpeed.115200=115200 +upesy_esp32c3_mini.menu.UploadSpeed.115200.upload.speed=115200 +upesy_esp32c3_mini.menu.UploadSpeed.256000.windows=256000 +upesy_esp32c3_mini.menu.UploadSpeed.256000.upload.speed=256000 +upesy_esp32c3_mini.menu.UploadSpeed.230400.windows.upload.speed=256000 +upesy_esp32c3_mini.menu.UploadSpeed.230400=230400 +upesy_esp32c3_mini.menu.UploadSpeed.230400.upload.speed=230400 +upesy_esp32c3_mini.menu.UploadSpeed.460800.linux=460800 +upesy_esp32c3_mini.menu.UploadSpeed.460800.macosx=460800 +upesy_esp32c3_mini.menu.UploadSpeed.460800.upload.speed=460800 +upesy_esp32c3_mini.menu.UploadSpeed.512000.windows=512000 +upesy_esp32c3_mini.menu.UploadSpeed.512000.upload.speed=512000 + +upesy_esp32c3_mini.menu.DebugLevel.none=None +upesy_esp32c3_mini.menu.DebugLevel.none.build.code_debug=0 +upesy_esp32c3_mini.menu.DebugLevel.error=Error +upesy_esp32c3_mini.menu.DebugLevel.error.build.code_debug=1 +upesy_esp32c3_mini.menu.DebugLevel.warn=Warn +upesy_esp32c3_mini.menu.DebugLevel.warn.build.code_debug=2 +upesy_esp32c3_mini.menu.DebugLevel.info=Info +upesy_esp32c3_mini.menu.DebugLevel.info.build.code_debug=3 +upesy_esp32c3_mini.menu.DebugLevel.debug=Debug +upesy_esp32c3_mini.menu.DebugLevel.debug.build.code_debug=4 +upesy_esp32c3_mini.menu.DebugLevel.verbose=Verbose +upesy_esp32c3_mini.menu.DebugLevel.verbose.build.code_debug=5 + +upesy_esp32c3_mini.menu.EraseFlash.none=Disabled +upesy_esp32c3_mini.menu.EraseFlash.none.upload.erase_cmd= +upesy_esp32c3_mini.menu.EraseFlash.all=Enabled +upesy_esp32c3_mini.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## diff --git a/variants/uPesy_c3_basic/pins_arduino.h b/variants/uPesy_esp32c3_basic/pins_arduino.h similarity index 100% rename from variants/uPesy_c3_basic/pins_arduino.h rename to variants/uPesy_esp32c3_basic/pins_arduino.h diff --git a/variants/uPesy_esp32c3_mini/pins_arduino.h b/variants/uPesy_esp32c3_mini/pins_arduino.h new file mode 100644 index 00000000000..2d2a7bf710e --- /dev/null +++ b/variants/uPesy_esp32c3_mini/pins_arduino.h @@ -0,0 +1,32 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 22 +#define NUM_DIGITAL_PINS 22 +#define NUM_ANALOG_INPUTS 6 + +#define analogInputToDigitalPin(p) (((p) Date: Tue, 17 Oct 2023 14:51:16 +0200 Subject: [PATCH 05/14] tweak uPesy C3 Mini pinout tweak uPesy C3 Mini pinout tweak uPesy C3 basic pinout Add uPesy ESP32S3 pin variant Add uPesy ESP32S3 pin variant Tweak uPesy ESP32s3/C3 pinout variant --- variants/uPesy_esp32c3_basic/pins_arduino.h | 12 ++- variants/uPesy_esp32c3_mini/pins_arduino.h | 13 +++- variants/uPesy_esp32s3_basic/pins_arduino.h | 82 +++++++++++++++++++++ 3 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 variants/uPesy_esp32s3_basic/pins_arduino.h diff --git a/variants/uPesy_esp32c3_basic/pins_arduino.h b/variants/uPesy_esp32c3_basic/pins_arduino.h index 8ce191ad23a..1e8fcf666c5 100644 --- a/variants/uPesy_esp32c3_basic/pins_arduino.h +++ b/variants/uPesy_esp32c3_basic/pins_arduino.h @@ -3,6 +3,12 @@ #include +#define USB_VID 0x303A +#define USB_PID 0x8195 +#define USB_MANUFACTURER "uPesy Electronics" +#define USB_PRODUCT "uPesy ESP32C3 Basic" +#define USB_SERIAL "" + #define EXTERNAL_NUM_INTERRUPTS 22 #define NUM_DIGITAL_PINS 22 #define NUM_ANALOG_INPUTS 6 @@ -14,8 +20,8 @@ static const uint8_t TX = 21; static const uint8_t RX = 20; -static const uint8_t SDA = 8; -static const uint8_t SCL = 9; +static const uint8_t SDA = 3; +static const uint8_t SCL = 10; static const uint8_t SS = 7; static const uint8_t MOSI = 6; @@ -29,4 +35,6 @@ static const uint8_t A3 = 3; static const uint8_t A4 = 4; static const uint8_t A5 = 5; +static const uint8_t VBAT_SENSE = 0; + #endif /* Pins_Arduino_h */ diff --git a/variants/uPesy_esp32c3_mini/pins_arduino.h b/variants/uPesy_esp32c3_mini/pins_arduino.h index 2d2a7bf710e..102291598fe 100644 --- a/variants/uPesy_esp32c3_mini/pins_arduino.h +++ b/variants/uPesy_esp32c3_mini/pins_arduino.h @@ -3,6 +3,12 @@ #include +#define USB_VID 0x303A +#define USB_PID 0x819B +#define USB_MANUFACTURER "uPesy Electronics" +#define USB_PRODUCT "uPesy ESP32C3 Mini" +#define USB_SERIAL "" + #define EXTERNAL_NUM_INTERRUPTS 22 #define NUM_DIGITAL_PINS 22 #define NUM_ANALOG_INPUTS 6 @@ -14,8 +20,8 @@ static const uint8_t TX = 21; static const uint8_t RX = 20; -static const uint8_t SDA = 21; -static const uint8_t SCL = 20; +static const uint8_t SDA = 3; +static const uint8_t SCL = 10; static const uint8_t SS = 7; static const uint8_t MOSI = 6; @@ -24,9 +30,10 @@ static const uint8_t SCK = 4; 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 VBAT_SENSE = 0; + #endif /* Pins_Arduino_h */ diff --git a/variants/uPesy_esp32s3_basic/pins_arduino.h b/variants/uPesy_esp32s3_basic/pins_arduino.h new file mode 100644 index 00000000000..76eded265bd --- /dev/null +++ b/variants/uPesy_esp32s3_basic/pins_arduino.h @@ -0,0 +1,82 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include +#include "soc/soc_caps.h" + +#define USB_VID 0x303A +#define USB_PID 0x8192 +#define USB_MANUFACTURER "uPesy Electronics" +#define USB_PRODUCT "uPesy ESP32S3 Basic" +#define USB_SERIAL "" + + +static const uint8_t RGB_DATA = 38; +// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite() +#define RGB_BUILTIN (RGB_DATA + SOC_GPIO_PIN_COUNT) +#define RGB_BRIGHTNESS 64 + +static const uint8_t LED_BUILTIN = 2; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN + +static const uint8_t TX = 43; +static const uint8_t RX = 44; +static const uint8_t TX0 = 43; +static const uint8_t RX0 = 44; + +static const uint8_t TX1 = 17; +static const uint8_t RX1 = 18; + +static const uint8_t SDA = 8; +static const uint8_t SCL = 9; + +static const uint8_t SS = 10; +static const uint8_t MOSI = 11; +static const uint8_t MISO = 13; +static const uint8_t SCK = 12; + +static const uint8_t A0 = 1; +static const uint8_t A1 = 2; +static const uint8_t A2 = 3; +static const uint8_t A3 = 4; +static const uint8_t A4 = 5; +static const uint8_t A5 = 6; +static const uint8_t A6 = 7; +static const uint8_t A7 = 8; +static const uint8_t A8 = 9; +static const uint8_t A9 = 10; +static const uint8_t A10 = 11; +static const uint8_t A11 = 12; +static const uint8_t A12 = 13; +static const uint8_t A13 = 14; +static const uint8_t A14 = 15; +static const uint8_t A15 = 16; +static const uint8_t A16 = 17; +static const uint8_t A17 = 18; +static const uint8_t A18 = 19; +static const uint8_t A19 = 20; + +static const uint8_t T1 = 1; +static const uint8_t T2 = 2; +static const uint8_t T3 = 3; +static const uint8_t T4 = 4; +static const uint8_t T5 = 5; +static const uint8_t T6 = 6; +static const uint8_t T7 = 7; +static const uint8_t T8 = 8; +static const uint8_t T9 = 9; +static const uint8_t T10 = 10; +static const uint8_t T11 = 11; +static const uint8_t T12 = 12; +static const uint8_t T13 = 13; +static const uint8_t T14 = 14; + +static const uint8_t MTMS = 42; +static const uint8_t MTDI = 41; +static const uint8_t MTDO = 40; +static const uint8_t MTCK = 39; + + + +#endif /* Pins_Arduino_h */ From 43e61975ae27c83a2ab889e90573b3a559a4b40f Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Tue, 17 Oct 2023 15:43:15 +0200 Subject: [PATCH 06/14] add upesy esp32s3 config in boards.txt --- boards.txt | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 97ba7ea9754..9bbdc758234 100644 --- a/boards.txt +++ b/boards.txt @@ -20117,7 +20117,6 @@ upesy_esp32c3_basic.menu.CPUFreq.10=10MHz upesy_esp32c3_basic.menu.CPUFreq.10.build.f_cpu=10000000L - upesy_esp32c3_basic.menu.FlashFreq.80=80MHz upesy_esp32c3_basic.menu.FlashFreq.80.build.flash_freq=80m upesy_esp32c3_basic.menu.FlashFreq.40=40MHz @@ -20275,6 +20274,169 @@ upesy_esp32c3_mini.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## +upesy_esp32s3_basic.name=uPesy ESP32S3 Basic +upesy_esp32s3_basic.vid.0=0x303a +upesy_esp32s3_basic.pid.0=0x8192 + +upesy_esp32s3_basic.bootloader.tool=esptool_py +upesy_esp32s3_basic.bootloader.tool.default=esptool_py + +upesy_esp32s3_basic.upload.tool=esptool_py +upesy_esp32s3_basic.upload.tool.default=esptool_py +upesy_esp32s3_basic.upload.tool.network=esp_ota + +upesy_esp32s3_basic.upload.maximum_size=1310720 +upesy_esp32s3_basic.upload.maximum_data_size=327680 +upesy_esp32s3_basic.upload.flags= +upesy_esp32s3_basic.upload.extra_flags= +upesy_esp32s3_basic.upload.use_1200bps_touch=false +upesy_esp32s3_basic.upload.wait_for_upload_port=false + +upesy_esp32s3_basic.serial.disableDTR=false +upesy_esp32s3_basic.serial.disableRTS=false + +upesy_esp32s3_basic.build.tarch=xtensa +upesy_esp32s3_basic.build.bootloader_addr=0x0 +upesy_esp32s3_basic.build.target=esp32s3 +upesy_esp32s3_basic.build.mcu=esp32s3 +upesy_esp32s3_basic.build.core=esp32 +upesy_esp32s3_basic.build.variant=upesy_esp32s3_basic +upesy_esp32s3_basic.build.board=uPesy_ESP32S3_BASIC + +upesy_esp32s3_basic.build.usb_mode=1 +upesy_esp32s3_basic.build.cdc_on_boot=0 +upesy_esp32s3_basic.build.msc_on_boot=0 +upesy_esp32s3_basic.build.dfu_on_boot=0 +upesy_esp32s3_basic.build.f_cpu=240000000L +upesy_esp32s3_basic.build.flash_size=16MB +upesy_esp32s3_basic.build.flash_freq=80m +upesy_esp32s3_basic.build.flash_mode=dio +upesy_esp32s3_basic.build.boot=qio +upesy_esp32s3_basic.build.boot_freq=80m +upesy_esp32s3_basic.build.partitions=default +upesy_esp32s3_basic.build.defines=-DBOARD_HAS_PSRAM +upesy_esp32s3_basic.build.loop_core= +upesy_esp32s3_basic.build.event_core= +upesy_esp32s3_basic.build.psram_type=opi +upesy_esp32s3_basic.build.memory_type={build.boot}_{build.psram_type} + +## IDE 2.0 Seems to not update the value +esp32s3.menu.JTAGAdapter.default=Disabled +esp32s3.menu.JTAGAdapter.default.build.copy_jtag_files=0 +esp32s3.menu.JTAGAdapter.builtin=Integrated USB JTAG +esp32s3.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg +esp32s3.menu.JTAGAdapter.builtin.build.copy_jtag_files=1 +esp32s3.menu.JTAGAdapter.external=FTDI Adapter +esp32s3.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg +esp32s3.menu.JTAGAdapter.external.build.copy_jtag_files=1 +esp32s3.menu.JTAGAdapter.bridge=ESP USB Bridge +esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg +esp32s3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +upesy_esp32s3_basic.menu.FlashMode.qio=QIO 80MHz +upesy_esp32s3_basic.menu.FlashMode.qio.build.flash_mode=dio +upesy_esp32s3_basic.menu.FlashMode.qio.build.boot=qio +upesy_esp32s3_basic.menu.FlashMode.qio.build.boot_freq=80m +upesy_esp32s3_basic.menu.FlashMode.qio.build.flash_freq=80m +upesy_esp32s3_basic.menu.FlashMode.qio120=QIO 120MHz +upesy_esp32s3_basic.menu.FlashMode.qio120.build.flash_mode=dio +upesy_esp32s3_basic.menu.FlashMode.qio120.build.boot=qio +upesy_esp32s3_basic.menu.FlashMode.qio120.build.boot_freq=120m +upesy_esp32s3_basic.menu.FlashMode.qio120.build.flash_freq=80m + +upesy_esp32s3_basic.menu.LoopCore.1=Core 1 +upesy_esp32s3_basic.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +upesy_esp32s3_basic.menu.LoopCore.0=Core 0 +upesy_esp32s3_basic.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +upesy_esp32s3_basic.menu.EventsCore.1=Core 1 +upesy_esp32s3_basic.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +upesy_esp32s3_basic.menu.EventsCore.0=Core 0 +upesy_esp32s3_basic.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + +upesy_esp32s3_basic.menu.USBMode.hwcdc=Hardware CDC and JTAG +upesy_esp32s3_basic.menu.USBMode.hwcdc.build.usb_mode=1 +upesy_esp32s3_basic.menu.USBMode.default=USB-OTG (TinyUSB) +upesy_esp32s3_basic.menu.USBMode.default.build.usb_mode=0 + +upesy_esp32s3_basic.menu.CDCOnBoot.default=Disabled +upesy_esp32s3_basic.menu.CDCOnBoot.default.build.cdc_on_boot=0 +upesy_esp32s3_basic.menu.CDCOnBoot.cdc=Enabled +upesy_esp32s3_basic.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 + +upesy_esp32s3_basic.menu.MSCOnBoot.default=Disabled +upesy_esp32s3_basic.menu.MSCOnBoot.default.build.msc_on_boot=0 +upesy_esp32s3_basic.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode) +upesy_esp32s3_basic.menu.MSCOnBoot.msc.build.msc_on_boot=1 + +upesy_esp32s3_basic.menu.DFUOnBoot.default=Disabled +upesy_esp32s3_basic.menu.DFUOnBoot.default.build.dfu_on_boot=0 +upesy_esp32s3_basic.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode) +upesy_esp32s3_basic.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 + +upesy_esp32s3_basic.menu.UploadMode.default=UART0 / Hardware CDC +upesy_esp32s3_basic.menu.UploadMode.default.upload.use_1200bps_touch=false +upesy_esp32s3_basic.menu.UploadMode.default.upload.wait_for_upload_port=false +upesy_esp32s3_basic.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB) +upesy_esp32s3_basic.menu.UploadMode.cdc.upload.use_1200bps_touch=true +upesy_esp32s3_basic.menu.UploadMode.cdc.upload.wait_for_upload_port=true + +upesy_esp32s3_basic.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS) +upesy_esp32s3_basic.menu.PartitionScheme.fatflash.build.partitions=ffat +upesy_esp32s3_basic.menu.PartitionScheme.fatflash.upload.maximum_size=2097152 +upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS) +upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB +upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 + + +upesy_esp32s3_basic.menu.CPUFreq.240=240MHz (WiFi) +upesy_esp32s3_basic.menu.CPUFreq.240.build.f_cpu=240000000L +upesy_esp32s3_basic.menu.CPUFreq.160=160MHz (WiFi) +upesy_esp32s3_basic.menu.CPUFreq.160.build.f_cpu=160000000L +upesy_esp32s3_basic.menu.CPUFreq.80=80MHz (WiFi) +upesy_esp32s3_basic.menu.CPUFreq.80.build.f_cpu=80000000L +upesy_esp32s3_basic.menu.CPUFreq.40=40MHz +upesy_esp32s3_basic.menu.CPUFreq.40.build.f_cpu=40000000L +upesy_esp32s3_basic.menu.CPUFreq.20=20MHz +upesy_esp32s3_basic.menu.CPUFreq.20.build.f_cpu=20000000L +upesy_esp32s3_basic.menu.CPUFreq.10=10MHz +upesy_esp32s3_basic.menu.CPUFreq.10.build.f_cpu=10000000L + +upesy_esp32s3_basic.menu.UploadSpeed.921600=921600 +upesy_esp32s3_basic.menu.UploadSpeed.921600.upload.speed=921600 +upesy_esp32s3_basic.menu.UploadSpeed.115200=115200 +upesy_esp32s3_basic.menu.UploadSpeed.115200.upload.speed=115200 +upesy_esp32s3_basic.menu.UploadSpeed.256000.windows=256000 +upesy_esp32s3_basic.menu.UploadSpeed.256000.upload.speed=256000 +upesy_esp32s3_basic.menu.UploadSpeed.230400.windows.upload.speed=256000 +upesy_esp32s3_basic.menu.UploadSpeed.230400=230400 +upesy_esp32s3_basic.menu.UploadSpeed.230400.upload.speed=230400 +upesy_esp32s3_basic.menu.UploadSpeed.460800.linux=460800 +upesy_esp32s3_basic.menu.UploadSpeed.460800.macosx=460800 +upesy_esp32s3_basic.menu.UploadSpeed.460800.upload.speed=460800 +upesy_esp32s3_basic.menu.UploadSpeed.512000.windows=512000 +upesy_esp32s3_basic.menu.UploadSpeed.512000.upload.speed=512000 + +upesy_esp32s3_basic.menu.DebugLevel.none=None +upesy_esp32s3_basic.menu.DebugLevel.none.build.code_debug=0 +upesy_esp32s3_basic.menu.DebugLevel.error=Error +upesy_esp32s3_basic.menu.DebugLevel.error.build.code_debug=1 +upesy_esp32s3_basic.menu.DebugLevel.warn=Warn +upesy_esp32s3_basic.menu.DebugLevel.warn.build.code_debug=2 +upesy_esp32s3_basic.menu.DebugLevel.info=Info +upesy_esp32s3_basic.menu.DebugLevel.info.build.code_debug=3 +upesy_esp32s3_basic.menu.DebugLevel.debug=Debug +upesy_esp32s3_basic.menu.DebugLevel.debug.build.code_debug=4 +upesy_esp32s3_basic.menu.DebugLevel.verbose=Verbose +upesy_esp32s3_basic.menu.DebugLevel.verbose.build.code_debug=5 + +upesy_esp32s3_basic.menu.EraseFlash.none=Disabled +upesy_esp32s3_basic.menu.EraseFlash.none.upload.erase_cmd= +upesy_esp32s3_basic.menu.EraseFlash.all=Enabled +upesy_esp32s3_basic.menu.EraseFlash.all.upload.erase_cmd=-e + +############################################################## + kb32.name=KB32-FT kb32.bootloader.tool=esptool_py From 7e23a3ed5518396d639a2ed67677379e35f61dd5 Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Wed, 18 Oct 2023 09:15:25 +0200 Subject: [PATCH 07/14] remove some lines that causes errors --- variants/uPesy_edu_esp32/pins_arduino.h | 4 ---- variants/uPesy_esp32c3_basic/pins_arduino.h | 4 ---- variants/uPesy_esp32c3_mini/pins_arduino.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/variants/uPesy_edu_esp32/pins_arduino.h b/variants/uPesy_edu_esp32/pins_arduino.h index a6b2e937ce3..3b765709eb4 100644 --- a/variants/uPesy_edu_esp32/pins_arduino.h +++ b/variants/uPesy_edu_esp32/pins_arduino.h @@ -8,10 +8,6 @@ #define NUM_DIGITAL_PINS 40 #define NUM_ANALOG_INPUTS 16 -#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) -#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) -#define digitalPinHasPWM(p) (p < 34) - static const uint8_t TX = 1; static const uint8_t RX = 3; diff --git a/variants/uPesy_esp32c3_basic/pins_arduino.h b/variants/uPesy_esp32c3_basic/pins_arduino.h index 1e8fcf666c5..4289d73c36e 100644 --- a/variants/uPesy_esp32c3_basic/pins_arduino.h +++ b/variants/uPesy_esp32c3_basic/pins_arduino.h @@ -13,10 +13,6 @@ #define NUM_DIGITAL_PINS 22 #define NUM_ANALOG_INPUTS 6 -#define analogInputToDigitalPin(p) (((p) Date: Wed, 18 Oct 2023 09:48:02 +0200 Subject: [PATCH 08/14] respect case for build.variant in boards.txt --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 9bbdc758234..7721c711f0f 100644 --- a/boards.txt +++ b/boards.txt @@ -20066,7 +20066,7 @@ upesy_esp32c3_basic.build.tarch=riscv32 upesy_esp32c3_basic.build.target=esp upesy_esp32c3_basic.build.mcu=esp32c3 upesy_esp32c3_basic.build.core=esp32 -upesy_esp32c3_basic.build.variant=upesy_esp32c3_basic +upesy_esp32c3_basic.build.variant=uPesy_esp32c3_basic upesy_esp32c3_basic.build.board=uPesy_ESP32C3_basic upesy_esp32c3_basic.build.bootloader_addr=0x0 @@ -20300,7 +20300,7 @@ upesy_esp32s3_basic.build.bootloader_addr=0x0 upesy_esp32s3_basic.build.target=esp32s3 upesy_esp32s3_basic.build.mcu=esp32s3 upesy_esp32s3_basic.build.core=esp32 -upesy_esp32s3_basic.build.variant=upesy_esp32s3_basic +upesy_esp32s3_basic.build.variant=uPesy_esp32s3_basic upesy_esp32s3_basic.build.board=uPesy_ESP32S3_BASIC upesy_esp32s3_basic.build.usb_mode=1 From 9089ce77fc1a6244d8ab3bd3e9bb13a31a474443 Mon Sep 17 00:00:00 2001 From: uPesy Electronics Date: Wed, 18 Oct 2023 10:59:25 +0200 Subject: [PATCH 09/14] Update variants/uPesy_edu_esp32/pins_arduino.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> --- variants/uPesy_edu_esp32/pins_arduino.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variants/uPesy_edu_esp32/pins_arduino.h b/variants/uPesy_edu_esp32/pins_arduino.h index 3b765709eb4..64fea337a89 100644 --- a/variants/uPesy_edu_esp32/pins_arduino.h +++ b/variants/uPesy_edu_esp32/pins_arduino.h @@ -4,10 +4,6 @@ #include -#define EXTERNAL_NUM_INTERRUPTS 16 -#define NUM_DIGITAL_PINS 40 -#define NUM_ANALOG_INPUTS 16 - static const uint8_t TX = 1; static const uint8_t RX = 3; From 50732c3b27441a4193ba081f5c85d3b6648feea1 Mon Sep 17 00:00:00 2001 From: uPesy Electronics Date: Wed, 18 Oct 2023 10:59:32 +0200 Subject: [PATCH 10/14] Update variants/uPesy_esp32c3_mini/pins_arduino.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> --- variants/uPesy_esp32c3_mini/pins_arduino.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variants/uPesy_esp32c3_mini/pins_arduino.h b/variants/uPesy_esp32c3_mini/pins_arduino.h index a5b4072a632..041078e74af 100644 --- a/variants/uPesy_esp32c3_mini/pins_arduino.h +++ b/variants/uPesy_esp32c3_mini/pins_arduino.h @@ -9,10 +9,6 @@ #define USB_PRODUCT "uPesy ESP32C3 Mini" #define USB_SERIAL "" -#define EXTERNAL_NUM_INTERRUPTS 22 -#define NUM_DIGITAL_PINS 22 -#define NUM_ANALOG_INPUTS 6 - static const uint8_t TX = 21; static const uint8_t RX = 20; From 359aa4181878246dbcd353eef0e858ed35f76e98 Mon Sep 17 00:00:00 2001 From: uPesy Electronics Date: Wed, 18 Oct 2023 10:59:38 +0200 Subject: [PATCH 11/14] Update variants/uPesy_esp32c3_basic/pins_arduino.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> --- variants/uPesy_esp32c3_basic/pins_arduino.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variants/uPesy_esp32c3_basic/pins_arduino.h b/variants/uPesy_esp32c3_basic/pins_arduino.h index 4289d73c36e..62c27c4c051 100644 --- a/variants/uPesy_esp32c3_basic/pins_arduino.h +++ b/variants/uPesy_esp32c3_basic/pins_arduino.h @@ -9,10 +9,6 @@ #define USB_PRODUCT "uPesy ESP32C3 Basic" #define USB_SERIAL "" -#define EXTERNAL_NUM_INTERRUPTS 22 -#define NUM_DIGITAL_PINS 22 -#define NUM_ANALOG_INPUTS 6 - static const uint8_t TX = 21; static const uint8_t RX = 20; From 106158460a8746be22b4981ceb4403a46a428774 Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Wed, 18 Oct 2023 11:03:12 +0200 Subject: [PATCH 12/14] respect case for build.board in boards.txt --- boards.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/boards.txt b/boards.txt index 7721c711f0f..4e870fb56c5 100644 --- a/boards.txt +++ b/boards.txt @@ -19727,7 +19727,7 @@ uPesy_wrover.build.target=esp32 uPesy_wrover.build.mcu=esp32 uPesy_wrover.build.core=esp32 uPesy_wrover.build.variant=uPesy_esp32_wrover_devkit -uPesy_wrover.build.board=uPesy_WROVER +uPesy_wrover.build.board=UPESY_WROVER uPesy_wrover.build.f_cpu=240000000L uPesy_wrover.build.flash_size=4MB @@ -19844,7 +19844,7 @@ uPesy_wroom.build.target=esp32 uPesy_wroom.build.mcu=esp32 uPesy_wroom.build.core=esp32 uPesy_wroom.build.variant=uPesy_esp32_wroom_devkit -uPesy_wroom.build.board=uPesy_WROOM +uPesy_wroom.build.board=UPESY_WROOM uPesy_wroom.build.f_cpu=240000000L uPesy_wroom.build.flash_size=4MB @@ -19954,7 +19954,7 @@ uPesy_edu_esp32.build.target=esp32 uPesy_edu_esp32.build.mcu=esp32 uPesy_edu_esp32.build.core=esp32 uPesy_edu_esp32.build.variant=uPesy_edu_esp32 -uPesy_edu_esp32.build.board=uPesy_EDU_ESP32 +uPesy_edu_esp32.build.board=UPESY_EDU_ESP32 uPesy_edu_esp32.build.f_cpu=240000000L uPesy_edu_esp32.build.flash_size=4MB @@ -20067,7 +20067,7 @@ upesy_esp32c3_basic.build.target=esp upesy_esp32c3_basic.build.mcu=esp32c3 upesy_esp32c3_basic.build.core=esp32 upesy_esp32c3_basic.build.variant=uPesy_esp32c3_basic -upesy_esp32c3_basic.build.board=uPesy_ESP32C3_basic +upesy_esp32c3_basic.build.board=UPESY_ESP32C3_BASIC upesy_esp32c3_basic.build.bootloader_addr=0x0 upesy_esp32c3_basic.build.cdc_on_boot=1 @@ -20183,7 +20183,7 @@ upesy_esp32c3_mini.build.target=esp upesy_esp32c3_mini.build.mcu=esp32c3 upesy_esp32c3_mini.build.core=esp32 upesy_esp32c3_mini.build.variant=uPesy_esp32c3_mini -upesy_esp32c3_mini.build.board=uPesy_ESP32C3_MINI +upesy_esp32c3_mini.build.board=UPESY_ESP32C3_MINI upesy_esp32c3_mini.build.bootloader_addr=0x0 upesy_esp32c3_mini.build.cdc_on_boot=1 @@ -20301,7 +20301,7 @@ upesy_esp32s3_basic.build.target=esp32s3 upesy_esp32s3_basic.build.mcu=esp32s3 upesy_esp32s3_basic.build.core=esp32 upesy_esp32s3_basic.build.variant=uPesy_esp32s3_basic -upesy_esp32s3_basic.build.board=uPesy_ESP32S3_BASIC +upesy_esp32s3_basic.build.board=UPESY_ESP32S3_BASIC upesy_esp32s3_basic.build.usb_mode=1 upesy_esp32s3_basic.build.cdc_on_boot=0 From b175009f967d0704efb7acac5e9bbf8afdb5eaef Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Wed, 18 Oct 2023 11:05:11 +0200 Subject: [PATCH 13/14] remove empty lines in boards.txt --- boards.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/boards.txt b/boards.txt index 4e870fb56c5..7b8750626af 100644 --- a/boards.txt +++ b/boards.txt @@ -20104,7 +20104,6 @@ upesy_esp32c3_basic.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFF upesy_esp32c3_basic.menu.PartitionScheme.huge_app.build.partitions=huge_app upesy_esp32c3_basic.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 - upesy_esp32c3_basic.menu.CPUFreq.160=160MHz (WiFi) upesy_esp32c3_basic.menu.CPUFreq.160.build.f_cpu=160000000L upesy_esp32c3_basic.menu.CPUFreq.80=80MHz (WiFi) @@ -20116,7 +20115,6 @@ upesy_esp32c3_basic.menu.CPUFreq.20.build.f_cpu=20000000L upesy_esp32c3_basic.menu.CPUFreq.10=10MHz upesy_esp32c3_basic.menu.CPUFreq.10.build.f_cpu=10000000L - upesy_esp32c3_basic.menu.FlashFreq.80=80MHz upesy_esp32c3_basic.menu.FlashFreq.80.build.flash_freq=80m upesy_esp32c3_basic.menu.FlashFreq.40=40MHz @@ -20220,7 +20218,6 @@ upesy_esp32c3_mini.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS upesy_esp32c3_mini.menu.PartitionScheme.huge_app.build.partitions=huge_app upesy_esp32c3_mini.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 - upesy_esp32c3_mini.menu.CPUFreq.160=160MHz (WiFi) upesy_esp32c3_mini.menu.CPUFreq.160.build.f_cpu=160000000L upesy_esp32c3_mini.menu.CPUFreq.80=80MHz (WiFi) @@ -20232,8 +20229,6 @@ upesy_esp32c3_mini.menu.CPUFreq.20.build.f_cpu=20000000L upesy_esp32c3_mini.menu.CPUFreq.10=10MHz upesy_esp32c3_mini.menu.CPUFreq.10.build.f_cpu=10000000L - - upesy_esp32c3_mini.menu.FlashFreq.80=80MHz upesy_esp32c3_mini.menu.FlashFreq.80.build.flash_freq=80m upesy_esp32c3_mini.menu.FlashFreq.40=40MHz @@ -20388,7 +20383,6 @@ upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9 upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB upesy_esp32s3_basic.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 - upesy_esp32s3_basic.menu.CPUFreq.240=240MHz (WiFi) upesy_esp32s3_basic.menu.CPUFreq.240.build.f_cpu=240000000L upesy_esp32s3_basic.menu.CPUFreq.160=160MHz (WiFi) From a0ec2f594a4eb33a0e6ee4c7c1a7b057a884e46f Mon Sep 17 00:00:00 2001 From: uPesy-computer Date: Mon, 23 Oct 2023 16:06:02 +0200 Subject: [PATCH 14/14] rename option https://github.com/espressif/arduino-esp32/pull/8778#discussion_r1363554039 --- boards.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/boards.txt b/boards.txt index 7b8750626af..152f19dd8df 100644 --- a/boards.txt +++ b/boards.txt @@ -20316,17 +20316,17 @@ upesy_esp32s3_basic.build.psram_type=opi upesy_esp32s3_basic.build.memory_type={build.boot}_{build.psram_type} ## IDE 2.0 Seems to not update the value -esp32s3.menu.JTAGAdapter.default=Disabled -esp32s3.menu.JTAGAdapter.default.build.copy_jtag_files=0 -esp32s3.menu.JTAGAdapter.builtin=Integrated USB JTAG -esp32s3.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg -esp32s3.menu.JTAGAdapter.builtin.build.copy_jtag_files=1 -esp32s3.menu.JTAGAdapter.external=FTDI Adapter -esp32s3.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg -esp32s3.menu.JTAGAdapter.external.build.copy_jtag_files=1 -esp32s3.menu.JTAGAdapter.bridge=ESP USB Bridge -esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg -esp32s3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 +upesy_esp32s3_basic.menu.JTAGAdapter.default=Disabled +upesy_esp32s3_basic.menu.JTAGAdapter.default.build.copy_jtag_files=0 +upesy_esp32s3_basic.menu.JTAGAdapter.builtin=Integrated USB JTAG +upesy_esp32s3_basic.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg +upesy_esp32s3_basic.menu.JTAGAdapter.builtin.build.copy_jtag_files=1 +upesy_esp32s3_basic.menu.JTAGAdapter.external=FTDI Adapter +upesy_esp32s3_basic.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg +upesy_esp32s3_basic.menu.JTAGAdapter.external.build.copy_jtag_files=1 +upesy_esp32s3_basic.menu.JTAGAdapter.bridge=ESP USB Bridge +upesy_esp32s3_basic.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg +upesy_esp32s3_basic.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 upesy_esp32s3_basic.menu.FlashMode.qio=QIO 80MHz upesy_esp32s3_basic.menu.FlashMode.qio.build.flash_mode=dio