itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-27 12:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix esp-lp-hal gpio reading for the esp32s3 and esp32s2 (#3191)

Browse Source 
* Fix esp-lp-hal gpio read

* Update esp-lp-hal changelog

* Fix esp-lp-hal for esp32-s2 and esp32-c6

* Add PR number #3191 to the changelog
This commit is contained in:
4rzael 2025-03-05 11:37:17 +01:00 committed by GitHub
parent 9c99a2ce67
commit e657aeb228
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esp-lp-hal/CHANGELOG.md
View File

@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Bump MSRV to 1.84 (#2951)
- Fix gpio `input_state` and `output_state` for the ESP32-S3 and ESP32-S2 (#3191)
### Fixed

20
esp-lp-hal/src/gpio.rs
View File

@ -39,7 +39,15 @@ pub struct Input<const PIN: u8>;
impl<const PIN: u8> Input<PIN> {
/// Read the input state/level of the pin.
pub fn input_state(&self) -> bool {
(unsafe { &*LpIo::PTR }.in_().read().bits() >> PIN) & 0x1 != 0
cfg_if::cfg_if! {
if #[cfg(feature = "esp32c6")] {
(unsafe { &*LpIo::PTR }.in_().read().bits() >> PIN) & 0x1 != 0
} else if #[cfg(feature = "esp32s2")] {
(unsafe { &*LpIo::PTR }.in_().read().gpio_in_next().bits() >> PIN) & 0x1 != 0
} else if #[cfg(feature = "esp32s3")] {
(unsafe { &*LpIo::PTR }.in_().read().next().bits() >> PIN) & 0x1 != 0
}
}
}
}
@ -49,7 +57,15 @@ pub struct Output<const PIN: u8>;
impl<const PIN: u8> Output<PIN> {
/// Read the output state/level of the pin.
pub fn output_state(&self) -> bool {
(unsafe { &*LpIo::PTR }.out().read().bits() >> PIN) & 0x1 != 0
cfg_if::cfg_if! {
if #[cfg(feature = "esp32c6")] {
(unsafe { &*LpIo::PTR }.out().read().bits() >> PIN) & 0x1 != 0
} else if #[cfg(feature = "esp32s2")] {
(unsafe { &*LpIo::PTR }.out().read().gpio_out_data().bits() >> PIN) & 0x1 != 0
} else if #[cfg(feature = "esp32s3")] {
(unsafe { &*LpIo::PTR }.out().read().data().bits() >> PIN) & 0x1 != 0
}
}
}
/// Set the output state/level of the pin.