Update to use the overhauled GPIO API

rp-rs · Aug 3, 2023 · bcbe172 · bcbe172
1 parent 387e7b0
commit bcbe172
Show file tree

Hide file tree

Showing 38 changed files with 1,122 additions and 1,119 deletions.
diff --git a/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs b/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs
@@ -58,7 +58,7 @@ fn main() -> ! {
     let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS);
     let mut ws = Ws2812::new(
         // The onboard NeoPixel is attached to GPIO pin #16 on the Feather RP2040.
-        pins.neopixel.into_mode(),
+        pins.neopixel.into_function(),
         &mut pio,
         sm0,
         clocks.peripheral_clock.freq(),

diff --git a/boards/adafruit-feather-rp2040/src/lib.rs b/boards/adafruit-feather-rp2040/src/lib.rs
@@ -20,19 +20,19 @@ pub use hal::pac;
 hal::bsp_pins!(
     Gpio0 {
         name: tx,
-        aliases: { FunctionUart: UartTx }
+        aliases: { FunctionUart, PullNone: UartTx }
     },
     Gpio1 {
         name: rx,
-        aliases: { FunctionUart: UartRx }
+        aliases: { FunctionUart, PullNone: UartRx }
     },
     Gpio2 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullUp: Sda }
     },
     Gpio3 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullUp: Scl }
     },
     Gpio6 { name: d4 },
     Gpio7 { name: d5 },
@@ -45,15 +45,15 @@ hal::bsp_pins!(
     Gpio16 { name: neopixel },
     Gpio18 {
         name: sclk,
-        aliases: { FunctionSpi: Sclk }
+        aliases: { FunctionSpi, PullNone: Sclk }
     },
     Gpio19 {
         name: mosi,
-        aliases: { FunctionSpi: Mosi }
+        aliases: { FunctionSpi, PullNone: Mosi }
     },
     Gpio20 {
         name: miso,
-        aliases: { FunctionSpi: Miso }
+        aliases: { FunctionSpi, PullNone: Miso }
     },
     Gpio24 { name: d24 },
     Gpio25 { name: d25 },

diff --git a/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs b/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs
@@ -48,7 +48,7 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let led = pins.neopixel_data.into_mode();
+    let led = pins.neopixel_data.into_function();
 
     pins.neopixel_power
         .into_push_pull_output_in_state(PinState::High);

diff --git a/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs b/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs
@@ -20,19 +20,19 @@ pub use hal::pac;
 hal::bsp_pins!(
     Gpio0 {
         name: tx,
-        aliases: { FunctionUart: UartTx }
+        aliases: { FunctionUart, PullNone: UartTx }
     },
     Gpio1 {
         name: rx,
-        aliases: { FunctionUart: UartRx }
+        aliases: { FunctionUart, PullNone: UartRx }
     },
     Gpio2 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullUp: Sda }
     },
     Gpio3 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullUp: Scl }
     },
     Gpio4 { name: d4 },
     Gpio5 { name: d3 },
@@ -48,15 +48,15 @@ hal::bsp_pins!(
     Gpio17 { name: neopixel_data },
     Gpio18 {
         name: sclk,
-        aliases: { FunctionSpi: Sclk }
+        aliases: { FunctionSpi, PullNone: Sclk }
     },
     Gpio19 {
         name: mosi,
-        aliases: { FunctionSpi: Mosi }
+        aliases: { FunctionSpi, PullNone: Mosi }
     },
     Gpio20 {
         name: miso
-        aliases: { FunctionSpi: Miso }
+        aliases: { FunctionSpi, PullNone: Miso }
     },
     Gpio24 { name: d24 },
     Gpio25 { name: d25 },

diff --git a/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs b/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs
@@ -70,7 +70,7 @@ fn main() -> ! {
     let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS);
 
     let mut ws = Ws2812::new(
-        pins.neopixel.into_mode(),
+        pins.neopixel.into_function(),
         &mut pio,
         sm0,
         clocks.peripheral_clock.freq(),

diff --git a/boards/adafruit-kb2040/src/lib.rs b/boards/adafruit-kb2040/src/lib.rs
@@ -19,11 +19,11 @@ pub use hal::pac;
 hal::bsp_pins!(
     Gpio0 {
         name: tx,
-        aliases: { FunctionUart: UartTx }
+        aliases: { FunctionUart, PullNone: UartTx }
     },
     Gpio1 {
         name: rx,
-        aliases: { FunctionUart: UartRx }
+        aliases: { FunctionUart, PullNone: UartRx }
     },
     Gpio2 { name: d2 },
     Gpio3 { name: d3 },
@@ -37,24 +37,24 @@ hal::bsp_pins!(
     Gpio11 { name: d11 },
     Gpio12 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullNone: Sda }
     },
     Gpio13 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullNone: Scl }
     },
     Gpio17 { name: neopixel },
     Gpio18 {
         name: sclk,
-        aliases: { FunctionSpi: Sclk }
+        aliases: { FunctionSpi, PullNone: Sclk }
     },
     Gpio19 {
         name: mosi,
-        aliases: { FunctionSpi: Mosi }
+        aliases: { FunctionSpi, PullNone: Mosi }
     },
     Gpio20 {
         name: miso,
-        aliases: { FunctionSpi: Miso }
+        aliases: { FunctionSpi, PullNone: Miso }
     },
     Gpio26 { name: a0 },
     Gpio27 { name: a1 },

