Prepare for v0.15 release (atsamd-rs#570)

* Remove gpio::v1 and promote gpio::v2 to gpio * Remove sercom::v1 * Fix eic modules * Fix thumbv7em::{pwm, qspi} * Fix usb modules * Promote sercom::v2 to sercom * Fix Tier 1 BSPs * Remove all deprecated modules * Adjust HAL readme to point to feather_m0 examples
rtsuk · Mar 29, 2022 · 088610a · 088610a
1 parent 02fa5eb
commit 088610a
Show file tree

Hide file tree

Showing 103 changed files with 623 additions and 4,709 deletions.
diff --git a/boards/feather_m0/CHANGELOG.md b/boards/feather_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Add an `i2c` example
 - Make use of `bsp_peripherals`, `periph_alias` and `pin_alias` macros

diff --git a/boards/feather_m0/examples/eic.rs b/boards/feather_m0/examples/eic.rs
@@ -19,7 +19,7 @@ use hal::clock::GenericClockController;
 use hal::delay::Delay;
 use hal::eic::pin::{ExtInt2, Sense};
 use hal::eic::EIC;
-use hal::gpio::v2::{Pin, PullUpInterrupt};
+use hal::gpio::{Pin, PullUpInterrupt};
 use hal::prelude::*;
 use pac::{interrupt, CorePeripherals, Peripherals};
 

diff --git a/boards/feather_m0/examples/i2c.rs b/boards/feather_m0/examples/i2c.rs
@@ -1,4 +1,4 @@
-//! This example showcases the i2c::v2 module.
+//! This example showcases the i2c module.
 
 #![no_std]
 #![no_main]
@@ -21,7 +21,7 @@ use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
 use hal::ehal::blocking::i2c::WriteRead;
 use hal::prelude::*;
-use hal::sercom::v2::i2c;
+use hal::sercom::i2c;
 
 const LENGTH: usize = 1;
 const ADDRESS: u8 = 0x77;

diff --git a/boards/feather_m0/examples/uart.rs b/boards/feather_m0/examples/uart.rs
@@ -1,4 +1,4 @@
-//! This example showcases the uart::v2 module.
+//! This example showcases the uart module.
 
 #![no_std]
 #![no_main]

diff --git a/boards/feather_m0/src/lib.rs b/boards/feather_m0/src/lib.rs
@@ -8,7 +8,7 @@ pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;
-use hal::sercom::v2::{
+use hal::sercom::{
     i2c, spi,
     uart::{self, BaudMode, Oversampling},
 };

diff --git a/boards/feather_m4/CHANGELOG.md b/boards/feather_m4/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Add an `i2c` example
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Updated to 2021 edition, updated dependencies, removed unused dependencies (#562)

diff --git a/boards/feather_m4/examples/i2c.rs b/boards/feather_m4/examples/i2c.rs
@@ -1,4 +1,4 @@
-//! This example showcases the i2c::v2 module.
+//! This example showcases the i2c module.
 
 #![no_std]
 #![no_main]
@@ -21,7 +21,7 @@ use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
 use hal::ehal::blocking::i2c::WriteRead;
 use hal::prelude::*;
-use hal::sercom::v2::i2c;
+use hal::sercom::i2c;
 
 const LENGTH: usize = 1;
 const ADDRESS: u8 = 0x77;

diff --git a/boards/feather_m4/src/lib.rs b/boards/feather_m4/src/lib.rs
@@ -8,7 +8,7 @@ pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;
-use hal::sercom::v2::{
+use hal::sercom::{
     i2c, spi,
     uart::{self, BaudMode, Oversampling},
     IoSet1, Sercom1, Sercom2, Sercom5, UndocIoSet1,

diff --git a/boards/metro_m0/CHANGELOG.md b/boards/metro_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Add an `i2c` example
 - Updated to 2021 edition, updated dependencies, removed unused dependencies (#562)

diff --git a/boards/metro_m0/examples/i2c.rs b/boards/metro_m0/examples/i2c.rs
@@ -1,4 +1,4 @@
-//! This example showcases the i2c::v2 module.
+//! This example showcases the i2c module.
 
 #![no_std]
 #![no_main]
@@ -21,7 +21,7 @@ use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
 use hal::ehal::blocking::i2c::WriteRead;
 use hal::prelude::*;
-use hal::sercom::v2::i2c;
+use hal::sercom::i2c;
 
 const LENGTH: usize = 1;
 const ADDRESS: u8 = 0x77;

diff --git a/boards/metro_m0/src/lib.rs b/boards/metro_m0/src/lib.rs
@@ -9,7 +9,7 @@ pub use hal::pac;
 
 use hal::clock::GenericClockController;
 use hal::prelude::*;
-use hal::sercom::v2::{i2c, spi, uart, Sercom0, Sercom3, Sercom4, Sercom5};
+use hal::sercom::{i2c, spi, uart, Sercom0, Sercom3, Sercom4, Sercom5};
 use hal::time::{Hertz, MegaHertz};
 
 #[cfg(feature = "usb")]

diff --git a/boards/metro_m4/CHANGELOG.md b/boards/metro_m4/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Add an `i2c` example
 - Fix incorrect clocking in `uart` helper function

diff --git a/boards/metro_m4/examples/adc.rs b/boards/metro_m4/examples/adc.rs
@@ -16,7 +16,7 @@ use cortex_m_semihosting::hprintln;
 use bsp::entry;
 use hal::adc::Adc;
 use hal::clock::GenericClockController;
-use hal::gpio::v2::B;
+use hal::gpio::B;
 use hal::prelude::*;
 use pac::gclk::pchctrl::GEN_A::GCLK11;
 use pac::{CorePeripherals, Peripherals};

diff --git a/boards/metro_m4/examples/clock_out.rs b/boards/metro_m4/examples/clock_out.rs
@@ -13,7 +13,7 @@ use panic_semihosting as _;
 
 use bsp::entry;
 use hal::clock::GenericClockController;
-use hal::gpio::v2::M;
+use hal::gpio::M;
 
 use pac::gclk::genctrl::SRC_A::DPLL0;
 use pac::gclk::pchctrl::GEN_A::GCLK2;

diff --git a/boards/metro_m4/examples/i2c.rs b/boards/metro_m4/examples/i2c.rs
@@ -1,4 +1,4 @@
-//! This example showcases the i2c::v2 module.
+//! This example showcases the i2c module.
 
 #![no_std]
 #![no_main]
@@ -21,7 +21,7 @@ use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
 use hal::ehal::blocking::i2c::WriteRead;
 use hal::prelude::*;
-use hal::sercom::v2::i2c;
+use hal::sercom::i2c;
 
 const LENGTH: usize = 1;
 const ADDRESS: u8 = 0x77;

diff --git a/boards/metro_m4/examples/pwm.rs b/boards/metro_m4/examples/pwm.rs
@@ -10,7 +10,7 @@ use metro_m4 as bsp;
 
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
-use hal::gpio::v2::E;
+use hal::gpio::E;
 use hal::prelude::*;
 use hal::pwm::{Pwm2, TC2Pinout};
 use pac::{CorePeripherals, Peripherals};

diff --git a/boards/metro_m4/src/lib.rs b/boards/metro_m4/src/lib.rs
@@ -12,7 +12,7 @@ pub use cortex_m_rt::entry;
 use hal::{
     clock::GenericClockController,
     qspi::{OneShot, Qspi},
-    sercom::v2::{
+    sercom::{
         i2c, spi,
         uart::{self, BaudMode, Oversampling},
         IoSet1, IoSet6, Sercom2, Sercom3, Sercom5,

diff --git a/boards/samd11_bare/CHANGELOG.md b/boards/samd11_bare/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Add an `i2c` example
 

diff --git a/boards/samd11_bare/Cargo.toml b/boards/samd11_bare/Cargo.toml
@@ -35,6 +35,9 @@ use_semihosting = []
 [profile.release]
 debug = true
 
+[profile.dev]
+opt-level = "s"
+
 # for cargo flash
 [package.metadata]
 chip = "ATSAMD11C14A"

diff --git a/boards/samd11_bare/examples/adc.rs b/boards/samd11_bare/examples/adc.rs
@@ -22,7 +22,7 @@ use samd11_bare as bsp;
 use bsp::entry;
 use hal::adc::Adc;
 use hal::clock::GenericClockController;
-use hal::gpio::v2::*;
+use hal::gpio::*;
 use hal::pac::{CorePeripherals, Peripherals};
 use hal::prelude::*;
 use rtt_target::{rprintln, rtt_init_print};

diff --git a/boards/samd11_bare/examples/i2c.rs b/boards/samd11_bare/examples/i2c.rs
@@ -21,7 +21,7 @@ use hal::clock::GenericClockController;
 use hal::dmac::{DmaController, PriorityLevel};
 use hal::ehal::blocking::i2c::WriteRead;
 use hal::prelude::*;
-use hal::sercom::v2::i2c;
+use hal::sercom::i2c;
 
 const LENGTH: usize = 1;
 const ADDRESS: u8 = 0x77;

diff --git a/boards/samd11_bare/examples/pwm.rs b/boards/samd11_bare/examples/pwm.rs
@@ -13,7 +13,7 @@ use bsp::{hal, pac};
 use bsp::entry;
 use hal::clock::GenericClockController;
 use hal::delay::Delay;
-use hal::gpio::v2::*;
+use hal::gpio::*;
 use hal::prelude::*;
 use hal::pwm::{Channel, Pwm0};
 use pac::{CorePeripherals, Peripherals};

diff --git a/boards/samd11_bare/examples/serial.rs b/boards/samd11_bare/examples/serial.rs
@@ -17,7 +17,7 @@ use hal::delay::Delay;
 use hal::pac::{CorePeripherals, Peripherals};
 
 use hal::pac::gclk::{clkctrl::GEN_A, genctrl::SRC_A};
-use hal::sercom::v2::{
+use hal::sercom::{
     uart::{self, BaudMode, Oversampling},
     Sercom0,
 };

diff --git a/boards/samd11_bare/src/lib.rs b/boards/samd11_bare/src/lib.rs
@@ -10,7 +10,7 @@ pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;
-use hal::sercom::v2::{
+use hal::sercom::{
     i2c,
     uart::{self, BaudMode, Oversampling},
     Sercom0,

diff --git a/boards/wio_terminal/CHANGELOG.md b/boards/wio_terminal/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Fix removed deprecated modules from HAL
+- Update `lib.rs` and examples to reflect removal of `v1` APIs and promotion of `v2` APIs
 - Update `i2c_master` convenience function to use the new `sercom::v2::i2c` API
 - Add an `i2c` example
 

diff --git a/boards/wio_terminal/src/buttons.rs b/boards/wio_terminal/src/buttons.rs
@@ -1,6 +1,6 @@
 use atsamd_hal::clock::GenericClockController;
-use atsamd_hal::common::eic;
-use atsamd_hal::common::eic::pin::{
+use atsamd_hal::eic;
+use atsamd_hal::eic::pin::{
     ExtInt10, ExtInt11, ExtInt12, ExtInt3, ExtInt4, ExtInt5, ExtInt7, Sense,
 };
 use atsamd_hal::pac::{interrupt, EIC, MCLK};

diff --git a/boards/wio_terminal/src/display.rs b/boards/wio_terminal/src/display.rs
@@ -1,10 +1,10 @@
 use atsamd_hal::clock::GenericClockController;
+use atsamd_hal::ehal::blocking::delay::DelayMs;
 use atsamd_hal::ehal::digital::v2::OutputPin;
-use atsamd_hal::hal::blocking::delay::DelayMs;
-use atsamd_hal::hal::spi::{Phase, Polarity};
+use atsamd_hal::ehal::spi::{Phase, Polarity};
 use atsamd_hal::pac::{MCLK, SERCOM7};
-use atsamd_hal::sercom::v2::spi;
-use atsamd_hal::sercom::v2::{IoSet4, Sercom7};
+use atsamd_hal::sercom::spi;
+use atsamd_hal::sercom::{IoSet4, Sercom7};
 use atsamd_hal::time::Hertz;
 use atsamd_hal::typelevel::NoneT;
 use display_interface_spi::SPIInterface;

diff --git a/boards/wio_terminal/src/pins.rs b/boards/wio_terminal/src/pins.rs
@@ -6,7 +6,7 @@ use super::sound::{Buzzer, Microphone};
 use super::storage::{QSPIFlash, SDCard};
 use super::wifi::WifiPins;
 
-/// [`Pin`](atsamd_hal::gpio::v2::Pin) aliases defined by the
+/// [`Pin`](atsamd_hal::gpio::Pin) aliases defined by the
 /// [`bsp_pins!`](atsamd_hal::bsp_pins) macro
 pub mod aliases {
     atsamd_hal::bsp_pins!(

diff --git a/boards/wio_terminal/src/sensors.rs b/boards/wio_terminal/src/sensors.rs
@@ -2,10 +2,7 @@ use atsamd_hal::adc::Adc;
 use atsamd_hal::clock::GenericClockController;
 use atsamd_hal::pac::gclk::pchctrl::GEN_A::GCLK11;
 use atsamd_hal::pac::{ADC1, MCLK, SERCOM4};
-use atsamd_hal::sercom::{
-    v2::{i2c, IoSet3, Sercom4},
-    PadPin,
-};
+use atsamd_hal::sercom::{i2c, IoSet3, Sercom4};
 use atsamd_hal::time::U32Ext;
 
 use lis3dh::{Lis3dh, SlaveAddr};

diff --git a/boards/wio_terminal/src/serial.rs b/boards/wio_terminal/src/serial.rs
@@ -1,6 +1,6 @@
 use atsamd_hal::clock::GenericClockController;
 use atsamd_hal::pac::{self, MCLK, SERCOM2};
-use atsamd_hal::sercom::v2::{uart, IoSet2, Sercom2};
+use atsamd_hal::sercom::{uart, IoSet2, Sercom2};
 use atsamd_hal::time::Hertz;
 
 #[cfg(feature = "usb")]

diff --git a/boards/wio_terminal/src/storage.rs b/boards/wio_terminal/src/storage.rs
@@ -2,7 +2,7 @@ use atsamd_hal::{
     clock::{GenericClockController, Sercom6CoreClock},
     pac::{MCLK, QSPI, SERCOM6},
     qspi,
-    sercom::v2::{spi, IoSet1, Sercom6},
+    sercom::{spi, IoSet1, Sercom6},
     time::{Hertz, U32Ext},
     typelevel::NoneT,
 };

diff --git a/boards/wio_terminal/src/wifi.rs b/boards/wio_terminal/src/wifi.rs
@@ -6,7 +6,7 @@ use atsamd_hal::{
     ehal::serial::{Read, Write},
     pac::{interrupt, MCLK, SERCOM0},
     prelude::nb,
-    sercom::v2::{uart, IoSet2, Sercom0},
+    sercom::{uart, IoSet2, Sercom0},
     time::{Hertz, U32Ext},
 };
 use bbqueue::{self, BBBuffer, Consumer, Producer};
@@ -288,10 +288,8 @@ impl Wifi {
 /// Imports necessary for using `wifi_singleton`.
 pub mod wifi_prelude {
     pub use crate::wifi::*;
-    pub use atsamd_hal::gpio::Port;
     pub use atsamd_hal::pac::SERCOM0;
     pub use atsamd_hal::pac::{interrupt, MCLK};
-    pub use atsamd_hal::sercom::{Sercom0Pad0, Sercom0Pad2, UART0};
     pub use bbqueue::{BBBuffer, Producer};
 
     pub use cortex_m::interrupt::CriticalSection;

diff --git a/hal/CHANGELOG.md b/hal/CHANGELOG.md
@@ -1,5 +1,14 @@
-# Unreleased Changes
+# v0.15.0
 
+- Remove deprecated modules:
+  - Remove `gpio::v1`, `sercom::v1` module, promote `gpio::v2` to `gpio` and `sercom::v2` to `sercom`.
+  - Remove deprecated `hal` in favour of `ehal`
+  - Remove deprecated `target_device` in favour of `pac`
+  - Remove deprecated `spi_common` module
+  - Remove deprecated `common` module
+  - Remove deprecated `samd51`, `same51`, `same53`, `same54` modules
+  - Remove deprecated `SpinTimer`
+  - Provide the necessary fixes to support those changes.
 - Cleanup most `clippy` lints
 - Update `seq_macro` and remove `replace_with` dependencies (#568)
 - Add a `bsp_peripherals!` macro and fix a bug in `bsp_pins!` (#515)

diff --git a/hal/README.md b/hal/README.md
@@ -32,9 +32,9 @@ This crate can support other variants in a similar fashion; pull requests for th
 
 ## Examples?
 
-Check out the metro_m0 board support crate examples:
+Check out the `feather_m0` board support crate examples:
 
-https://github.com/atsamd-rs/atsamd/tree/master/boards/metro_m0/examples
+https://github.com/atsamd-rs/atsamd/tree/master/boards/feather_m0/examples
 
 ## License
 

diff --git a/hal/src/gpio/v2/dynpin.rs → hal/src/gpio/dynpin.rs b/hal/src/gpio/v2/dynpin.rs → hal/src/gpio/dynpin.rs