itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-10-02 14:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use latest PAC which aligns TWAI field names (#2438)

Browse Source
This commit is contained in:
Jesse Braham 2024-10-31 05:22:37 -07:00 committed by GitHub
parent 25d8390d68
commit 6fa2823e10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
esp-hal/Cargo.toml
View File

@ -55,13 +55,13 @@ xtensa-lx = { version = "0.9.0", optional = true }
# IMPORTANT: # IMPORTANT:
# Each supported device MUST have its PAC included below along with a # Each supported device MUST have its PAC included below along with a
# corresponding feature. # corresponding feature.
esp32 = { version = "0.33.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32 = { version = "0.33.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32c2 = { version = "0.22.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32c2 = { version = "0.22.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32c3 = { version = "0.25.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32c3 = { version = "0.25.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32c6 = { version = "0.16.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32c6 = { version = "0.16.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32h2 = { version = "0.12.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32h2 = { version = "0.12.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32s2 = { version = "0.24.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32s2 = { version = "0.24.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
esp32s3 = { version = "0.28.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "48fd400", features = ["critical-section", "rt"], optional = true } esp32s3 = { version = "0.28.0", git = "https://github.com/esp-rs/esp-pacs.git", rev = "390c88b", features = ["critical-section", "rt"], optional = true }
[target.'cfg(target_arch = "riscv32")'.dependencies] [target.'cfg(target_arch = "riscv32")'.dependencies]
esp-riscv-rt = { version = "0.9.0", path = "../esp-riscv-rt" } esp-riscv-rt = { version = "0.9.0", path = "../esp-riscv-rt" }

10
esp-hal/src/twai/mod.rs
View File

@ -1947,18 +1947,14 @@ mod asynch {
let status = register_block.status().read(); let status = register_block.status().read();
// Read error code direction (transmitting or receiving) // Read error code direction (transmitting or receiving)
cfg_if::cfg_if! { let ecc_direction = err_capture.ecc_direction().bit_is_set();
if #[cfg(any(esp32, esp32c3, esp32s2, esp32s3))] {
let ecc_direction = err_capture.ecc_direction().bit_is_set();
} else {
let ecc_direction = err_capture.err_capture_code_direction().bit_is_set();
}
}
// If the error comes from Tx and Tx request is pending // If the error comes from Tx and Tx request is pending
if !ecc_direction && !status.tx_buf_st().bit_is_set() { if !ecc_direction && !status.tx_buf_st().bit_is_set() {
// Cancel a pending transmission request // Cancel a pending transmission request
register_block.cmd().write(|w| w.abort_tx().set_bit()); register_block.cmd().write(|w| w.abort_tx().set_bit());
} }
async_state.err_waker.wake(); async_state.err_waker.wake();
} }