diff --git a/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs b/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs index 5d18418b..16b1de36 100644 --- 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 index 99fb6403..1392ae47 100644 --- 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 index 7e29b4de..927da9ab 100644 --- 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 index f58e2f27..a6102013 100644 --- 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 index 9cfdd1c5..c9f62940 100644 --- 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 index d7c286f3..523e2fec 100644 --- 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 index 2c5d26e4..07e5fa45 100644 --- a/boards/adafruit-macropad/src/lib.rs +++ b/boards/adafruit-macropad/src/lib.rs @@ -40,20 +40,20 @@ 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 }, @@ -61,15 +61,15 @@ hal::bsp_pins!( 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 index 022d9bfe..a1d4af1a 100644 --- 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 index d663cb7b..f5d1dc85 100644 --- 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 index 979f8f02..3315afa0 100644 --- 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 index f9f2c8ad..d1a118ec 100644 --- 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 }, ); diff --git a/boards/arduino_nano_connect/src/lib.rs b/boards/arduino_nano_connect/src/lib.rs index 69ac811d..f8a00f44 100644 --- a/boards/arduino_nano_connect/src/lib.rs +++ b/boards/arduino_nano_connect/src/lib.rs @@ -49,7 +49,7 @@ hal::bsp_pins!( aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx + FunctionUart, PullNone: Gp0Uart0Tx } }, @@ -67,7 +67,7 @@ hal::bsp_pins!( name: rx, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx + FunctionUart, PullNone: Gp1Uart0Rx } }, @@ -86,7 +86,7 @@ hal::bsp_pins!( name: ble_rts, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts + FunctionUart, PullNone: Gp2Uart0Cts } }, @@ -121,17 +121,17 @@ hal::bsp_pins!( name: cipo, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -149,17 +149,17 @@ hal::bsp_pins!( name: d10, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -178,17 +178,17 @@ hal::bsp_pins!( name: sck0, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -209,17 +209,17 @@ hal::bsp_pins!( name: copi, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -238,9 +238,9 @@ hal::bsp_pins!( name: ble_tx_cipo, aliases: { /// UART Function alias for pin [crate::Pins::gpio8]. - FunctionUart: Gp8Uart1Tx, + FunctionUart, PullNone: Gp8Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio8]. - FunctionSpi: Gp8Spi1Rx + FunctionSpi, PullNone: Gp8Spi1Rx } }, @@ -259,9 +259,9 @@ hal::bsp_pins!( name: ble_rx_cs, aliases: { /// UART Function alias for pin [crate::Pins::gpio9]. - FunctionUart: Gp9Uart1Rx, + FunctionUart, PullNone: Gp9Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio9]. - FunctionSpi: Gp9Spi1Csn + FunctionSpi, PullNone: Gp9Spi1Csn } }, @@ -280,9 +280,9 @@ hal::bsp_pins!( name: ble_cts_ack, aliases: { /// UART Function alias for pin [crate::Pins::gpio10]. - FunctionUart: Gp10Uart1Cts, + FunctionUart, PullNone: Gp10Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio10]. - FunctionSpi: Gp10Spi1Sck + FunctionSpi, PullNone: Gp10Spi1Sck } }, @@ -301,9 +301,9 @@ hal::bsp_pins!( name: nina_copi, aliases: { /// UART Function alias for pin [crate::Pins::gpio11]. - FunctionUart: Gp11Uart1Rts, + FunctionUart, PullNone: Gp11Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio11]. - FunctionSpi: Gp11Spi1Tx + FunctionSpi, PullNone: Gp11Spi1Tx } }, @@ -322,17 +322,17 @@ hal::bsp_pins!( name: a4, aliases: { /// UART Function alias for pin [crate::Pins::gpio12]. - FunctionUart: Gp12Uart0Tx, + FunctionUart, PullNone: Gp12Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio12]. - FunctionSpi: Gp12Spi1Rx, + FunctionSpi, PullNone: Gp12Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio12]. - FunctionI2C: Gp12I2C0Sda, + FunctionI2C, PullUp: Gp12I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio12]. - FunctionPwm: Gp12Pwm6A, + FunctionPwm, PullNone: Gp12Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio12]. - FunctionPio0: Gp12Pio0, + FunctionPio0, PullNone: Gp12Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio12]. - FunctionPio1: Gp12Pio1 + FunctionPio1, PullNone: Gp12Pio1 } }, @@ -351,17 +351,17 @@ hal::bsp_pins!( name: a5, aliases: { /// UART Function alias for pin [crate::Pins::gpio13]. - FunctionUart: Gp13Uart0Rx, + FunctionUart, PullNone: Gp13Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio13]. - FunctionSpi: Gp13Spi1Csn, + FunctionSpi, PullNone: Gp13Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio13]. - FunctionI2C: Gp13I2C0Scl, + FunctionI2C, PullUp: Gp13I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio13]. - FunctionPwm: Gp13Pwm6B, + FunctionPwm, PullNone: Gp13Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio13]. - FunctionPio0: Gp13Pio0, + FunctionPio0, PullNone: Gp13Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio13]. - FunctionPio1: Gp13Pio1 + FunctionPio1, PullNone: Gp13Pio1 } }, @@ -379,7 +379,7 @@ hal::bsp_pins!( name: nina_sck, aliases: { /// SPI Function alias for pin [crate::Pins::gpio14]. - FunctionSpi: Gp14Spi1Sck + FunctionSpi, PullNone: Gp14Spi1Sck } }, @@ -397,17 +397,17 @@ hal::bsp_pins!( name: d3, aliases: { /// UART Function alias for pin [crate::Pins::gpio15]. - FunctionUart: Gp15Uart0Rts, + FunctionUart, PullNone: Gp15Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio15]. - FunctionSpi: Gp15Spi1Tx, + FunctionSpi, PullNone: Gp15Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio15]. - FunctionI2C: Gp15I2C1Scl, + FunctionI2C, PullUp: Gp15I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio15]. - FunctionPwm: Gp15Pwm7B, + FunctionPwm, PullNone: Gp15Pwm7B, /// PIO0 Function alias for pin [crate::Pins::gpio15]. - FunctionPio0: Gp15Pio0, + FunctionPio0, PullNone: Gp15Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio15]. - FunctionPio1: Gp15Pio1 + FunctionPio1, PullNone: Gp15Pio1 } }, @@ -425,17 +425,17 @@ hal::bsp_pins!( name: d4, aliases: { /// UART Function alias for pin [crate::Pins::gpio16]. - FunctionUart: Gp16Uart0Tx, + FunctionUart, PullNone: Gp16Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio16]. - FunctionSpi: Gp16Spi0Rx, + FunctionSpi, PullNone: Gp16Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio16]. - FunctionI2C: Gp16I2C0Sda, + FunctionI2C, PullUp: Gp16I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio16]. - FunctionPwm: Gp16Pwm0A, + FunctionPwm, PullNone: Gp16Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio16]. - FunctionPio0: Gp16Pio0, + FunctionPio0, PullNone: Gp16Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio16]. - FunctionPio1: Gp16Pio1 + FunctionPio1, PullNone: Gp16Pio1 } }, @@ -453,17 +453,17 @@ hal::bsp_pins!( name: d5, aliases: { /// UART Function alias for pin [crate::Pins::gpio17]. - FunctionUart: Gp17Uart0Rx, + FunctionUart, PullNone: Gp17Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: Gp17Spi0Csn, + FunctionSpi, PullNone: Gp17Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio17]. - FunctionI2C: Gp17I2C0Scl, + FunctionI2C, PullUp: Gp17I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio17]. - FunctionPwm: Gp17Pwm0B, + FunctionPwm, PullNone: Gp17Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio17]. - FunctionPio0: Gp17Pio0, + FunctionPio0, PullNone: Gp17Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio17]. - FunctionPio1: Gp17Pio1 + FunctionPio1, PullNone: Gp17Pio1 } }, @@ -481,17 +481,17 @@ hal::bsp_pins!( name: d6, aliases: { /// UART Function alias for pin [crate::Pins::gpio18]. - FunctionUart: Gp18Uart0Cts, + FunctionUart, PullNone: Gp18Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Gp18Spi0Sck, + FunctionSpi, PullNone: Gp18Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio18]. - FunctionI2C: Gp18I2C1Sda, + FunctionI2C, PullUp: Gp18I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio18]. - FunctionPwm: Gp18Pwm1A, + FunctionPwm, PullNone: Gp18Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio18]. - FunctionPio0: Gp18Pio0, + FunctionPio0, PullNone: Gp18Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio18]. - FunctionPio1: Gp18Pio1 + FunctionPio1, PullNone: Gp18Pio1 } }, @@ -509,17 +509,17 @@ hal::bsp_pins!( name: d7, aliases: { /// UART Function alias for pin [crate::Pins::gpio19]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio19]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio19]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio19]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio19]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -537,17 +537,17 @@ hal::bsp_pins!( name: d8, aliases: { /// UART Function alias for pin [crate::Pins::gpio20]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio20]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio20]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio20]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio20]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio20]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -565,17 +565,17 @@ hal::bsp_pins!( name: d9, aliases: { /// UART Function alias for pin [crate::Pins::gpio21]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio21]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio21]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio21]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio21]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio21]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -636,17 +636,17 @@ hal::bsp_pins!( name: d2, aliases: { /// UART Function alias for pin [crate::Pins::gpio25]. - FunctionUart: Gp25Uart1Rx, + FunctionUart, PullNone: Gp25Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio25]. - FunctionSpi: Gp25Spi1Csn, + FunctionSpi, PullNone: Gp25Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio25]. - FunctionI2C: Gp25I2C0Scl, + FunctionI2C, PullUp: Gp25I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio25]. - FunctionPwm: Gp25Pwm4B, + FunctionPwm, PullNone: Gp25Pwm4B, /// PIO0 Function alias for pin [crate::Pins::gpio25]. - FunctionPio0: Gp25Pio0, + FunctionPio0, PullNone: Gp25Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio25]. - FunctionPio1: Gp25Pio1 + FunctionPio1, PullNone: Gp25Pio1 } }, @@ -664,17 +664,17 @@ hal::bsp_pins!( name: a0, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -692,17 +692,17 @@ hal::bsp_pins!( name: a1, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -720,17 +720,17 @@ hal::bsp_pins!( name: a2, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, @@ -748,17 +748,17 @@ hal::bsp_pins!( name: a3, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp29Uart0Rx, + FunctionUart, PullNone: Gp29Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp29Spi1CSn, + FunctionSpi, PullNone: Gp29Spi1CSn, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp29I2C0Scl, + FunctionI2C, PullUp: Gp29I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp29Pwm6B, + FunctionPwm, PullNone: Gp29Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp29Pio0, + FunctionPio0, PullNone: Gp29Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp29Pio1 + FunctionPio1, PullNone: Gp29Pio1 } }, ); diff --git a/boards/pimoroni-pico-explorer/src/lib.rs b/boards/pimoroni-pico-explorer/src/lib.rs index 09b557ab..304b1804 100644 --- a/boards/pimoroni-pico-explorer/src/lib.rs +++ b/boards/pimoroni-pico-explorer/src/lib.rs @@ -36,11 +36,10 @@ use hal::{ adc::Adc, gpio::{ bank0::{ - Gpio0, Gpio1, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio18, Gpio19, Gpio2, - Gpio20, Gpio21, Gpio22, Gpio23, Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3, - Gpio4, Gpio5, Gpio6, Gpio7, + Gpio0, Gpio1, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio2, Gpio22, Gpio23, + Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3, Gpio4, Gpio5, Gpio6, Gpio7, }, - FunctionI2C, FunctionPwm, FunctionSpi, Pin, PinId, PullUpInput, PushPullOutput, + FunctionNull, FunctionPwm, FunctionSioInput, FunctionSioOutput, Pin, PullNone, PullUp, }, pac::{RESETS, SPI0}, sio::SioGpioBank0, @@ -60,19 +59,19 @@ pub mod all_pins { Gpio7 { name: gpio7 }, Gpio8 { name: motor1_neg, - aliases: { FunctionPwm: Motor1Neg } + aliases: { FunctionPwm, PullNone: Motor1Neg } }, Gpio9 { name: motor1_pos, - aliases: { FunctionPwm: Motor1Pos } + aliases: { FunctionPwm, PullNone: Motor1Pos } }, Gpio10 { name: motor2_neg, - aliases: { FunctionPwm: Motor2Neg } + aliases: { FunctionPwm, PullNone: Motor2Neg } }, Gpio11 { name: motor2_pos, - aliases: { FunctionPwm: Motor2Pos } + aliases: { FunctionPwm, PullNone: Motor2Pos } }, Gpio12 { name: switch_a }, Gpio13 { name: switch_b }, @@ -80,27 +79,27 @@ pub mod all_pins { Gpio15 { name: switch_y }, Gpio16 { name: spi_miso, - aliases: { FunctionSpi: Miso } + aliases: { FunctionSpi, PullNone: Miso } }, Gpio17 { name: lcd_cs, - aliases: { FunctionSpi: LcdCs } + aliases: { FunctionSpi, PullNone: LcdCs } }, Gpio18 { name: spi_sclk, - aliases: { FunctionSpi: Sclk } + aliases: { FunctionSpi, PullNone: Sclk } }, Gpio19 { name: spi_mosi, - aliases: { FunctionSpi: Mosi } + aliases: { FunctionSpi, PullNone: Mosi } }, Gpio20 { name: i2c_sda, - aliases: { FunctionI2C: Sda } + aliases: { FunctionI2C, PullUp: Sda } }, Gpio21 { name: i2c_scl, - aliases: { FunctionI2C: Scl } + aliases: { FunctionI2C, PullUp: Scl } }, Gpio22 { name: i2c_int }, Gpio23 { name: b_power_save }, @@ -117,26 +116,24 @@ pub mod all_pins { // Can't use `hal::bsp_pins!` here because some pins are not set to their reset state pub struct Pins { - pub gpio0: Pin::Reset>, - pub gpio1: Pin::Reset>, - pub gpio2: Pin::Reset>, - pub gpio3: Pin::Reset>, - pub gpio4: Pin::Reset>, - pub gpio5: Pin::Reset>, - pub gpio6: Pin::Reset>, - pub gpio7: Pin::Reset>, - pub spi_sclk: Pin, - pub spi_mosi: Pin, - pub i2c_sda: Pin, - pub i2c_scl: Pin, - pub i2c_int: Pin, - pub b_power_save: Pin::Reset>, - pub vbus_detect: Pin::Reset>, - pub led: Pin::Reset>, - pub adc0: Pin::Reset>, - pub adc1: Pin::Reset>, - pub adc2: Pin::Reset>, - pub voltage_monitor: Pin::Reset>, + pub gpio0: Pin, + pub gpio1: Pin, + pub gpio2: Pin, + pub gpio3: Pin, + pub gpio4: Pin, + pub gpio5: Pin, + pub gpio6: Pin, + pub gpio7: Pin, + pub i2c_sda: all_pins::Sda, + pub i2c_scl: all_pins::Scl, + pub i2c_int: Pin, + pub b_power_save: Pin, + pub vbus_detect: Pin, + pub led: Pin, + pub adc0: Pin, + pub adc1: Pin, + pub adc2: Pin, + pub voltage_monitor: Pin, } pub const XOSC_CRYSTAL_FREQ: u32 = 12_000_000; @@ -159,15 +156,19 @@ pub enum MotorAction { } pub type Screen = ST7789< - SPIInterface, Pin, Pin>, + SPIInterface< + Spi, + Pin, + Pin, + >, DummyPin, >; pub struct PicoExplorer { - pub a: Pin, - pub b: Pin, - pub x: Pin, - pub y: Pin, + pub a: Pin, + pub b: Pin, + pub x: Pin, + pub y: Pin, adc: Adc, pub screen: Screen, } @@ -201,17 +202,18 @@ impl PicoExplorer { let x = internal_pins.switch_x.into_pull_up_input(); let y = internal_pins.switch_y.into_pull_up_input(); - internal_pins.motor1_pos.into_mode::(); - internal_pins.motor1_neg.into_mode::(); - internal_pins.motor2_pos.into_mode::(); - internal_pins.motor2_neg.into_mode::(); + internal_pins.motor1_pos.into_function::(); + internal_pins.motor1_neg.into_function::(); + internal_pins.motor2_pos.into_function::(); + internal_pins.motor2_neg.into_function::(); - let dc = internal_pins.spi_miso.into_push_pull_output(); - let cs = internal_pins.lcd_cs.into_push_pull_output(); - let spi_sclk = internal_pins.spi_sclk.into_mode::(); - let spi_mosi = internal_pins.spi_mosi.into_mode::(); + let dc = internal_pins.spi_miso.into(); + let cs = internal_pins.lcd_cs.into(); + let spi_sclk = internal_pins.spi_sclk.into(); + let spi_mosi = internal_pins.spi_mosi.into(); - let spi_screen = Spi::<_, _, 8>::new(spi0).init(resets, 125u32.MHz(), 16u32.MHz(), MODE_0); + let spi_screen = + Spi::new(spi0, (spi_mosi, spi_sclk)).init(resets, 125u32.MHz(), 16u32.MHz(), MODE_0); let spii_screen = SPIInterface::new(spi_screen, dc, cs); @@ -233,26 +235,24 @@ impl PicoExplorer { screen, }, Pins { - gpio0: internal_pins.gpio0, - gpio1: internal_pins.gpio1, - gpio2: internal_pins.gpio2, - gpio3: internal_pins.gpio3, - gpio4: internal_pins.gpio4, - gpio5: internal_pins.gpio5, - gpio6: internal_pins.gpio6, - gpio7: internal_pins.gpio7, - spi_sclk, - spi_mosi, - i2c_sda: internal_pins.i2c_sda.into_mode(), - i2c_scl: internal_pins.i2c_scl.into_mode(), - i2c_int: internal_pins.i2c_int.into_mode(), - b_power_save: internal_pins.b_power_save, - vbus_detect: internal_pins.vbus_detect, - led: internal_pins.led, - adc0: internal_pins.adc0, - adc1: internal_pins.adc1, - adc2: internal_pins.adc2, - voltage_monitor: internal_pins.voltage_monitor, + gpio0: internal_pins.gpio0.into(), + gpio1: internal_pins.gpio1.into(), + gpio2: internal_pins.gpio2.into(), + gpio3: internal_pins.gpio3.into(), + gpio4: internal_pins.gpio4.into(), + gpio5: internal_pins.gpio5.into(), + gpio6: internal_pins.gpio6.into(), + gpio7: internal_pins.gpio7.into(), + i2c_sda: internal_pins.i2c_sda.into(), + i2c_scl: internal_pins.i2c_scl.into(), + i2c_int: internal_pins.i2c_int.into(), + b_power_save: internal_pins.b_power_save.into(), + vbus_detect: internal_pins.vbus_detect.into(), + led: internal_pins.led.into(), + adc0: internal_pins.adc0.into(), + adc1: internal_pins.adc1.into(), + adc2: internal_pins.adc2.into(), + voltage_monitor: internal_pins.voltage_monitor.into(), }, ) } diff --git a/boards/pimoroni-plasma-2040/examples/pimoroni_plasma_2040_ws2812_led.rs b/boards/pimoroni-plasma-2040/examples/pimoroni_plasma_2040_ws2812_led.rs index 09160506..f5109085 100644 --- a/boards/pimoroni-plasma-2040/examples/pimoroni_plasma_2040_ws2812_led.rs +++ b/boards/pimoroni-plasma-2040/examples/pimoroni_plasma_2040_ws2812_led.rs @@ -94,7 +94,7 @@ fn main() -> ! { // Instantiate a Ws2812 LED strip: let mut ws = Ws2812::new( - pins.data.into_mode(), + pins.data.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/pimoroni-plasma-2040/src/lib.rs b/boards/pimoroni-plasma-2040/src/lib.rs index 9bf2412e..4bbaad1d 100644 --- a/boards/pimoroni-plasma-2040/src/lib.rs +++ b/boards/pimoroni-plasma-2040/src/lib.rs @@ -45,12 +45,12 @@ hal::bsp_pins!( /// GPIO 20 is I2C_SDA Gpio20 { name: i2c_sda, - aliases: { FunctionI2C: Sda } + aliases: { FunctionI2C, PullUp: Sda } }, /// GPIO 21 is I2C_SCL Gpio21 { name: i2c_scl, - aliases: { FunctionI2C: Scl } + aliases: { FunctionI2C, PullUp: Scl } }, /// GPIO 23 is connected to the USER_SW, the BOOT button, active low Gpio23 { name: user_sw }, diff --git a/boards/pimoroni-servo2040/examples/pimoroni_servo2040_rainbow.rs b/boards/pimoroni-servo2040/examples/pimoroni_servo2040_rainbow.rs index e6192017..1a44ce96 100644 --- a/boards/pimoroni-servo2040/examples/pimoroni_servo2040_rainbow.rs +++ b/boards/pimoroni-servo2040/examples/pimoroni_servo2040_rainbow.rs @@ -54,7 +54,7 @@ fn main() -> ! { let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS); let mut ws = Ws2812::new( - pins.led_data.into_mode(), + pins.led_data.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/pimoroni-servo2040/src/lib.rs b/boards/pimoroni-servo2040/src/lib.rs index 13310dbb..5c10178f 100644 --- a/boards/pimoroni-servo2040/src/lib.rs +++ b/boards/pimoroni-servo2040/src/lib.rs @@ -47,11 +47,11 @@ hal::bsp_pins!( name: servo1, aliases: { /// PWM Function alias for pin [crate::Pins::servo1]. - FunctionPwm: Servo1Pwm0A, + FunctionPwm, PullNone: Servo1Pwm0A, /// PIO0 Function alias for pin [crate::Pins::servo1]. - FunctionPio0: Servo1Pio0, + FunctionPio0, PullNone: Servo1Pio0, /// PIO1 Function alias for pin [crate::Pins::servo1]. - FunctionPio1: Servo1Pio1 + FunctionPio1, PullNone: Servo1Pio1 } }, @@ -66,11 +66,11 @@ hal::bsp_pins!( name: servo2, aliases: { /// PWM Function alias for pin [crate::Pins::servo2]. - FunctionPwm: Servo2Pwm0B, + FunctionPwm, PullNone: Servo2Pwm0B, /// PIO0 Function alias for pin [crate::Pins::servo2]. - FunctionPio0: Servo2Pio0, + FunctionPio0, PullNone: Servo2Pio0, /// PIO1 Function alias for pin [crate::Pins::servo2]. - FunctionPio1: Servo2Pio1 + FunctionPio1, PullNone: Servo2Pio1 } }, @@ -85,11 +85,11 @@ hal::bsp_pins!( name: servo3, aliases: { /// PWM Function alias for pin [crate::Pins::servo3]. - FunctionPwm: Servo3Pwm1A, + FunctionPwm, PullNone: Servo3Pwm1A, /// PIO0 Function alias for pin [crate::Pins::servo3]. - FunctionPio0: Servo3Pio0, + FunctionPio0, PullNone: Servo3Pio0, /// PIO1 Function alias for pin [crate::Pins::servo3]. - FunctionPio1: Servo3Pio1 + FunctionPio1, PullNone: Servo3Pio1 } }, @@ -104,11 +104,11 @@ hal::bsp_pins!( name: servo4, aliases: { /// PWM Function alias for pin [crate::Pins::servo4]. - FunctionPwm: Servo4Pwm1B, + FunctionPwm, PullNone: Servo4Pwm1B, /// PIO0 Function alias for pin [crate::Pins::servo4]. - FunctionPio0: Servo4Pio0, + FunctionPio0, PullNone: Servo4Pio0, /// PIO1 Function alias for pin [crate::Pins::servo4]. - FunctionPio1: Servo4Pio1 + FunctionPio1, PullNone: Servo4Pio1 } }, @@ -123,11 +123,11 @@ hal::bsp_pins!( name: servo5, aliases: { /// PWM Function alias for pin [crate::Pins::servo5]. - FunctionPwm: Servo5Pwm2A, + FunctionPwm, PullNone: Servo5Pwm2A, /// PIO0 Function alias for pin [crate::Pins::servo5]. - FunctionPio0: Servo5Pio0, + FunctionPio0, PullNone: Servo5Pio0, /// PIO1 Function alias for pin [crate::Pins::servo5]. - FunctionPio1: Servo5Pio1 + FunctionPio1, PullNone: Servo5Pio1 } }, @@ -142,11 +142,11 @@ hal::bsp_pins!( name: servo6, aliases: { /// PWM Function alias for pin [crate::Pins::servo6]. - FunctionPwm: Servo6Pwm2B, + FunctionPwm, PullNone: Servo6Pwm2B, /// PIO0 Function alias for pin [crate::Pins::servo6]. - FunctionPio0: Servo6Pio0, + FunctionPio0, PullNone: Servo6Pio0, /// PIO1 Function alias for pin [crate::Pins::servo6]. - FunctionPio1: Servo6Pio1 + FunctionPio1, PullNone: Servo6Pio1 } }, @@ -161,11 +161,11 @@ hal::bsp_pins!( name: servo7, aliases: { /// PWM Function alias for pin [crate::Pins::servo7]. - FunctionPwm: Servo7Pwm3A, + FunctionPwm, PullNone: Servo7Pwm3A, /// PIO0 Function alias for pin [crate::Pins::servo7]. - FunctionPio0: Servo7Pio0, + FunctionPio0, PullNone: Servo7Pio0, /// PIO1 Function alias for pin [crate::Pins::servo7]. - FunctionPio1: Servo7Pio1 + FunctionPio1, PullNone: Servo7Pio1 } }, @@ -180,11 +180,11 @@ hal::bsp_pins!( name: servo8, aliases: { /// PWM Function alias for pin [crate::Pins::servo8]. - FunctionPwm: Servo8Pwm3B, + FunctionPwm, PullNone: Servo8Pwm3B, /// PIO0 Function alias for pin [crate::Pins::servo8]. - FunctionPio0: Servo8Pio0, + FunctionPio0, PullNone: Servo8Pio0, /// PIO1 Function alias for pin [crate::Pins::servo8]. - FunctionPio1: Servo8Pio1 + FunctionPio1, PullNone: Servo8Pio1 } }, @@ -199,11 +199,11 @@ hal::bsp_pins!( name: servo9, aliases: { /// PWM Function alias for pin [crate::Pins::servo9]. - FunctionPwm: Servo9Pwm4A, + FunctionPwm, PullNone: Servo9Pwm4A, /// PIO0 Function alias for pin [crate::Pins::servo9]. - FunctionPio0: Servo9Pio0, + FunctionPio0, PullNone: Servo9Pio0, /// PIO1 Function alias for pin [crate::Pins::servo9]. - FunctionPio1: Servo9Pio1 + FunctionPio1, PullNone: Servo9Pio1 } }, @@ -218,11 +218,11 @@ hal::bsp_pins!( name: servo10, aliases: { /// PWM Function alias for pin [crate::Pins::servo10]. - FunctionPwm: Servo10Pwm4B, + FunctionPwm, PullNone: Servo10Pwm4B, /// PIO0 Function alias for pin [crate::Pins::servo10]. - FunctionPio0: Servo10Pio0, + FunctionPio0, PullNone: Servo10Pio0, /// PIO1 Function alias for pin [crate::Pins::servo10]. - FunctionPio1: Servo10Pio1 + FunctionPio1, PullNone: Servo10Pio1 } }, @@ -237,11 +237,11 @@ hal::bsp_pins!( name: servo11, aliases: { /// PWM Function alias for pin [crate::Pins::servo11]. - FunctionPwm: Servo11Pwm5A, + FunctionPwm, PullNone: Servo11Pwm5A, /// PIO0 Function alias for pin [crate::Pins::servo11]. - FunctionPio0: Servo11Pio0, + FunctionPio0, PullNone: Servo11Pio0, /// PIO1 Function alias for pin [crate::Pins::servo11]. - FunctionPio1: Servo11Pio1 + FunctionPio1, PullNone: Servo11Pio1 } }, @@ -256,11 +256,11 @@ hal::bsp_pins!( name: servo12, aliases: { /// PWM Function alias for pin [crate::Pins::servo12]. - FunctionPwm: Servo12Pwm5B, + FunctionPwm, PullNone: Servo12Pwm5B, /// PIO0 Function alias for pin [crate::Pins::servo12]. - FunctionPio0: Servo12Pio0, + FunctionPio0, PullNone: Servo12Pio0, /// PIO1 Function alias for pin [crate::Pins::servo12]. - FunctionPio1: Servo12Pio1 + FunctionPio1, PullNone: Servo12Pio1 } }, @@ -275,11 +275,11 @@ hal::bsp_pins!( name: servo13, aliases: { /// PWM Function alias for pin [crate::Pins::servo13]. - FunctionPwm: Servo13Pwm6A, + FunctionPwm, PullNone: Servo13Pwm6A, /// PIO0 Function alias for pin [crate::Pins::servo13]. - FunctionPio0: Servo13Pio0, + FunctionPio0, PullNone: Servo13Pio0, /// PIO1 Function alias for pin [crate::Pins::servo13]. - FunctionPio1: Servo13Pio1 + FunctionPio1, PullNone: Servo13Pio1 } }, @@ -294,11 +294,11 @@ hal::bsp_pins!( name: servo14, aliases: { /// PWM Function alias for pin [crate::Pins::servo14]. - FunctionPwm: Servo14Pwm6B, + FunctionPwm, PullNone: Servo14Pwm6B, /// PIO0 Function alias for pin [crate::Pins::servo14]. - FunctionPio0: Servo14Pio0, + FunctionPio0, PullNone: Servo14Pio0, /// PIO1 Function alias for pin [crate::Pins::servo14]. - FunctionPio1: Servo14Pio1 + FunctionPio1, PullNone: Servo14Pio1 } }, @@ -313,11 +313,11 @@ hal::bsp_pins!( name: servo15, aliases: { /// PWM Function alias for pin [crate::Pins::servo15]. - FunctionPwm: Servo15Pwm7A, + FunctionPwm, PullNone: Servo15Pwm7A, /// PIO0 Function alias for pin [crate::Pins::servo15]. - FunctionPio0: Servo15Pio0, + FunctionPio0, PullNone: Servo15Pio0, /// PIO1 Function alias for pin [crate::Pins::servo15]. - FunctionPio1: Servo15Pio1 + FunctionPio1, PullNone: Servo15Pio1 } }, @@ -332,11 +332,11 @@ hal::bsp_pins!( name: servo16, aliases: { /// PWM Function alias for pin [crate::Pins::servo16]. - FunctionPwm: Servo16Pwm7B, + FunctionPwm, PullNone: Servo16Pwm7B, /// PIO0 Function alias for pin [crate::Pins::servo16]. - FunctionPio0: Servo16Pio0, + FunctionPio0, PullNone: Servo16Pio0, /// PIO1 Function alias for pin [crate::Pins::servo16]. - FunctionPio1: Servo16Pio1 + FunctionPio1, PullNone: Servo16Pio1 } }, @@ -351,11 +351,11 @@ hal::bsp_pins!( name: servo17, aliases: { /// PWM Function alias for pin [crate::Pins::servo17]. - FunctionPwm: Servo17Pwm0A, + FunctionPwm, PullNone: Servo17Pwm0A, /// PIO0 Function alias for pin [crate::Pins::servo17]. - FunctionPio0: Servo17Pio0, + FunctionPio0, PullNone: Servo17Pio0, /// PIO1 Function alias for pin [crate::Pins::servo17]. - FunctionPio1: Servo17Pio1 + FunctionPio1, PullNone: Servo17Pio1 } }, @@ -370,11 +370,11 @@ hal::bsp_pins!( name: servo18, aliases: { /// PWM Function alias for pin [crate::Pins::servo18]. - FunctionPwm: Servo18Pwm0B, + FunctionPwm, PullNone: Servo18Pwm0B, /// PIO0 Function alias for pin [crate::Pins::servo18]. - FunctionPio0: Servo18Pio0, + FunctionPio0, PullNone: Servo18Pio0, /// PIO1 Function alias for pin [crate::Pins::servo18]. - FunctionPio1: Servo18Pio1 + FunctionPio1, PullNone: Servo18Pio1 } }, @@ -397,17 +397,17 @@ hal::bsp_pins!( name: int_, aliases: { /// UART Function alias for pin [crate::Pins::int_]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::int_]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::int_]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::int_]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::int_]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::int_]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -425,17 +425,17 @@ hal::bsp_pins!( name: sda, aliases: { /// UART Function alias for pin [crate::Pins::sda]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::sda]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::sda]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::sda]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::sda]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::sda]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -453,17 +453,17 @@ hal::bsp_pins!( name: scl, aliases: { /// UART Function alias for pin [crate::Pins::scl]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::scl]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::scl]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::scl]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::scl]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::scl]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -486,17 +486,17 @@ hal::bsp_pins!( name: user_sw, aliases: { /// UART Function alias for pin [crate::Pins::user_sw]. - FunctionUart: Gp23Uart1Rts, + FunctionUart, PullNone: Gp23Uart1Rts, /// SPI Function alias for pin [crate::Pins::user_sw]. - FunctionSpi: Gp23Spi0Tx, + FunctionSpi, PullNone: Gp23Spi0Tx, /// I2C Function alias for pin [crate::Pins::user_sw]. - FunctionI2C: Gp23I2C1Scl, + FunctionI2C, PullUp: Gp23I2C1Scl, /// PWM Function alias for pin [crate::Pins::user_sw]. - FunctionPwm: Gp23Pwm3B, + FunctionPwm, PullNone: Gp23Pwm3B, /// PIO0 Function alias for pin [crate::Pins::user_sw]. - FunctionPio0: Gp23Pio0, + FunctionPio0, PullNone: Gp23Pio0, /// PIO1 Function alias for pin [crate::Pins::user_sw]. - FunctionPio1: Gp23Pio1 + FunctionPio1, PullNone: Gp23Pio1 } }, @@ -524,17 +524,17 @@ hal::bsp_pins!( name: adc0, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -552,17 +552,17 @@ hal::bsp_pins!( name: adc1, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -580,17 +580,17 @@ hal::bsp_pins!( name: adc2, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, diff --git a/boards/pimoroni-tiny2040/src/lib.rs b/boards/pimoroni-tiny2040/src/lib.rs index 12f3746d..8ab22106 100644 --- a/boards/pimoroni-tiny2040/src/lib.rs +++ b/boards/pimoroni-tiny2040/src/lib.rs @@ -32,17 +32,17 @@ hal::bsp_pins!( name: gpio0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx, + FunctionUart, PullNone: Gp0Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio0]. - FunctionSpi: Gp0Spi0Rx, + FunctionSpi, PullNone: Gp0Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio0]. - FunctionI2C: Gp0I2C0Sda, + FunctionI2C, PullUp: Gp0I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio0]. - FunctionPwm: Gp0Pwm0A, + FunctionPwm, PullNone: Gp0Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio0]. - FunctionPio0: Gp0Pio0, + FunctionPio0, PullNone: Gp0Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio0]. - FunctionPio1: Gp0Pio1 + FunctionPio1, PullNone: Gp0Pio1 } }, @@ -60,17 +60,17 @@ hal::bsp_pins!( name: gpio1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx, + FunctionUart, PullNone: Gp1Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio1]. - FunctionSpi: Gp1Spi0Csn, + FunctionSpi, PullNone: Gp1Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio1]. - FunctionI2C: Gp1I2C0Scl, + FunctionI2C, PullUp: Gp1I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio1]. - FunctionPwm: Gp1Pwm0B, + FunctionPwm, PullNone: Gp1Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio1]. - FunctionPio0: Gp1Pio0, + FunctionPio0, PullNone: Gp1Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio1]. - FunctionPio1: Gp1Pio1 + FunctionPio1, PullNone: Gp1Pio1 } }, @@ -88,17 +88,17 @@ hal::bsp_pins!( name: gpio2, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts, + FunctionUart, PullNone: Gp2Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio2]. - FunctionSpi: Gp2Spi0Sck, + FunctionSpi, PullNone: Gp2Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio2]. - FunctionI2C: Gp2I2C1Sda, + FunctionI2C, PullUp: Gp2I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio2]. - FunctionPwm: Gp2Pwm1A, + FunctionPwm, PullNone: Gp2Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio2]. - FunctionPio0: Gp2Pio0, + FunctionPio0, PullNone: Gp2Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio2]. - FunctionPio1: Gp2Pio1 + FunctionPio1, PullNone: Gp2Pio1 } }, @@ -116,17 +116,17 @@ hal::bsp_pins!( name: gpio3, aliases: { /// UART Function alias for pin [crate::Pins::gpio3]. - FunctionUart: Gp3Uart0Rts, + FunctionUart, PullNone: Gp3Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio3]. - FunctionSpi: Gp3Spi0Tx, + FunctionSpi, PullNone: Gp3Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio3]. - FunctionI2C: Gp3I2C1Scl, + FunctionI2C, PullUp: Gp3I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio3]. - FunctionPwm: Gp3Pwm1B, + FunctionPwm, PullNone: Gp3Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio3]. - FunctionPio0: Gp3Pio0, + FunctionPio0, PullNone: Gp3Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio3]. - FunctionPio1: Gp3Pio1 + FunctionPio1, PullNone: Gp3Pio1 } }, @@ -144,17 +144,17 @@ hal::bsp_pins!( name: gpio4, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -172,17 +172,17 @@ hal::bsp_pins!( name: gpio5, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -200,17 +200,17 @@ hal::bsp_pins!( name: gpio6, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -228,17 +228,17 @@ hal::bsp_pins!( name: gpio7, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -276,17 +276,17 @@ hal::bsp_pins!( name: gpio26, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -304,17 +304,17 @@ hal::bsp_pins!( name: gpio27, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -332,17 +332,17 @@ hal::bsp_pins!( name: gpio28, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, @@ -360,17 +360,17 @@ hal::bsp_pins!( name: gpio29, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp29Uart0Rx, + FunctionUart, PullNone: Gp29Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp29Spi1Csn, + FunctionSpi, PullNone: Gp29Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp29I2C0Scl, + FunctionI2C, PullUp: Gp29I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp29Pwm6B, + FunctionPwm, PullNone: Gp29Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp29Pio0, + FunctionPio0, PullNone: Gp29Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp29Pio1 + FunctionPio1, PullNone: Gp29Pio1 } }, ); diff --git a/boards/pimoroni_badger2040/src/lib.rs b/boards/pimoroni_badger2040/src/lib.rs index dc252545..de66d394 100644 --- a/boards/pimoroni_badger2040/src/lib.rs +++ b/boards/pimoroni_badger2040/src/lib.rs @@ -20,14 +20,14 @@ hal::bsp_pins!( name: gpio0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: UartTx + FunctionUart, PullNone: UartTx } }, Gpio1 { name: gpio1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: UartRx + FunctionUart, PullNone: UartRx } }, Gpio3 { name: i2c_int }, @@ -35,14 +35,14 @@ hal::bsp_pins!( name: gpio4, aliases: { /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: I2cSda + FunctionI2C, PullUp: I2cSda } }, Gpio5 { name: gpio5, aliases: { /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: I2cScl + FunctionI2C, PullUp: I2cScl } }, Gpio10 { name: p3v3_en }, @@ -55,28 +55,28 @@ hal::bsp_pins!( name: miso, aliases: { /// SPI Function alias for pin [crate::Pins::gpio16]. - FunctionSpi: Miso + FunctionSpi, PullNone: Miso } }, Gpio17 { name: inky_cs_gpio, aliases: { /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: InkyCs + FunctionSpi, PullNone: InkyCs } }, Gpio18 { name: sclk, aliases: { /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Sclk + FunctionSpi, PullNone: Sclk } }, Gpio19 { name: mosi, aliases: { /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Mosi + FunctionSpi, PullNone: Mosi } }, Gpio20 { name: inky_dc }, diff --git a/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs b/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs index f68cb737..31dafb83 100644 --- a/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs +++ b/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs @@ -121,8 +121,8 @@ fn main() -> ! { ); // Configure two pins as being I²C, not GPIO - let sda_pin = pins.gpio16.into_mode::(); - let scl_pin = pins.gpio17.into_mode::(); + let sda_pin = pins.gpio16.into_function::(); + let scl_pin = pins.gpio17.into_function::(); // Create the I²C driver, using the two pre-configured pins. This will fail // at compile time if the pins are in the wrong mode, or if this I²C diff --git a/boards/rp-pico/examples/pico_i2c_pio.rs b/boards/rp-pico/examples/pico_i2c_pio.rs index 0ee03b00..85692076 100644 --- a/boards/rp-pico/examples/pico_i2c_pio.rs +++ b/boards/rp-pico/examples/pico_i2c_pio.rs @@ -93,9 +93,9 @@ fn main() -> ! { let uart_pins = ( // UART TX (characters sent from RP2040) on pin 1 (GPIO0) - pins.gpio0.into_mode::(), + pins.gpio0.into_function::(), // UART RX (characters received by RP2040) on pin 2 (GPIO1) - pins.gpio1.into_mode::(), + pins.gpio1.into_function::(), ); let mut uart = hal::uart::UartPeripheral::new(pac.UART0, uart_pins, &mut pac.RESETS) diff --git a/boards/rp-pico/examples/pico_pio_pwm.rs b/boards/rp-pico/examples/pico_pio_pwm.rs index 770b63c6..1c5bb2cf 100644 --- a/boards/rp-pico/examples/pico_pio_pwm.rs +++ b/boards/rp-pico/examples/pico_pio_pwm.rs @@ -133,7 +133,7 @@ fn main() -> ! { let installed = pio0.install(&program.program).unwrap(); // Set gpio25 to pio - let _led: hal::gpio::Pin<_, hal::gpio::FunctionPio0> = pins.led.into_mode(); + let _led: hal::gpio::Pin<_, hal::gpio::FunctionPio0, hal::gpio::PullNone> = pins.led.into(); let led_pin_id = 25; // Build the pio program and set pin both for set and side set! diff --git a/boards/rp-pico/examples/pico_rtic.rs b/boards/rp-pico/examples/pico_rtic.rs index 96306047..318842ab 100644 --- a/boards/rp-pico/examples/pico_rtic.rs +++ b/boards/rp-pico/examples/pico_rtic.rs @@ -19,7 +19,11 @@ mod app { struct Shared { timer: hal::Timer, alarm: hal::timer::Alarm0, - led: hal::gpio::Pin, + led: hal::gpio::Pin< + hal::gpio::bank0::Gpio25, + hal::gpio::FunctionSioOutput, + hal::gpio::PullNone, + >, } #[local] @@ -53,7 +57,7 @@ mod app { sio.gpio_bank0, &mut resets, ); - let mut led = pins.led.into_push_pull_output(); + let mut led = pins.led.into(); led.set_low().unwrap(); let mut timer = hal::Timer::new(c.device.TIMER, &mut resets, &clocks); diff --git a/boards/rp-pico/examples/pico_spi_sd_card.rs b/boards/rp-pico/examples/pico_spi_sd_card.rs index e941cae9..7d3a449c 100644 --- a/boards/rp-pico/examples/pico_spi_sd_card.rs +++ b/boards/rp-pico/examples/pico_spi_sd_card.rs @@ -239,13 +239,13 @@ fn main() -> ! { let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz()); // These are implicitly used by the spi driver if they are in the correct mode - let _spi_sclk = pins.gpio2.into_mode::(); - let _spi_mosi = pins.gpio3.into_mode::(); - let _spi_miso = pins.gpio4.into_mode::(); + let spi_sclk = pins.gpio2.into_function::(); + let spi_mosi = pins.gpio3.into_function::(); + let spi_miso = pins.gpio4.into_function::(); let spi_cs = pins.gpio5.into_push_pull_output(); // Create an SPI driver instance for the SPI0 device - let spi = spi::Spi::<_, _, 8>::new(pac.SPI0); + let spi = spi::Spi::<_, _, _, 8>::new(pac.SPI0, (spi_mosi, spi_miso, spi_sclk)); // Exchange the uninitialised SPI driver for an initialised one let spi = spi.init( diff --git a/boards/rp-pico/examples/pico_uart_irq_buffer.rs b/boards/rp-pico/examples/pico_uart_irq_buffer.rs index c4681d9b..f1d96d8f 100644 --- a/boards/rp-pico/examples/pico_uart_irq_buffer.rs +++ b/boards/rp-pico/examples/pico_uart_irq_buffer.rs @@ -53,15 +53,15 @@ use critical_section::Mutex; use heapless::spsc::Queue; /// Import the GPIO pins we use -use hal::gpio::pin::bank0::{Gpio0, Gpio1}; +use hal::gpio::bank0::{Gpio0, Gpio1}; // UART related types use hal::uart::{DataBits, StopBits, UartConfig}; /// Alias the type for our UART pins to make things clearer. type UartPins = ( - hal::gpio::Pin>, - hal::gpio::Pin>, + hal::gpio::Pin, + hal::gpio::Pin, ); /// Alias the type for our UART to make things clearer. @@ -128,9 +128,9 @@ fn main() -> ! { let uart_pins = ( // UART TX (characters sent from RP2040) on pin 1 (GPIO0) - pins.gpio0.into_mode::(), + pins.gpio0.into(), // UART RX (characters received by RP2040) on pin 2 (GPIO1) - pins.gpio1.into_mode::(), + pins.gpio1.into(), ); // Make a UART on the given pins diff --git a/boards/rp-pico/examples/pico_uart_irq_echo.rs b/boards/rp-pico/examples/pico_uart_irq_echo.rs index fdf69185..590d3c80 100644 --- a/boards/rp-pico/examples/pico_uart_irq_echo.rs +++ b/boards/rp-pico/examples/pico_uart_irq_echo.rs @@ -50,15 +50,15 @@ use core::cell::RefCell; use critical_section::Mutex; /// Import the GPIO pins we use -use hal::gpio::pin::bank0::{Gpio0, Gpio1}; +use hal::gpio::bank0::{Gpio0, Gpio1}; // UART related types use hal::uart::{DataBits, StopBits, UartConfig}; /// Alias the type for our UART pins to make things clearer. type UartPins = ( - hal::gpio::Pin>, - hal::gpio::Pin>, + hal::gpio::Pin, + hal::gpio::Pin, ); /// Alias the type for our UART to make things clearer. @@ -112,9 +112,9 @@ fn main() -> ! { let uart_pins = ( // UART TX (characters sent from RP2040) on pin 1 (GPIO0) - pins.gpio0.into_mode::(), + pins.gpio0.into(), // UART RX (characters received by RP2040) on pin 2 (GPIO1) - pins.gpio1.into_mode::(), + pins.gpio1.into(), ); // Make a UART on the given pins diff --git a/boards/rp-pico/examples/pico_ws2812_led.rs b/boards/rp-pico/examples/pico_ws2812_led.rs index 883eb637..7772e614 100644 --- a/boards/rp-pico/examples/pico_ws2812_led.rs +++ b/boards/rp-pico/examples/pico_ws2812_led.rs @@ -129,7 +129,7 @@ fn main() -> ! { let mut ws = Ws2812::new( // Use pin 6 on the Raspberry Pi Pico (which is GPIO4 of the rp2040 chip) // for the LED data output: - pins.gpio4.into_mode(), + pins.gpio4.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/rp-pico/src/lib.rs b/boards/rp-pico/src/lib.rs index 1b574f49..fc7602a8 100644 --- a/boards/rp-pico/src/lib.rs +++ b/boards/rp-pico/src/lib.rs @@ -83,17 +83,17 @@ hal::bsp_pins!( name: gpio0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx, + FunctionUart, PullNone: Gp0Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio0]. - FunctionSpi: Gp0Spi0Rx, + FunctionSpi, PullNone: Gp0Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio0]. - FunctionI2C: Gp0I2C0Sda, + FunctionI2C, PullUp: Gp0I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio0]. - FunctionPwm: Gp0Pwm0A, + FunctionPwm, PullNone: Gp0Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio0]. - FunctionPio0: Gp0Pio0, + FunctionPio0, PullNone: Gp0Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio0]. - FunctionPio1: Gp0Pio1 + FunctionPio1, PullNone: Gp0Pio1 } }, @@ -111,17 +111,17 @@ hal::bsp_pins!( name: gpio1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx, + FunctionUart, PullNone: Gp1Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio1]. - FunctionSpi: Gp1Spi0Csn, + FunctionSpi, PullNone: Gp1Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio1]. - FunctionI2C: Gp1I2C0Scl, + FunctionI2C, PullUp: Gp1I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio1]. - FunctionPwm: Gp1Pwm0B, + FunctionPwm, PullNone: Gp1Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio1]. - FunctionPio0: Gp1Pio0, + FunctionPio0, PullNone: Gp1Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio1]. - FunctionPio1: Gp1Pio1 + FunctionPio1, PullNone: Gp1Pio1 } }, @@ -139,17 +139,17 @@ hal::bsp_pins!( name: gpio2, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts, + FunctionUart, PullNone: Gp2Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio2]. - FunctionSpi: Gp2Spi0Sck, + FunctionSpi, PullNone: Gp2Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio2]. - FunctionI2C: Gp2I2C1Sda, + FunctionI2C, PullUp: Gp2I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio2]. - FunctionPwm: Gp2Pwm1A, + FunctionPwm, PullNone: Gp2Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio2]. - FunctionPio0: Gp2Pio0, + FunctionPio0, PullNone: Gp2Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio2]. - FunctionPio1: Gp2Pio1 + FunctionPio1, PullNone: Gp2Pio1 } }, @@ -167,17 +167,17 @@ hal::bsp_pins!( name: gpio3, aliases: { /// UART Function alias for pin [crate::Pins::gpio3]. - FunctionUart: Gp3Uart0Rts, + FunctionUart, PullNone: Gp3Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio3]. - FunctionSpi: Gp3Spi0Tx, + FunctionSpi, PullNone: Gp3Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio3]. - FunctionI2C: Gp3I2C1Scl, + FunctionI2C, PullUp: Gp3I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio3]. - FunctionPwm: Gp3Pwm1B, + FunctionPwm, PullNone: Gp3Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio3]. - FunctionPio0: Gp3Pio0, + FunctionPio0, PullNone: Gp3Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio3]. - FunctionPio1: Gp3Pio1 + FunctionPio1, PullNone: Gp3Pio1 } }, @@ -195,17 +195,17 @@ hal::bsp_pins!( name: gpio4, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -223,17 +223,17 @@ hal::bsp_pins!( name: gpio5, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -251,17 +251,17 @@ hal::bsp_pins!( name: gpio6, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -279,17 +279,17 @@ hal::bsp_pins!( name: gpio7, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -307,17 +307,17 @@ hal::bsp_pins!( name: gpio8, aliases: { /// UART Function alias for pin [crate::Pins::gpio8]. - FunctionUart: Gp8Uart1Tx, + FunctionUart, PullNone: Gp8Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio8]. - FunctionSpi: Gp8Spi1Rx, + FunctionSpi, PullNone: Gp8Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio8]. - FunctionI2C: Gp8I2C0Sda, + FunctionI2C, PullUp: Gp8I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio8]. - FunctionPwm: Gp8Pwm4A, + FunctionPwm, PullNone: Gp8Pwm4A, /// PIO0 Function alias for pin [crate::Pins::gpio8]. - FunctionPio0: Gp8Pio0, + FunctionPio0, PullNone: Gp8Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio8]. - FunctionPio1: Gp8Pio1 + FunctionPio1, PullNone: Gp8Pio1 } }, @@ -335,17 +335,17 @@ hal::bsp_pins!( name: gpio9, aliases: { /// UART Function alias for pin [crate::Pins::gpio9]. - FunctionUart: Gp9Uart1Rx, + FunctionUart, PullNone: Gp9Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio9]. - FunctionSpi: Gp9Spi1Csn, + FunctionSpi, PullNone: Gp9Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio9]. - FunctionI2C: Gp9I2C0Scl, + FunctionI2C, PullUp: Gp9I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio9]. - FunctionPwm: Gp9Pwm4B, + FunctionPwm, PullNone: Gp9Pwm4B, /// PIO0 Function alias for pin [crate::Pins::gpio9]. - FunctionPio0: Gp9Pio0, + FunctionPio0, PullNone: Gp9Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio9]. - FunctionPio1: Gp9Pio1 + FunctionPio1, PullNone: Gp9Pio1 } }, @@ -363,17 +363,17 @@ hal::bsp_pins!( name: gpio10, aliases: { /// UART Function alias for pin [crate::Pins::gpio10]. - FunctionUart: Gp10Uart1Cts, + FunctionUart, PullNone: Gp10Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio10]. - FunctionSpi: Gp10Spi1Sck, + FunctionSpi, PullNone: Gp10Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio10]. - FunctionI2C: Gp10I2C1Sda, + FunctionI2C, PullUp: Gp10I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio10]. - FunctionPwm: Gp10Pwm5A, + FunctionPwm, PullNone: Gp10Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio10]. - FunctionPio0: Gp10Pio0, + FunctionPio0, PullNone: Gp10Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio10]. - FunctionPio1: Gp10Pio1 + FunctionPio1, PullNone: Gp10Pio1 } }, @@ -391,17 +391,17 @@ hal::bsp_pins!( name: gpio11, aliases: { /// UART Function alias for pin [crate::Pins::gpio11]. - FunctionUart: Gp11Uart1Rts, + FunctionUart, PullNone: Gp11Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio11]. - FunctionSpi: Gp11Spi1Tx, + FunctionSpi, PullNone: Gp11Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio11]. - FunctionI2C: Gp11I2C1Scl, + FunctionI2C, PullUp: Gp11I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio11]. - FunctionPwm: Gp11Pwm5B, + FunctionPwm, PullNone: Gp11Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio11]. - FunctionPio0: Gp11Pio0, + FunctionPio0, PullNone: Gp11Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio11]. - FunctionPio1: Gp11Pio1 + FunctionPio1, PullNone: Gp11Pio1 } }, @@ -419,17 +419,17 @@ hal::bsp_pins!( name: gpio12, aliases: { /// UART Function alias for pin [crate::Pins::gpio12]. - FunctionUart: Gp12Uart0Tx, + FunctionUart, PullNone: Gp12Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio12]. - FunctionSpi: Gp12Spi1Rx, + FunctionSpi, PullNone: Gp12Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio12]. - FunctionI2C: Gp12I2C0Sda, + FunctionI2C, PullUp: Gp12I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio12]. - FunctionPwm: Gp12Pwm6A, + FunctionPwm, PullNone: Gp12Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio12]. - FunctionPio0: Gp12Pio0, + FunctionPio0, PullNone: Gp12Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio12]. - FunctionPio1: Gp12Pio1 + FunctionPio1, PullNone: Gp12Pio1 } }, @@ -447,17 +447,17 @@ hal::bsp_pins!( name: gpio13, aliases: { /// UART Function alias for pin [crate::Pins::gpio13]. - FunctionUart: Gp13Uart0Rx, + FunctionUart, PullNone: Gp13Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio13]. - FunctionSpi: Gp13Spi1Csn, + FunctionSpi, PullNone: Gp13Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio13]. - FunctionI2C: Gp13I2C0Scl, + FunctionI2C, PullUp: Gp13I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio13]. - FunctionPwm: Gp13Pwm6B, + FunctionPwm, PullNone: Gp13Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio13]. - FunctionPio0: Gp13Pio0, + FunctionPio0, PullNone: Gp13Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio13]. - FunctionPio1: Gp13Pio1 + FunctionPio1, PullNone: Gp13Pio1 } }, @@ -475,17 +475,17 @@ hal::bsp_pins!( name: gpio14, aliases: { /// UART Function alias for pin [crate::Pins::gpio14]. - FunctionUart: Gp14Uart0Cts, + FunctionUart, PullNone: Gp14Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio14]. - FunctionSpi: Gp14Spi1Sck, + FunctionSpi, PullNone: Gp14Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio14]. - FunctionI2C: Gp14I2C1Sda, + FunctionI2C, PullUp: Gp14I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio14]. - FunctionPwm: Gp14Pwm7A, + FunctionPwm, PullNone: Gp14Pwm7A, /// PIO0 Function alias for pin [crate::Pins::gpio14]. - FunctionPio0: Gp14Pio0, + FunctionPio0, PullNone: Gp14Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio14]. - FunctionPio1: Gp14Pio1 + FunctionPio1, PullNone: Gp14Pio1 } }, @@ -503,17 +503,17 @@ hal::bsp_pins!( name: gpio15, aliases: { /// UART Function alias for pin [crate::Pins::gpio15]. - FunctionUart: Gp15Uart0Rts, + FunctionUart, PullNone: Gp15Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio15]. - FunctionSpi: Gp15Spi1Tx, + FunctionSpi, PullNone: Gp15Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio15]. - FunctionI2C: Gp15I2C1Scl, + FunctionI2C, PullUp: Gp15I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio15]. - FunctionPwm: Gp15Pwm7B, + FunctionPwm, PullNone: Gp15Pwm7B, /// PIO0 Function alias for pin [crate::Pins::gpio15]. - FunctionPio0: Gp15Pio0, + FunctionPio0, PullNone: Gp15Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio15]. - FunctionPio1: Gp15Pio1 + FunctionPio1, PullNone: Gp15Pio1 } }, @@ -531,17 +531,17 @@ hal::bsp_pins!( name: gpio16, aliases: { /// UART Function alias for pin [crate::Pins::gpio16]. - FunctionUart: Gp16Uart0Tx, + FunctionUart, PullNone: Gp16Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio16]. - FunctionSpi: Gp16Spi0Rx, + FunctionSpi, PullNone: Gp16Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio16]. - FunctionI2C: Gp16I2C0Sda, + FunctionI2C, PullUp: Gp16I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio16]. - FunctionPwm: Gp16Pwm0A, + FunctionPwm, PullNone: Gp16Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio16]. - FunctionPio0: Gp16Pio0, + FunctionPio0, PullNone: Gp16Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio16]. - FunctionPio1: Gp16Pio1 + FunctionPio1, PullNone: Gp16Pio1 } }, @@ -559,17 +559,17 @@ hal::bsp_pins!( name: gpio17, aliases: { /// UART Function alias for pin [crate::Pins::gpio17]. - FunctionUart: Gp17Uart0Rx, + FunctionUart, PullNone: Gp17Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: Gp17Spi0Csn, + FunctionSpi, PullNone: Gp17Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio17]. - FunctionI2C: Gp17I2C0Scl, + FunctionI2C, PullUp: Gp17I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio17]. - FunctionPwm: Gp17Pwm0B, + FunctionPwm, PullNone: Gp17Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio17]. - FunctionPio0: Gp17Pio0, + FunctionPio0, PullNone: Gp17Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio17]. - FunctionPio1: Gp17Pio1 + FunctionPio1, PullNone: Gp17Pio1 } }, @@ -587,17 +587,17 @@ hal::bsp_pins!( name: gpio18, aliases: { /// UART Function alias for pin [crate::Pins::gpio18]. - FunctionUart: Gp18Uart0Cts, + FunctionUart, PullNone: Gp18Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Gp18Spi0Sck, + FunctionSpi, PullNone: Gp18Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio18]. - FunctionI2C: Gp18I2C1Sda, + FunctionI2C, PullUp: Gp18I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio18]. - FunctionPwm: Gp18Pwm1A, + FunctionPwm, PullNone: Gp18Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio18]. - FunctionPio0: Gp18Pio0, + FunctionPio0, PullNone: Gp18Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio18]. - FunctionPio1: Gp18Pio1 + FunctionPio1, PullNone: Gp18Pio1 } }, @@ -615,17 +615,17 @@ hal::bsp_pins!( name: gpio19, aliases: { /// UART Function alias for pin [crate::Pins::gpio19]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio19]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio19]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio19]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio19]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -643,17 +643,17 @@ hal::bsp_pins!( name: gpio20, aliases: { /// UART Function alias for pin [crate::Pins::gpio20]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio20]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio20]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio20]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio20]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio20]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -671,17 +671,17 @@ hal::bsp_pins!( name: gpio21, aliases: { /// UART Function alias for pin [crate::Pins::gpio21]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio21]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio21]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio21]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio21]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio21]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -699,17 +699,17 @@ hal::bsp_pins!( name: gpio22, aliases: { /// UART Function alias for pin [crate::Pins::gpio22]. - FunctionUart: Gp22Uart1Cts, + FunctionUart, PullNone: Gp22Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio22]. - FunctionSpi: Gp22Spi0Sck, + FunctionSpi, PullNone: Gp22Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio22]. - FunctionI2C: Gp22I2C1Sda, + FunctionI2C, PullUp: Gp22I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio22]. - FunctionPwm: Gp22Pwm3A, + FunctionPwm, PullNone: Gp22Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio22]. - FunctionPio0: Gp22Pio0, + FunctionPio0, PullNone: Gp22Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio22]. - FunctionPio1: Gp22Pio1 + FunctionPio1, PullNone: Gp22Pio1 } }, @@ -742,17 +742,17 @@ hal::bsp_pins!( name: gpio26, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -770,17 +770,17 @@ hal::bsp_pins!( name: gpio27, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -798,17 +798,17 @@ hal::bsp_pins!( name: gpio28, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, diff --git a/boards/seeeduino-xiao-rp2040/src/lib.rs b/boards/seeeduino-xiao-rp2040/src/lib.rs index f80e3b0f..4089178c 100644 --- a/boards/seeeduino-xiao-rp2040/src/lib.rs +++ b/boards/seeeduino-xiao-rp2040/src/lib.rs @@ -20,45 +20,45 @@ pub use hal::pac; hal::bsp_pins!( Gpio0 { name: tx, - aliases: { FunctionUart: UartTx } + aliases: { FunctionUart, PullNone: UartTx } }, Gpio1 { name: rx - aliases: { FunctionUart: UartRx, FunctionSpi: Csn } + aliases: { FunctionUart, PullNone: UartRx, FunctionSpi, PullNone: Csn } }, Gpio2 { name: sck, - aliases: { FunctionSpi: Sck } + aliases: { FunctionSpi, PullNone: Sck } }, Gpio3 { name: mosi, - aliases: { FunctionSpi: Mosi } + aliases: { FunctionSpi, PullNone: Mosi } }, Gpio4 { name: miso, - aliases: { FunctionSpi: Miso } + aliases: { FunctionSpi, PullNone: Miso } }, Gpio6 { name: sda, - aliases: { FunctionI2C: Sda } + aliases: { FunctionI2C, PullUp: Sda } }, Gpio7 { name: scl, - aliases: { FunctionI2C: Scl } + aliases: { FunctionI2C, PullUp: Scl } }, Gpio11 { name: neopixel_power }, Gpio12 { name: neopixel_data }, Gpio16 { name: led_green, - aliases: { FunctionPwm: LedGreenPwm } + aliases: { FunctionPwm, PullNone: LedGreenPwm } }, Gpio17 { name: led_red, - aliases: { FunctionPwm: LedRedPwm } + aliases: { FunctionPwm, PullNone: LedRedPwm } }, Gpio25 { name: led_blue, - aliases: { FunctionPwm: LedBluePwm } + aliases: { FunctionPwm, PullNone: LedBluePwm } }, Gpio26 { name: a0 }, Gpio27 { name: a1 }, diff --git a/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs b/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs index 52be1da0..42f01623 100644 --- a/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs +++ b/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_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 #21 on the RP2040 Stamp. - pins.neopixel.into_mode(), + pins.neopixel.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs b/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs index 0b08ad8e..d498163e 100644 --- a/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs +++ b/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs @@ -69,7 +69,7 @@ fn main() -> ! { // Configure the addressable LED let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS); let mut ws = Ws2812::new( - pins.led.into_mode(), + pins.led.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs b/boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs index 292c693a..ea8d0ccd 100644 --- a/boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs +++ b/boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs @@ -68,7 +68,7 @@ fn main() -> ! { // Configure the addressable LED let (mut pio, sm0, _, _, _) = pac.PIO0.split(&mut pac.RESETS); let mut ws = Ws2812::new( - pins.ws2812.into_mode(), + pins.ws2812.into_function(), &mut pio, sm0, clocks.peripheral_clock.freq(), diff --git a/boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_neopixel_rainbow.rs b/boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_neopixel_rainbow.rs index c434c5ee..2c6a7034 100644 --- a/boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_neopixel_rainbow.rs +++ b/boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_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/vcc-gnd-yd-rp2040/src/lib.rs b/boards/vcc-gnd-yd-rp2040/src/lib.rs index acbe9657..4e5fa100 100644 --- a/boards/vcc-gnd-yd-rp2040/src/lib.rs +++ b/boards/vcc-gnd-yd-rp2040/src/lib.rs @@ -32,17 +32,17 @@ hal::bsp_pins!( name: gpio0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx, + FunctionUart, PullNone: Gp0Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio0]. - FunctionSpi: Gp0Spi0Rx, + FunctionSpi, PullNone: Gp0Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio0]. - FunctionI2C: Gp0I2C0Sda, + FunctionI2C, PullUp: Gp0I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio0]. - FunctionPwm: Gp0Pwm0A, + FunctionPwm, PullNone: Gp0Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio0]. - FunctionPio0: Gp0Pio0, + FunctionPio0, PullNone: Gp0Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio0]. - FunctionPio1: Gp0Pio1 + FunctionPio1, PullNone: Gp0Pio1 } }, @@ -60,17 +60,17 @@ hal::bsp_pins!( name: gpio1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx, + FunctionUart, PullNone: Gp1Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio1]. - FunctionSpi: Gp1Spi0Csn, + FunctionSpi, PullNone: Gp1Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio1]. - FunctionI2C: Gp1I2C0Scl, + FunctionI2C, PullUp: Gp1I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio1]. - FunctionPwm: Gp1Pwm0B, + FunctionPwm, PullNone: Gp1Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio1]. - FunctionPio0: Gp1Pio0, + FunctionPio0, PullNone: Gp1Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio1]. - FunctionPio1: Gp1Pio1 + FunctionPio1, PullNone: Gp1Pio1 } }, @@ -88,17 +88,17 @@ hal::bsp_pins!( name: gpio2, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts, + FunctionUart, PullNone: Gp2Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio2]. - FunctionSpi: Gp2Spi0Sck, + FunctionSpi, PullNone: Gp2Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio2]. - FunctionI2C: Gp2I2C1Sda, + FunctionI2C, PullUp: Gp2I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio2]. - FunctionPwm: Gp2Pwm1A, + FunctionPwm, PullNone: Gp2Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio2]. - FunctionPio0: Gp2Pio0, + FunctionPio0, PullNone: Gp2Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio2]. - FunctionPio1: Gp2Pio1 + FunctionPio1, PullNone: Gp2Pio1 } }, @@ -116,17 +116,17 @@ hal::bsp_pins!( name: gpio3, aliases: { /// UART Function alias for pin [crate::Pins::gpio3]. - FunctionUart: Gp3Uart0Rts, + FunctionUart, PullNone: Gp3Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio3]. - FunctionSpi: Gp3Spi0Tx, + FunctionSpi, PullNone: Gp3Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio3]. - FunctionI2C: Gp3I2C1Scl, + FunctionI2C, PullUp: Gp3I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio3]. - FunctionPwm: Gp3Pwm1B, + FunctionPwm, PullNone: Gp3Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio3]. - FunctionPio0: Gp3Pio0, + FunctionPio0, PullNone: Gp3Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio3]. - FunctionPio1: Gp3Pio1 + FunctionPio1, PullNone: Gp3Pio1 } }, @@ -144,17 +144,17 @@ hal::bsp_pins!( name: gpio4, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -172,17 +172,17 @@ hal::bsp_pins!( name: gpio5, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -200,17 +200,17 @@ hal::bsp_pins!( name: gpio6, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -228,17 +228,17 @@ hal::bsp_pins!( name: gpio7, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -256,17 +256,17 @@ hal::bsp_pins!( name: gpio8, aliases: { /// UART Function alias for pin [crate::Pins::gpio8]. - FunctionUart: Gp8Uart1Tx, + FunctionUart, PullNone: Gp8Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio8]. - FunctionSpi: Gp8Spi1Rx, + FunctionSpi, PullNone: Gp8Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio8]. - FunctionI2C: Gp8I2C0Sda, + FunctionI2C, PullUp: Gp8I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio8]. - FunctionPwm: Gp8Pwm4A, + FunctionPwm, PullNone: Gp8Pwm4A, /// PIO0 Function alias for pin [crate::Pins::gpio8]. - FunctionPio0: Gp8Pio0, + FunctionPio0, PullNone: Gp8Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio8]. - FunctionPio1: Gp8Pio1 + FunctionPio1, PullNone: Gp8Pio1 } }, @@ -284,17 +284,17 @@ hal::bsp_pins!( name: gpio9, aliases: { /// UART Function alias for pin [crate::Pins::gpio9]. - FunctionUart: Gp9Uart1Rx, + FunctionUart, PullNone: Gp9Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio9]. - FunctionSpi: Gp9Spi1Csn, + FunctionSpi, PullNone: Gp9Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio9]. - FunctionI2C: Gp9I2C0Scl, + FunctionI2C, PullUp: Gp9I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio9]. - FunctionPwm: Gp9Pwm4B, + FunctionPwm, PullNone: Gp9Pwm4B, /// PIO0 Function alias for pin [crate::Pins::gpio9]. - FunctionPio0: Gp9Pio0, + FunctionPio0, PullNone: Gp9Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio9]. - FunctionPio1: Gp9Pio1 + FunctionPio1, PullNone: Gp9Pio1 } }, @@ -312,17 +312,17 @@ hal::bsp_pins!( name: gpio10, aliases: { /// UART Function alias for pin [crate::Pins::gpio10]. - FunctionUart: Gp10Uart1Cts, + FunctionUart, PullNone: Gp10Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio10]. - FunctionSpi: Gp10Spi1Sck, + FunctionSpi, PullNone: Gp10Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio10]. - FunctionI2C: Gp10I2C1Sda, + FunctionI2C, PullUp: Gp10I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio10]. - FunctionPwm: Gp10Pwm5A, + FunctionPwm, PullNone: Gp10Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio10]. - FunctionPio0: Gp10Pio0, + FunctionPio0, PullNone: Gp10Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio10]. - FunctionPio1: Gp10Pio1 + FunctionPio1, PullNone: Gp10Pio1 } }, @@ -340,17 +340,17 @@ hal::bsp_pins!( name: gpio11, aliases: { /// UART Function alias for pin [crate::Pins::gpio11]. - FunctionUart: Gp11Uart1Rts, + FunctionUart, PullNone: Gp11Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio11]. - FunctionSpi: Gp11Spi1Tx, + FunctionSpi, PullNone: Gp11Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio11]. - FunctionI2C: Gp11I2C1Scl, + FunctionI2C, PullUp: Gp11I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio11]. - FunctionPwm: Gp11Pwm5B, + FunctionPwm, PullNone: Gp11Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio11]. - FunctionPio0: Gp11Pio0, + FunctionPio0, PullNone: Gp11Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio11]. - FunctionPio1: Gp11Pio1 + FunctionPio1, PullNone: Gp11Pio1 } }, @@ -368,17 +368,17 @@ hal::bsp_pins!( name: gpio12, aliases: { /// UART Function alias for pin [crate::Pins::gpio12]. - FunctionUart: Gp12Uart0Tx, + FunctionUart, PullNone: Gp12Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio12]. - FunctionSpi: Gp12Spi1Rx, + FunctionSpi, PullNone: Gp12Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio12]. - FunctionI2C: Gp12I2C0Sda, + FunctionI2C, PullUp: Gp12I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio12]. - FunctionPwm: Gp12Pwm6A, + FunctionPwm, PullNone: Gp12Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio12]. - FunctionPio0: Gp12Pio0, + FunctionPio0, PullNone: Gp12Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio12]. - FunctionPio1: Gp12Pio1 + FunctionPio1, PullNone: Gp12Pio1 } }, @@ -396,17 +396,17 @@ hal::bsp_pins!( name: gpio13, aliases: { /// UART Function alias for pin [crate::Pins::gpio13]. - FunctionUart: Gp13Uart0Rx, + FunctionUart, PullNone: Gp13Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio13]. - FunctionSpi: Gp13Spi1Csn, + FunctionSpi, PullNone: Gp13Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio13]. - FunctionI2C: Gp13I2C0Scl, + FunctionI2C, PullUp: Gp13I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio13]. - FunctionPwm: Gp13Pwm6B, + FunctionPwm, PullNone: Gp13Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio13]. - FunctionPio0: Gp13Pio0, + FunctionPio0, PullNone: Gp13Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio13]. - FunctionPio1: Gp13Pio1 + FunctionPio1, PullNone: Gp13Pio1 } }, @@ -424,17 +424,17 @@ hal::bsp_pins!( name: gpio14, aliases: { /// UART Function alias for pin [crate::Pins::gpio14]. - FunctionUart: Gp14Uart0Cts, + FunctionUart, PullNone: Gp14Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio14]. - FunctionSpi: Gp14Spi1Sck, + FunctionSpi, PullNone: Gp14Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio14]. - FunctionI2C: Gp14I2C1Sda, + FunctionI2C, PullUp: Gp14I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio14]. - FunctionPwm: Gp14Pwm7A, + FunctionPwm, PullNone: Gp14Pwm7A, /// PIO0 Function alias for pin [crate::Pins::gpio14]. - FunctionPio0: Gp14Pio0, + FunctionPio0, PullNone: Gp14Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio14]. - FunctionPio1: Gp14Pio1 + FunctionPio1, PullNone: Gp14Pio1 } }, @@ -452,17 +452,17 @@ hal::bsp_pins!( name: gpio15, aliases: { /// UART Function alias for pin [crate::Pins::gpio15]. - FunctionUart: Gp15Uart0Rts, + FunctionUart, PullNone: Gp15Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio15]. - FunctionSpi: Gp15Spi1Tx, + FunctionSpi, PullNone: Gp15Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio15]. - FunctionI2C: Gp15I2C1Scl, + FunctionI2C, PullUp: Gp15I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio15]. - FunctionPwm: Gp15Pwm7B, + FunctionPwm, PullNone: Gp15Pwm7B, /// PIO0 Function alias for pin [crate::Pins::gpio15]. - FunctionPio0: Gp15Pio0, + FunctionPio0, PullNone: Gp15Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio15]. - FunctionPio1: Gp15Pio1 + FunctionPio1, PullNone: Gp15Pio1 } }, @@ -480,17 +480,17 @@ hal::bsp_pins!( name: gpio16, aliases: { /// UART Function alias for pin [crate::Pins::gpio16]. - FunctionUart: Gp16Uart0Tx, + FunctionUart, PullNone: Gp16Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio16]. - FunctionSpi: Gp16Spi0Rx, + FunctionSpi, PullNone: Gp16Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio16]. - FunctionI2C: Gp16I2C0Sda, + FunctionI2C, PullUp: Gp16I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio16]. - FunctionPwm: Gp16Pwm0A, + FunctionPwm, PullNone: Gp16Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio16]. - FunctionPio0: Gp16Pio0, + FunctionPio0, PullNone: Gp16Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio16]. - FunctionPio1: Gp16Pio1 + FunctionPio1, PullNone: Gp16Pio1 } }, @@ -508,17 +508,17 @@ hal::bsp_pins!( name: gpio17, aliases: { /// UART Function alias for pin [crate::Pins::gpio17]. - FunctionUart: Gp17Uart0Rx, + FunctionUart, PullNone: Gp17Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: Gp17Spi0Csn, + FunctionSpi, PullNone: Gp17Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio17]. - FunctionI2C: Gp17I2C0Scl, + FunctionI2C, PullUp: Gp17I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio17]. - FunctionPwm: Gp17Pwm0B, + FunctionPwm, PullNone: Gp17Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio17]. - FunctionPio0: Gp17Pio0, + FunctionPio0, PullNone: Gp17Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio17]. - FunctionPio1: Gp17Pio1 + FunctionPio1, PullNone: Gp17Pio1 } }, @@ -536,17 +536,17 @@ hal::bsp_pins!( name: gpio18, aliases: { /// UART Function alias for pin [crate::Pins::gpio18]. - FunctionUart: Gp18Uart0Cts, + FunctionUart, PullNone: Gp18Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Gp18Spi0Sck, + FunctionSpi, PullNone: Gp18Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio18]. - FunctionI2C: Gp18I2C1Sda, + FunctionI2C, PullUp: Gp18I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio18]. - FunctionPwm: Gp18Pwm1A, + FunctionPwm, PullNone: Gp18Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio18]. - FunctionPio0: Gp18Pio0, + FunctionPio0, PullNone: Gp18Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio18]. - FunctionPio1: Gp18Pio1 + FunctionPio1, PullNone: Gp18Pio1 } }, @@ -564,17 +564,17 @@ hal::bsp_pins!( name: gpio19, aliases: { /// UART Function alias for pin [crate::Pins::gpio19]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio19]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio19]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio19]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio19]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -592,17 +592,17 @@ hal::bsp_pins!( name: gpio20, aliases: { /// UART Function alias for pin [crate::Pins::gpio20]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio20]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio20]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio20]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio20]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio20]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -620,17 +620,17 @@ hal::bsp_pins!( name: gpio21, aliases: { /// UART Function alias for pin [crate::Pins::gpio21]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio21]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio21]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio21]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio21]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio21]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -648,17 +648,17 @@ hal::bsp_pins!( name: gpio22, aliases: { /// UART Function alias for pin [crate::Pins::gpio22]. - FunctionUart: Gp22Uart1Cts, + FunctionUart, PullNone: Gp22Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio22]. - FunctionSpi: Gp22Spi0Sck, + FunctionSpi, PullNone: Gp22Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio22]. - FunctionI2C: Gp22I2C1Sda, + FunctionI2C, PullUp: Gp22I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio22]. - FunctionPwm: Gp22Pwm3A, + FunctionPwm, PullNone: Gp22Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio22]. - FunctionPio0: Gp22Pio0, + FunctionPio0, PullNone: Gp22Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio22]. - FunctionPio1: Gp22Pio1 + FunctionPio1, PullNone: Gp22Pio1 } }, @@ -691,17 +691,17 @@ hal::bsp_pins!( name: gpio26, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -719,17 +719,17 @@ hal::bsp_pins!( name: gpio27, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -747,17 +747,17 @@ hal::bsp_pins!( name: gpio28, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, @@ -766,17 +766,17 @@ hal::bsp_pins!( name: gpio29, aliases: { /// UART Function alias for pin [crate::Pins::gpio29]. - FunctionUart: Gp29Uart0Rx, + FunctionUart, PullNone: Gp29Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio29]. - FunctionSpi: Gp29Spi1Csn, + FunctionSpi, PullNone: Gp29Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio29]. - FunctionI2C: Gp29I2C0Scl, + FunctionI2C, PullUp: Gp29I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio29]. - FunctionPwm: Gp29Pwm6B, + FunctionPwm, PullNone: Gp29Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio29]. - FunctionPio0: Gp29Pio0, + FunctionPio0, PullNone: Gp29Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio29]. - FunctionPio1: Gp29Pio1 + FunctionPio1, PullNone: Gp29Pio1 } }, ); diff --git a/boards/waveshare-rp2040-lcd-0-96/examples/waveshare_rp2040_lcd_demo.rs b/boards/waveshare-rp2040-lcd-0-96/examples/waveshare_rp2040_lcd_demo.rs index 64c79742..ac0c5f6a 100644 --- a/boards/waveshare-rp2040-lcd-0-96/examples/waveshare_rp2040_lcd_demo.rs +++ b/boards/waveshare-rp2040-lcd-0-96/examples/waveshare_rp2040_lcd_demo.rs @@ -70,9 +70,8 @@ fn main() -> ! { // https://www.waveshare.com/wiki/RP2040-LCD-0.96 // ST7735S LCD let lcd_dc = pins.gp8.into_push_pull_output(); - let mut _lcd_cs = pins.gp9.into_mode::(); - let mut _lcd_clk = pins.gp10.into_mode::(); - let mut _lcd_mosi = pins.gp11.into_mode::(); + let lcd_clk = pins.gp10.into_function::(); + let lcd_mosi = pins.gp11.into_function::(); let lcd_rst = pins .gp12 .into_push_pull_output_in_state(hal::gpio::PinState::High); @@ -80,7 +79,7 @@ fn main() -> ! { .gp25 .into_push_pull_output_in_state(hal::gpio::PinState::High); - let spi = hal::Spi::<_, _, 8>::new(pac.SPI1); + let spi = hal::Spi::<_, _, _, 8>::new(pac.SPI1, (lcd_mosi, lcd_clk)); // Exchange the uninitialised SPI driver for an initialised one let spi = spi.init( diff --git a/boards/waveshare-rp2040-lcd-0-96/src/lib.rs b/boards/waveshare-rp2040-lcd-0-96/src/lib.rs index f9adbe2a..3556a898 100644 --- a/boards/waveshare-rp2040-lcd-0-96/src/lib.rs +++ b/boards/waveshare-rp2040-lcd-0-96/src/lib.rs @@ -32,17 +32,17 @@ hal::bsp_pins!( name: gp0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx, + FunctionUart, PullNone: Gp0Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio0]. - FunctionSpi: Gp0Spi0Rx, + FunctionSpi, PullNone: Gp0Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio0]. - FunctionI2C: Gp0I2C0Sda, + FunctionI2C, PullUp: Gp0I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio0]. - FunctionPwm: Gp0Pwm0A, + FunctionPwm, PullNone: Gp0Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio0]. - FunctionPio0: Gp0Pio0, + FunctionPio0, PullNone: Gp0Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio0]. - FunctionPio1: Gp0Pio1 + FunctionPio1, PullNone: Gp0Pio1 } }, @@ -60,17 +60,17 @@ hal::bsp_pins!( name: gp1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx, + FunctionUart, PullNone: Gp1Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio1]. - FunctionSpi: Gp1Spi0Csn, + FunctionSpi, PullNone: Gp1Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio1]. - FunctionI2C: Gp1I2C0Scl, + FunctionI2C, PullUp: Gp1I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio1]. - FunctionPwm: Gp1Pwm0B, + FunctionPwm, PullNone: Gp1Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio1]. - FunctionPio0: Gp1Pio0, + FunctionPio0, PullNone: Gp1Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio1]. - FunctionPio1: Gp1Pio1 + FunctionPio1, PullNone: Gp1Pio1 } }, @@ -88,17 +88,17 @@ hal::bsp_pins!( name: gp2, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts, + FunctionUart, PullNone: Gp2Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio2]. - FunctionSpi: Gp2Spi0Sck, + FunctionSpi, PullNone: Gp2Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio2]. - FunctionI2C: Gp2I2C1Sda, + FunctionI2C, PullUp: Gp2I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio2]. - FunctionPwm: Gp2Pwm1A, + FunctionPwm, PullNone: Gp2Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio2]. - FunctionPio0: Gp2Pio0, + FunctionPio0, PullNone: Gp2Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio2]. - FunctionPio1: Gp2Pio1 + FunctionPio1, PullNone: Gp2Pio1 } }, @@ -116,17 +116,17 @@ hal::bsp_pins!( name: gp3, aliases: { /// UART Function alias for pin [crate::Pins::gpio3]. - FunctionUart: Gp3Uart0Rts, + FunctionUart, PullNone: Gp3Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio3]. - FunctionSpi: Gp3Spi0Tx, + FunctionSpi, PullNone: Gp3Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio3]. - FunctionI2C: Gp3I2C1Scl, + FunctionI2C, PullUp: Gp3I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio3]. - FunctionPwm: Gp3Pwm1B, + FunctionPwm, PullNone: Gp3Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio3]. - FunctionPio0: Gp3Pio0, + FunctionPio0, PullNone: Gp3Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio3]. - FunctionPio1: Gp3Pio1 + FunctionPio1, PullNone: Gp3Pio1 } }, @@ -144,17 +144,17 @@ hal::bsp_pins!( name: gp4, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -172,17 +172,17 @@ hal::bsp_pins!( name: gp5, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -200,17 +200,17 @@ hal::bsp_pins!( name: gp6, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -228,17 +228,17 @@ hal::bsp_pins!( name: gp7, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -256,17 +256,17 @@ hal::bsp_pins!( name: gp8, aliases: { /// UART Function alias for pin [crate::Pins::gpio8]. - FunctionUart: Gp8Uart1Tx, + FunctionUart, PullNone: Gp8Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio8]. - FunctionSpi: Gp8Spi1Rx, + FunctionSpi, PullNone: Gp8Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio8]. - FunctionI2C: Gp8I2C0Sda, + FunctionI2C, PullUp: Gp8I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio8]. - FunctionPwm: Gp8Pwm4A, + FunctionPwm, PullNone: Gp8Pwm4A, /// PIO0 Function alias for pin [crate::Pins::gpio8]. - FunctionPio0: Gp8Pio0, + FunctionPio0, PullNone: Gp8Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio8]. - FunctionPio1: Gp8Pio1 + FunctionPio1, PullNone: Gp8Pio1 } }, @@ -284,17 +284,17 @@ hal::bsp_pins!( name: gp9, aliases: { /// UART Function alias for pin [crate::Pins::gpio9]. - FunctionUart: Gp9Uart1Rx, + FunctionUart, PullNone: Gp9Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio9]. - FunctionSpi: Gp9Spi1Csn, + FunctionSpi, PullNone: Gp9Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio9]. - FunctionI2C: Gp9I2C0Scl, + FunctionI2C, PullUp: Gp9I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio9]. - FunctionPwm: Gp9Pwm4B, + FunctionPwm, PullNone: Gp9Pwm4B, /// PIO0 Function alias for pin [crate::Pins::gpio9]. - FunctionPio0: Gp9Pio0, + FunctionPio0, PullNone: Gp9Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio9]. - FunctionPio1: Gp9Pio1 + FunctionPio1, PullNone: Gp9Pio1 } }, @@ -312,17 +312,17 @@ hal::bsp_pins!( name: gp10, aliases: { /// UART Function alias for pin [crate::Pins::gpio10]. - FunctionUart: Gp10Uart1Cts, + FunctionUart, PullNone: Gp10Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio10]. - FunctionSpi: Gp10Spi1Sck, + FunctionSpi, PullNone: Gp10Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio10]. - FunctionI2C: Gp10I2C1Sda, + FunctionI2C, PullUp: Gp10I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio10]. - FunctionPwm: Gp10Pwm5A, + FunctionPwm, PullNone: Gp10Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio10]. - FunctionPio0: Gp10Pio0, + FunctionPio0, PullNone: Gp10Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio10]. - FunctionPio1: Gp10Pio1 + FunctionPio1, PullNone: Gp10Pio1 } }, @@ -340,17 +340,17 @@ hal::bsp_pins!( name: gp11, aliases: { /// UART Function alias for pin [crate::Pins::gpio11]. - FunctionUart: Gp11Uart1Rts, + FunctionUart, PullNone: Gp11Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio11]. - FunctionSpi: Gp11Spi1Tx, + FunctionSpi, PullNone: Gp11Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio11]. - FunctionI2C: Gp11I2C1Scl, + FunctionI2C, PullUp: Gp11I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio11]. - FunctionPwm: Gp11Pwm5B, + FunctionPwm, PullNone: Gp11Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio11]. - FunctionPio0: Gp11Pio0, + FunctionPio0, PullNone: Gp11Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio11]. - FunctionPio1: Gp11Pio1 + FunctionPio1, PullNone: Gp11Pio1 } }, @@ -368,17 +368,17 @@ hal::bsp_pins!( name: gp12, aliases: { /// UART Function alias for pin [crate::Pins::gpio12]. - FunctionUart: Gp12Uart0Tx, + FunctionUart, PullNone: Gp12Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio12]. - FunctionSpi: Gp12Spi1Rx, + FunctionSpi, PullNone: Gp12Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio12]. - FunctionI2C: Gp12I2C0Sda, + FunctionI2C, PullUp: Gp12I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio12]. - FunctionPwm: Gp12Pwm6A, + FunctionPwm, PullNone: Gp12Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio12]. - FunctionPio0: Gp12Pio0, + FunctionPio0, PullNone: Gp12Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio12]. - FunctionPio1: Gp12Pio1 + FunctionPio1, PullNone: Gp12Pio1 } }, @@ -396,17 +396,17 @@ hal::bsp_pins!( name: gp13, aliases: { /// UART Function alias for pin [crate::Pins::gpio13]. - FunctionUart: Gp13Uart0Rx, + FunctionUart, PullNone: Gp13Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio13]. - FunctionSpi: Gp13Spi1Csn, + FunctionSpi, PullNone: Gp13Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio13]. - FunctionI2C: Gp13I2C0Scl, + FunctionI2C, PullUp: Gp13I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio13]. - FunctionPwm: Gp13Pwm6B, + FunctionPwm, PullNone: Gp13Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio13]. - FunctionPio0: Gp13Pio0, + FunctionPio0, PullNone: Gp13Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio13]. - FunctionPio1: Gp13Pio1 + FunctionPio1, PullNone: Gp13Pio1 } }, @@ -424,17 +424,17 @@ hal::bsp_pins!( name: gp14, aliases: { /// UART Function alias for pin [crate::Pins::gpio14]. - FunctionUart: Gp14Uart0Cts, + FunctionUart, PullNone: Gp14Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio14]. - FunctionSpi: Gp14Spi1Sck, + FunctionSpi, PullNone: Gp14Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio14]. - FunctionI2C: Gp14I2C1Sda, + FunctionI2C, PullUp: Gp14I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio14]. - FunctionPwm: Gp14Pwm7A, + FunctionPwm, PullNone: Gp14Pwm7A, /// PIO0 Function alias for pin [crate::Pins::gpio14]. - FunctionPio0: Gp14Pio0, + FunctionPio0, PullNone: Gp14Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio14]. - FunctionPio1: Gp14Pio1 + FunctionPio1, PullNone: Gp14Pio1 } }, @@ -452,17 +452,17 @@ hal::bsp_pins!( name: gp15, aliases: { /// UART Function alias for pin [crate::Pins::gpio15]. - FunctionUart: Gp15Uart0Rts, + FunctionUart, PullNone: Gp15Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio15]. - FunctionSpi: Gp15Spi1Tx, + FunctionSpi, PullNone: Gp15Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio15]. - FunctionI2C: Gp15I2C1Scl, + FunctionI2C, PullUp: Gp15I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio15]. - FunctionPwm: Gp15Pwm7B, + FunctionPwm, PullNone: Gp15Pwm7B, /// PIO0 Function alias for pin [crate::Pins::gpio15]. - FunctionPio0: Gp15Pio0, + FunctionPio0, PullNone: Gp15Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio15]. - FunctionPio1: Gp15Pio1 + FunctionPio1, PullNone: Gp15Pio1 } }, @@ -483,17 +483,17 @@ hal::bsp_pins!( name: gpio17, aliases: { /// UART Function alias for pin [crate::Pins::gpio17]. - FunctionUart: Gp17Uart0Rx, + FunctionUart, PullNone: Gp17Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: Gp17Spi0Csn, + FunctionSpi, PullNone: Gp17Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio17]. - FunctionI2C: Gp17I2C0Scl, + FunctionI2C, PullUp: Gp17I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio17]. - FunctionPwm: Gp17Pwm0B, + FunctionPwm, PullNone: Gp17Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio17]. - FunctionPio0: Gp17Pio0, + FunctionPio0, PullNone: Gp17Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio17]. - FunctionPio1: Gp17Pio1 + FunctionPio1, PullNone: Gp17Pio1 } }, @@ -511,17 +511,17 @@ hal::bsp_pins!( name: gpio18, aliases: { /// UART Function alias for pin [crate::Pins::gpio18]. - FunctionUart: Gp18Uart0Cts, + FunctionUart, PullNone: Gp18Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Gp18Spi0Sck, + FunctionSpi, PullNone: Gp18Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio18]. - FunctionI2C: Gp18I2C1Sda, + FunctionI2C, PullUp: Gp18I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio18]. - FunctionPwm: Gp18Pwm1A, + FunctionPwm, PullNone: Gp18Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio18]. - FunctionPio0: Gp18Pio0, + FunctionPio0, PullNone: Gp18Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio18]. - FunctionPio1: Gp18Pio1 + FunctionPio1, PullNone: Gp18Pio1 } }, @@ -539,17 +539,17 @@ hal::bsp_pins!( name: gpio19, aliases: { /// UART Function alias for pin [crate::Pins::gpio19]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio19]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio19]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio19]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio19]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -567,17 +567,17 @@ hal::bsp_pins!( name: gpio20, aliases: { /// UART Function alias for pin [crate::Pins::gpio20]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio20]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio20]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio20]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio20]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio20]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -595,17 +595,17 @@ hal::bsp_pins!( name: gpio21, aliases: { /// UART Function alias for pin [crate::Pins::gpio21]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio21]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio21]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio21]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio21]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio21]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -623,17 +623,17 @@ hal::bsp_pins!( name: gpio22, aliases: { /// UART Function alias for pin [crate::Pins::gpio22]. - FunctionUart: Gp22Uart1Cts, + FunctionUart, PullNone: Gp22Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio22]. - FunctionSpi: Gp22Spi0Sck, + FunctionSpi, PullNone: Gp22Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio22]. - FunctionI2C: Gp22I2C1Sda, + FunctionI2C, PullUp: Gp22I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio22]. - FunctionPwm: Gp22Pwm3A, + FunctionPwm, PullNone: Gp22Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio22]. - FunctionPio0: Gp22Pio0, + FunctionPio0, PullNone: Gp22Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio22]. - FunctionPio1: Gp22Pio1 + FunctionPio1, PullNone: Gp22Pio1 } }, @@ -641,12 +641,12 @@ hal::bsp_pins!( Gpio23 { name: gp23, aliases: { - FunctionUart: Gp23Uart1Rts, - FunctionSpi: Gp23Spi0Tx, - FunctionI2C: Gp23I2C1Scl, - FunctionPwm: Gp23Pwm3B, - FunctionPio0: Gp23Pio0, - FunctionPio1: Gp23Pio1 + FunctionUart, PullNone: Gp23Uart1Rts, + FunctionSpi, PullNone: Gp23Spi0Tx, + FunctionI2C, PullUp: Gp23I2C1Scl, + FunctionPwm, PullNone: Gp23Pwm3B, + FunctionPio0, PullNone: Gp23Pio0, + FunctionPio1, PullNone: Gp23Pio1 } }, @@ -654,12 +654,12 @@ hal::bsp_pins!( Gpio24 { name: gp24, aliases: { - FunctionUart: Gp24Uart1Tx, - FunctionSpi: Gp24Spi1Rx, - FunctionI2C: Gp24I2C0Sda, - FunctionPwm: Gp24Pwm4A, - FunctionPio0: Gp24Pio0, - FunctionPio1: Gp24Pio1 + FunctionUart, PullNone: Gp24Uart1Tx, + FunctionSpi, PullNone: Gp24Spi1Rx, + FunctionI2C, PullUp: Gp24I2C0Sda, + FunctionPwm, PullNone: Gp24Pwm4A, + FunctionPio0, PullNone: Gp24Pio0, + FunctionPio1, PullNone: Gp24Pio1 } }, @@ -667,12 +667,12 @@ hal::bsp_pins!( Gpio25 { name: gp25, aliases: { - FunctionUart: Gp25Uart1Rx, - FunctionSpi: Gp25Spi1Csn, - FunctionI2C: Gp25I2C0Scl, - FunctionPwm: Gp25Pwm4B, - FunctionPio0: Gp25Pio0, - FunctionPio1: Gp25Pio1 + FunctionUart, PullNone: Gp25Uart1Rx, + FunctionSpi, PullNone: Gp25Spi1Csn, + FunctionI2C, PullUp: Gp25I2C0Scl, + FunctionPwm, PullNone: Gp25Pwm4B, + FunctionPio0, PullNone: Gp25Pio0, + FunctionPio1, PullNone: Gp25Pio1 } }, @@ -692,17 +692,17 @@ hal::bsp_pins!( name: gp26, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -722,17 +722,17 @@ hal::bsp_pins!( name: gp27, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -752,17 +752,17 @@ hal::bsp_pins!( name: gp28, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, @@ -772,12 +772,12 @@ hal::bsp_pins!( Gpio29 { name: gp29, aliases: { - FunctionUart: Gp29Uart0Rx, - FunctionSpi: Gp29Spi1Csn, - FunctionI2C: Gp29I2C0Scl, - FunctionPwm: Gp29Pwm6B, - FunctionPio0: Gp29Pio0, - FunctionPio1: Gp29Pio1 + FunctionUart, PullNone: Gp29Uart0Rx, + FunctionSpi, PullNone: Gp29Spi1Csn, + FunctionI2C, PullUp: Gp29I2C0Scl, + FunctionPwm, PullNone: Gp29Pwm6B, + FunctionPio0, PullNone: Gp29Pio0, + FunctionPio1, PullNone: Gp29Pio1 } }, ); diff --git a/boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_neopixel_rainbow.rs b/boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_neopixel_rainbow.rs index 1d7f9f46..f8fd12dc 100644 --- a/boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_neopixel_rainbow.rs +++ b/boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_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/waveshare-rp2040-zero/src/lib.rs b/boards/waveshare-rp2040-zero/src/lib.rs index f9adbe2a..3556a898 100644 --- a/boards/waveshare-rp2040-zero/src/lib.rs +++ b/boards/waveshare-rp2040-zero/src/lib.rs @@ -32,17 +32,17 @@ hal::bsp_pins!( name: gp0, aliases: { /// UART Function alias for pin [crate::Pins::gpio0]. - FunctionUart: Gp0Uart0Tx, + FunctionUart, PullNone: Gp0Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio0]. - FunctionSpi: Gp0Spi0Rx, + FunctionSpi, PullNone: Gp0Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio0]. - FunctionI2C: Gp0I2C0Sda, + FunctionI2C, PullUp: Gp0I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio0]. - FunctionPwm: Gp0Pwm0A, + FunctionPwm, PullNone: Gp0Pwm0A, /// PIO0 Function alias for pin [crate::Pins::gpio0]. - FunctionPio0: Gp0Pio0, + FunctionPio0, PullNone: Gp0Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio0]. - FunctionPio1: Gp0Pio1 + FunctionPio1, PullNone: Gp0Pio1 } }, @@ -60,17 +60,17 @@ hal::bsp_pins!( name: gp1, aliases: { /// UART Function alias for pin [crate::Pins::gpio1]. - FunctionUart: Gp1Uart0Rx, + FunctionUart, PullNone: Gp1Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio1]. - FunctionSpi: Gp1Spi0Csn, + FunctionSpi, PullNone: Gp1Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio1]. - FunctionI2C: Gp1I2C0Scl, + FunctionI2C, PullUp: Gp1I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio1]. - FunctionPwm: Gp1Pwm0B, + FunctionPwm, PullNone: Gp1Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio1]. - FunctionPio0: Gp1Pio0, + FunctionPio0, PullNone: Gp1Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio1]. - FunctionPio1: Gp1Pio1 + FunctionPio1, PullNone: Gp1Pio1 } }, @@ -88,17 +88,17 @@ hal::bsp_pins!( name: gp2, aliases: { /// UART Function alias for pin [crate::Pins::gpio2]. - FunctionUart: Gp2Uart0Cts, + FunctionUart, PullNone: Gp2Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio2]. - FunctionSpi: Gp2Spi0Sck, + FunctionSpi, PullNone: Gp2Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio2]. - FunctionI2C: Gp2I2C1Sda, + FunctionI2C, PullUp: Gp2I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio2]. - FunctionPwm: Gp2Pwm1A, + FunctionPwm, PullNone: Gp2Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio2]. - FunctionPio0: Gp2Pio0, + FunctionPio0, PullNone: Gp2Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio2]. - FunctionPio1: Gp2Pio1 + FunctionPio1, PullNone: Gp2Pio1 } }, @@ -116,17 +116,17 @@ hal::bsp_pins!( name: gp3, aliases: { /// UART Function alias for pin [crate::Pins::gpio3]. - FunctionUart: Gp3Uart0Rts, + FunctionUart, PullNone: Gp3Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio3]. - FunctionSpi: Gp3Spi0Tx, + FunctionSpi, PullNone: Gp3Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio3]. - FunctionI2C: Gp3I2C1Scl, + FunctionI2C, PullUp: Gp3I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio3]. - FunctionPwm: Gp3Pwm1B, + FunctionPwm, PullNone: Gp3Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio3]. - FunctionPio0: Gp3Pio0, + FunctionPio0, PullNone: Gp3Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio3]. - FunctionPio1: Gp3Pio1 + FunctionPio1, PullNone: Gp3Pio1 } }, @@ -144,17 +144,17 @@ hal::bsp_pins!( name: gp4, aliases: { /// UART Function alias for pin [crate::Pins::gpio4]. - FunctionUart: Gp4Uart1Tx, + FunctionUart, PullNone: Gp4Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio4]. - FunctionSpi: Gp4Spi0Rx, + FunctionSpi, PullNone: Gp4Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio4]. - FunctionI2C: Gp4I2C0Sda, + FunctionI2C, PullUp: Gp4I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio4]. - FunctionPwm: Gp4Pwm2A, + FunctionPwm, PullNone: Gp4Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio4]. - FunctionPio0: Gp4Pio0, + FunctionPio0, PullNone: Gp4Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio4]. - FunctionPio1: Gp4Pio1 + FunctionPio1, PullNone: Gp4Pio1 } }, @@ -172,17 +172,17 @@ hal::bsp_pins!( name: gp5, aliases: { /// UART Function alias for pin [crate::Pins::gpio5]. - FunctionUart: Gp5Uart1Rx, + FunctionUart, PullNone: Gp5Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio5]. - FunctionSpi: Gp5Spi0Csn, + FunctionSpi, PullNone: Gp5Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio5]. - FunctionI2C: Gp5I2C0Scl, + FunctionI2C, PullUp: Gp5I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio5]. - FunctionPwm: Gp5Pwm2B, + FunctionPwm, PullNone: Gp5Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio5]. - FunctionPio0: Gp5Pio0, + FunctionPio0, PullNone: Gp5Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio5]. - FunctionPio1: Gp5Pio1 + FunctionPio1, PullNone: Gp5Pio1 } }, @@ -200,17 +200,17 @@ hal::bsp_pins!( name: gp6, aliases: { /// UART Function alias for pin [crate::Pins::gpio6]. - FunctionUart: Gp6Uart1Cts, + FunctionUart, PullNone: Gp6Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio6]. - FunctionSpi: Gp6Spi0Sck, + FunctionSpi, PullNone: Gp6Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio6]. - FunctionI2C: Gp6I2C1Sda, + FunctionI2C, PullUp: Gp6I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio6]. - FunctionPwm: Gp6Pwm3A, + FunctionPwm, PullNone: Gp6Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio6]. - FunctionPio0: Gp6Pio0, + FunctionPio0, PullNone: Gp6Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio6]. - FunctionPio1: Gp6Pio1 + FunctionPio1, PullNone: Gp6Pio1 } }, @@ -228,17 +228,17 @@ hal::bsp_pins!( name: gp7, aliases: { /// UART Function alias for pin [crate::Pins::gpio7]. - FunctionUart: Gp7Uart1Rts, + FunctionUart, PullNone: Gp7Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio7]. - FunctionSpi: Gp7Spi0Tx, + FunctionSpi, PullNone: Gp7Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio7]. - FunctionI2C: Gp7I2C1Scl, + FunctionI2C, PullUp: Gp7I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio7]. - FunctionPwm: Gp7Pwm3B, + FunctionPwm, PullNone: Gp7Pwm3B, /// PIO0 Function alias for pin [crate::Pins::gpio7]. - FunctionPio0: Gp7Pio0, + FunctionPio0, PullNone: Gp7Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio7]. - FunctionPio1: Gp7Pio1 + FunctionPio1, PullNone: Gp7Pio1 } }, @@ -256,17 +256,17 @@ hal::bsp_pins!( name: gp8, aliases: { /// UART Function alias for pin [crate::Pins::gpio8]. - FunctionUart: Gp8Uart1Tx, + FunctionUart, PullNone: Gp8Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio8]. - FunctionSpi: Gp8Spi1Rx, + FunctionSpi, PullNone: Gp8Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio8]. - FunctionI2C: Gp8I2C0Sda, + FunctionI2C, PullUp: Gp8I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio8]. - FunctionPwm: Gp8Pwm4A, + FunctionPwm, PullNone: Gp8Pwm4A, /// PIO0 Function alias for pin [crate::Pins::gpio8]. - FunctionPio0: Gp8Pio0, + FunctionPio0, PullNone: Gp8Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio8]. - FunctionPio1: Gp8Pio1 + FunctionPio1, PullNone: Gp8Pio1 } }, @@ -284,17 +284,17 @@ hal::bsp_pins!( name: gp9, aliases: { /// UART Function alias for pin [crate::Pins::gpio9]. - FunctionUart: Gp9Uart1Rx, + FunctionUart, PullNone: Gp9Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio9]. - FunctionSpi: Gp9Spi1Csn, + FunctionSpi, PullNone: Gp9Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio9]. - FunctionI2C: Gp9I2C0Scl, + FunctionI2C, PullUp: Gp9I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio9]. - FunctionPwm: Gp9Pwm4B, + FunctionPwm, PullNone: Gp9Pwm4B, /// PIO0 Function alias for pin [crate::Pins::gpio9]. - FunctionPio0: Gp9Pio0, + FunctionPio0, PullNone: Gp9Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio9]. - FunctionPio1: Gp9Pio1 + FunctionPio1, PullNone: Gp9Pio1 } }, @@ -312,17 +312,17 @@ hal::bsp_pins!( name: gp10, aliases: { /// UART Function alias for pin [crate::Pins::gpio10]. - FunctionUart: Gp10Uart1Cts, + FunctionUart, PullNone: Gp10Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio10]. - FunctionSpi: Gp10Spi1Sck, + FunctionSpi, PullNone: Gp10Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio10]. - FunctionI2C: Gp10I2C1Sda, + FunctionI2C, PullUp: Gp10I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio10]. - FunctionPwm: Gp10Pwm5A, + FunctionPwm, PullNone: Gp10Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio10]. - FunctionPio0: Gp10Pio0, + FunctionPio0, PullNone: Gp10Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio10]. - FunctionPio1: Gp10Pio1 + FunctionPio1, PullNone: Gp10Pio1 } }, @@ -340,17 +340,17 @@ hal::bsp_pins!( name: gp11, aliases: { /// UART Function alias for pin [crate::Pins::gpio11]. - FunctionUart: Gp11Uart1Rts, + FunctionUart, PullNone: Gp11Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio11]. - FunctionSpi: Gp11Spi1Tx, + FunctionSpi, PullNone: Gp11Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio11]. - FunctionI2C: Gp11I2C1Scl, + FunctionI2C, PullUp: Gp11I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio11]. - FunctionPwm: Gp11Pwm5B, + FunctionPwm, PullNone: Gp11Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio11]. - FunctionPio0: Gp11Pio0, + FunctionPio0, PullNone: Gp11Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio11]. - FunctionPio1: Gp11Pio1 + FunctionPio1, PullNone: Gp11Pio1 } }, @@ -368,17 +368,17 @@ hal::bsp_pins!( name: gp12, aliases: { /// UART Function alias for pin [crate::Pins::gpio12]. - FunctionUart: Gp12Uart0Tx, + FunctionUart, PullNone: Gp12Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio12]. - FunctionSpi: Gp12Spi1Rx, + FunctionSpi, PullNone: Gp12Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio12]. - FunctionI2C: Gp12I2C0Sda, + FunctionI2C, PullUp: Gp12I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio12]. - FunctionPwm: Gp12Pwm6A, + FunctionPwm, PullNone: Gp12Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio12]. - FunctionPio0: Gp12Pio0, + FunctionPio0, PullNone: Gp12Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio12]. - FunctionPio1: Gp12Pio1 + FunctionPio1, PullNone: Gp12Pio1 } }, @@ -396,17 +396,17 @@ hal::bsp_pins!( name: gp13, aliases: { /// UART Function alias for pin [crate::Pins::gpio13]. - FunctionUart: Gp13Uart0Rx, + FunctionUart, PullNone: Gp13Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio13]. - FunctionSpi: Gp13Spi1Csn, + FunctionSpi, PullNone: Gp13Spi1Csn, /// I2C Function alias for pin [crate::Pins::gpio13]. - FunctionI2C: Gp13I2C0Scl, + FunctionI2C, PullUp: Gp13I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio13]. - FunctionPwm: Gp13Pwm6B, + FunctionPwm, PullNone: Gp13Pwm6B, /// PIO0 Function alias for pin [crate::Pins::gpio13]. - FunctionPio0: Gp13Pio0, + FunctionPio0, PullNone: Gp13Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio13]. - FunctionPio1: Gp13Pio1 + FunctionPio1, PullNone: Gp13Pio1 } }, @@ -424,17 +424,17 @@ hal::bsp_pins!( name: gp14, aliases: { /// UART Function alias for pin [crate::Pins::gpio14]. - FunctionUart: Gp14Uart0Cts, + FunctionUart, PullNone: Gp14Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio14]. - FunctionSpi: Gp14Spi1Sck, + FunctionSpi, PullNone: Gp14Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio14]. - FunctionI2C: Gp14I2C1Sda, + FunctionI2C, PullUp: Gp14I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio14]. - FunctionPwm: Gp14Pwm7A, + FunctionPwm, PullNone: Gp14Pwm7A, /// PIO0 Function alias for pin [crate::Pins::gpio14]. - FunctionPio0: Gp14Pio0, + FunctionPio0, PullNone: Gp14Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio14]. - FunctionPio1: Gp14Pio1 + FunctionPio1, PullNone: Gp14Pio1 } }, @@ -452,17 +452,17 @@ hal::bsp_pins!( name: gp15, aliases: { /// UART Function alias for pin [crate::Pins::gpio15]. - FunctionUart: Gp15Uart0Rts, + FunctionUart, PullNone: Gp15Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio15]. - FunctionSpi: Gp15Spi1Tx, + FunctionSpi, PullNone: Gp15Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio15]. - FunctionI2C: Gp15I2C1Scl, + FunctionI2C, PullUp: Gp15I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio15]. - FunctionPwm: Gp15Pwm7B, + FunctionPwm, PullNone: Gp15Pwm7B, /// PIO0 Function alias for pin [crate::Pins::gpio15]. - FunctionPio0: Gp15Pio0, + FunctionPio0, PullNone: Gp15Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio15]. - FunctionPio1: Gp15Pio1 + FunctionPio1, PullNone: Gp15Pio1 } }, @@ -483,17 +483,17 @@ hal::bsp_pins!( name: gpio17, aliases: { /// UART Function alias for pin [crate::Pins::gpio17]. - FunctionUart: Gp17Uart0Rx, + FunctionUart, PullNone: Gp17Uart0Rx, /// SPI Function alias for pin [crate::Pins::gpio17]. - FunctionSpi: Gp17Spi0Csn, + FunctionSpi, PullNone: Gp17Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio17]. - FunctionI2C: Gp17I2C0Scl, + FunctionI2C, PullUp: Gp17I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio17]. - FunctionPwm: Gp17Pwm0B, + FunctionPwm, PullNone: Gp17Pwm0B, /// PIO0 Function alias for pin [crate::Pins::gpio17]. - FunctionPio0: Gp17Pio0, + FunctionPio0, PullNone: Gp17Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio17]. - FunctionPio1: Gp17Pio1 + FunctionPio1, PullNone: Gp17Pio1 } }, @@ -511,17 +511,17 @@ hal::bsp_pins!( name: gpio18, aliases: { /// UART Function alias for pin [crate::Pins::gpio18]. - FunctionUart: Gp18Uart0Cts, + FunctionUart, PullNone: Gp18Uart0Cts, /// SPI Function alias for pin [crate::Pins::gpio18]. - FunctionSpi: Gp18Spi0Sck, + FunctionSpi, PullNone: Gp18Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio18]. - FunctionI2C: Gp18I2C1Sda, + FunctionI2C, PullUp: Gp18I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio18]. - FunctionPwm: Gp18Pwm1A, + FunctionPwm, PullNone: Gp18Pwm1A, /// PIO0 Function alias for pin [crate::Pins::gpio18]. - FunctionPio0: Gp18Pio0, + FunctionPio0, PullNone: Gp18Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio18]. - FunctionPio1: Gp18Pio1 + FunctionPio1, PullNone: Gp18Pio1 } }, @@ -539,17 +539,17 @@ hal::bsp_pins!( name: gpio19, aliases: { /// UART Function alias for pin [crate::Pins::gpio19]. - FunctionUart: Gp19Uart0Rts, + FunctionUart, PullNone: Gp19Uart0Rts, /// SPI Function alias for pin [crate::Pins::gpio19]. - FunctionSpi: Gp19Spi0Tx, + FunctionSpi, PullNone: Gp19Spi0Tx, /// I2C Function alias for pin [crate::Pins::gpio19]. - FunctionI2C: Gp19I2C1Scl, + FunctionI2C, PullUp: Gp19I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio19]. - FunctionPwm: Gp19Pwm1B, + FunctionPwm, PullNone: Gp19Pwm1B, /// PIO0 Function alias for pin [crate::Pins::gpio19]. - FunctionPio0: Gp19Pio0, + FunctionPio0, PullNone: Gp19Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio19]. - FunctionPio1: Gp19Pio1 + FunctionPio1, PullNone: Gp19Pio1 } }, @@ -567,17 +567,17 @@ hal::bsp_pins!( name: gpio20, aliases: { /// UART Function alias for pin [crate::Pins::gpio20]. - FunctionUart: Gp20Uart1Tx, + FunctionUart, PullNone: Gp20Uart1Tx, /// SPI Function alias for pin [crate::Pins::gpio20]. - FunctionSpi: Gp20Spi0Rx, + FunctionSpi, PullNone: Gp20Spi0Rx, /// I2C Function alias for pin [crate::Pins::gpio20]. - FunctionI2C: Gp20I2C0Sda, + FunctionI2C, PullUp: Gp20I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio20]. - FunctionPwm: Gp20Pwm2A, + FunctionPwm, PullNone: Gp20Pwm2A, /// PIO0 Function alias for pin [crate::Pins::gpio20]. - FunctionPio0: Gp20Pio0, + FunctionPio0, PullNone: Gp20Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio20]. - FunctionPio1: Gp20Pio1 + FunctionPio1, PullNone: Gp20Pio1 } }, @@ -595,17 +595,17 @@ hal::bsp_pins!( name: gpio21, aliases: { /// UART Function alias for pin [crate::Pins::gpio21]. - FunctionUart: Gp21Uart1Rx, + FunctionUart, PullNone: Gp21Uart1Rx, /// SPI Function alias for pin [crate::Pins::gpio21]. - FunctionSpi: Gp21Spi0Csn, + FunctionSpi, PullNone: Gp21Spi0Csn, /// I2C Function alias for pin [crate::Pins::gpio21]. - FunctionI2C: Gp21I2C0Scl, + FunctionI2C, PullUp: Gp21I2C0Scl, /// PWM Function alias for pin [crate::Pins::gpio21]. - FunctionPwm: Gp21Pwm2B, + FunctionPwm, PullNone: Gp21Pwm2B, /// PIO0 Function alias for pin [crate::Pins::gpio21]. - FunctionPio0: Gp21Pio0, + FunctionPio0, PullNone: Gp21Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio21]. - FunctionPio1: Gp21Pio1 + FunctionPio1, PullNone: Gp21Pio1 } }, @@ -623,17 +623,17 @@ hal::bsp_pins!( name: gpio22, aliases: { /// UART Function alias for pin [crate::Pins::gpio22]. - FunctionUart: Gp22Uart1Cts, + FunctionUart, PullNone: Gp22Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio22]. - FunctionSpi: Gp22Spi0Sck, + FunctionSpi, PullNone: Gp22Spi0Sck, /// I2C Function alias for pin [crate::Pins::gpio22]. - FunctionI2C: Gp22I2C1Sda, + FunctionI2C, PullUp: Gp22I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio22]. - FunctionPwm: Gp22Pwm3A, + FunctionPwm, PullNone: Gp22Pwm3A, /// PIO0 Function alias for pin [crate::Pins::gpio22]. - FunctionPio0: Gp22Pio0, + FunctionPio0, PullNone: Gp22Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio22]. - FunctionPio1: Gp22Pio1 + FunctionPio1, PullNone: Gp22Pio1 } }, @@ -641,12 +641,12 @@ hal::bsp_pins!( Gpio23 { name: gp23, aliases: { - FunctionUart: Gp23Uart1Rts, - FunctionSpi: Gp23Spi0Tx, - FunctionI2C: Gp23I2C1Scl, - FunctionPwm: Gp23Pwm3B, - FunctionPio0: Gp23Pio0, - FunctionPio1: Gp23Pio1 + FunctionUart, PullNone: Gp23Uart1Rts, + FunctionSpi, PullNone: Gp23Spi0Tx, + FunctionI2C, PullUp: Gp23I2C1Scl, + FunctionPwm, PullNone: Gp23Pwm3B, + FunctionPio0, PullNone: Gp23Pio0, + FunctionPio1, PullNone: Gp23Pio1 } }, @@ -654,12 +654,12 @@ hal::bsp_pins!( Gpio24 { name: gp24, aliases: { - FunctionUart: Gp24Uart1Tx, - FunctionSpi: Gp24Spi1Rx, - FunctionI2C: Gp24I2C0Sda, - FunctionPwm: Gp24Pwm4A, - FunctionPio0: Gp24Pio0, - FunctionPio1: Gp24Pio1 + FunctionUart, PullNone: Gp24Uart1Tx, + FunctionSpi, PullNone: Gp24Spi1Rx, + FunctionI2C, PullUp: Gp24I2C0Sda, + FunctionPwm, PullNone: Gp24Pwm4A, + FunctionPio0, PullNone: Gp24Pio0, + FunctionPio1, PullNone: Gp24Pio1 } }, @@ -667,12 +667,12 @@ hal::bsp_pins!( Gpio25 { name: gp25, aliases: { - FunctionUart: Gp25Uart1Rx, - FunctionSpi: Gp25Spi1Csn, - FunctionI2C: Gp25I2C0Scl, - FunctionPwm: Gp25Pwm4B, - FunctionPio0: Gp25Pio0, - FunctionPio1: Gp25Pio1 + FunctionUart, PullNone: Gp25Uart1Rx, + FunctionSpi, PullNone: Gp25Spi1Csn, + FunctionI2C, PullUp: Gp25I2C0Scl, + FunctionPwm, PullNone: Gp25Pwm4B, + FunctionPio0, PullNone: Gp25Pio0, + FunctionPio1, PullNone: Gp25Pio1 } }, @@ -692,17 +692,17 @@ hal::bsp_pins!( name: gp26, aliases: { /// UART Function alias for pin [crate::Pins::gpio26]. - FunctionUart: Gp26Uart1Cts, + FunctionUart, PullNone: Gp26Uart1Cts, /// SPI Function alias for pin [crate::Pins::gpio26]. - FunctionSpi: Gp26Spi1Sck, + FunctionSpi, PullNone: Gp26Spi1Sck, /// I2C Function alias for pin [crate::Pins::gpio26]. - FunctionI2C: Gp26I2C1Sda, + FunctionI2C, PullUp: Gp26I2C1Sda, /// PWM Function alias for pin [crate::Pins::gpio26]. - FunctionPwm: Gp26Pwm5A, + FunctionPwm, PullNone: Gp26Pwm5A, /// PIO0 Function alias for pin [crate::Pins::gpio26]. - FunctionPio0: Gp26Pio0, + FunctionPio0, PullNone: Gp26Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio26]. - FunctionPio1: Gp26Pio1 + FunctionPio1, PullNone: Gp26Pio1 } }, @@ -722,17 +722,17 @@ hal::bsp_pins!( name: gp27, aliases: { /// UART Function alias for pin [crate::Pins::gpio27]. - FunctionUart: Gp27Uart1Rts, + FunctionUart, PullNone: Gp27Uart1Rts, /// SPI Function alias for pin [crate::Pins::gpio27]. - FunctionSpi: Gp27Spi1Tx, + FunctionSpi, PullNone: Gp27Spi1Tx, /// I2C Function alias for pin [crate::Pins::gpio27]. - FunctionI2C: Gp27I2C1Scl, + FunctionI2C, PullUp: Gp27I2C1Scl, /// PWM Function alias for pin [crate::Pins::gpio27]. - FunctionPwm: Gp27Pwm5B, + FunctionPwm, PullNone: Gp27Pwm5B, /// PIO0 Function alias for pin [crate::Pins::gpio27]. - FunctionPio0: Gp27Pio0, + FunctionPio0, PullNone: Gp27Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio27]. - FunctionPio1: Gp27Pio1 + FunctionPio1, PullNone: Gp27Pio1 } }, @@ -752,17 +752,17 @@ hal::bsp_pins!( name: gp28, aliases: { /// UART Function alias for pin [crate::Pins::gpio28]. - FunctionUart: Gp28Uart0Tx, + FunctionUart, PullNone: Gp28Uart0Tx, /// SPI Function alias for pin [crate::Pins::gpio28]. - FunctionSpi: Gp28Spi1Rx, + FunctionSpi, PullNone: Gp28Spi1Rx, /// I2C Function alias for pin [crate::Pins::gpio28]. - FunctionI2C: Gp28I2C0Sda, + FunctionI2C, PullUp: Gp28I2C0Sda, /// PWM Function alias for pin [crate::Pins::gpio28]. - FunctionPwm: Gp28Pwm6A, + FunctionPwm, PullNone: Gp28Pwm6A, /// PIO0 Function alias for pin [crate::Pins::gpio28]. - FunctionPio0: Gp28Pio0, + FunctionPio0, PullNone: Gp28Pio0, /// PIO1 Function alias for pin [crate::Pins::gpio28]. - FunctionPio1: Gp28Pio1 + FunctionPio1, PullNone: Gp28Pio1 } }, @@ -772,12 +772,12 @@ hal::bsp_pins!( Gpio29 { name: gp29, aliases: { - FunctionUart: Gp29Uart0Rx, - FunctionSpi: Gp29Spi1Csn, - FunctionI2C: Gp29I2C0Scl, - FunctionPwm: Gp29Pwm6B, - FunctionPio0: Gp29Pio0, - FunctionPio1: Gp29Pio1 + FunctionUart, PullNone: Gp29Uart0Rx, + FunctionSpi, PullNone: Gp29Spi1Csn, + FunctionI2C, PullUp: Gp29I2C0Scl, + FunctionPwm, PullNone: Gp29Pwm6B, + FunctionPio0, PullNone: Gp29Pio0, + FunctionPio1, PullNone: Gp29Pio1 } }, );