Apply updates to rp235x-hal-examples

Author: jannic

rp235x-hal-examples/Cargo.toml

@@ -18,15 +18,16 @@ cortex-m-rtic = "1.1.4"
 critical-section = {version = "1.2.0"}
 defmt = "0.3"
 defmt-rtt = "0.4.0"
-dht-sensor = "0.2.1"
+dht-sensor = { version = "0.2.1", git = "https://github.com/michaelbeaumont/dht-sensor", rev = "10319bdeae9ace3bb0fc79a15da2869c5bf50f52" }
 embedded-alloc = "0.5.1"
 embedded-hal = "1.0.0"
 embedded-hal-async = "1.0.0"
+embedded-hal-bus = {version = "0.3.0", features = ["defmt-03"]}
 embedded-io = "0.7.1"
 embedded_hal_0_2 = {package = "embedded-hal", version = "0.2.5", features = ["unproven"]}
 fugit = "0.3.6"
 futures = {version = "0.3.30", default-features = false, features = ["async-await"]}
-hd44780-driver = "0.4.0"
+hd44780-driver = { version = "0.4.0", git = "https://github.com/JohnDoneth/hd44780-driver", rev = "9009f2c24771ba0a20f8f7534471c9869188f76c" }
 heapless = "0.8.0"
 nb = "1.0"
 panic-halt = "0.2.0"

rp235x-hal-examples/src/bin/dht11.rs

@@ -31,7 +31,7 @@ pub static IMAGE_DEF: hal::block::ImageDef = hal::block::ImageDef::secure_exe();
 /// Adjust if your board has a different frequency
 const XTAL_FREQ_HZ: u32 = 12_000_000u32;
 
-use dht_sensor::{dht11, DhtReading};
+use dht_sensor::dht11;
 
 /// Entry point to our bare-metal application.
 ///
@@ -71,14 +71,14 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let mut delay = hal::Timer::new_timer0(pac.TIMER0, &mut pac.RESETS, &clocks);
+    let mut timer = hal::Timer::new_timer0(pac.TIMER0, &mut pac.RESETS, &clocks);
 
     // Use GPIO 28 as an InOutPin
     let mut pin = hal::gpio::InOutPin::new(pins.gpio28);
     let _ = pin.set_high();
 
     // Perform a sensor reading
-    let _measurement = dht11::Reading::read(&mut delay, &mut pin);
+    let _measurement = dht11::blocking::read(&mut timer, &mut pin);
 
     // In this case, we just ignore the result. A real application
     // would do something with the measurement.

rp235x-hal-examples/src/bin/i2c.rs

@@ -17,7 +17,7 @@ use panic_halt as _;
 use rp235x_hal as hal;
 
 // Some things we need
-use embedded_hal_0_2::blocking::i2c::Write;
+use embedded_hal::i2c::I2c;
 use hal::fugit::RateExtU32;
 use hal::gpio::{FunctionI2C, Pin};
 

rp235x-hal-examples/src/bin/lcd_display.rs

@@ -20,7 +20,9 @@ use panic_halt as _;
 use rp235x_hal as hal;
 
 // Our LCD driver
-use hd44780_driver as hd44780;
+use hd44780_driver::{
+    self as hd44780, bus::FourBitBusPins, memory_map::MemoryMap1602, setup::DisplayOptions4Bit,
+};
 
 /// Tell the Boot ROM about our application
 #[link_section = ".start_block"]
@@ -74,16 +76,15 @@ fn main() -> ! {
     );
 
     // Create the LCD driver from some GPIO pins
-    let mut lcd = hd44780::HD44780::new_4bit(
-        pins.gpio16.into_push_pull_output(), // Register Select
-        pins.gpio17.into_push_pull_output(), // Enable
-        pins.gpio18.into_push_pull_output(), // d4
-        pins.gpio19.into_push_pull_output(), // d5
-        pins.gpio20.into_push_pull_output(), // d6
-        pins.gpio21.into_push_pull_output(), // d7
-        &mut delay,
-    )
-    .unwrap();
+    let options = DisplayOptions4Bit::new(MemoryMap1602::new()).with_pins(FourBitBusPins {
+        rs: pins.gpio16.into_push_pull_output(), // Register Select
+        en: pins.gpio17.into_push_pull_output(), // Enable
+        d4: pins.gpio18.into_push_pull_output(), // d4
+        d5: pins.gpio19.into_push_pull_output(), // d5
+        d6: pins.gpio20.into_push_pull_output(), // d6
+        d7: pins.gpio21.into_push_pull_output(), // d7
+    });
+    let mut lcd = hd44780::HD44780::new(options, &mut delay).unwrap();
 
     // Clear the screen
     lcd.reset(&mut delay).unwrap();

rp235x-hal-examples/src/bin/spi.rs

@@ -12,6 +12,8 @@
 #![no_std]
 #![no_main]
 
+use embedded_hal::spi::SpiDevice;
+use embedded_hal_bus::spi::ExclusiveDevice;
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
 use panic_halt as _;
@@ -20,7 +22,6 @@ use panic_halt as _;
 use rp235x_hal as hal;
 
 // Some things we need
-use embedded_hal_0_2::prelude::*;
 use hal::clocks::Clock;
 use hal::fugit::RateExtU32;
 
@@ -60,6 +61,8 @@ fn main() -> ! {
     )
     .unwrap();
 
+    let mut timer = hal::Timer::new_timer0(pac.TIMER0, &mut pac.RESETS, &clocks);
+
     // The single-cycle I/O block controls our GPIO pins
     let sio = hal::Sio::new(pac.SIO);
 
@@ -78,34 +81,25 @@ fn main() -> ! {
     let spi_bus = hal::spi::Spi::<_, _, _, 8>::new(pac.SPI0, (spi_mosi, spi_miso, spi_sclk));
 
     // Exchange the uninitialised SPI driver for an initialised one
-    let mut spi_bus = spi_bus.init(
+    let spi_bus = spi_bus.init(
         &mut pac.RESETS,
         clocks.peripheral_clock.freq(),
         16.MHz(),
         embedded_hal::spi::MODE_0,
     );
 
+    let spi_cs = pins.gpio8.into_function::<hal::gpio::FunctionSioOutput>();
+    let mut spi = ExclusiveDevice::new(spi_bus, spi_cs, &mut timer).unwrap();
+
     // Write out 0, ignore return value
-    if spi_bus.write(&[0]).is_ok() {
+    if spi.write(&[0]).is_ok() {
         // SPI write was successful
     };
 
-    // write 50, then check the return
-    let send_success = spi_bus.send(50);
-    match send_success {
-        Ok(_) => {
-            // We succeeded, check the read value
-            if let Ok(_x) = spi_bus.read() {
-                // We got back `x` in exchange for the 0x50 we sent.
-            };
-        }
-        Err(_) => todo!(),
-    }
-
     // Do a read+write at the same time. Data in `buffer` will be replaced with
     // the data read from the SPI device.
     let mut buffer: [u8; 4] = [1, 2, 3, 4];
-    let transfer_success = spi_bus.transfer(&mut buffer);
+    let transfer_success = spi.transfer_in_place(&mut buffer);
     #[allow(clippy::single_match)]
     match transfer_success {
         Ok(_) => {}  // Handle success