From 9f44af1d0f4db6f138abf7de83bd1b4bc06e31f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Mon, 19 Jun 2023 17:33:46 +0100 Subject: [PATCH] Fix chip type name for ESP32-S3 (#227) ***NO_CI*** --- nanoFirmwareFlasher.Library/Esp32Firmware.cs | 2 +- nanoFirmwareFlasher.Library/EspTool.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nanoFirmwareFlasher.Library/Esp32Firmware.cs b/nanoFirmwareFlasher.Library/Esp32Firmware.cs index ed2c24a7..93a2f80c 100644 --- a/nanoFirmwareFlasher.Library/Esp32Firmware.cs +++ b/nanoFirmwareFlasher.Library/Esp32Firmware.cs @@ -83,7 +83,7 @@ internal async System.Threading.Tasks.Task DownloadAndExtractAsync(Es FlashPartitions = new Dictionary { // bootloader goes to 0x1000, except for ESP32_C3 and ESP32_S3, which goes to 0x0 - { deviceInfo.ChipType == "ESP32-C3" || deviceInfo.ChipType == "ESP32-SC3" ? 0x0 : 0x1000, Path.Combine(LocationPath, BootloaderPath) }, + { deviceInfo.ChipType == "ESP32-C3" || deviceInfo.ChipType == "ESP32-S3" ? 0x0 : 0x1000, Path.Combine(LocationPath, BootloaderPath) }, // nanoCLR goes to 0x10000 { CLRAddress, Path.Combine(LocationPath, "nanoCLR.bin") }, diff --git a/nanoFirmwareFlasher.Library/EspTool.cs b/nanoFirmwareFlasher.Library/EspTool.cs index a172dd11..4cbf2d3a 100644 --- a/nanoFirmwareFlasher.Library/EspTool.cs +++ b/nanoFirmwareFlasher.Library/EspTool.cs @@ -286,8 +286,8 @@ private PSRamAvailability FindPSRamAvailable() // compose bootloader partition var bootloaderPartition = new Dictionary { - // bootloader goes to 0x1000 - { 0x1000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") }, + // bootloader goes to 0x1000, except for ESP32_C3 and ESP32_S3, which goes to 0x0 + { _chipType == "esp32c3" || _chipType == "esp32s3" ? 0x0 : 0x1000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") }, // nanoCLR goes to 0x10000 { 0x10000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "test_startup.bin") },