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

Merge branch 'master' into feature/livestream

This commit is contained in:
Ryan Summers 2021-06-15 14:15:16 +02:00 committed by GitHub
parent 99114e3c9c 22381ee703
commit d81e0c9323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -52,7 +52,10 @@ mcp23017 = "1.0"
git = "https://github.com/quartiq/rtt-logger.git" git = "https://github.com/quartiq/rtt-logger.git"
rev = "70b0eb5" rev = "70b0eb5"
# fast double buffered DMA without poisoning and buffer swapping # The following modifications of the HAL are being used:
# * fast double buffered DMA without poisoning and buffer swapping
# * Utilize `master` branch of smoltcp
# * Utilize `master` branch of HAL
[dependencies.stm32h7xx-hal] [dependencies.stm32h7xx-hal]
features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"] features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"]
# version = "0.9.0" # version = "0.9.0"

2
src/hardware/setup.rs
View File

@ -368,7 +368,6 @@ pub fn setup(
polarity: hal::spi::Polarity::IdleHigh, polarity: hal::spi::Polarity::IdleHigh,
phase: hal::spi::Phase::CaptureOnSecondTransition, phase: hal::spi::Phase::CaptureOnSecondTransition,
}) })
.inter_word_delay(design_parameters::ADC_SETUP_TIME)
.hardware_cs(hal::spi::HardwareCS { .hardware_cs(hal::spi::HardwareCS {
mode: hal::spi::HardwareCSMode::WordTransaction, mode: hal::spi::HardwareCSMode::WordTransaction,
assertion_delay: design_parameters::ADC_SETUP_TIME, assertion_delay: design_parameters::ADC_SETUP_TIME,
@ -412,7 +411,6 @@ pub fn setup(
polarity: hal::spi::Polarity::IdleHigh, polarity: hal::spi::Polarity::IdleHigh,
phase: hal::spi::Phase::CaptureOnSecondTransition, phase: hal::spi::Phase::CaptureOnSecondTransition,
}) })
.inter_word_delay(design_parameters::ADC_SETUP_TIME)
.hardware_cs(hal::spi::HardwareCS { .hardware_cs(hal::spi::HardwareCS {
mode: hal::spi::HardwareCSMode::WordTransaction, mode: hal::spi::HardwareCSMode::WordTransaction,
assertion_delay: design_parameters::ADC_SETUP_TIME, assertion_delay: design_parameters::ADC_SETUP_TIME,