Merge branch 'master' of git.gottschlag.net:bernd/smart-home

display/firmware/src/main.rs

@@ -2,6 +2,7 @@
 #![no_std]
 
 mod board;
+mod pins;
 mod assets {
     include!(concat!(env!("OUT_DIR"), "/assets.rs"));
 }

display/firmware/src/pins.rs

@@ -0,0 +1,154 @@
+use mkl25z4::{GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, SIM, SPI0, SPI1};
+use mkl25z4_hal::gpio::{self, gpioa, gpiob, gpioc, gpiod, gpioe, GpioExt};
+use mkl25z4_hal::spi::{self, Phase, Polarity, Spi};
+
+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>>,
+    /// 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>>,
+
+    /// Top switch (active low).
+    pub top_switch: gpioc::PC1<gpio::Input<gpio::PullUp>>,
+    /// Left switches (top to bottom, active low).
+    pub left_switches: (
+        gpiod::PD1<gpio::Input<gpio::PullUp>>,
+        gpiod::PD2<gpio::Input<gpio::PullUp>>,
+        gpiod::PD3<gpio::Input<gpio::PullUp>>,
+        gpiod::PD4<gpio::Input<gpio::PullUp>>,
+    ),
+    /// Right switches (top to bottom, active low).
+    pub right_switches: (
+        gpioa::PA13<gpio::Input<gpio::PullUp>>,
+        gpioa::PA12<gpio::Input<gpio::PullUp>>,
+        gpioa::PA5<gpio::Input<gpio::PullUp>>,
+        gpioa::PA4<gpio::Input<gpio::PullUp>>,
+    ),
+
+    /// Ambient light sensor enable (active high).
+    pub als_en: gpioe::PE20<gpio::Output<gpio::PushPull>>,
+    // TODO: ADC for the ambient light sensor.
+    /// Ambient light sensor.
+    pub als: gpioe::PE21<gpio::Input<gpio::Floating>>,
+
+    // TODO: PWM for the buzzer.
+    /// Buzzer (active high).
+    pub buzzer: gpioc::PC3<gpio::Output<gpio::PushPull>>,
+
+    /// NRF IRQ line (active low).
+    pub nrf_irq: gpiob::PB0<gpio::Input<gpio::PullUp>>,
+    /// NRF chip select (active low).
+    pub nrf_cs: gpiob::PB1<gpio::Output<gpio::PushPull>>,
+    /// NRF chip enable.
+    pub nrf_ce: gpiob::PB2<gpio::Output<gpio::PushPull>>,
+    /// NRF supply voltage enable (active low).
+    pub nrf_pwr: gpiob::PB3<gpio::Output<gpio::PushPull>>,
+    /// SPI for the NRF module.
+    pub nrf_spi: Spi<
+        SPI1,
+        gpiob::PB16<gpio::Alternate2>,
+        gpiob::PB17<gpio::Alternate2>,
+        gpiod::PD5<gpio::Alternate2>,
+    >,
+
+    /// BME280 chip select (active low).
+    pub bme_cs: gpioc::PC2<gpio::Output<gpio::PushPull>>,
+
+    /// Display busy (active low).
+    pub display_busy: gpioc::PC4<gpio::Input<gpio::PullUp>>,
+    /// Display chip select (active low).
+    pub display_cs: gpioc::PC8<gpio::Output<gpio::PushPull>>,
+    /// Display data/command.
+    pub display_dc: gpioc::PC9<gpio::Output<gpio::PushPull>>,
+    /// Display reset (active low).
+    pub display_rst: gpioc::PC10<gpio::Output<gpio::PushPull>>,
+    /// Display supply voltage enable (active low).
+    pub display_pwr: gpioc::PC11<gpio::Output<gpio::PushPull>>,
+
+    /// SPI for both display and BME280.
+    pub display_bme_spi: Spi<
+        SPI0,
+        gpioc::PC7<gpio::Alternate5>,
+        gpioc::PC6<gpio::Alternate5>,
+        gpioc::PC5<gpio::Alternate2>,
+    >,
+}
+
+impl Pins {
+    pub fn configure(
+        sim: &mut SIM,
+        gpioa: GPIOA,
+        gpiob: GPIOB,
+        gpioc: GPIOC,
+        gpiod: GPIOD,
+        gpioe: GPIOE,
+        spi0: SPI0,
+        spi1: SPI1,
+    ) -> Pins {
+        let mut gpioa = gpioa.split(sim);
+        let mut gpiob = gpiob.split(sim);
+        let mut gpioc = gpioc.split(sim);
+        let mut gpiod = gpiod.split(sim);
+        let mut gpioe = gpioe.split(sim);
+
+        // SPI0 for the display/BME module.
+        let mosi = gpioc.pc7.into_alternate(&mut gpioc.pddr);
+        let miso = gpioc.pc6.into_alternate(&mut gpioc.pddr);
+        let sck = gpioc.pc5.into_alternate(&mut gpioc.pddr);
+        let mode = spi::Mode {
+            polarity: Polarity::IdleLow,
+            phase: Phase::CaptureOnFirstTransition,
+        };
+        let spi0 = Spi::spi0(spi0, mosi, miso, sck, mode, sim);
+
+        // SPI1 for the NRF module.
+        let mosi = gpiob.pb16.into_alternate(&mut gpiob.pddr);
+        let miso = gpiob.pb17.into_alternate(&mut gpiob.pddr);
+        let sck = gpiod.pd5.into_alternate(&mut gpiod.pddr);
+        let mode = spi::Mode {
+            polarity: Polarity::IdleLow,
+            phase: Phase::CaptureOnFirstTransition,
+        };
+        let spi1 = Spi::spi1(spi1, mosi, miso, sck, mode, sim);
+
+        Pins {
+            enable_5v: gpioa.pa1.into_push_pull_output(&mut gpioa.pddr),
+            red: gpioe.pe29.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),
+            left_switches: (
+                gpiod.pd1.into_pull_up_input(&mut gpiod.pddr),
+                gpiod.pd2.into_pull_up_input(&mut gpiod.pddr),
+                gpiod.pd3.into_pull_up_input(&mut gpiod.pddr),
+                gpiod.pd4.into_pull_up_input(&mut gpiod.pddr),
+            ),
+            right_switches: (
+                gpioa.pa13.into_pull_up_input(&mut gpioa.pddr),
+                gpioa.pa12.into_pull_up_input(&mut gpioa.pddr),
+                gpioa.pa5.into_pull_up_input(&mut gpioa.pddr),
+                gpioa.pa4.into_pull_up_input(&mut gpioa.pddr),
+            ),
+            als_en: gpioe.pe20.into_push_pull_output(&mut gpioe.pddr),
+            als: gpioe.pe21.into_floating_input(&mut gpioe.pddr),
+            buzzer: gpioc.pc3.into_push_pull_output(&mut gpioc.pddr),
+            nrf_irq: gpiob.pb0.into_pull_up_input(&mut gpiob.pddr),
+            nrf_cs: gpiob.pb1.into_push_pull_output(&mut gpiob.pddr),
+            nrf_ce: gpiob.pb2.into_push_pull_output(&mut gpiob.pddr),
+            nrf_pwr: gpiob.pb3.into_push_pull_output(&mut gpiob.pddr),
+            nrf_spi: spi1,
+            bme_cs: gpioc.pc2.into_push_pull_output(&mut gpioc.pddr),
+            display_busy: gpioc.pc4.into_pull_up_input(&mut gpioc.pddr),
+            display_cs: gpioc.pc8.into_push_pull_output(&mut gpioc.pddr),
+            display_dc: gpioc.pc9.into_push_pull_output(&mut gpioc.pddr),
+            display_rst: gpioc.pc10.into_push_pull_output(&mut gpioc.pddr),
+            display_pwr: gpioc.pc11.into_push_pull_output(&mut gpioc.pddr),
+
+            display_bme_spi: spi0,
+        }
+    }
+}

