From 11ff93e6f0a080a1239de0d44bf3fd5040cab11c Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Wed, 28 Oct 2020 15:57:14 +0100
Subject: [PATCH] Fixing diff

---
 src/main.rs        | 4 ++--
 src/pounder/mod.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a791457..c7d0eaa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -500,7 +500,7 @@ const APP: () = {
                     let qspi = hal::qspi::Qspi::bank2(
                         dp.QUADSPI,
                         qspi_pins,
-                        11.mhz(),
+                        10.mhz(),
                         &ccdr.clocks,
                         ccdr.peripheral.QSPI,
                     );
@@ -511,7 +511,7 @@ const APP: () = {
                 let io_update = gpiog.pg7.into_push_pull_output();
 
                 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(
                         frequency_hz,
                     ))
diff --git a/src/pounder/mod.rs b/src/pounder/mod.rs
index 1288765..6940e0e 100644
--- a/src/pounder/mod.rs
+++ b/src/pounder/mod.rs
@@ -235,7 +235,7 @@ pub struct PounderDevices<DELAY> {
         hal::gpio::gpiog::PG7<hal::gpio::Output<hal::gpio::PushPull>>,
     >,
     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>,
     adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>,
     adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>,
@@ -262,7 +262,7 @@ where
             DELAY,
             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>,
         adc2: hal::adc::Adc<hal::stm32::ADC2, hal::adc::Enabled>,
         adc1_in_p: hal::gpio::gpiof::PF11<hal::gpio::Analog>,