kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #298 from dnadlinger/update-hal 

Update stm32h7xx-hal
This commit is contained in:
Ryan Summers 2021-04-07 13:45:02 +02:00 committed by GitHub
parent cc61e2eedf e51336dc90
commit 46c5bb4c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3
[[package]] [[package]]
name = "ad9959" name = "ad9959"
version = "0.1.0" version = "0.1.0"
@ -757,12 +759,12 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]] [[package]]
name = "stm32h7" name = "stm32h7"
version = "0.12.1" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7571f17d1ed7d67957d0004de6c52bd1ef5e736ed5ddc2bcecf001512269f77c" checksum = "8b672c837e0ee8158ecc7fce0f9a948dd0693a9c588338e728d14b73307a0b7d"
dependencies = [ dependencies = [
"bare-metal 0.2.5", "bare-metal 0.2.5",
"cortex-m 0.6.7", "cortex-m 0.7.1",
"cortex-m-rt", "cortex-m-rt",
"vcell", "vcell",
] ]
@ -770,11 +772,11 @@ dependencies = [
[[package]] [[package]]
name = "stm32h7xx-hal" name = "stm32h7xx-hal"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=master#08231e334a11236fe556668ac19cb1c214da2406" source = "git+https://github.com/stm32-rs/stm32h7xx-hal?branch=master#ad2a1ae9831dd34e171cc178cdad84e770b4c0ae"
dependencies = [ dependencies = [
"bare-metal 1.0.0", "bare-metal 1.0.0",
"cast", "cast",
"cortex-m 0.6.7", "cortex-m 0.7.1",
"cortex-m-rt", "cortex-m-rt",
"embedded-dma", "embedded-dma",
"embedded-hal", "embedded-hal",

8
src/hardware/pounder/mod.rs
View File

@ -231,14 +231,16 @@ impl ad9959::Interface for QspiInterface {
}; };
self.qspi self.qspi
.write(encoded_address, &encoded_payload) .write(encoded_address.into(), &encoded_payload)
.map_err(|_| Error::Qspi) .map_err(|_| Error::Qspi)
} }
ad9959::Mode::FourBitSerial => { ad9959::Mode::FourBitSerial => {
if self.streaming { if self.streaming {
Err(Error::Qspi) Err(Error::Qspi)
} else { } else {
self.qspi.write(addr, data).map_err(|_| Error::Qspi)?; self.qspi
.write(addr.into(), data)
.map_err(|_| Error::Qspi)?;
Ok(()) Ok(())
} }
} }
@ -257,7 +259,7 @@ impl ad9959::Interface for QspiInterface {
} }
self.qspi self.qspi
.read(0x80_u8 | addr, dest) .read((0x80_u8 | addr).into(), dest)
.map_err(|_| Error::Qspi) .map_err(|_| Error::Qspi)
} }
} }