display/hardware/display-cache.lib

@@ -129,6 +129,30 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_Crystal_GND3
+#
+DEF Device_Crystal_GND3 Y 0 40 Y N 1 F N
+F0 "Y" 0 225 50 H V C CNN
+F1 "Device_Crystal_GND3" 0 150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -75 0 N
+P 2 0 1 20 -75 -50 -75 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 75 0 100 0 N
+P 2 0 1 20 75 50 75 -50 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -200 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_D_Zener_Small
 #
 DEF Device_D_Zener_Small D 0 10 N N 1 F N

display/hardware/display.sch

@@ -274,7 +274,7 @@ U 1 1 5EC3255F
 P 1250 4200
 F 0 "J1" H 1300 4617 50  0000 C CNN
 F 1 "SWD" H 1300 4526 50  0000 C CNN
-F 2 "Connector_PinSocket_1.27mm:PinSocket_2x05_P1.27mm_Vertical" H 1250 4200 50  0001 C CNN
+F 2 "Connector_PinHeader_1.27mm:PinHeader_2x05_P1.27mm_Vertical" H 1250 4200 50  0001 C CNN
 F 3 "~" H 1250 4200 50  0001 C CNN
 F 4 "1175-1627-ND" H 1250 4200 50  0001 C CNN "Digikey PN"
 F 5 "https://www.digikey.de/product-detail/de/cnc-tech/3220-10-0100-00/1175-1627-ND/3883661" H 1250 4200 50  0001 C CNN "Digikey Link"
