Skip to content

Commit

Permalink
bump esp32c3 (#997)
Browse files Browse the repository at this point in the history
* bump esp32-c3

* update changelog and example

* rtic-monotonics: update esp32c3 to v0.26

---------

Co-authored-by: Henrik Tjäder <[email protected]>
  • Loading branch information
MikeGstefan and AfoHT authored Nov 27, 2024
1 parent d251ba7 commit ed026cc
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/esp32c3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ esp-backtrace = { version = "0.14.0", features = [
"exception-handler",
"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"] }

[features]
Expand Down
28 changes: 10 additions & 18 deletions examples/lm3s6965/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rtic-monotonics/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!

### Changed

- Updated esp32c3 dependency to v0.26.0
- Update `esp32c3` dependency

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion rtic-monotonics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ stm32-metapac = { version = "15.0.0", 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 }


Expand Down
1 change: 1 addition & 0 deletions rtic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
- Replace `atomic-polyfill` with `portable-atomic`
- Remove unused dependency `rtic-monotonics`
- Updated esp32c3 dependency to v0.25.0
- Updated esp32c3 dependency to v0.26.0

## [v2.1.1] - 2024-03-13

Expand Down
2 changes: 1 addition & 1 deletion rtic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ name = "rtic"

[dependencies]
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 }
cortex-m = { version = "0.7.0", optional = true }
bare-metal = "1.0.0"
Expand Down
8 changes: 4 additions & 4 deletions rtic/src/export/riscv_esp32c3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ pub unsafe fn lock<T, R>(ptr: *mut T, ceiling: u8, f: impl FnOnce(&mut T) -> R)
unsafe {
(*INTERRUPT_CORE0::ptr())
.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
let r = f(&mut *ptr);
unsafe {
(*INTERRUPT_CORE0::ptr())
.cpu_int_thresh()
.write(|w| w.cpu_int_thresh().bits(current))
.write(|w| w.cpu_int_thresh().bits(current));
}
r
}
Expand Down Expand Up @@ -106,7 +106,7 @@ pub fn pend(int: Interrupt) {
.cpu_intr_from_cpu_3()
.write(|w| w.cpu_intr_from_cpu_3().bit(true)),
_ => panic!("Unsupported software interrupt"), //should never happen, checked at compile time
}
};
}
}

Expand All @@ -132,7 +132,7 @@ pub fn unpend(int: Interrupt) {
.cpu_intr_from_cpu_3()
.write(|w| w.cpu_intr_from_cpu_3().bit(false)),
_ => panic!("Unsupported software interrupt"),
}
};
}
}

Expand Down

0 comments on commit ed026cc

Please sign in to comment.