From 2a5bbf842ca839ee801e404a517607192a8ea99a Mon Sep 17 00:00:00 2001 From: Victor Gil Date: Mon, 8 May 2023 23:38:39 +0200 Subject: [PATCH 1/2] Changed to RC5 Removed uncompatible targets of ESP32-C6 and added IMAC ones --- Cargo.lock | 4 ++-- cargo-espflash/Cargo.toml | 4 ++-- espflash/Cargo.toml | 2 +- espflash/src/targets/esp32c6.rs | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edc5ed07..e6f0e570 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "cargo-espflash" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "cargo", "cargo_metadata", @@ -898,7 +898,7 @@ dependencies = [ [[package]] name = "espflash" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "addr2line", "base64 0.21.0", diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index 1c3eebec..75cec39c 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-espflash" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" authors = ["Robin Appelman ", "Jesse Braham "] edition = "2021" rust-version = "1.64" @@ -26,7 +26,7 @@ cargo_metadata = "0.15.2" clap = { version = "4.0.32", features = ["derive"] } env_logger = "0.10.0" esp-idf-part = "0.2.0" -espflash = { version = "=2.0.0-rc.4", path = "../espflash" } +espflash = { version = "=2.0.0-rc.5", path = "../espflash" } log = "0.4.17" miette = { version = "5.5.0", features = ["fancy"] } serde = { version = "1.0.152", features = ["derive"] } diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index 950a2de6..0dfa3a43 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espflash" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" authors = ["Robin Appelman ", "Jesse Braham "] edition = "2021" rust-version = "1.64" diff --git a/espflash/src/targets/esp32c6.rs b/espflash/src/targets/esp32c6.rs index 6c835bc2..5597e275 100644 --- a/espflash/src/targets/esp32c6.rs +++ b/espflash/src/targets/esp32c6.rs @@ -115,8 +115,7 @@ impl Target for Esp32c6 { fn supported_build_targets(&self) -> &[&str] { &[ "riscv32imac-unknown-none-elf", - "riscv32imc-esp-espidf", - "riscv32imc-unknown-none-elf", + "riscv32imac-esp-espidf", ] } } From 11dc6729dfdca0c520fa9ef0c087381d1721c082 Mon Sep 17 00:00:00 2001 From: Victor Gil Date: Tue, 9 May 2023 22:33:37 +0200 Subject: [PATCH 2/2] Passed rustfmt Reverted to rc.4 --- Cargo.lock | 4 ++-- cargo-espflash/Cargo.toml | 4 ++-- espflash/Cargo.toml | 2 +- espflash/src/targets/esp32c6.rs | 5 +---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6f0e570..edc5ed07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "cargo-espflash" -version = "2.0.0-rc.5" +version = "2.0.0-rc.4" dependencies = [ "cargo", "cargo_metadata", @@ -898,7 +898,7 @@ dependencies = [ [[package]] name = "espflash" -version = "2.0.0-rc.5" +version = "2.0.0-rc.4" dependencies = [ "addr2line", "base64 0.21.0", diff --git a/cargo-espflash/Cargo.toml b/cargo-espflash/Cargo.toml index 75cec39c..1c3eebec 100644 --- a/cargo-espflash/Cargo.toml +++ b/cargo-espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-espflash" -version = "2.0.0-rc.5" +version = "2.0.0-rc.4" authors = ["Robin Appelman ", "Jesse Braham "] edition = "2021" rust-version = "1.64" @@ -26,7 +26,7 @@ cargo_metadata = "0.15.2" clap = { version = "4.0.32", features = ["derive"] } env_logger = "0.10.0" esp-idf-part = "0.2.0" -espflash = { version = "=2.0.0-rc.5", path = "../espflash" } +espflash = { version = "=2.0.0-rc.4", path = "../espflash" } log = "0.4.17" miette = { version = "5.5.0", features = ["fancy"] } serde = { version = "1.0.152", features = ["derive"] } diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index 0dfa3a43..950a2de6 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "espflash" -version = "2.0.0-rc.5" +version = "2.0.0-rc.4" authors = ["Robin Appelman ", "Jesse Braham "] edition = "2021" rust-version = "1.64" diff --git a/espflash/src/targets/esp32c6.rs b/espflash/src/targets/esp32c6.rs index 5597e275..2e4dd7a8 100644 --- a/espflash/src/targets/esp32c6.rs +++ b/espflash/src/targets/esp32c6.rs @@ -113,9 +113,6 @@ impl Target for Esp32c6 { } fn supported_build_targets(&self) -> &[&str] { - &[ - "riscv32imac-unknown-none-elf", - "riscv32imac-esp-espidf", - ] + &["riscv32imac-unknown-none-elf", "riscv32imac-esp-espidf"] } }