diff --git a/boards/adafruit-macropad/src/lib.rs b/boards/adafruit-macropad/src/lib.rs
@@ -40,36 +40,36 @@ hal::bsp_pins!(
     Gpio16 { name: speaker },
     Gpio17 {
         name: encoder_rota,
-        aliases: { PullUpInput: RotaryA }
+        aliases: { FunctionSioInput, PullUp: RotaryA }
     },
     Gpio18 {
         name: encoder_rotb,
-        aliases: { PullUpInput: RotaryB }
+        aliases: { FunctionSioInput, PullUp: RotaryB }
     },
     Gpio19 { name: neopixel },
     Gpio20 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullUp: Sda }
     },
     Gpio21 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullUp: Scl }
     },
     // This CS is on the wrong SPI channel so cannot be controlled by the peripheral
     Gpio22 { name: oled_cs },
     Gpio23 { name: oled_reset },
     Gpio24 { name: oled_dc },
     Gpio26 {
         name: sclk,
-        aliases: { FunctionSpi: Sclk }
+        aliases: { FunctionSpi, PullNone: Sclk }
     },
     Gpio27 {
         name: mosi,
-        aliases: { FunctionSpi: Mosi }
+        aliases: { FunctionSpi, PullNone: Mosi }
     },
     Gpio28 {
         name: miso,
-        aliases: { FunctionSpi: Miso }
+        aliases: { FunctionSpi, PullNone: Miso }
     },
 );
 

diff --git a/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs b/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs
@@ -48,7 +48,7 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    let led = pins.neopixel_data.into_mode();
+    let led = pins.neopixel_data.into_function();
 
     pins.neopixel_power
         .into_push_pull_output_in_state(PinState::High);

diff --git a/boards/adafruit-qt-py-rp2040/src/lib.rs b/boards/adafruit-qt-py-rp2040/src/lib.rs
@@ -20,44 +20,44 @@ pub use hal::pac;
 hal::bsp_pins!(
     Gpio3 {
         name: mosi,
-        aliases: { FunctionSpi: Mosi }
+        aliases: { FunctionSpi, PullNone: Mosi }
     },
     Gpio4 {
         name: miso
-        aliases: { FunctionSpi: Miso }
+        aliases: { FunctionSpi, PullNone: Miso }
     },
     Gpio5 {
         name: rx,
-        aliases: { FunctionUart: UartRx }
+        aliases: { FunctionUart, PullNone: UartRx }
     },
     Gpio6 {
         name: sclk,
-        aliases: { FunctionSpi: Sclk }
+        aliases: { FunctionSpi, PullNone: Sclk }
     },
     Gpio11 { name: neopixel_power },
     Gpio12 { name: neopixel_data },
     Gpio20 {
         name: tx,
-        aliases: { FunctionUart: UartTx }
+        aliases: { FunctionUart, PullNone: UartTx }
     },
     Gpio21 {
         name: button
     },
     Gpio22 {
         name: sda1,
-        aliases: { FunctionI2C: Sda1 }
+        aliases: { FunctionI2C, PullUp: Sda1 }
     },
     Gpio23 {
         name: scl1,
-        aliases: { FunctionI2C: Scl1 }
+        aliases: { FunctionI2C, PullUp: Scl1 }
     },
     Gpio24 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullUp: Sda }
     },
     Gpio25 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullUp: Scl }
     },
     Gpio26 { name: a3 },
     Gpio27 { name: a2 },

diff --git a/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs b/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs
@@ -70,7 +70,7 @@ fn main() -> ! {
     let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS);
 
     let mut ws = Ws2812::new(
-        pins.neopixel.into_mode(),
+        pins.neopixel.into_function(),
         &mut pio,
         sm0,
         clocks.peripheral_clock.freq(),

diff --git a/boards/adafruit-trinkey-qt2040/src/lib.rs b/boards/adafruit-trinkey-qt2040/src/lib.rs
@@ -21,11 +21,11 @@ hal::bsp_pins!(
     Gpio12 { name: button },
     Gpio16 {
         name: sda,
-        aliases: { FunctionI2C: Sda }
+        aliases: { FunctionI2C, PullUp: Sda }
     },
     Gpio17 {
         name: scl,
-        aliases: { FunctionI2C: Scl }
+        aliases: { FunctionI2C, PullUp: Scl }
     },
     Gpio27 { name: neopixel },
 );