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.

Sign up for GitHub

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

Jump to bottom

Update to embedded-hal v1.0.0 #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to embedded-hal v1.0.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8017dcb
Update to embedded-hal v1.0.0
richardeoin Dec 21, 2023
2a84e54
Use release version of embedded-hal
richardeoin Jan 9, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## [Unreleased]

* Upgrade to embedded-hal v1.0 [#13]

## [v0.3.0] 2022-12-29

* Parallel NAND Flash is supported with the `nand ` feature flag [#9]
Expand Down Expand Up @@ -49,3 +51,4 @@
[#7]: https://github.com/stm32-rs/stm32-fmc/pull/7
[#8]: https://github.com/stm32-rs/stm32-fmc/pull/8
[#9]: https://github.com/stm32-rs/stm32-fmc/pull/9
[#13]: https://github.com/stm32-rs/stm32-fmc/pull/13
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ version = "0.3"
optional = true

[dependencies]
embedded-hal = "0.2.4"
embedded-hal = { version = "1.0" }

[dev-dependencies]
paste = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions src/nand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use core::cmp;
use core::marker::PhantomData;

use embedded_hal::blocking::delay::DelayUs;
use embedded_hal::delay::DelayNs;

use crate::fmc::{FmcBank, FmcRegisters};
use crate::FmcPeripheral;
Expand Down Expand Up @@ -136,7 +136,7 @@ impl<IC: NandChip, FMC: FmcPeripheral> Nand<FMC, IC> {
/// required by the NAND device
pub fn init<D>(&mut self, delay: &mut D) -> device::NandDevice
where
D: DelayUs<u8>,
D: DelayNs,
{
// calculate clock period, round down
let fmc_source_ck_hz = self.fmc.source_clock_hz();
Expand All @@ -150,7 +150,7 @@ impl<IC: NandChip, FMC: FmcPeripheral> Nand<FMC, IC> {

// enable memory controller
self.fmc.memory_controller_enable();
delay.delay_us(1u8);
delay.delay_us(1);

// NOTE(unsafe): FMC controller has been initialized and enabled for
// this bank
Expand Down
4 changes: 2 additions & 2 deletions src/sdram.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use core::cmp;
use core::convert::TryInto;
use core::marker::PhantomData;

use embedded_hal::blocking::delay::DelayUs;
use embedded_hal::delay::DelayNs;

use crate::fmc::{AddressPinSet, FmcBank, FmcRegisters};
use crate::FmcPeripheral;
Expand Down Expand Up @@ -254,7 +254,7 @@ impl<IC: SdramChip, FMC: FmcPeripheral> Sdram<FMC, IC> {
/// maximum SD clock in `IC::TIMING`
pub fn init<D>(&mut self, delay: &mut D) -> *mut u32
where
D: DelayUs<u8>,
D: DelayNs,
{
use SdramCommand::*;

Expand Down
Loading