NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stm32f4: Use unwrap! where possible

Browse source
This commit is contained in:
Ben Gamari 2021-07-31 12:26:12 -04:00 committed by Dario Nieuwenhuis
parent f4950c4449
commit e44acd0d56
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
embassy-stm32/src/rcc/f4/mod.rs
View file

@ -63,7 +63,7 @@ impl<'d> Rcc<'d> {
}
let sysclk = if sysclk_on_pll {
plls.pllsysclk.unwrap()
unwrap!(plls.pllsysclk)
} else {
sysclk
};
@ -245,13 +245,11 @@ impl<'d> Rcc<'d> {
// Find the lowest pllm value that minimize the difference between
// target frequency and the real vco_out frequency.
let pllm = (pllm_min..=pllm_max)
.min_by_key(|pllm| {
let vco_in = pllsrcclk / pllm;
let plln = target_freq / vco_in;
target_freq - vco_in * plln
})
.unwrap();
let pllm = unwrap!((pllm_min..=pllm_max).min_by_key(|pllm| {
let vco_in = pllsrcclk / pllm;
let plln = target_freq / vco_in;
target_freq - vco_in * plln
}));
let vco_in = pllsrcclk / pllm;
assert!((1_000_000..=2_000_000).contains(&vco_in));
@ -261,14 +259,12 @@ impl<'d> Rcc<'d> {
let plln = if pll48clk {
// try the different valid pllq according to the valid
// main scaller values, and take the best
let pllq = (4..=9)
.min_by_key(|pllq| {
let plln = 48_000_000 * pllq / vco_in;
let pll48_diff = 48_000_000 - vco_in * plln / pllq;
let sysclk_diff = (sysclk as i32 - (vco_in * plln / sysclk_div) as i32).abs();
(pll48_diff, sysclk_diff)
})
.unwrap();
let pllq = unwrap!((4..=9).min_by_key(|pllq| {
let plln = 48_000_000 * pllq / vco_in;
let pll48_diff = 48_000_000 - vco_in * plln / pllq;
let sysclk_diff = (sysclk as i32 - (vco_in * plln / sysclk_div) as i32).abs();
(pll48_diff, sysclk_diff)
}));
48_000_000 * pllq / vco_in
} else {
sysclk * sysclk_div / vco_in

4
examples/stm32f4/src/bin/usart.rs
View file

@ -31,7 +31,7 @@ fn main() -> ! {
let mut buf = [0u8; 1];
loop {
unwrap!(usart.read_blocking(&mut buf).unwbrap());
unwrap!(usart.bwrite_all(&buf).unwrap());
unwrap!(usart.read_blocking(&mut buf));
unwrap!(usart.bwrite_all(&buf));
}
}