@@ -334,8 +334,6 @@ TODO: Quartz?
 Wire Wire Line
 	950  4200 950  4300
 NoConn ~ 4500 2400
-NoConn ~ 4500 3400
-NoConn ~ 4500 3500
 Wire Wire Line
 	1600 1200 2050 1200
 Wire Wire Line
@@ -977,4 +975,42 @@ Wire Wire Line
 	7400 3000 7400 2900
 Wire Wire Line
 	8050 3000 7400 3000
+$Comp
+L Device:Crystal_GND3 Y1
+U 1 1 5E996AE4
+P 3800 3500
+F 0 "Y1" H 3800 3768 50  0000 C CNN
+F 1 "32768Hz" H 3800 3677 50  0000 C CNN
+F 2 "Crystal:Crystal_SMD_MicroCrystal_MS3V-T1R" H 3800 3500 50  0001 C CNN
+F 3 "~" H 3800 3500 50  0001 C CNN
+F 4 "2195-MS3V-T1R-32.768KHZ-7PF-20PPM-TA-QC-AUCT-ND" H 3800 3500 50  0001 C CNN "Digikey PN"
+F 5 "https://www.digikey.de/product-detail/de/micro-crystal-ag/MS3V-T1R-32-768KHZ-7PF-20PPM-TA-QC-AU/2195-MS3V-T1R-32-768KHZ-7PF-20PPM-TA-QC-AUCT-ND/10500146" H 3800 3500 50  0001 C CNN "Digikey Link"
+	1    3800 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0130
+U 1 1 5E997E3B
+P 3800 3800
+F 0 "#PWR0130" H 3800 3550 50  0001 C CNN
+F 1 "GND" H 3805 3627 50  0000 C CNN
+F 2 "" H 3800 3800 50  0001 C CNN
+F 3 "" H 3800 3800 50  0001 C CNN
+	1    3800 3800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4500 3500 3950 3500
+Wire Wire Line
+	3650 3500 3550 3500
+Wire Wire Line
+	3550 3500 3550 3150
+Wire Wire Line
+	3550 3150 4050 3150
+Wire Wire Line
+	4050 3150 4050 3400
+Wire Wire Line
+	4050 3400 4500 3400
+Wire Wire Line
+	3800 3700 3800 3800
 $EndSCHEMATC