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

stm32: Register access for timers now doesn't require self

Browse Source
This commit is contained in:
Matous Hybl
2022-02-28 16:20:42 +01:00
parent 141e007acf
commit a88c5e716e
4 changed files with 47 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
examples/stm32h7/src/bin/low_level_timer_api.rs
View File

@ -90,20 +90,16 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
this.inner.start();
unsafe {
this.inner
.regs_gp32()
T::regs_gp32()
.ccmr_output(0)
.modify(|w| w.set_ocm(0, OutputCompareMode::PwmMode1.into()));
this.inner
.regs_gp32()
T::regs_gp32()
.ccmr_output(0)
.modify(|w| w.set_ocm(1, OutputCompareMode::PwmMode1.into()));
this.inner
.regs_gp32()
T::regs_gp32()
.ccmr_output(1)
.modify(|w| w.set_ocm(0, OutputCompareMode::PwmMode1.into()));
this.inner
.regs_gp32()
T::regs_gp32()
.ccmr_output(1)
.modify(|w| w.set_ocm(1, OutputCompareMode::PwmMode1.into()));
}
@ -112,8 +108,7 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
pub fn enable(&mut self, channel: Channel) {
unsafe {
self.inner
.regs_gp32()
T::regs_gp32()
.ccer()
.modify(|w| w.set_cce(channel.raw(), true));
}
@ -121,8 +116,7 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
pub fn disable(&mut self, channel: Channel) {
unsafe {
self.inner
.regs_gp32()
T::regs_gp32()
.ccer()
.modify(|w| w.set_cce(channel.raw(), false));
}
@ -136,14 +130,13 @@ impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
}
pub fn get_max_duty(&self) -> u32 {
unsafe { self.inner.regs_gp32().arr().read().arr() }
unsafe { T::regs_gp32().arr().read().arr() }
}
pub fn set_duty(&mut self, channel: Channel, duty: u32) {
defmt::assert!(duty < self.get_max_duty());
unsafe {
self.inner
.regs_gp32()
T::regs_gp32()
.ccr(channel.raw())
.modify(|w| w.set_ccr(duty))
}