mirror of
https://github.com/Anshorei/epd-waveshare.git
synced 2026-10-03 22:06:43 +00:00
Merge branch 'fix-70' of https://github.com/olback/epd-waveshare into olback-fix-70
This commit is contained in:
@@ -61,8 +61,8 @@ fn main() -> Result<(), std::io::Error> {
|
||||
let mut epd = Epd1in54::new(&mut spi, cs_pin, busy, dc, rst, &mut delay)?;
|
||||
|
||||
// Clear the full screen
|
||||
epd.clear_frame(&mut spi)?;
|
||||
epd.display_frame(&mut spi)?;
|
||||
epd.clear_frame(&mut spi, &mut delay)?;
|
||||
epd.display_frame(&mut spi, &mut delay)?;
|
||||
|
||||
// Speeddemo
|
||||
epd.set_lut(&mut spi, Some(RefreshLut::Quick))?;
|
||||
@@ -71,12 +71,12 @@ fn main() -> Result<(), std::io::Error> {
|
||||
for i in 0..number_of_runs {
|
||||
let offset = i * 8 % 150;
|
||||
epd.update_partial_frame(&mut spi, &small_buffer, 25 + offset, 25 + offset, 16, 16)?;
|
||||
epd.display_frame(&mut spi)?;
|
||||
epd.display_frame(&mut spi, &mut delay)?;
|
||||
}
|
||||
|
||||
// Clear the full screen
|
||||
epd.clear_frame(&mut spi)?;
|
||||
epd.display_frame(&mut spi)?;
|
||||
epd.clear_frame(&mut spi, &mut delay)?;
|
||||
epd.display_frame(&mut spi, &mut delay)?;
|
||||
|
||||
// Draw some squares
|
||||
let small_buffer = [Color::Black.get_byte_value(); 3200]; //160x160
|
||||
@@ -89,11 +89,11 @@ fn main() -> Result<(), std::io::Error> {
|
||||
epd.update_partial_frame(&mut spi, &small_buffer, 96, 96, 8, 8)?;
|
||||
|
||||
// Display updated frame
|
||||
epd.display_frame(&mut spi)?;
|
||||
epd.display_frame(&mut spi, &mut delay)?;
|
||||
delay.delay_ms(5000u16);
|
||||
|
||||
// Set the EPD to sleep
|
||||
epd.sleep(&mut spi)?;
|
||||
epd.sleep(&mut spi, &mut delay)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -80,9 +80,9 @@ fn main() -> Result<(), std::io::Error> {
|
||||
display.set_rotation(DisplayRotation::Rotate270);
|
||||
draw_text(&mut display, "Rotate 270!", 5, 50);
|
||||
|
||||
epd2in13.update_frame(&mut spi, &display.buffer())?;
|
||||
epd2in13.update_frame(&mut spi, &display.buffer(), &mut delay)?;
|
||||
epd2in13
|
||||
.display_frame(&mut spi)
|
||||
.display_frame(&mut spi, &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
delay.delay_ms(5000u16);
|
||||
|
||||
@@ -123,7 +123,7 @@ fn main() -> Result<(), std::io::Error> {
|
||||
epd2in13
|
||||
.set_refresh(&mut spi, &mut delay, RefreshLut::Quick)
|
||||
.unwrap();
|
||||
epd2in13.clear_frame(&mut spi).unwrap();
|
||||
epd2in13.clear_frame(&mut spi, &mut delay).unwrap();
|
||||
|
||||
// a moving `Hello World!`
|
||||
let limit = 10;
|
||||
@@ -131,7 +131,7 @@ fn main() -> Result<(), std::io::Error> {
|
||||
draw_text(&mut display, " Hello World! ", 5 + i * 12, 50);
|
||||
|
||||
epd2in13
|
||||
.update_and_display_frame(&mut spi, &display.buffer())
|
||||
.update_and_display_frame(&mut spi, &display.buffer(), &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
delay.delay_ms(1_000u16);
|
||||
}
|
||||
@@ -140,7 +140,7 @@ fn main() -> Result<(), std::io::Error> {
|
||||
// the screen can refresh for this kind of change (small single character)
|
||||
display.clear_buffer(Color::White);
|
||||
epd2in13
|
||||
.update_and_display_frame(&mut spi, &display.buffer())
|
||||
.update_and_display_frame(&mut spi, &display.buffer(), &mut delay)
|
||||
.unwrap();
|
||||
|
||||
let spinner = ["|", "/", "-", "\\"];
|
||||
@@ -148,12 +148,12 @@ fn main() -> Result<(), std::io::Error> {
|
||||
display.clear_buffer(Color::White);
|
||||
draw_text(&mut display, spinner[i % spinner.len()], 10, 100);
|
||||
epd2in13
|
||||
.update_and_display_frame(&mut spi, &display.buffer())
|
||||
.update_and_display_frame(&mut spi, &display.buffer(), &mut delay)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
println!("Finished tests - going to sleep");
|
||||
epd2in13.sleep(&mut spi)
|
||||
epd2in13.sleep(&mut spi, &mut delay)
|
||||
}
|
||||
|
||||
fn draw_text(display: &mut Display2in13, text: &str, x: i32, y: i32) {
|
||||
|
||||
+8
-6
@@ -80,9 +80,9 @@ fn main() -> Result<(), std::io::Error> {
|
||||
display.set_rotation(DisplayRotation::Rotate270);
|
||||
draw_text(&mut display, "Rotate 270!", 5, 50);
|
||||
|
||||
epd4in2.update_frame(&mut spi, &display.buffer())?;
|
||||
epd4in2.update_frame(&mut spi, &display.buffer(), &mut delay)?;
|
||||
epd4in2
|
||||
.display_frame(&mut spi)
|
||||
.display_frame(&mut spi, &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
delay.delay_ms(5000u16);
|
||||
|
||||
@@ -121,22 +121,24 @@ fn main() -> Result<(), std::io::Error> {
|
||||
// a moving `Hello World!`
|
||||
let limit = 10;
|
||||
epd4in2.set_lut(&mut spi, Some(RefreshLut::Quick)).unwrap();
|
||||
epd4in2.clear_frame(&mut spi).unwrap();
|
||||
epd4in2.clear_frame(&mut spi, &mut delay).unwrap();
|
||||
for i in 0..limit {
|
||||
//println!("Moving Hello World. Loop {} from {}", (i + 1), limit);
|
||||
|
||||
draw_text(&mut display, " Hello World! ", 5 + i * 12, 50);
|
||||
|
||||
epd4in2.update_frame(&mut spi, &display.buffer()).unwrap();
|
||||
epd4in2
|
||||
.display_frame(&mut spi)
|
||||
.update_frame(&mut spi, &display.buffer(), &mut delay)
|
||||
.unwrap();
|
||||
epd4in2
|
||||
.display_frame(&mut spi, &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
|
||||
delay.delay_ms(1_000u16);
|
||||
}
|
||||
|
||||
println!("Finished tests - going to sleep");
|
||||
epd4in2.sleep(&mut spi)
|
||||
epd4in2.sleep(&mut spi, &mut delay)
|
||||
}
|
||||
|
||||
fn draw_text(display: &mut Display4in2, text: &str, x: i32, y: i32) {
|
||||
|
||||
@@ -88,7 +88,7 @@ fn main() -> Result<(), std::io::Error> {
|
||||
.update_partial_frame(&mut spi, &display.buffer(), x, y, width, height)
|
||||
.unwrap();
|
||||
epd4in2
|
||||
.display_frame(&mut spi)
|
||||
.display_frame(&mut spi, &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
delay.delay_ms(5000u16);
|
||||
|
||||
@@ -137,14 +137,14 @@ fn main() -> Result<(), std::io::Error> {
|
||||
.update_partial_frame(&mut spi, &display.buffer(), x, y, width, height)
|
||||
.unwrap();
|
||||
epd4in2
|
||||
.display_frame(&mut spi)
|
||||
.display_frame(&mut spi, &mut delay)
|
||||
.expect("display frame new graphics");
|
||||
|
||||
delay.delay_ms(1_000u16);
|
||||
}
|
||||
|
||||
println!("Finished tests - going to sleep");
|
||||
epd4in2.sleep(&mut spi)
|
||||
epd4in2.sleep(&mut spi, &mut delay)
|
||||
}
|
||||
|
||||
fn draw_text(display: &mut VarDisplay, text: &str, x: i32, y: i32) {
|
||||
|
||||
Reference in New Issue
Block a user