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

Upgraded the embedded-hal crate to embedded-can #60

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ maintenance = { status = "actively-developed" }
bitflags = "1.2.1"
vcell = "0.1.2"
nb = "1.0.0"
embedded-can = "0.4.1"

[dependencies.embedded-hal-02]
version = "0.2.7"
package = "embedded-hal"

[dependencies.defmt]
optional = true
Expand Down
4 changes: 2 additions & 2 deletions src/embedded_hal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

use crate::{Can, Data, ExtendedId, Frame, Id, Instance, OverrunError, StandardId};

use embedded_hal_02::can;
use embedded_can as can;

impl<I> can::Can for Can<I>
impl<I> can::nb::Can for Can<I>
where
I: Instance,
{
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub use crate::pac::can::RegisterBlock;

use crate::filter::MasterFilters;
use core::cmp::{Ord, Ordering};
use core::convert::{Infallible, TryInto};
use core::convert::Infallible;
use core::marker::PhantomData;
use core::mem;
use core::ptr::NonNull;
Expand Down
Loading