Bump rp2040-pac to 0.6 in rtic-monotonics (#905)

* Support rp2040-pac v0.6 in rtic-monotonics * Add changelog entry * Fix rp2040_local_i2c_init example
rtic-rs · Apr 21, 2024 · 5d05d60 · 5d05d60
1 parent acb9f44
commit 5d05d60
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 63 deletions.
diff --git a/examples/rp2040_local_i2c_init/Cargo.lock b/examples/rp2040_local_i2c_init/Cargo.lock
diff --git a/examples/rp2040_local_i2c_init/Cargo.toml b/examples/rp2040_local_i2c_init/Cargo.toml
@@ -22,7 +22,7 @@ features = ["rp2040"]
 cortex-m = "0.7"
 embedded-hal = { version = "0.2.7", features = ["unproven"] }
 fugit = "0.3"
-rp-pico = "0.8.0"
+rp-pico = "0.9.0"
 panic-probe = "0.3"
 
 [profile.dev]

diff --git a/examples/rp2040_local_i2c_init/src/main.rs b/examples/rp2040_local_i2c_init/src/main.rs
@@ -14,7 +14,7 @@ mod app {
         gpio::{
             self,
             bank0::{Gpio2, Gpio25, Gpio3},
-            FunctionSioOutput, PullNone, PullUp,
+            FunctionSio, PullNone, PullUp, SioOutput,
         },
         pac,
         sio::Sio,
@@ -41,7 +41,7 @@ mod app {
 
     #[local]
     struct Local {
-        led: gpio::Pin<Gpio25, FunctionSioOutput, PullNone>,
+        led: gpio::Pin<Gpio25, FunctionSio<SioOutput>, PullNone>,
         i2c: &'static mut I2CBus,
     }
 
@@ -82,14 +82,14 @@ mod app {
         led.set_low().unwrap();
 
         // Init I2C pins
-        let sda_pin = gpioa
+        let sda_pin: gpio::Pin<_, gpio::FunctionI2C, _> = gpioa
             .gpio2
             .into_pull_up_disabled()
-            .into_function::<gpio::FunctionI2C>();
-        let scl_pin = gpioa
+            .reconfigure();
+        let scl_pin: gpio::Pin<_, gpio::FunctionI2C, _> = gpioa
             .gpio3
             .into_pull_up_disabled()
-            .into_function::<gpio::FunctionI2C>();
+            .reconfigure();
 
         // Init I2C itself, using MaybeUninit to overwrite the previously
         // uninitialized i2c_ctx variable without dropping its value