mirror of
https://github.com/rtic-rs/rtic.git
synced 2024-12-29 05:19:34 +01:00
bump esp32c3 (#997)
* bump esp32-c3 * update changelog and example * rtic-monotonics: update esp32c3 to v0.26 --------- Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
This commit is contained in:
parent
d251ba7173
commit
ed026cc4a3
7 changed files with 19 additions and 25 deletions
|
@ -16,7 +16,7 @@ esp-backtrace = { version = "0.14.0", features = [
|
||||||
"exception-handler",
|
"exception-handler",
|
||||||
"println",
|
"println",
|
||||||
] }
|
] }
|
||||||
esp32c3 = {version = "0.25.0", features = ["critical-section"]}
|
esp32c3 = {version = "0.26.0", features = ["critical-section"]}
|
||||||
esp-println = { version = "0.11.0", features = ["esp32c3"] }
|
esp-println = { version = "0.11.0", features = ["esp32c3"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|
28
examples/lm3s6965/Cargo.lock
generated
28
examples/lm3s6965/Cargo.lock
generated
|
@ -306,27 +306,25 @@ dependencies = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-error"
|
name = "proc-macro-error-attr2"
|
||||||
version = "1.0.4"
|
version = "2.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-error-attr",
|
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 1.0.109",
|
|
||||||
"version_check",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-error-attr"
|
name = "proc-macro-error2"
|
||||||
version = "1.0.4"
|
version = "2.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"proc-macro-error-attr2",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"version_check",
|
"syn 2.0.49",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -378,7 +376,7 @@ name = "rtic-macros"
|
||||||
version = "2.1.0"
|
version = "2.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"proc-macro-error",
|
"proc-macro-error2",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.49",
|
"syn 2.0.49",
|
||||||
|
@ -386,7 +384,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rtic-monotonics"
|
name = "rtic-monotonics"
|
||||||
version = "2.0.2"
|
version = "2.0.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cortex-m",
|
"cortex-m",
|
||||||
|
@ -502,12 +500,6 @@ version = "0.1.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
|
checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "version_check"
|
|
||||||
version = "0.9.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "void"
|
name = "void"
|
||||||
version = "1.0.2"
|
version = "1.0.2"
|
||||||
|
|
|
@ -15,6 +15,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
- Updated esp32c3 dependency to v0.26.0
|
||||||
- Update `esp32c3` dependency
|
- Update `esp32c3` dependency
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
|
@ -67,7 +67,7 @@ stm32-metapac = { version = "15.0.0", optional = true }
|
||||||
imxrt-ral = { version = "0.5.3", optional = true }
|
imxrt-ral = { version = "0.5.3", optional = true }
|
||||||
|
|
||||||
|
|
||||||
esp32c3 = {version = "0.25.0", optional = true }
|
esp32c3 = {version = "0.26.0", optional = true }
|
||||||
riscv = {version = "0.12.1", optional = true }
|
riscv = {version = "0.12.1", optional = true }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
|
||||||
- Replace `atomic-polyfill` with `portable-atomic`
|
- Replace `atomic-polyfill` with `portable-atomic`
|
||||||
- Remove unused dependency `rtic-monotonics`
|
- Remove unused dependency `rtic-monotonics`
|
||||||
- Updated esp32c3 dependency to v0.25.0
|
- Updated esp32c3 dependency to v0.25.0
|
||||||
|
- Updated esp32c3 dependency to v0.26.0
|
||||||
|
|
||||||
## [v2.1.1] - 2024-03-13
|
## [v2.1.1] - 2024-03-13
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ name = "rtic"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
riscv-slic = { version = "0.1.1", optional = true }
|
riscv-slic = { version = "0.1.1", optional = true }
|
||||||
esp32c3 = { version = "0.25.0", optional = true }
|
esp32c3 = { version = "0.26.0", optional = true }
|
||||||
riscv = { version = "0.12.1", optional = true }
|
riscv = { version = "0.12.1", optional = true }
|
||||||
cortex-m = { version = "0.7.0", optional = true }
|
cortex-m = { version = "0.7.0", optional = true }
|
||||||
bare-metal = "1.0.0"
|
bare-metal = "1.0.0"
|
||||||
|
|
|
@ -71,13 +71,13 @@ pub unsafe fn lock<T, R>(ptr: *mut T, ceiling: u8, f: impl FnOnce(&mut T) -> R)
|
||||||
unsafe {
|
unsafe {
|
||||||
(*INTERRUPT_CORE0::ptr())
|
(*INTERRUPT_CORE0::ptr())
|
||||||
.cpu_int_thresh()
|
.cpu_int_thresh()
|
||||||
.write(|w| w.cpu_int_thresh().bits(ceiling + 1))
|
.write(|w| w.cpu_int_thresh().bits(ceiling + 1));
|
||||||
} //esp32c3 lets interrupts with prio equal to threshold through so we up it by one
|
} //esp32c3 lets interrupts with prio equal to threshold through so we up it by one
|
||||||
let r = f(&mut *ptr);
|
let r = f(&mut *ptr);
|
||||||
unsafe {
|
unsafe {
|
||||||
(*INTERRUPT_CORE0::ptr())
|
(*INTERRUPT_CORE0::ptr())
|
||||||
.cpu_int_thresh()
|
.cpu_int_thresh()
|
||||||
.write(|w| w.cpu_int_thresh().bits(current))
|
.write(|w| w.cpu_int_thresh().bits(current));
|
||||||
}
|
}
|
||||||
r
|
r
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ pub fn pend(int: Interrupt) {
|
||||||
.cpu_intr_from_cpu_3()
|
.cpu_intr_from_cpu_3()
|
||||||
.write(|w| w.cpu_intr_from_cpu_3().bit(true)),
|
.write(|w| w.cpu_intr_from_cpu_3().bit(true)),
|
||||||
_ => panic!("Unsupported software interrupt"), //should never happen, checked at compile time
|
_ => panic!("Unsupported software interrupt"), //should never happen, checked at compile time
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ pub fn unpend(int: Interrupt) {
|
||||||
.cpu_intr_from_cpu_3()
|
.cpu_intr_from_cpu_3()
|
||||||
.write(|w| w.cpu_intr_from_cpu_3().bit(false)),
|
.write(|w| w.cpu_intr_from_cpu_3().bit(false)),
|
||||||
_ => panic!("Unsupported software interrupt"),
|
_ => panic!("Unsupported software interrupt"),
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue