Channel 0 working

firmware/src/adc.rs

@@ -1,7 +1,7 @@
 use stm32f0xx_hal as hal;
 use hal::prelude::*;
 use hal::spi::{Spi, Mode, Phase, Polarity, EightBit};
-use hal::gpio::{Output, PushPull, Alternate, AF0};
+use hal::gpio::{Output, PushPull, Alternate, AF0, AF5};
 use embedded_hal::blocking::spi::Transfer;
 use defmt::*;
 
@@ -14,7 +14,7 @@ const IIR_ALPHA: u16 = 51;
 
 pub struct Tlc0832 {
     spi: Spi<hal::stm32::SPI2, 
-        hal::gpio::gpiob::PB10<Alternate<AF0>>,
+        hal::gpio::gpiob::PB10<Alternate<AF5>>,
         hal::gpio::gpiob::PB14<Alternate<AF0>>,
         hal::gpio::gpiob::PB15<Alternate<AF0>>,
         EightBit>,
@@ -35,7 +35,7 @@ impl Tlc0832 {
         rcc: &mut hal::rcc::Rcc,
     ) -> Self {
         cortex_m::interrupt::free(|critical_section| {
-            let sck = sck.into_alternate_af0(critical_section);
+            let sck = sck.into_alternate_af5(critical_section);
             let miso = miso.into_alternate_af0(critical_section);
             let mosi = mosi.into_alternate_af0(critical_section);
             let cs = cs.into_push_pull_output(critical_section);
@@ -220,6 +220,7 @@ impl Tlc0832 {
             }
         }
 
+        /*
         match self.read_channel(1) {
             Ok(raw_b) => {
                 self.apply_iir_filter(1, raw_b);
@@ -235,6 +236,7 @@ impl Tlc0832 {
                 error!("Error reading channel 1: {}", e);
             }
         }
+        */
 
         (midi_a_change, midi_b_change)
     }

firmware/src/hardware.rs

@@ -4,6 +4,7 @@ use hal::{delay::Delay, serial::Serial, stm32};
 use hal::gpio::{Input, Floating, gpiob};
 use embedded_midi::{MidiOut, MidiIn};
 use crate::bus::Bus;
+use crate::adc::Tlc0832;
 
 pub struct Hardware {
     pub delay: Delay,
@@ -12,6 +13,7 @@ pub struct Hardware {
     pub bus: Bus,
     pub midi_tx: MidiOut<hal::serial::Tx<stm32::USART1>>,
     pub midi_rx: MidiIn<hal::serial::Rx<stm32::USART1>>,
+    pub adc: Tlc0832,
 }
 
 impl Hardware {
@@ -52,6 +54,13 @@ impl Hardware {
         let midi_tx = MidiOut::new(tx);
         let midi_rx = MidiIn::new(rx);
 
+        let adc_sck = cortex_m::interrupt::free(|cs| gpiob.pb10.into_floating_input(cs));
+        let adc_miso = cortex_m::interrupt::free(|cs| gpiob.pb14.into_floating_input(cs));
+        let adc_mosi = cortex_m::interrupt::free(|cs| gpiob.pb15.into_floating_input(cs));
+        let adc_cs = cortex_m::interrupt::free(|cs| gpiob.pb12.into_floating_input(cs));
+        
+        let adc = Tlc0832::new(dp.SPI2, adc_sck, adc_miso, adc_mosi, adc_cs, &mut rcc);
+
         Self {
             delay,
             button_1_5,
@@ -59,6 +68,7 @@ impl Hardware {
             bus,
             midi_tx,
             midi_rx,
+            adc,
         }
     }
 }

firmware/src/main.rs

@@ -1,12 +1,13 @@
 #![no_std]
 #![no_main]
 
-mod led_state;
+mod adc;
 mod bus;
 mod button;
-mod midi;
-mod hardware;
 mod display;
+mod hardware;
+mod led_state;
+mod midi;
 
 use cortex_m_rt::entry;
 use panic_halt as _;
@@ -17,6 +18,8 @@ use button::ButtonHandler;
 use midi::MidiProcessor;
 use hardware::Hardware;
 use display::DisplayController;
+use embedded_midi::MidiMessage;
+use midi_types::{Control, Channel, Value7};
 
 defmt::timestamp!("{=u32}", {
     static mut COUNTER: u32 = 0;
@@ -52,6 +55,17 @@ fn main() -> ! {
             
             MidiProcessor::process_message(&mut hardware.midi_rx, &mut led_state);
         }
+        let (pedal_a_change, pedal_b_change) = hardware.adc.update_and_get_midi_changes();
+
+        if let Some(value) = pedal_a_change {
+            let msg = MidiMessage::ControlChange(Channel::C1, Control::from(1), Value7::from(value));
+            hardware.midi_tx.write(&msg).ok();
+        }
+
+        if let Some(value) = pedal_b_change {
+            let msg = MidiMessage::ControlChange(Channel::C1, Control::from(7), Value7::from(value));
+            hardware.midi_tx.write(&msg).ok();
+        }
     }
 }