From 71e7ff915d45aad31aadc3a7b2287e82a9a4eb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gro=C3=9F?= Date: Tue, 29 May 2018 08:49:05 +0200 Subject: [PATCH] Fixed broken example --- examples/embedded_linux/src/main.rs | 38 +++++++++++++---------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/examples/embedded_linux/src/main.rs b/examples/embedded_linux/src/main.rs index 223840d..6b4bebd 100644 --- a/examples/embedded_linux/src/main.rs +++ b/examples/embedded_linux/src/main.rs @@ -93,8 +93,7 @@ fn main() { let delay = Delay {}; - let white = Color::White; - let black = Color::Black; + @@ -107,7 +106,7 @@ fn main() { // draw something let graphics = Graphics::new(400, 300); - graphics.clear(&mut buffer, &white); + graphics.clear(&mut buffer, &Color::White); graphics.draw_line(&mut buffer, 0,0,400,300, &Color::Black); graphics.draw_filled_rectangle(&mut buffer, 200,200, 230, 230, &Color::Black); @@ -130,35 +129,32 @@ fn main() { //Test fast updating a bit more let mut small_buffer = [0x00; 128]; let circle_graphics = Graphics::new(32,32); - graphics.draw_circle(&mut small_buffer, 16,16, 10, &Color::Black); + circle_graphics.draw_circle(&mut small_buffer, 16,16, 10, &Color::Black); + + epd4in2.set_partial_window(&small_buffer, 16,16, 32, 32, false).expect("Partial Window Error"); + epd4in2.display_frame().expect("Display Frame Error"); - epd4in2.set_partial_window(&small_buffer, 16,16, 32, 32, false); - epd4in2.display_frame(); + epd4in2.set_partial_window(&small_buffer, 128,64, 32, 32, false).expect("Partial Window Error"); + epd4in2.display_frame().expect("Display Frame Error"); - epd4in2.set_partial_window(&small_buffer, 128,64, 32, 32, false); - epd4in2.display_frame(); + epd4in2.set_partial_window(&small_buffer, 320,24, 32, 32, false).expect("Partial Window Error"); + epd4in2.display_frame().expect("Display Frame Error"); - epd4in2.set_partial_window(&small_buffer, 320,24, 32, 32, false); - epd4in2.display_frame(); + epd4in2.set_partial_window(&small_buffer, 160,240, 32, 32, false).expect("Partial Window Error"); + epd4in2.display_frame().expect("Display Frame Error"); - epd4in2.set_partial_window(&small_buffer, 160,240, 32, 32, false); + epd4in2.delay_ms(3000); - epd4in2.display_frame(); - epd4in2.delay_ms(3000); - //pub fn draw_string(&self, buffer: &mut[u8], x0: u16, y0: u16, input: String, color: &Color) { - graphics.draw_string(&mut buffer, 16, 16, &['h', 'e', 'l', 'l', 'o'], &Color::Black); - graphics.draw_char(&mut buffer, 250, 250, '#', &Color::Black); - graphics.draw_char(&mut buffer, 300, 16, '7', &Color::Black); + //pub fn draw_string_8x8(&self, buffer: &mut[u8], x0: u16, y0: u16, input: &str, color: &Color) { + graphics.draw_string_8x8(&mut buffer, 16, 16, "hello", &Color::Black); + graphics.draw_char_8x8(&mut buffer, 250, 250, '#', &Color::Black); + graphics.draw_char_8x8(&mut buffer, 300, 16, '7', &Color::Black); epd4in2.display_and_transfer_frame(&buffer, None).expect("display and transfer error"); epd4in2.delay_ms(3000); - - - epd4in2.clear_frame(None).expect("clear frame error"); - epd4in2.sleep().expect("sleeping error"); }