Skip to content

Fix feeding of RWDT #1645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2024
Merged

Fix feeding of RWDT #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6085b7
Fix feeding of `RWDT`
jessebraham May 30, 2024
8618823
Update `CHANGELOG.md`
jessebraham May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion esp-hal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- spi: fix dma wrong mode when using eh1 blocking api (#1541)
- uart: make `uart::UartRx::read_byte` public (#1547)
- Fix async serial-usb-jtag (#1561)
- Feeding `RWDT` now actually works (#1645)

### Changed

Expand All @@ -44,7 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Refactoring of GPIO module, have drivers for Input,Output,OutputOpenDrain, all drivers setup their GPIOs correctly (#1542)
- DMA transactions are now found in the `dma` module (#1550)
- Remove unnecessary generics from PARL_IO driver (#1545)
- Use `Level enum` in GPIO constructors instead of plain bools (#1574)
- Use `Level enum` in GPIO constructors instead of plain bools (#1574)
- rmt: make ChannelCreator public (#1597)

### Removed
Expand Down
5 changes: 4 additions & 1 deletion esp-hal/src/rtc_cntl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,10 @@ impl Rwdt {
let rtc_cntl = unsafe { &*LP_WDT::PTR };

self.set_write_protection(false);
rtc_cntl.wdtfeed().write(|w| unsafe { w.bits(1) });
#[cfg(any(esp32c6, esp32h2))]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sucks, but I already published new PACs for the upcoming release. I will update the PACs in the repo, then make a note to fix this after we've published.

rtc_cntl.wdtfeed().write(|w| w.rtc_wdt_feed().set_bit());
#[cfg(not(any(esp32c6, esp32h2)))]
rtc_cntl.wdtfeed().write(|w| w.wdt_feed().set_bit());
self.set_write_protection(true);
}

Expand Down
Loading