Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

embedded-hal: 1.0.0-alpha.10 -> 1.0.0-rc.1 #86

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Conversation

newAM
Copy link
Collaborator

@newAM newAM commented Aug 15, 2023

Closes #85
Closes #76

The embedded_hal blocking serial module was removed, it was replaced with embedded_io, but I think this makes more sense as a separate mock since it no longer has the Word generic.

@newAM
Copy link
Collaborator Author

newAM commented Aug 15, 2023

I bumped the MSRV to fix this CI error: error: package tokio v1.31.0 cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0.

I could alternatively pin the version of tokio, or commit a lockfile and run CI with --locked

@tommy-gilligan
Copy link
Contributor

Very exciting! I didn't know embedded-hal was at rc.1 now.

@vDorst
Copy link

vDorst commented Aug 28, 2023

I hope that this is merged soon, so I can point to this repo.
Have it running for a while.

@dbrgn
Copy link
Owner

dbrgn commented Sep 14, 2023

Hi @newAM, I updated the main branch to fix CI and to bump the MSRV. Could you rebase your branch? (The second commit isn't needed anymore, you can drop it.)

@newAM
Copy link
Collaborator Author

newAM commented Sep 17, 2023

Done! Should be all good-to-go now.

@rursprung
Copy link
Contributor

@dbrgn: sorry to bother you, but is there a chance to get this (and other PRs in e-h-m) reviewed/merged/released? it'd be great to have a released version of this crate which matches the e-h release. thanks!

Copy link
Owner

@dbrgn dbrgn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reminder, and sorry for the delay!

Looks good to me, only one documentation issue left. Afterwards it can be merged! I'll fix it myself, so we can merge directly.

src/eh1/spi.rs Outdated
@@ -8,8 +8,7 @@
//! ## Usage
//!
//! ```
//! # use eh1 as embedded_hal;
//! use embedded_hal::spi::{SpiBus, SpiBusWrite};
//! use eh1::spi::SpiBus;
Copy link
Owner

@dbrgn dbrgn Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since these docs are for public users (which would import embedded_hal), I'd prefer to use the embedded_hal alias in here.

@dbrgn
Copy link
Owner

dbrgn commented Nov 1, 2023

@newAM ah, seems I can't push to your branch. Could you apply the patch below and push an update?

diff --git a/src/eh1/spi.rs b/src/eh1/spi.rs
index 2c590d8..54bd591 100644
--- a/src/eh1/spi.rs
+++ b/src/eh1/spi.rs
@@ -8,7 +8,8 @@
 //! ## Usage
 //!
 //! ```
-//! use eh1::spi::SpiBus;
+//! # use eh1 as embedded_hal;
+//! use embedded_hal::spi::SpiBus;
 //! use embedded_hal_mock::eh1::spi::{Mock as SpiMock, Transaction as SpiTransaction};
 //! use embedded_hal_nb::spi::FullDuplex;
 //!
@@ -40,10 +41,8 @@
 //! // Finalise expectations
 //! spi.done();
 //! ```
-use eh1::spi;
-use eh1::spi::{Operation, SpiBus, SpiDevice};
-use embedded_hal_nb::nb;
-use embedded_hal_nb::spi::FullDuplex;
+use eh1::spi::{self, Operation, SpiBus, SpiDevice};
+use embedded_hal_nb::{nb, spi::FullDuplex};

 use crate::common::Generic;

@newAM
Copy link
Collaborator Author

newAM commented Nov 1, 2023

Could you apply the patch below and push an update?

Done! :)

@newAM newAM requested a review from dbrgn November 1, 2023 03:02
@rnestler
Copy link

rnestler commented Nov 1, 2023

A bit tangential, but maybe we should move this repository to a more "official" embedded rust GitHub organization to ease the maintenance burden on @dbrgn a bit?

@newAM
Copy link
Collaborator Author

newAM commented Nov 1, 2023

I'm can also help out with maintenance if desired :)

@dbrgn
Copy link
Owner

dbrgn commented Nov 1, 2023

@newAM thanks for the update! Ready for merge now 🙂

@rnestler @newAM I'm open for moving the repo to the rust-embedded organization, and also for adding more maintainers! Note that @ryankurte already has maintainer-rights here. @newAM I also invited you as collaborator 🙂 Thanks for the help!

@dbrgn dbrgn merged commit a1585f1 into dbrgn:main Nov 1, 2023
3 checks passed
@dbrgn
Copy link
Owner

dbrgn commented Nov 1, 2023

This is now released as embedded-hal-mock version 0.10.0-rc.1: https://crates.io/crates/embedded-hal-mock/0.10.0-rc.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants