From 7d85efd1f0c8ce136a9bdcb96cc4d0fe672bed6b Mon Sep 17 00:00:00 2001 From: Jeremy Boynes Date: Sat, 14 Jan 2023 15:02:06 -0800 Subject: [PATCH] Fix Alternate for USB pins in BSP for boards that use SAMD51 (#661) * Fix Alternate for USB pins on boards that use SAMD51 * Update changelogs --- boards/feather_m4/CHANGELOG.md | 2 ++ boards/feather_m4/src/lib.rs | 4 ++-- boards/grand_central_m4/CHANGELOG.md | 1 + boards/grand_central_m4/src/lib.rs | 4 ++-- boards/metro_m4/CHANGELOG.md | 1 + boards/metro_m4/src/lib.rs | 4 ++-- boards/pyportal/CHANGELOG.md | 2 ++ boards/pyportal/src/pins.rs | 4 ++-- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/boards/feather_m4/CHANGELOG.md b/boards/feather_m4/CHANGELOG.md index 24393864da82..2cddcc2be819 100644 --- a/boards/feather_m4/CHANGELOG.md +++ b/boards/feather_m4/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- Use correct alternate for USB (#661) + # v0.10.1 - Update to `atsamd-hal` version `0.15.1` diff --git a/boards/feather_m4/src/lib.rs b/boards/feather_m4/src/lib.rs index e8331b35c06c..b601893bf9ad 100644 --- a/boards/feather_m4/src/lib.rs +++ b/boards/feather_m4/src/lib.rs @@ -155,14 +155,14 @@ hal::bsp_pins!( /// The USB D- pad name: usb_dm, aliases: { - AlternateG: UsbDm + AlternateH: UsbDm } } PA25 { /// The USB D+ pad name: usb_dp, aliases: { - AlternateG: UsbDp + AlternateH: UsbDp } } ); diff --git a/boards/grand_central_m4/CHANGELOG.md b/boards/grand_central_m4/CHANGELOG.md index cfb17e7d0ddf..17700ba2dbe5 100644 --- a/boards/grand_central_m4/CHANGELOG.md +++ b/boards/grand_central_m4/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased +- Use correct alternate for USB (#661) - update to `atsamd-hal-0.15` (v2 drivers of peripherals and removal of deprecated things) - correction to the USB clock in the bsp convenience function diff --git a/boards/grand_central_m4/src/lib.rs b/boards/grand_central_m4/src/lib.rs index 2f562d3a6c55..fef5cbeb4f42 100644 --- a/boards/grand_central_m4/src/lib.rs +++ b/boards/grand_central_m4/src/lib.rs @@ -466,14 +466,14 @@ hal::bsp_pins!( /// The USB D- pad name: usb_dm aliases: { - AlternateG: UsbDm, + AlternateH: UsbDm, } } PA25 { /// The USB D+ pad name: usb_dp aliases: { - AlternateG: UsbDp, + AlternateH: UsbDp, } } ); diff --git a/boards/metro_m4/CHANGELOG.md b/boards/metro_m4/CHANGELOG.md index 4cf3d97271ea..f254a2b2f1d5 100644 --- a/boards/metro_m4/CHANGELOG.md +++ b/boards/metro_m4/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased +- Use correct alternate for USB (#661) - Correction to the clock in the usb convenience function - Add aliases for A6 and A7. diff --git a/boards/metro_m4/src/lib.rs b/boards/metro_m4/src/lib.rs index 9f248fa2df03..7ca50168525f 100644 --- a/boards/metro_m4/src/lib.rs +++ b/boards/metro_m4/src/lib.rs @@ -221,7 +221,7 @@ hal::bsp_pins!( /// The USB D- pad name: usb_dm aliases: { - AlternateG: UsbDm + AlternateH: UsbDm } } @@ -229,7 +229,7 @@ hal::bsp_pins!( /// The USB D+ pad name: usb_dp aliases: { - AlternateG: UsbDp + AlternateH: UsbDp } } diff --git a/boards/pyportal/CHANGELOG.md b/boards/pyportal/CHANGELOG.md index 075a249c0b7e..a9329029131b 100644 --- a/boards/pyportal/CHANGELOG.md +++ b/boards/pyportal/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- Use correct alternate for USB (#661) + # v0.10.0 - update to `atsamd-hal` to 0.15.1 and `cortex-m-rt` to 0.7.1 diff --git a/boards/pyportal/src/pins.rs b/boards/pyportal/src/pins.rs index ea050c241569..4d97459c2110 100644 --- a/boards/pyportal/src/pins.rs +++ b/boards/pyportal/src/pins.rs @@ -333,7 +333,7 @@ hal::bsp_pins!( /// The USB D- pad name: usb_dm aliases: { - AlternateG: UsbDm, + AlternateH: UsbDm, Reset: UsbDmReset, } } @@ -341,7 +341,7 @@ hal::bsp_pins!( /// The USB D+ pad name: usb_dp aliases: { - AlternateG: UsbDp, + AlternateH: UsbDp, Reset: UsbDpReset, } }