From 90f475316fe34adab6063de9ec9408c69f829736 Mon Sep 17 00:00:00 2001
From: Eli Hastings <eli@seagen.io>
Date: Mon, 10 Mar 2025 10:03:20 +0000
Subject: [PATCH] Bump ESP versions

---
 examples/esp32c3/Cargo.lock | 34 +++++++++++++++++++++++++++++-----
 rtic-monotonics/Cargo.toml  |  2 +-
 rust-toolchain.toml         |  2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/examples/esp32c3/Cargo.lock b/examples/esp32c3/Cargo.lock
index cac97ed12dc..c3ce7a611b5 100644
--- a/examples/esp32c3/Cargo.lock
+++ b/examples/esp32c3/Cargo.lock
@@ -374,7 +374,7 @@ dependencies = [
  "paste",
  "portable-atomic",
  "rand_core",
- "riscv",
+ "riscv 0.12.1",
  "serde",
  "strum 0.27.1",
  "ufmt-write",
@@ -430,7 +430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec69987b3d7c48b65f8fb829220832a101478d766c518ae836720d040608d5dd"
 dependencies = [
  "document-features",
- "riscv",
+ "riscv 0.12.1",
  "riscv-rt-macros",
 ]
 
@@ -721,7 +721,20 @@ dependencies = [
  "critical-section",
  "embedded-hal 1.0.0",
  "paste",
- "riscv-macros",
+ "riscv-macros 0.1.0",
+ "riscv-pac",
+]
+
+[[package]]
+name = "riscv"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa3cdbeccae4359f6839a00e8b77e5736caa200ba216caf38d24e4c16e2b586"
+dependencies = [
+ "critical-section",
+ "embedded-hal 1.0.0",
+ "paste",
+ "riscv-macros 0.2.0",
  "riscv-pac",
 ]
 
@@ -736,6 +749,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "riscv-macros"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c4aa1ea1af6dcc83a61be12e8189f9b293c3ba5a487778a4cd89fb060fdbbc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "riscv-pac"
 version = "0.2.0"
@@ -761,7 +785,7 @@ dependencies = [
  "critical-section",
  "esp32c3",
  "portable-atomic",
- "riscv",
+ "riscv 0.13.0",
  "rtic-core",
  "rtic-macros",
 ]
@@ -799,7 +823,7 @@ dependencies = [
  "esp32c3",
  "fugit",
  "portable-atomic",
- "riscv",
+ "riscv 0.13.0",
  "rtic-time",
 ]
 
diff --git a/rtic-monotonics/Cargo.toml b/rtic-monotonics/Cargo.toml
index 366cd833381..991a84c9bb3 100644
--- a/rtic-monotonics/Cargo.toml
+++ b/rtic-monotonics/Cargo.toml
@@ -68,7 +68,7 @@ stm32-metapac = { version = "15.0.0", optional = true }
 imxrt-ral = { version = "0.5.3", optional = true }
 
 esp32c3 = {version = "0.28.0", optional = true }
-esp32c6 = {version = "0.18.0", optional = true }
+esp32c6 = {version = "0.19.0", optional = true }
 riscv = {version = "0.13.0", optional = true }
 
 [build-dependencies]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 93283c11741..a049be7ded9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "stable"
 components = [ "rust-src", "rustfmt", "llvm-tools-preview" ]
-targets = [ "thumbv6m-none-eabi", "thumbv7m-none-eabi", "thumbv8m.base-none-eabi", "thumbv8m.main-none-eabi", "riscv32imc-unknown-none-elf" ]
+targets = [ "thumbv6m-none-eabi", "thumbv7m-none-eabi", "thumbv8m.base-none-eabi", "thumbv8m.main-none-eabi", "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf" ]