Your browser does not support the Web Serial API. Try Chrome
@@ -123,6 +139,23 @@ fn manifest() -> content::RawJson<&'static str> {
}
]
},
+ {
+ "chipFamily": "ESP32-C2",
+ "parts": [
+ {
+ "path": "bootloader.bin",
+ "offset": 0
+ },
+ {
+ "path": "partitions.bin",
+ "offset": 32768
+ },
+ {
+ "path": "firmware.bin",
+ "offset": 65536
+ }
+ ]
+ },
{
"chipFamily": "ESP32-S2",
"parts": [
@@ -164,7 +197,7 @@ fn manifest() -> content::RawJson<&'static str> {
}
struct PartsData {
- chip: String,
+ _chip: String,
bootloader: Vec
,
partitions: Vec,
firmware: Vec,
@@ -174,6 +207,7 @@ fn prepare() -> Result {
let opts = Args::parse();
let elf = std::fs::read(opts.elf)?;
+ let elf = xmas_elf::ElfFile::new(&elf).expect("Invalid elf file");
let p = if let Some(p) = &opts.partition_table {
Some(PartitionTable::try_from_bytes(std::fs::read(p)?)?)
@@ -187,9 +221,7 @@ fn prepare() -> Result {
None
};
- let firmware = FirmwareImageBuilder::new(&elf)
- .flash_size(Some(FlashSize::Flash4Mb)) // TODO make configurable
- .build()?;
+ let firmware = ElfFirmwareImage::new(elf);
let chip = opts.chip;
let chip_name = match chip {
@@ -198,16 +230,26 @@ fn prepare() -> Result {
Chip::Esp32s2 => "ESP32-S2",
Chip::Esp32s3 => "ESP32-S3",
Chip::Esp8266 => "ESP8266",
+ Chip::Esp32c2 => "ESP32-C2",
};
- let image = chip.get_flash_image(&firmware, b, p, None, None)?;
+ let image = chip.into_target().get_flash_image(
+ &firmware,
+ b,
+ p,
+ None,
+ None,
+ None,
+ Some(Flash4Mb),
+ None,
+ )?;
let parts: Vec<_> = image.flash_segments().collect();
let bootloader = &parts[0];
let partitions = &parts[1];
let app = &parts[2];
Ok(PartsData {
- chip: chip_name.to_string(),
+ _chip: chip_name.to_string(),
bootloader: bootloader.data.to_vec(),
partitions: partitions.data.to_vec(),
firmware: app.data.to_vec(),