Merge #519

519: update deps r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
  - extend visibility of gpio/marker to crate since i2s module require it [#490]
  - Bump `synopsys-usb-otg` to `0.3.0` [#508]
  - Bump `embedded-hal` to `1.0.0-alpha.8` [#510]
+ - Update `bxcan`, `rtic` and other dependencies [#519]
 
 ### Removed
  - `i2s-audio-out-dma.rs` example, too difficult to fix.
@@ -43,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#514]: https://github.com/stm32-rs/stm32f4xx-hal/pull/514
 [#515]: https://github.com/stm32-rs/stm32f4xx-hal/pull/515
 [#517]: https://github.com/stm32-rs/stm32f4xx-hal/pull/517
+[#519]: https://github.com/stm32-rs/stm32f4xx-hal/pull/519
 
 ## [v0.13.2] - 2022-05-16
 

Cargo.toml

@@ -28,11 +28,11 @@ targets = ["thumbv7em-none-eabihf"]
 
 [dependencies]
 defmt = { version = "0.3.1", optional = true }
-bxcan = { version = "0.6", optional = true }
+bxcan = { version = "0.7", optional = true }
 cortex-m = "0.7.4"
-cortex-m-rt = "0.7"
+cortex-m-rt = "0.7.1"
 nb = "1"
-rand_core = "0.6"
+rand_core = "0.6.3"
 stm32f4 = "0.15.1"
 synopsys-usb-otg = { version = "0.3.0", features = ["cortex-m"], optional = true }
 sdio-host = { version = "0.6.0", optional = true }
@@ -41,15 +41,15 @@ bare-metal = { version = "1" }
 void = { default-features = false, version = "1.0.2" }
 embedded-hal = { features = ["unproven"], version = "0.2.7" }
 display-interface = { version = "0.4.1", optional = true }
-fugit = "0.3.5"
+fugit = "0.3.6"
 fugit-timer = "0.1.3"
 rtic-monotonic = { version = "1.0", optional = true }
 systick-monotonic = { version = "1.0", optional = true }
 bitflags = "1.3.2"
 embedded-storage = "0.2"
 
 [dependencies.time]
-version = "0.3"
+version = "0.3.14"
 default-features = false
 
 [dependencies.embedded-hal-one]
@@ -62,22 +62,22 @@ optional = true
 
 [dev-dependencies]
 defmt-rtt = "0.3.2"
-panic-semihosting = "0.5.3"
-cortex-m-semihosting = "0.3.3"
-heapless = "0.7.5"
+panic-semihosting = "0.6.0"
+cortex-m-semihosting = "0.5.0"
+heapless = "0.7.16"
 panic-halt = "0.2.0"
-ssd1306 = "0.7.0"
+ssd1306 = "0.7.1"
 embedded-graphics = "0.7.1"
-usb-device = "0.2.5"
-usbd-serial = "0.1.0"
+usb-device = "0.2.9"
+usbd-serial = "0.1.1"
 micromath = "2"
-cortex-m-rtic = "1.0"
+cortex-m-rtic = "1.1.3"
 dwt-systick-monotonic = "1.0"
-st7789 = "0.6.1"
+st7789 = "0.7.0"
 panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
-display-interface-spi = "0.4"
-ist7920 = "0.1.0"
+display-interface-spi = "0.4.1"
+ist7920 = "0.1.1"
 smart-leds = "0.3.0"
 ws2812-spi = { version = "0.4.0", features = [] }
 hd44780-driver = "0.4.0"

examples/can-send.rs

@@ -7,7 +7,7 @@
 use panic_halt as _;
 
 use bxcan::filter::Mask32;
-use bxcan::{Frame, StandardId};
+use bxcan::{Fifo, Frame, StandardId};
 use cortex_m_rt::entry;
 use nb::block;
 use stm32f4xx_hal::{pac, prelude::*};
@@ -41,7 +41,7 @@ fn main() -> ! {
 
     // Configure filters so that can frames can be received.
     let mut filters = can1.modify_filters();
-    filters.enable_bank(0, Mask32::accept_all());
+    filters.enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
 
     let _can2 = {
         let tx = gpiob.pb13.into_alternate();
@@ -59,7 +59,7 @@ fn main() -> ! {
         // Split them equally between CAN1 and CAN2.
         filters.set_split(14);
         let mut slave_filters = filters.slave_filters();
-        slave_filters.enable_bank(14, Mask32::accept_all());
+        slave_filters.enable_bank(14, Fifo::Fifo0, Mask32::accept_all());
         can2
     };
 

examples/dynamic_gpio.rs

@@ -36,7 +36,7 @@ fn main() -> ! {
     loop {
         pin.make_floating_input();
         block!(timer.wait()).unwrap();
-        hprintln!("{}", pin.is_high().unwrap()).unwrap();
+        hprintln!("{}", pin.is_high().unwrap());
 
         pin.make_push_pull_output_in_state(PinState::High);
         block!(timer.wait()).unwrap();

examples/f413disco_lcd_ferris.rs

@@ -740,9 +740,6 @@ fn main() -> ! {
         // We're not using the "tearing" signal from the display
         let mut _te = gpiob.pb14.into_floating_input();
 
-        // Enable backlight
-        gpioe.pe5.into_push_pull_output().set_high();
-
         // Get delay provider
         let mut delay = cp.SYST.delay(&clocks);
 
@@ -754,7 +751,13 @@ fn main() -> ! {
         let (_fsmc, interface) = FsmcLcd::new(p.FSMC, lcd_pins, &read_timing, &write_timing);
 
         // Pass display-interface instance ST7789 driver to setup a new display
-        let mut disp = ST7789::new(interface, rst, 240, 240);
+        let mut disp = ST7789::new(
+            interface,
+            Some(rst),
+            Some(gpioe.pe5.into_push_pull_output()),
+            240,
+            240,
+        );
 
         // Initialise the display and clear the screen
         disp.init(&mut delay).unwrap();

examples/sd.rs

@@ -42,7 +42,7 @@ fn main() -> ! {
     let cmd = gpiod.pd2.into_alternate().internal_pull_up(true);
     let mut sdio: Sdio<SdCard> = Sdio::new(device.SDIO, (clk, cmd, d0, d1, d2, d3), &clocks);
 
-    hprintln!("Waiting for card...").ok();
+    hprintln!("Waiting for card...");
 
     // Wait for card to be ready
     loop {
@@ -55,20 +55,20 @@ fn main() -> ! {
     }
 
     let nblocks = sdio.card().map(|c| c.block_count()).unwrap_or(0);
-    hprintln!("Card detected: nbr of blocks: {:?}", nblocks).ok();
+    hprintln!("Card detected: nbr of blocks: {:?}", nblocks);
 
     // Read a block from the card and print the data
     let mut block = [0u8; 512];
 
     match sdio.read_block(0, &mut block) {
         Ok(()) => (),
         Err(err) => {
-            hprintln!("Failed to read block: {:?}", err).ok();
+            hprintln!("Failed to read block: {:?}", err);
         }
     }
 
     for b in block.iter() {
-        hprint!("{:X} ", b).ok();
+        hprint!("{:X} ", b);
     }
 
     loop {

examples/st7789-lcd.rs

@@ -103,14 +103,17 @@ fn main() -> ! {
     // https://github.com/STMicroelectronics/STM32CubeF4/blob/e084518f363e04344dc37822210a75e87377b200/Drivers/BSP/Components/st7789h2/st7789h2.c
 
     // Add LCD controller driver
-    let mut lcd = ST7789::new(interface, lcd_reset, 240, 240);
+    let mut lcd = ST7789::new(
+        interface,
+        Some(lcd_reset),
+        Some(backlight_control),
+        240,
+        240,
+    );
     // Initialise the display and clear the screen
     lcd.init(&mut delay).unwrap();
     lcd.clear(Rgb565::BLACK).unwrap();
 
-    // Turn on backlight
-    backlight_control.set_high();
-
     // Draw some circles
     let test_colors = [
         Rgb565::new(0x4e >> 3, 0x79 >> 2, 0xa7 >> 3),

examples/timer-periph.rs

@@ -30,32 +30,32 @@ fn main() -> ! {
     let mut timer = dp.TIM1.counter_ms(&clocks);
     timer.start(1.secs()).unwrap();
 
-    hprintln!("hello!").unwrap();
+    hprintln!("hello!");
     // wait until timer expires
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 1").unwrap();
+    hprintln!("timer expired 1");
 
     // the function counter_ms() creates a periodic timer, so it is automatically
     // restarted
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 2").unwrap();
+    hprintln!("timer expired 2");
 
     // cancel current timer
     timer.cancel().unwrap();
 
     // start it again
     timer.start(1.secs()).unwrap();
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 3").unwrap();
+    hprintln!("timer expired 3");
 
     timer.cancel().unwrap();
     let cancel_outcome = timer.cancel();
     assert_eq!(cancel_outcome, Err(Error::Disabled));
-    hprintln!("ehy, you cannot cancel a timer two times!").unwrap();
+    hprintln!("ehy, you cannot cancel a timer two times!");
     // this time the timer was not restarted, therefore this function should
     // wait forever
     nb::block!(timer.wait()).unwrap();
     // you should never see this print
-    hprintln!("if you see this there is something wrong").unwrap();
+    hprintln!("if you see this there is something wrong");
     panic!();
 }

examples/timer-syst.rs

@@ -31,32 +31,32 @@ fn main() -> ! {
     let mut timer = cp.SYST.counter_us(&clocks);
     timer.start(42.millis()).unwrap();
 
-    hprintln!("hello!").unwrap();
+    hprintln!("hello!");
     // wait until timer expires
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 1").unwrap();
+    hprintln!("timer expired 1");
 
     // the function syst() creates a periodic timer, so it is automatically
     // restarted
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 2").unwrap();
+    hprintln!("timer expired 2");
 
     // cancel current timer
     timer.cancel().unwrap();
 
     // start it again
     timer.start(42.millis()).unwrap();
     nb::block!(timer.wait()).unwrap();
-    hprintln!("timer expired 3").unwrap();
+    hprintln!("timer expired 3");
 
     timer.cancel().unwrap();
     let cancel_outcome = timer.cancel();
     assert_eq!(cancel_outcome, Err(Error::Disabled));
-    hprintln!("ehy, you cannot cancel a timer two times!").unwrap();
+    hprintln!("ehy, you cannot cancel a timer two times!");
     // this time the timer was not restarted, therefore this function should
     // wait forever
     nb::block!(timer.wait()).unwrap();
     // you should never see this print
-    hprintln!("if you see this there is something wrong").unwrap();
+    hprintln!("if you see this there is something wrong");
     panic!();
 }

src/timer.rs

@@ -452,11 +452,7 @@ macro_rules! with_pwm {
             fn enable_channel(c: u8, b: bool) {
                 let tim = unsafe { &*<$TIM>::ptr() };
                 if c < Self::CH_NUMBER {
-                    if b {
-                        unsafe { bb::set(&tim.ccer, c*4) }
-                    } else {
-                        unsafe { bb::clear(&tim.ccer, c*4) }
-                    }
+                    unsafe { bb::write(&tim.ccer, c*4, b); }
                 }
             }
         }
@@ -502,11 +498,7 @@ macro_rules! with_pwm {
             fn enable_channel(c: u8, b: bool) {
                 let tim = unsafe { &*<$TIM>::ptr() };
                 if c < Self::CH_NUMBER {
-                    if b {
-                        unsafe { bb::set(&tim.ccer, c*4) }
-                    } else {
-                        unsafe { bb::clear(&tim.ccer, c*4) }
-                    }
+                    unsafe { bb::write(&tim.ccer, c*4, b); }
                 }
             }
         }
@@ -560,11 +552,7 @@ macro_rules! with_pwm {
             fn enable_channel(c: u8, b: bool) {
                 let tim = unsafe { &*<$TIM>::ptr() };
                 if c < Self::CH_NUMBER {
-                    if b {
-                        unsafe { bb::set(&tim.ccer, c*4) }
-                    } else {
-                        unsafe { bb::clear(&tim.ccer, c*4) }
-                    }
+                    unsafe { bb::write(&tim.ccer, c*4, b); }
                 }
             }
         }