Implement reading values from the BME280.

display/firmware/Cargo.lock

@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bme280"
 version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mgottschlag/bme280-rs?branch=destroy#e3c3f39a32261bd29b94431b97b214dff027e9bb"
 dependencies = [
  "embedded-hal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -91,7 +91,7 @@ name = "cortex-m-rt-macros"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -113,7 +113,7 @@ name = "cortex-m-rtfm-macros"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rtfm-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -131,7 +131,7 @@ dependencies = [
 name = "display-firmware"
 version = "0.0.1"
 dependencies = [
- "bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bme280 0.2.1 (git+https://github.com/mgottschlag/bme280-rs?branch=destroy)",
  "cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cortex-m-rtfm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -304,7 +304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.10"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -315,7 +315,7 @@ name = "quote"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -339,7 +339,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -374,7 +374,7 @@ name = "syn"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -392,7 +392,7 @@ name = "thiserror-impl"
 version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -447,7 +447,7 @@ dependencies = [
 "checksum bare-metal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
 "checksum bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bme280 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bc93357f2a5603736e2c1f1ba8e18e9ec80efa7fdade5d6a37c11362b76363f4"
+"checksum bme280 0.2.1 (git+https://github.com/mgottschlag/bme280-rs?branch=destroy)" = "<none>"
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 "checksum cc 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
 "checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
@@ -475,7 +475,7 @@ dependencies = [
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
 "checksum panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c03864ac862876c16a308f5286f4aa217f1a69ac45df87ad3cd2847f818a642c"
 "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
+"checksum proc-macro2 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"
 "checksum quote 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
 "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f"
 "checksum rgb 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "a85b83fd629b0ce765f45316774fa6aaa95947fd74c8e4bbf3c6d1e349701d95"

display/firmware/Cargo.toml

@@ -20,7 +20,7 @@ cortex-m-semihosting = "0.3.5"
 mkl25z4-hal = { git = "https://github.com/mgottschlag/mkl25z4-hal" }
 embedded-hal = "0.2.3"
 nb = "0.1.2"
-bme280 = "0.2.1"
+bme280 = { git = "https://github.com/mgottschlag/bme280-rs", branch = "destroy" }
 embedded-nrf24l01 = { git = "https://github.com/astro/embedded-nrf24l01" }
 epd-waveshare = { git = "https://github.com/mgottschlag/epd-waveshare.git", branch = "streaming" }
 tinygfx = { git = "https://github.com/mgottschlag/tinygfx" }

display/firmware/src/main.rs

@@ -4,6 +4,7 @@
 mod display;
 mod information;
 mod pins;
+mod sensors;
 
 // TODO: Enable warnings again.
 #[allow(unused)]
@@ -17,7 +18,7 @@ use panic_semihosting as _;
 
 use display::{Display, DisplayState};
 use information::{Information, TemperatureHumidity};
-use pins::DisplayBmeSpi;
+use pins::{BME280Pins, DisplayBmeSpi};
 
 #[rtfm::app(device = mkl25z4_hal::mkl25z4, peripherals = true)]
 const APP: () = {
@@ -26,6 +27,7 @@ const APP: () = {
         display_state: DisplayState,
         display: Display,
         display_bme_spi: Option<DisplayBmeSpi>,
+        bme_pins: Option<BME280Pins>,
         time: CopyableMonoTimer,
     }
 
@@ -73,6 +75,7 @@ const APP: () = {
             },
             display,
             display_bme_spi: Some(pins.display_bme_spi),
+            bme_pins: Some(pins.bme),
             time,
         }
     }
@@ -91,10 +94,18 @@ const APP: () = {
         // TODO
     }
 
-    #[task(priority = 1, spawn = [update_display], resources = [info])]
+    #[task(priority = 1, spawn = [update_display], resources = [info, bme_pins, display_bme_spi, &time])]
     fn fetch_update(mut ctx: fetch_update::Context) {
         // Fetch local updates.
-        // TODO
+        let time = ctx.resources.time.clone();
+        let pins = ctx.resources.bme_pins.take().unwrap();
+        let (pins, values) = ctx.resources.display_bme_spi.lock(|display_bme_spi| {
+            let spi = display_bme_spi.take().unwrap();
+            let (pins, spi, values) = sensors::bme280(pins, spi, time);
+            *display_bme_spi = Some(spi);
+            (pins, values)
+        });
+        *ctx.resources.bme_pins = Some(pins);
 
         // Send local measurements to the base station. This needs to be done before fetching data
         // from the base station as the base station might return the data to us.
@@ -104,10 +115,10 @@ const APP: () = {
         // TODO
         ctx.resources.info.lock(|info| {
             info.inside = Some(TemperatureHumidity {
-                temperature: -212,
-                humidity: 345,
+                temperature: values.temperature,
+                humidity: values.humidity,
             });
-            info.pressure = Some(100000);
+            info.pressure = Some(values.pressure);
         });
 
         // If the update failed, simply increment the time and place a hint that

display/firmware/src/sensors.rs

@@ -0,0 +1,41 @@
+use bme280::spi::BME280;
+use embedded_hal::digital::v2::OutputPin;
+use mkl25z4_hal::time::CopyableMonoTimer;
+
+use super::pins::{BME280Pins, DisplayBmeSpi};
+
+pub fn bme280(
+    mut pins: BME280Pins,
+    spi: DisplayBmeSpi,
+    delay: CopyableMonoTimer,
+) -> (BME280Pins, DisplayBmeSpi, BME280Data) {
+    // Enable power.
+    pins.pwr.set_low().ok();
+
+    // Read the sensor.
+    let mut bme = BME280::new(spi, pins.cs, delay).unwrap();
+    bme.init().unwrap();
+    let values = bme.measure().unwrap();
+    let (spi, cs, _) = bme.destroy();
+
+    // Disable power again.
+    pins.pwr.set_high().ok();
+    (
+        BME280Pins {
+            pwr: pins.pwr,
+            cs: cs,
+        },
+        spi,
+        BME280Data {
+            temperature: (values.temperature * 10.0) as i32,
+            humidity: (values.humidity * 10.0) as u32,
+            pressure: values.pressure as u32,
+        },
+    )
+}
+
+pub struct BME280Data {
+    pub temperature: i32,
+    pub humidity: u32,
+    pub pressure: u32,
+}