updated version to v0.2 of embedded_hal, but broke f3 example

This commit is contained in:
Christoph Groß
2018-05-22 12:02:03 +02:00
parent ba5d44a1d7
commit aff8b83ac3
5 changed files with 21 additions and 16 deletions
+4 -3
View File
@@ -5,8 +5,9 @@ authors = ["Christoph Groß <christoph.gross@student.uni-tuebingen.de>"]
[dependencies]
eink_waveshare_rs = { git = "https://github.com/Caemor/eink-waveshare-rs"}
#eink_waveshare_rs = { git = "https://github.com/Caemor/eink-waveshare-rs"}
eink_waveshare_rs = { path = "../../"}
linux-embedded-hal = "0.1.1"
linux-embedded-hal = "0.2.0"
embedded-hal = { version = "0.1.2", features = ["unproven"] }
embedded-hal = { version = "0.2.1", features = ["unproven"] }
+8 -5
View File
@@ -17,28 +17,31 @@ use lin_hal::Delay;
// DigitalIn Hack as long as it's not in the linux_embedded_hal
// from https://github.com/rudihorn/max31865/blob/extra_examples/examples/rpi.rs
// (slightly changed now as OutputPin doesn't provide is_high and is_low anymore)
extern crate embedded_hal;
use embedded_hal::digital::{InputPin, OutputPin};
use embedded_hal::digital::{InputPin};
struct HackInputPin<'a> {
pin: &'a OutputPin
pin: &'a Pin
}
impl<'a> HackInputPin<'a> {
fn new(p : &'a OutputPin) -> HackInputPin {
fn new(p : &'a Pin) -> HackInputPin {
HackInputPin {
pin: p
}
}
}
//TODO: make it safer?? or handle the errors better?
// now it defaults to is_low if an error appears
impl<'a> InputPin for HackInputPin<'a> {
fn is_low(&self) -> bool {
self.pin.is_low()
self.pin.get_value().unwrap_or(0) == 0
}
fn is_high(&self) -> bool {
self.pin.is_high()
self.pin.get_value().unwrap_or(0) == 1
}
}