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

Fixing diff

This commit is contained in:
Ryan Summers 2020-10-28 15:57:14 +01:00
parent e36b853dc8
commit 11ff93e6f0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@ -500,7 +500,7 @@ const APP: () = {
let qspi = hal::qspi::Qspi::bank2( let qspi = hal::qspi::Qspi::bank2(
dp.QUADSPI, dp.QUADSPI,
qspi_pins, qspi_pins,
11.mhz(), 10.mhz(),
&ccdr.clocks, &ccdr.clocks,
ccdr.peripheral.QSPI, ccdr.peripheral.QSPI,
); );
@ -511,7 +511,7 @@ const APP: () = {
let io_update = gpiog.pg7.into_push_pull_output(); let io_update = gpiog.pg7.into_push_pull_output();
let asm_delay = { let asm_delay = {
let frequency_hz = ccdr.ccdr.c_ck().0; let frequency_hz = ccdr.clocks.c_ck().0;
asm_delay::AsmDelay::new(asm_delay::bitrate::Hertz( asm_delay::AsmDelay::new(asm_delay::bitrate::Hertz(
frequency_hz, frequency_hz,
)) ))

4
src/pounder/mod.rs
View File

@ -235,7 +235,7 @@ pub struct PounderDevices<DELAY> {
hal::gpio::gpiog::PG7<hal::gpio::Output<hal::gpio::PushPull>>, hal::gpio::gpiog::PG7<hal::gpio::Output<hal::gpio::PushPull>>,
>, >,
mcp23017: mcp23017::MCP23017<hal::i2c::I2c<hal::stm32::I2C1>>, mcp23017: mcp23017::MCP23017<hal::i2c::I2c<hal::stm32::I2C1>>,
attenuator_spi: hal::spi::Spi<hal::stm32::SPI1>, attenuator_spi: hal::spi::Spi<hal::stm32::SPI1, hal::spi::Enabled, u8>,
adc1: hal::adc::Adc<hal::stm32::ADC1, hal::adc::Enabled>, adc1: hal::adc::Adc<hal::stm32::ADC1, hal::adc::Enabled>,
adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>, adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>,
adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>, adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>,
@ -262,7 +262,7 @@ where
DELAY, DELAY,
hal::gpio::gpiog::PG7<hal::gpio::Output<hal::gpio::PushPull>>, hal::gpio::gpiog::PG7<hal::gpio::Output<hal::gpio::PushPull>>,
>, >,
attenuator_spi: hal::spi::Spi<hal::stm32::SPI1>, attenuator_spi: hal::spi::Spi<hal::stm32::SPI1, hal::spi::Enabled, u8>,
adc1: hal::adc::Adc<hal::stm32::ADC1, hal::adc::Enabled>, adc1: hal::adc::Adc<hal::stm32::ADC1, hal::adc::Enabled>,
adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>, adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>,
adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>, adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>,