display: Display the data received from the base station.

display/firmware/Cargo.lock

@@ -59,6 +59,15 @@ name = "cc"
 version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "chrono"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cmake"
 version = "0.1.42"
@@ -137,6 +146,7 @@ name = "display-firmware"
 version = "0.0.1"
 dependencies = [
  "bme280 0.2.1 (git+https://github.com/mgottschlag/bme280-rs?branch=destroy)",
+ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -294,6 +304,23 @@ name = "nb"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "num-integer"
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "panic-semihosting"
 version = "0.5.3"
@@ -469,6 +496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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 chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 "checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
 "checksum cortex-m 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2954942fbbdd49996704e6f048ce57567c3e1a4e2dc59b41ae9fde06a01fc763"
 "checksum cortex-m-rt 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "00d518da72bba39496024b62607c1d8e37bcece44b2536664f1132a73a499a28"
@@ -493,6 +521,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum mkl25z4 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "91f9b185f1346b1fdc8337481e2fdf5f282d0e884e2c59e4ddea5328105017d7"
 "checksum mkl25z4-hal 0.1.0 (git+https://github.com/mgottschlag/mkl25z4-hal)" = "<none>"
 "checksum nb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
+"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 "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.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319"

display/firmware/Cargo.toml

@@ -25,10 +25,8 @@ embedded-nrf24l01 = { git = "https://github.com/mgottschlag/embedded-nrf24l01",
 epd-waveshare = { git = "https://github.com/mgottschlag/epd-waveshare", branch = "wip" }
 tinygfx = { git = "https://github.com/mgottschlag/tinygfx" }
 protocol = { path = "../../common/rust-protocol" }
-
-[dependencies.void]
-default-features = false
-version = "1.0.2"
+chrono = { version = "0.4.11", default-features = false }
+void = { version = "1.0.2", default-features = false }
 
 [build-dependencies]
 tinygfx-assets = { git = "https://github.com/mgottschlag/tinygfx" }

display/firmware/src/information.rs

@@ -4,7 +4,7 @@ use super::sensors::BME280Data;
 
 #[derive(Clone)]
 pub struct Information {
-    pub time: u32,
+    pub time: u64,
     pub valid: bool,
 
     pub inside: Option<TemperatureHumidity>,

display/firmware/src/main.rs

@@ -104,6 +104,9 @@ const APP: () = {
         ctx.resources.update_timer.start(10.s());
         ctx.resources.update_timer.enable_interrupt();
 
+        // Update the time.
+        // TODO
+
         // Trigger an update of the displayed values.
         ctx.spawn.fetch_update().ok();
     }
@@ -144,14 +147,50 @@ const APP: () = {
             &[ValueType::Temperature, ValueType::Humidity],
             &mut balcony,
         );
-        // TODO
+        let mut bathroom = [None; 2];
+        radio.request_values(
+            Location::Bathroom,
+            &[ValueType::Temperature, ValueType::Humidity],
+            &mut bathroom,
+        );
+        let mut general = [None; 2];
+        radio.request_values(
+            Location::Livingroom,
+            &[ValueType::Time, ValueType::Pressure],
+            &mut general,
+        );
 
         ctx.resources.info.lock(|info| {
-            info.inside = Some(TemperatureHumidity {
-                temperature: values.temperature,
-                humidity: values.humidity,
-            });
-            info.pressure = Some(values.pressure);
+            if livingroom[0].is_some() && livingroom[1].is_some() {
+                info.inside = Some(TemperatureHumidity {
+                    temperature: livingroom[0].unwrap() as i32,
+                    humidity: livingroom[1].unwrap() as u32,
+                });
+            } else {
+                info.inside = None;
+            }
+            if balcony[0].is_some() && balcony[1].is_some() {
+                info.outside = Some(TemperatureHumidity {
+                    temperature: balcony[0].unwrap() as i32,
+                    humidity: balcony[1].unwrap() as u32,
+                });
+            } else {
+                info.outside = None;
+            }
+            if bathroom[0].is_some() && bathroom[1].is_some() {
+                info.bathroom = Some(TemperatureHumidity {
+                    temperature: bathroom[0].unwrap() as i32,
+                    humidity: bathroom[1].unwrap() as u32,
+                });
+            } else {
+                info.bathroom = None;
+            }
+            if general[1].is_some() {
+                info.pressure = Some(general[1].unwrap() as u32);
+            }
+            if general[0].is_some() {
+                info.time = general[0].unwrap() as u64;
+            }
             info.local = Some(values);
         });
 

display/firmware/src/ui/tiles.rs

@@ -1,5 +1,7 @@
 use core::fmt::Write;
 
+use chrono::naive::NaiveDateTime;
+use chrono::{Datelike, Timelike, Weekday};
 use tinygfx::color::BlackWhite::{self, Black, White};
 use tinygfx::image::{MonoBitmapImage, MonoImageData};
 use tinygfx::{Clip, MonoImage, Rectangle, Renderer, Text, TextAlignment};
@@ -18,20 +20,55 @@ impl TileView {
     }
 
     pub fn draw(&self, renderer: &mut Renderer<BlackWhite>) {
-        // TODO: Insert values.
-        let date = Text::new(8, 8, "Samstag, 25.04.2020", &ROBOTO_22, Black);
-        let mut time = Text::new(392, 8, "12:34", &ROBOTO_22, Black);
-        time.align(TextAlignment::Right);
-        let top_bar = Rectangle::new(0, 34, 400, 1, Black);
+        // Format the time.
+        let datetime = NaiveDateTime::from_timestamp(self.info.time as i64, 0);
+        let date = datetime.date();
+        let time = datetime.time();
 
-        let tile_width = 400 / 2 - 1;
-        let tile_height = (300 - 35) / 2 - 1;
+        let mut date_buffer = WriteBuffer {
+            buffer: [0u8; 32],
+            length: 0,
+        };
+        write!(
+            date_buffer,
+            "{}, {:02}.{:02}.{:04}",
+            match date.weekday() {
+                Weekday::Mon => "Montag",
+                Weekday::Tue => "Dienstag",
+                Weekday::Wed => "Mittwoch",
+                Weekday::Thu => "Donnerstag",
+                Weekday::Fri => "Freitag",
+                Weekday::Sat => "Samstag",
+                Weekday::Sun => "Sonntag",
+            },
+            date.day(),
+            date.month(),
+            date.year()
+        )
+        .ok();
 
+        let mut time_buffer = WriteBuffer {
+            buffer: [0u8; 8],
+            length: 0,
+        };
+        write!(time_buffer, "{:02}:{:02}", time.hour(), time.minute(),).ok();
+
+        // Format everything else.
         let outside_strings = self.info.outside.map(|x| TempHumStrings::new(x));
         let inside_strings = self.info.inside.map(|x| TempHumStrings::new(x));
         let bathroom_strings = self.info.bathroom.map(|x| TempHumStrings::new(x));
         let pressure_string = self.info.pressure.map(|x| PressureString::new(x));
 
+        // Create the UI.
+        // TODO: Insert values.
+        let date = Text::new(8, 8, date_buffer.to_str(), &ROBOTO_22, Black);
+        let mut time = Text::new(392, 8, time_buffer.to_str(), &ROBOTO_22, Black);
+        time.align(TextAlignment::Right);
+        let top_bar = Rectangle::new(0, 34, 400, 1, Black);
+
+        let tile_width = 400 / 2 - 1;
+        let tile_height = (300 - 35) / 2 - 1;
+
         let inside_tile = TempHumTile::new(
             "Innen",
             inside_strings.as_ref(),