display: Fix pins/SPI and configure some default pin states.

display/firmware/src/pins.rs

@@ -1,19 +1,22 @@
+use embedded_hal::digital::v2::OutputPin;
 use mkl25z4::{GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, SIM, SPI0, SPI1};
+use mkl25z4_hal::clocks::Clocks;
 use mkl25z4_hal::gpio::{self, gpioa, gpiob, gpioc, gpiod, gpioe, GpioExt};
 use mkl25z4_hal::spi::{self, Phase, Polarity, Spi};
+use mkl25z4_hal::time::U32Ext;
 
 pub struct Pins {
     /// 5V supply for the LED (active high).
     pub enable_5v: gpioa::PA1<gpio::Output<gpio::PushPull>>,
     /// Red display frontlight LEDs (active high).
-    pub red: gpioe::PE29<gpio::Output<gpio::PushPull>>,
+    pub red: gpioe::PE31<gpio::Output<gpio::PushPull>>,
     /// Green display frontlight LEDs (active high).
     pub green: gpioe::PE30<gpio::Output<gpio::PushPull>>,
     /// Blue display frontlight LEDs (active high).
-    pub blue: gpioe::PE31<gpio::Output<gpio::PushPull>>,
+    pub blue: gpioe::PE29<gpio::Output<gpio::PushPull>>,
 
     /// Top switch (active low).
-    pub top_switch: gpioc::PC1<gpio::Input<gpio::PullUp>>,
+    pub top_switch: gpioc::PC1<gpio::Input<gpio::Floating>>,
     /// Left switches (top to bottom, active low).
     pub left_switches: (
         gpiod::PD1<gpio::Input<gpio::PullUp>>,
@@ -81,6 +84,7 @@ pub struct Pins {
 impl Pins {
     pub fn configure(
         sim: &mut SIM,
+        clocks: Clocks,
         gpioa: GPIOA,
         gpiob: GPIOB,
         gpioc: GPIOC,
@@ -103,7 +107,7 @@ impl Pins {
             polarity: Polarity::IdleLow,
             phase: Phase::CaptureOnFirstTransition,
         };
-        let spi0 = Spi::spi0(spi0, mosi, miso, sck, mode, sim);
+        let spi0 = Spi::spi0(spi0, mosi, miso, sck, mode, 500000u32.hz(), clocks, sim);
 
         // SPI1 for the NRF module.
         let mosi = gpiob.pb16.into_alternate(&mut gpiob.pddr);
@@ -113,14 +117,14 @@ impl Pins {
             polarity: Polarity::IdleLow,
             phase: Phase::CaptureOnFirstTransition,
         };
-        let spi1 = Spi::spi1(spi1, mosi, miso, sck, mode, sim);
+        let spi1 = Spi::spi1(spi1, mosi, miso, sck, mode, 500000u32.hz(), clocks, sim);
 
-        Pins {
+        let mut pins = Pins {
             enable_5v: gpioa.pa1.into_push_pull_output(&mut gpioa.pddr),
-            red: gpioe.pe29.into_push_pull_output(&mut gpioe.pddr),
+            red: gpioe.pe31.into_push_pull_output(&mut gpioe.pddr),
             green: gpioe.pe30.into_push_pull_output(&mut gpioe.pddr),
-            blue: gpioe.pe31.into_push_pull_output(&mut gpioe.pddr),
-            top_switch: gpioc.pc1.into_pull_up_input(&mut gpioc.pddr),
+            blue: gpioe.pe29.into_push_pull_output(&mut gpioe.pddr),
+            top_switch: gpioc.pc1.into_floating_input(&mut gpioc.pddr),
             left_switches: (
                 gpiod.pd1.into_pull_up_input(&mut gpiod.pddr),
                 gpiod.pd2.into_pull_up_input(&mut gpiod.pddr),
@@ -149,6 +153,18 @@ impl Pins {
             display_pwr: gpioc.pc11.into_push_pull_output(&mut gpioc.pddr),
 
             display_bme_spi: spi0,
-        }
+        };
+
+        // Disable all power, set all chip-select lines high.
+        pins.enable_5v.set_low().ok();
+        pins.als_en.set_low().ok();
+        pins.buzzer.set_low().ok();
+        pins.nrf_cs.set_high().ok();
+        pins.nrf_pwr.set_high().ok();
+        pins.bme_cs.set_high().ok();
+        pins.display_cs.set_high().ok();
+        pins.display_pwr.set_high().ok();
+
+        pins
     }
 }