Remove unnecessary embedded-hal dependencies from BSPs (#519)

Our HAL already re-exports embedded-hal, so there is no need to duplicate the dependency in every BSP. Also, updated edgebadge/pybadge to not export themselves as hal
atsamd-rs · Oct 17, 2021 · 9495af9 · 9495af9
1 parent 62801ca
commit 9495af9
Show file tree

Hide file tree

Showing 107 changed files with 85 additions and 89 deletions.
diff --git a/boards/arduino_mkr1000/CHANGELOG.md b/boards/arduino_mkr1000/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/arduino_mkr1000/Cargo.toml b/boards/arduino_mkr1000/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/arduino_mkrvidor4000/CHANGELOG.md b/boards/arduino_mkrvidor4000/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - removed unnecessary dependency on `nb` (#510)
 
 ---

diff --git a/boards/arduino_mkrvidor4000/Cargo.toml b/boards/arduino_mkrvidor4000/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/arduino_mkrzero/CHANGELOG.md b/boards/arduino_mkrzero/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/arduino_mkrzero/Cargo.toml b/boards/arduino_mkrzero/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/arduino_nano33iot/CHANGELOG.md b/boards/arduino_nano33iot/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 * move `usbd-x` crates used only in examples to `[dev-dependencies]`
 * removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/arduino_nano33iot/Cargo.toml b/boards/arduino_nano33iot/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.7"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/arduino_nano33iot/src/lib.rs b/boards/arduino_nano33iot/src/lib.rs
@@ -4,7 +4,7 @@
 pub use cortex_m_rt::entry;
 
 pub use atsamd_hal as hal;
-pub use embedded_hal as ehal;
+pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;

diff --git a/boards/atsame54_xpro/CHANGELOG.md b/boards/atsame54_xpro/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` and `panic_rtt` (#510)
 

diff --git a/boards/atsame54_xpro/Cargo.toml b/boards/atsame54_xpro/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/circuit_playground_express/CHANGELOG.md b/boards/circuit_playground_express/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - removed unnecessary dependency on `nb` (#510)
 
 ---

diff --git a/boards/circuit_playground_express/Cargo.toml b/boards/circuit_playground_express/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.atsamd-hal]
 version = "0.13"

diff --git a/boards/edgebadge/CHANGELOG.md b/boards/edgebadge/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/edgebadge/Cargo.toml b/boards/edgebadge/Cargo.toml
@@ -12,7 +12,6 @@ exclude = ["assets"]
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 st7735-lcd = "0.8.1"
 ws2812-timer-delay = "0.3"
 

diff --git a/boards/edgebadge/examples/blinky_basic.rs b/boards/edgebadge/examples/blinky_basic.rs
@@ -3,7 +3,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use hal::clock::GenericClockController;

diff --git a/boards/edgebadge/examples/ferris_img.rs b/boards/edgebadge/examples/ferris_img.rs
@@ -8,7 +8,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use embedded_graphics::image::Image;

diff --git a/boards/edgebadge/examples/neopixel_adc_battery.rs b/boards/edgebadge/examples/neopixel_adc_battery.rs
@@ -6,7 +6,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use hal::adc::Adc;

diff --git a/boards/edgebadge/examples/neopixel_adc_light.rs b/boards/edgebadge/examples/neopixel_adc_light.rs
@@ -6,11 +6,11 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
-use embedded_hal::digital::v1_compat::OldOutputPin;
 use hal::adc::Adc;
+use hal::ehal::digital::v1_compat::OldOutputPin;
 use hal::prelude::*;
 use hal::timer::SpinTimer;
 use hal::{clock::GenericClockController, delay::Delay};

diff --git a/boards/edgebadge/examples/neopixel_easing.rs b/boards/edgebadge/examples/neopixel_easing.rs
@@ -6,7 +6,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use core::f32::consts::FRAC_PI_2;

diff --git a/boards/edgebadge/examples/neopixel_rainbow_timer.rs b/boards/edgebadge/examples/neopixel_rainbow_timer.rs
@@ -9,7 +9,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use hal::prelude::*;

diff --git a/boards/edgebadge/examples/neopixel_tilt.rs b/boards/edgebadge/examples/neopixel_tilt.rs
@@ -7,7 +7,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use hal::prelude::*;

diff --git a/boards/edgebadge/examples/usb_poll.rs b/boards/edgebadge/examples/usb_poll.rs
@@ -4,7 +4,7 @@
 #![no_std]
 #![no_main]
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use hal::clock::GenericClockController;

diff --git a/boards/edgebadge/examples/usb_serial.rs b/boards/edgebadge/examples/usb_serial.rs
@@ -14,7 +14,7 @@
 //! Note leds may appear white during debug. Either build for release or add
 //! opt-level = 2 to profile.dev in Cargo.toml
 
-use edgebadge::{self as hal, entry, pac, Pins};
+use edgebadge::{entry, hal, pac, Pins};
 use panic_halt as _;
 
 use cortex_m::interrupt::free as disable_interrupts;

diff --git a/boards/edgebadge/src/pins.rs b/boards/edgebadge/src/pins.rs
@@ -2,12 +2,11 @@
 
 use super::{hal, pac};
 
-use embedded_hal::{digital::v1_compat::OldOutputPin, timer::CountDown, timer::Periodic};
 use gpio::{Floating, Input, Output, Port, PushPull};
 use hal::clock::GenericClockController;
 use hal::define_pins;
+use hal::ehal::{digital::v1_compat::OldOutputPin, spi, timer::CountDown, timer::Periodic};
 use hal::gpio::{self, *};
-use hal::hal::spi;
 use hal::prelude::*;
 use hal::sercom::{I2CMaster2, PadPin, SPIMaster1, SPIMaster4, UART5};
 use hal::time::Hertz;

diff --git a/boards/feather_m0/CHANGELOG.md b/boards/feather_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 * move `usbd-x` crates used only in examples to `[dev-dependencies]`
 * removed unnecessary dependency on `nb` and `panic_rtt` (#510)
 * Bump `cortex-m`/`cortex-m-rt` dependencies to fix a build issue

diff --git a/boards/feather_m0/Cargo.toml b/boards/feather_m0/Cargo.toml
@@ -12,7 +12,6 @@ resolver = "2"
 
 [dependencies]
 cortex-m = "0.7"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.7"

diff --git a/boards/feather_m0/src/lib.rs b/boards/feather_m0/src/lib.rs
@@ -4,7 +4,7 @@
 pub use cortex_m_rt::entry;
 
 pub use atsamd_hal as hal;
-pub use embedded_hal as ehal;
+pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;

diff --git a/boards/feather_m4/CHANGELOG.md b/boards/feather_m4/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/feather_m4/Cargo.toml b/boards/feather_m4/Cargo.toml
@@ -12,7 +12,6 @@ documentation = "https://atsamd-rs.github.io/atsamd/atsamd51j/feather_m4/"
 
 [dependencies]
 cortex-m = "0.7"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.7"

diff --git a/boards/feather_m4/src/lib.rs b/boards/feather_m4/src/lib.rs
@@ -7,7 +7,7 @@ use cortex_m_rt;
 pub use cortex_m_rt::entry;
 
 pub use atsamd_hal as hal;
-pub use embedded_hal as ehal;
+pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;

diff --git a/boards/gemma_m0/CHANGELOG.md b/boards/gemma_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - removed unnecessary dependency on `nb` (#510)
 
 ---

diff --git a/boards/gemma_m0/Cargo.toml b/boards/gemma_m0/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.6.12"

diff --git a/boards/grand_central_m4/CHANGELOG.md b/boards/grand_central_m4/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` and `panic_rtt` (#510)
 

diff --git a/boards/grand_central_m4/Cargo.toml b/boards/grand_central_m4/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 ws2812-timer-delay = "0.3"
 
 [dependencies.cortex-m-rt]

diff --git a/boards/grand_central_m4/src/pins.rs b/boards/grand_central_m4/src/pins.rs
@@ -14,7 +14,7 @@ use hal::sercom::{
 };
 use hal::time::Hertz;
 
-use embedded_hal::{digital::v1_compat::OldOutputPin, timer::CountDown, timer::Periodic};
+use hal::ehal::{digital::v1_compat::OldOutputPin, timer::CountDown, timer::Periodic};
 use ws2812_timer_delay as ws2812;
 
 use hal::clock::GenericClockController;
@@ -792,7 +792,7 @@ impl Neopixel {
         port: &mut Port,
     ) -> ws2812::Ws2812<
         T,
-        embedded_hal::digital::v1_compat::OldOutputPin<
+        hal::ehal::digital::v1_compat::OldOutputPin<
             atsamd_hal::common::gpio::Pc24<
                 atsamd_hal::common::gpio::Output<atsamd_hal::common::gpio::PushPull>,
             >,

diff --git a/boards/itsybitsy_m0/CHANGELOG.md b/boards/itsybitsy_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` (#510)
 

diff --git a/boards/itsybitsy_m0/Cargo.toml b/boards/itsybitsy_m0/Cargo.toml
@@ -11,7 +11,6 @@ readme = "README.md"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 bitbang-hal = "0.3"
 apa102-spi = "0.3"
 smart-leds = "0.3"

diff --git a/boards/itsybitsy_m0/src/pins.rs b/boards/itsybitsy_m0/src/pins.rs
@@ -3,7 +3,7 @@
 use super::{hal, pac};
 
 #[cfg(feature = "unproven")]
-use embedded_hal::timer::{CountDown, Periodic};
+use hal::ehal::timer::{CountDown, Periodic};
 
 use hal::clock::GenericClockController;
 use hal::define_pins;

diff --git a/boards/itsybitsy_m4/CHANGELOG.md b/boards/itsybitsy_m4/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 - move `usbd-x` crates used only in examples to `[dev-dependencies]`
 - removed unnecessary dependency on `nb` and `panic_rtt` (#510)
 

diff --git a/boards/itsybitsy_m4/Cargo.toml b/boards/itsybitsy_m4/Cargo.toml
@@ -14,7 +14,6 @@ readme = "README.md"
 
 [dependencies]
 cortex-m = "0.6"
-embedded-hal = "0.2.3"
 bitbang-hal = "0.3"
 apa102-spi = "0.3"
 smart-leds = "0.3"

diff --git a/boards/itsybitsy_m4/src/lib.rs b/boards/itsybitsy_m4/src/lib.rs
@@ -14,9 +14,9 @@ pub use hal::samd51::*;
 pub use cortex_m_rt::entry;
 pub use pins::Pins;
 
-use embedded_hal::timer::{CountDown, Periodic};
 use gpio::{PfC, Port};
 use hal::clock::GenericClockController;
+use hal::ehal::timer::{CountDown, Periodic};
 use hal::gpio::*;
 use hal::sercom::{I2CMaster2, SPIMaster1, UART3};
 use hal::time::Hertz;

diff --git a/boards/itsybitsy_m4/src/pins.rs b/boards/itsybitsy_m4/src/pins.rs
@@ -2,8 +2,8 @@
 
 use super::{hal, pac, pac::MCLK, pac::SERCOM1, pac::SERCOM2, pac::SERCOM3};
 
-use embedded_hal::timer::{CountDown, Periodic};
 use hal::define_pins;
+use hal::ehal::timer::{CountDown, Periodic};
 use hal::gpio::{self, *};
 use hal::sercom::{I2CMaster2, PadPin, SPIMaster1, Sercom2Pad0, Sercom2Pad1, UART3};
 use hal::time::Hertz;

diff --git a/boards/metro_m0/CHANGELOG.md b/boards/metro_m0/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- remove extraneous `embedded-hal` dependencies from BSPs
 * move `usbd-x` crates used only in examples to `[dev-dependencies]`
 * removed unnecessary dependency on `nb` and `panic_rtt` (#510)
 

diff --git a/boards/metro_m0/Cargo.toml b/boards/metro_m0/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2018"
 
 [dependencies]
 cortex-m = "0.7"
-embedded-hal = "0.2.3"
 
 [dependencies.cortex-m-rt]
 version = "0.7"

diff --git a/boards/metro_m0/src/lib.rs b/boards/metro_m0/src/lib.rs
@@ -4,7 +4,7 @@
 pub use cortex_m_rt::entry;
 
 pub use atsamd_hal as hal;
-pub use embedded_hal as ehal;
+pub use hal::ehal;
 pub use hal::pac;
 
 use hal::clock::GenericClockController;