Rename display pins and group BME280 pins.

display/firmware/src/display.rs

@@ -29,27 +29,16 @@ impl Display {
         mut time: CopyableMonoTimer,
     ) -> Display {
         // Enable power.
-        pins.display_pwr.set_low().ok();
+        pins.pwr.set_low().ok();
         // Wait a bit for power to stabilize.
         time.delay_us(100u8);
 
-        let epd = EPD4in2::new(
-            spi,
-            pins.display_cs,
-            pins.display_busy,
-            pins.display_dc,
-            pins.display_rst,
-            &mut time,
-        )
-        .unwrap(); // TODO: Error handling?
+        let epd = EPD4in2::new(spi, pins.cs, pins.busy, pins.dc, pins.rst, &mut time).unwrap(); // TODO: Error handling?
 
         // Disable power again.
-        pins.display_pwr.set_low().ok();
+        pins.pwr.set_low().ok();
 
-        Display {
-            pwr: pins.display_pwr,
-            epd,
-        }
+        Display { pwr: pins.pwr, epd }
     }
 
     pub fn update(
@@ -98,7 +87,7 @@ impl Display {
             tile_height,
         );
         let bathroom_tile = TempHumTile::new(
-            "Bad",
+            "Badezimmer",
             bathroom_strings.as_ref(),
             0,
             35 + tile_height + 1,

display/firmware/src/pins.rs

@@ -13,15 +13,22 @@ pub type DisplayPwr = gpioc::PC11<gpio::Output<gpio::PushPull>>;
 
 pub struct DisplayPins {
     /// Display busy (active low).
-    pub display_busy: gpioc::PC4<gpio::Input<gpio::PullUp>>,
+    pub busy: gpioc::PC4<gpio::Input<gpio::PullUp>>,
     /// Display chip select (active low).
-    pub display_cs: gpioc::PC8<gpio::Output<gpio::PushPull>>,
+    pub cs: gpioc::PC8<gpio::Output<gpio::PushPull>>,
     /// Display data/command.
-    pub display_dc: gpioc::PC9<gpio::Output<gpio::PushPull>>,
+    pub dc: gpioc::PC9<gpio::Output<gpio::PushPull>>,
     /// Display reset (active low).
-    pub display_rst: gpioc::PC10<gpio::Output<gpio::PushPull>>,
+    pub rst: gpioc::PC10<gpio::Output<gpio::PushPull>>,
     /// Display supply voltage enable (active low).
-    pub display_pwr: gpioc::PC11<gpio::Output<gpio::PushPull>>,
+    pub pwr: gpioc::PC11<gpio::Output<gpio::PushPull>>,
+}
+
+pub struct BME280Pins {
+    /// BME280 supply voltage enable (active low).
+    pub pwr: gpiob::PB18<gpio::Output<gpio::PushPull>>,
+    /// BME280 chip select (active low).
+    pub cs: gpioc::PC2<gpio::Output<gpio::PushPull>>,
 }
 
 pub type DisplayBmeSpi = Spi<
@@ -84,11 +91,10 @@ pub struct Pins {
         gpiod::PD5<gpio::Alternate2>,
     >,
 
-    /// BME280 chip select (active low).
-    pub bme_cs: gpioc::PC2<gpio::Output<gpio::PushPull>>,
-
     pub display: DisplayPins,
 
+    pub bme: BME280Pins,
+
     /// SPI for both display and BME280.
     pub display_bme_spi: DisplayBmeSpi,
 }
@@ -157,14 +163,18 @@ impl Pins {
             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: DisplayPins {
-                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),
+                busy: gpioc.pc4.into_pull_up_input(&mut gpioc.pddr),
+                cs: gpioc.pc8.into_push_pull_output(&mut gpioc.pddr),
+                dc: gpioc.pc9.into_push_pull_output(&mut gpioc.pddr),
+                rst: gpioc.pc10.into_push_pull_output(&mut gpioc.pddr),
+                pwr: gpioc.pc11.into_push_pull_output(&mut gpioc.pddr),
+            },
+
+            bme: BME280Pins {
+                pwr: gpiob.pb18.into_push_pull_output(&mut gpiob.pddr),
+                cs: gpioc.pc2.into_push_pull_output(&mut gpioc.pddr),
             },
 
             display_bme_spi: spi0,
@@ -176,9 +186,10 @@ impl Pins {
         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.display_cs.set_high().ok();
-        pins.display.display_pwr.set_high().ok();
+        pins.display.cs.set_high().ok();
+        pins.display.pwr.set_high().ok();
+        pins.bme.pwr.set_high().ok();
+        pins.bme.cs.set_high().ok();
 
         pins
     }