max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #1447

Browse Source 
1447: rp/watchdog: fix overflow if period is longer than 4294 seconds. r=Dirbaio a=Dirbaio

bors r+

Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2023-05-12 22:33:59 +00:00 committed by GitHub
commit dec75474d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
embassy-rp/src/watchdog.rs
View File

@ -89,14 +89,12 @@ impl Watchdog {
pub fn start(&mut self, period: Duration) { pub fn start(&mut self, period: Duration) {
const MAX_PERIOD: u32 = 0xFFFFFF; const MAX_PERIOD: u32 = 0xFFFFFF;
let delay_us = period.as_micros() as u32; let delay_us = period.as_micros();
if delay_us > MAX_PERIOD / 2 { if delay_us > (MAX_PERIOD / 2) as u64 {
panic!( panic!("Period cannot exceed {} microseconds", MAX_PERIOD / 2);
"Period cannot exceed maximum load value of {} ({} microseconds))",
MAX_PERIOD,
MAX_PERIOD / 2
);
} }
let delay_us = delay_us as u32;
// Due to a logic error, the watchdog decrements by 2 and // Due to a logic error, the watchdog decrements by 2 and
// the load value must be compensated; see RP2040-E1 // the load value must be compensated; see RP2040-E1
self.load_value = delay_us * 2; self.load_value = delay_us * 2;