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

hrtim: minor cleanup

Browse Source
This commit is contained in:
xoviat 2023-07-01 17:32:16 -05:00
parent 6e13f5b387
commit 21a8653195
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-stm32/Cargo.toml
View File

@ -57,7 +57,7 @@ sdio-host = "0.5.0"
embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true }
critical-section = "1.1" critical-section = "1.1"
atomic-polyfill = "1.0.1" atomic-polyfill = "1.0.1"
stm32-metapac = "10" stm32-metapac = "12"
vcell = "0.1.3" vcell = "0.1.3"
bxcan = "0.7.0" bxcan = "0.7.0"
nb = "1.0.0" nb = "1.0.0"

28
embassy-stm32/src/pwm/advanced_pwm.rs
View File

@ -187,8 +187,12 @@ impl<T: HighResolutionCaptureCompare16bitInstance, C: AdvancedChannel<T>> Bridge
T::regs().tim(C::raw()).cr().modify(|w| { T::regs().tim(C::raw()).cr().modify(|w| {
w.set_preen(true); w.set_preen(true);
// TODO: fix metapac w.set_cont(Cont::CONTINUOUS);
w.set_cont(Cont(1)); });
T::regs().oenr().modify(|w| {
w.set_t1oen(C::raw(), true);
w.set_t2oen(C::raw(), true);
}); });
// Set output 1 to active on a period event // Set output 1 to active on a period event
@ -234,24 +238,23 @@ impl<T: HighResolutionCaptureCompare16bitInstance, C: AdvancedChannel<T>> Bridge
// TODO: fix metapac // TODO: fix metapac
T::regs().tim(C::raw()).outr().modify(|w| { T::regs().tim(C::raw()).outr().modify(|w| {
w.set_idlem(0, Idlem(1)); w.set_idlem(0, Idlem::SETIDLE);
w.set_idlem(1, Idlem(1)); w.set_idlem(1, Idlem::SETIDLE);
w.set_idles(0, Idles(1)); w.set_idles(0, Idles::INACTIVE);
w.set_idles(1, Idles(1)); w.set_idles(1, Idles::INACTIVE);
}) })
} }
pub fn disable_burst_mode(&mut self) { pub fn disable_burst_mode(&mut self) {
use crate::pac::hrtim::vals::{Idlem, Idles}; use crate::pac::hrtim::vals::{Idlem, Idles};
// TODO: fix metapac
T::regs().tim(C::raw()).outr().modify(|w| { T::regs().tim(C::raw()).outr().modify(|w| {
w.set_idlem(0, Idlem(0)); w.set_idlem(0, Idlem::NOEFFECT);
w.set_idlem(1, Idlem(0)); w.set_idlem(1, Idlem::NOEFFECT);
w.set_idles(0, Idles(0)); w.set_idles(0, Idles::INACTIVE);
w.set_idles(1, Idles(0)); w.set_idles(1, Idles::INACTIVE);
}) })
} }
@ -303,8 +306,7 @@ impl<T: HighResolutionCaptureCompare16bitInstance, C: AdvancedChannel<T>> Resona
T::regs().tim(C::raw()).cr().modify(|w| { T::regs().tim(C::raw()).cr().modify(|w| {
w.set_preen(true); w.set_preen(true);
// TODO: fix metapac w.set_cont(Cont::CONTINUOUS);
w.set_cont(Cont(1));
w.set_half(true); w.set_half(true);
}); });

2
examples/stm32f334/.cargo/config.toml
View File

@ -1,6 +1,6 @@
[target.'cfg(all(target_arch = "arm", target_os = "none"))'] [target.'cfg(all(target_arch = "arm", target_os = "none"))']
# replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list` # replace STM32F429ZITx with your chip as listed in `probe-rs-cli chip list`
runner = "probe-rs-cli run --chip STM32F303ZETx" runner = "probe-run --chip STM32F334R8"
[build] [build]
target = "thumbv7em-none-eabihf" target = "thumbv7em-none-eabihf"