Anshorei/epd-waveshare
1
0
Fork 0
mirror of https://github.com/Anshorei/epd-waveshare.git synced 2026-10-03 22:06:43 +00:00
Code Issues Projects Releases Wiki Activity

Update to e.h 1.0a6 & linux e.h

Browse Source
This commit is contained in:
Caemor
2021-11-30 23:53:34 +01:00
parent e3779d458e
commit 9c1bfa3663
16 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/epd1in54_no_graphics.rs
+4 -3
View File
@@ -1,17 +1,18 @@
#![deny(warnings)]
use embedded_hal::delay::blocking::DelayUs;
use epd_waveshare::{epd1in54::Epd1in54, prelude::*};
use linux_embedded_hal::{
spidev::{self, SpidevOptions},
sysfs_gpio::Direction,
Delay, Pin, Spidev,
Delay, Spidev, SysfsPin as Pin,
};
// activate spi, gpio in raspi-config
// needs to be run with sudo because of some sysfs_gpio permission problems and follow-up timing problems
// see https://github.com/rust-embedded/rust-sysfs-gpio/issues/5 and follow-up issues
fn main() -> Result<(), std::io::Error> {
fn main() -> Result<(), linux_embedded_hal::SPIError> {
// Configure SPI
// SPI settings are from eink-waveshare-rs documenation
let mut spi = Spidev::open("/dev/spidev0.0")?;
@@ -89,7 +90,7 @@ fn main() -> Result<(), std::io::Error> {
// Display updated frame
epd.display_frame(&mut spi, &mut delay)?;
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
// Set the EPD to sleep
epd.sleep(&mut spi, &mut delay)?;
examples/epd2in13_v2.rs
+5 -5
View File
@@ -6,7 +6,7 @@ use embedded_graphics::{
primitives::{Circle, Line, PrimitiveStyle},
text::{Baseline, Text, TextStyleBuilder},
};
use embedded_hal::prelude::*;
use embedded_hal::delay::blocking::DelayUs;
use epd_waveshare::{
color::*,
epd2in13_v2::{Display2in13, Epd2in13},
@@ -16,14 +16,14 @@ use epd_waveshare::{
use linux_embedded_hal::{
spidev::{self, SpidevOptions},
sysfs_gpio::Direction,
Delay, Pin, Spidev,
Delay, Spidev, SysfsPin as Pin,
};
// activate spi, gpio in raspi-config
// needs to be run with sudo because of some sysfs_gpio permission problems and follow-up timing problems
// see https://github.com/rust-embedded/rust-sysfs-gpio/issues/5 and follow-up issues
fn main() -> Result<(), std::io::Error> {
fn main() -> Result<(), linux_embedded_hal::SPIError> {
// Configure SPI
// Settings are taken from
let mut spi = Spidev::open("/dev/spidev0.0").expect("spidev directory");
@@ -83,7 +83,7 @@ fn main() -> Result<(), std::io::Error> {
epd2in13
.display_frame(&mut spi, &mut delay)
.expect("display frame new graphics");
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
//println!("Now test new graphics with default rotation and some special stuff:");
display.clear_buffer(Color::White);
@@ -135,7 +135,7 @@ fn main() -> Result<(), std::io::Error> {
epd2in13
.update_and_display_frame(&mut spi, display.buffer(), &mut delay)
.expect("display frame new graphics");
delay.delay_ms(1_000u16);
delay.delay_ms(1_000).expect("delay");
}
// Show a spinning bar without any delay between frames. Shows how «fast»
examples/epd2in13bc.rs
+5 -5
View File
@@ -6,7 +6,7 @@ use embedded_graphics::{
primitives::{Circle, Line, PrimitiveStyle},
text::{Baseline, Text, TextStyleBuilder},
};
use embedded_hal::prelude::*;
use embedded_hal::delay::blocking::DelayUs;
use epd_waveshare::{
color::*,
epd2in13bc::{Display2in13bc, Epd2in13bc},
@@ -16,7 +16,7 @@ use epd_waveshare::{
use linux_embedded_hal::{
spidev::{self, SpidevOptions},
sysfs_gpio::Direction,
Delay, Pin, Spidev,
Delay, Spidev, SysfsPin as Pin,
};
// activate spi, gpio in raspi-config
@@ -34,7 +34,7 @@ use linux_embedded_hal::{
//
// after finishing, put the display to sleep
fn main() -> Result<(), std::io::Error> {
fn main() -> Result<(), linux_embedded_hal::SPIError> {
let busy = Pin::new(24); // GPIO 24, board J-18
busy.export().expect("busy export");
while !busy.is_exported() {}
@@ -98,7 +98,7 @@ fn main() -> Result<(), std::io::Error> {
.expect("display frame new graphics");
println!("First frame done. Waiting 5s");
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
println!("Now test new graphics with default rotation and three colors:");
display.clear_buffer(TriColor::White);
@@ -143,7 +143,7 @@ fn main() -> Result<(), std::io::Error> {
.expect("display frame new graphics");
println!("Second frame done. Waiting 5s");
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
// clear both bw buffer and chromatic buffer
display.clear_buffer(TriColor::White);
examples/epd4in2.rs
+5 -5
View File
@@ -6,7 +6,7 @@ use embedded_graphics::{
primitives::{Circle, Line, PrimitiveStyleBuilder},
text::{Baseline, Text, TextStyleBuilder},
};
use embedded_hal::prelude::*;
use embedded_hal::delay::blocking::DelayUs;
use epd_waveshare::{
color::*,
epd4in2::{Display4in2, Epd4in2},
@@ -16,14 +16,14 @@ use epd_waveshare::{
use linux_embedded_hal::{
spidev::{self, SpidevOptions},
sysfs_gpio::Direction,
Delay, Pin, Spidev,
Delay, Spidev, SysfsPin as Pin,
};
// activate spi, gpio in raspi-config
// needs to be run with sudo because of some sysfs_gpio permission problems and follow-up timing problems
// see https://github.com/rust-embedded/rust-sysfs-gpio/issues/5 and follow-up issues
fn main() -> Result<(), std::io::Error> {
fn main() -> Result<(), linux_embedded_hal::SPIError> {
// Configure SPI
// Settings are taken from
let mut spi = Spidev::open("/dev/spidev0.0").expect("spidev directory");
@@ -83,7 +83,7 @@ fn main() -> Result<(), std::io::Error> {
epd4in2
.display_frame(&mut spi, &mut delay)
.expect("display frame new graphics");
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
println!("Now test new graphics with default rotation and some special stuff");
display.clear_buffer(Color::White);
@@ -141,7 +141,7 @@ fn main() -> Result<(), std::io::Error> {
.display_frame(&mut spi, &mut delay)
.expect("display frame new graphics");
delay.delay_ms(1_000u16);
delay.delay_ms(1_000).expect("delay");
}
println!("Finished tests - going to sleep");
examples/epd4in2_variable_size.rs
+5 -5
View File
@@ -7,7 +7,7 @@ use embedded_graphics::{
primitives::{Circle, Line, PrimitiveStyleBuilder},
text::{Baseline, Text, TextStyleBuilder},
};
use embedded_hal::prelude::*;
use embedded_hal::delay::blocking::DelayUs;
use epd_waveshare::{
color::*,
epd4in2::{self, Epd4in2},
@@ -17,14 +17,14 @@ use epd_waveshare::{
use linux_embedded_hal::{
spidev::{self, SpidevOptions},
sysfs_gpio::Direction,
Delay, Pin, Spidev,
Delay, Spidev, SysfsPin as Pin,
};
// activate spi, gpio in raspi-config
// needs to be run with sudo because of some sysfs_gpio permission problems and follow-up timing problems
// see https://github.com/rust-embedded/rust-sysfs-gpio/issues/5 and follow-up issues
fn main() -> Result<(), std::io::Error> {
fn main() -> Result<(), linux_embedded_hal::SPIError> {
// Configure SPI
// Settings are taken from
let mut spi = Spidev::open("/dev/spidev0.0").expect("spidev directory");
@@ -89,7 +89,7 @@ fn main() -> Result<(), std::io::Error> {
epd4in2
.display_frame(&mut spi, &mut delay)
.expect("display frame new graphics");
delay.delay_ms(5000u16);
delay.delay_ms(5000).expect("delay");
println!("Now test new graphics with default rotation and some special stuff:");
display.set_rotation(DisplayRotation::Rotate0);
@@ -146,7 +146,7 @@ fn main() -> Result<(), std::io::Error> {
.display_frame(&mut spi, &mut delay)
.expect("display frame new graphics");
delay.delay_ms(1_000u16);
delay.delay_ms(1_000).expect("delay");
}
println!("Finished tests - going to sleep");