From 12571697bb1fe1e831e784e2c3712de6a59fa948 Mon Sep 17 00:00:00 2001 From: Boris Vinogradov Date: Mon, 12 May 2025 15:14:36 +0200 Subject: [PATCH 1/4] Fix compiller errors for updated peripheral --- examples/i2c.rs | 2 +- src/crc.rs | 4 ++-- src/timer/mod.rs | 4 ++-- src/timer/pins.rs | 2 +- src/timer/qei.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/i2c.rs b/examples/i2c.rs index b074ea9..a6807ea 100644 --- a/examples/i2c.rs +++ b/examples/i2c.rs @@ -24,7 +24,7 @@ fn main() -> ! { let sda = gpiob.pb9.into_open_drain_output_in_state(PinState::High); let scl = gpiob.pb8.into_open_drain_output_in_state(PinState::High); - let mut i2c = dp.I2C.i2c(sda, scl, Config::new(400.kHz()), &mut rcc); + let mut i2c = dp.I2C1.i2c(sda, scl, Config::new(400.kHz()), &mut rcc); i2c.write(0x2a, &[0x80, 0xff]).unwrap(); i2c.write(0x2a, &[0x01, 0x04, 0x00, 0x00]).unwrap(); diff --git a/src/crc.rs b/src/crc.rs index c9a8b76..a4991de 100644 --- a/src/crc.rs +++ b/src/crc.rs @@ -118,7 +118,7 @@ impl Config { Some(BitReversal::ByWord) => 0b11, }; - crc.init().write(|w| unsafe { w.crc_init().bits(init) }); + crc.init().write(|w| unsafe { w.init().bits(init) }); crc.pol().write(|w| unsafe { w.bits(poly) }); crc.cr().write(|w| unsafe { w.rev_in() @@ -160,7 +160,7 @@ impl Crc { let crc = unsafe { &(*CRC::ptr()) }; crc.init() - .write(|w| unsafe { w.crc_init().bits(initial_value) }); + .write(|w| unsafe { w.init().bits(initial_value) }); crc.cr().modify(|_, w| w.reset().set_bit()); } diff --git a/src/timer/mod.rs b/src/timer/mod.rs index 706efa0..ae490c2 100644 --- a/src/timer/mod.rs +++ b/src/timer/mod.rs @@ -257,8 +257,8 @@ macro_rules! timers_external_clocks { } timers_external_clocks! { - TIM1: (tim1, sms1, ece), - TIM3: (tim3, sms1, ece), + TIM1: (tim1, sms, ece), + TIM3: (tim3, sms, ece), } timers! { diff --git a/src/timer/pins.rs b/src/timer/pins.rs index ac663c5..1ac937a 100644 --- a/src/timer/pins.rs +++ b/src/timer/pins.rs @@ -64,7 +64,7 @@ macro_rules! trigger_pins { } }; - tim.smcr().modify(|_, w| unsafe { w.ts1().bits(ts) }); + tim.smcr().modify(|_, w| unsafe { w.ts().bits(ts) }); Self { pin, diff --git a/src/timer/qei.rs b/src/timer/qei.rs index ebc8300..e11e3ba 100644 --- a/src/timer/qei.rs +++ b/src/timer/qei.rs @@ -50,7 +50,7 @@ macro_rules! qei { tim.ccmr1_output().write(|w| unsafe { w.cc1s().bits(0b01).cc2s().bits(0b01) }); // Encoder mode 2. - tim.smcr().write(|w| unsafe { w.sms1().bits(0b010) }); + tim.smcr().write(|w| unsafe { w.sms().bits(0b010) }); // Enable and configure to capture on rising edge tim.ccer().write(|w| { From acaf37b877ac6ab28231d080d3cc4c95955adf0f Mon Sep 17 00:00:00 2001 From: Boris Vinogradov Date: Mon, 12 May 2025 15:17:41 +0200 Subject: [PATCH 2/4] Fix clippy warnings --- src/serial/usart.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/serial/usart.rs b/src/serial/usart.rs index 00fee5b..afd53cb 100644 --- a/src/serial/usart.rs +++ b/src/serial/usart.rs @@ -184,7 +184,7 @@ where Serial: hal::serial::Write, { fn write_str(&mut self, s: &str) -> fmt::Result { - let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).last(); + let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).next_back(); Ok(()) } } @@ -194,7 +194,7 @@ where Tx: hal::serial::Write, { fn write_str(&mut self, s: &str) -> fmt::Result { - let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).last(); + let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).next_back(); Ok(()) } } From 41afe21a406e76336ede6f3bc0a02380ddbba87f Mon Sep 17 00:00:00 2001 From: Boris Vinogradov Date: Mon, 12 May 2025 15:19:58 +0200 Subject: [PATCH 3/4] Fix formatting --- src/serial/usart.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/serial/usart.rs b/src/serial/usart.rs index afd53cb..d57aa71 100644 --- a/src/serial/usart.rs +++ b/src/serial/usart.rs @@ -184,8 +184,12 @@ where Serial: hal::serial::Write, { fn write_str(&mut self, s: &str) -> fmt::Result { - let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).next_back(); - Ok(()) + let _ = s + .as_bytes() + .iter() + .map(|c| block!(self.write(*c))) + .next_back(); + Ok(())ß } } @@ -194,7 +198,11 @@ where Tx: hal::serial::Write, { fn write_str(&mut self, s: &str) -> fmt::Result { - let _ = s.as_bytes().iter().map(|c| block!(self.write(*c))).next_back(); + let _ = s + .as_bytes() + .iter() + .map(|c| block!(self.write(*c))) + .next_back(); Ok(()) } } From bf020ad674599ff496df299ecf5ffb366113c3ce Mon Sep 17 00:00:00 2001 From: Boris Vinogradov Date: Mon, 12 May 2025 15:21:32 +0200 Subject: [PATCH 4/4] Remove failed symbol --- src/serial/usart.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serial/usart.rs b/src/serial/usart.rs index d57aa71..1ca542c 100644 --- a/src/serial/usart.rs +++ b/src/serial/usart.rs @@ -189,7 +189,7 @@ where .iter() .map(|c| block!(self.write(*c))) .next_back(); - Ok(())ß + Ok(()) } }