From 823615a31e42a10f4979178f7e37ed3bcc001f56 Mon Sep 17 00:00:00 2001 From: Raphael Nestler <raphael.nestler@gmail.com> Date: Fri, 23 Aug 2019 23:44:29 +0200 Subject: [PATCH] Show current sensor value --- sensor-plot/src/main.rs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sensor-plot/src/main.rs b/sensor-plot/src/main.rs index c4b38bc..fdf53f8 100644 --- a/sensor-plot/src/main.rs +++ b/sensor-plot/src/main.rs @@ -118,22 +118,31 @@ fn main() { } old_b = b; - let unit: &[u8] = match sensor { - Sensor::Temperature => b"T\0", - Sensor::Humidity => b"RH\0", - Sensor::Pressure => b"P\0", - Sensor::GasResistance => b"R\0", - }; + let mut str_buffer = [0u8; 32]; environment_sensors.read().map(|v| { plot_buffer_t.add_sample((v.temperature * 1000.0) as i32); plot_buffer_rh.add_sample((v.humidity * 1000.0) as i32); plot_buffer_p.add_sample((v.pressure * 1000.0) as i32); plot_buffer_r.add_sample((v.gas_resistance * 1000.0) as i32); + match sensor { + Sensor::Temperature => { + write!(FmtBuffer::new(&mut str_buffer), "T: {}\0", v.temperature).unwrap(); + } + Sensor::Humidity => { + write!(FmtBuffer::new(&mut str_buffer), "RH: {}\0", v.humidity).unwrap(); + } + Sensor::Pressure => { + write!(FmtBuffer::new(&mut str_buffer), "P: {}\0", v.pressure).unwrap(); + } + Sensor::GasResistance => { + write!(FmtBuffer::new(&mut str_buffer), "R: {}\0", v.gas_resistance).unwrap(); + } + }; }); display.clear(Color::black()); - display.print(0, 0, unit, Color::white(), Color::black()); + display.print(0, 0, &str_buffer, Color::white(), Color::black()); match sensor { Sensor::Temperature => plot_buffer_t.plot(&display), Sensor::Humidity => plot_buffer_rh.plot(&display), -- GitLab