rafaelcaricio/lvgl-rs
1
0
Fork 0
Code Issues 12 Pull requests 2 Projects Releases 4 Wiki Activity

Specific color mode

Browse source
This commit is contained in:
Rafael Caricio 2020-04-19 14:51:29 +02:00
parent 0ddd716735
commit 5f7bf51fd5
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lvgl/src/display.rs
View file

@ -4,25 +4,22 @@ use embedded_graphics;
use embedded_graphics::prelude::*; use embedded_graphics::prelude::*;
use embedded_graphics::{drawable, DrawTarget}; use embedded_graphics::{drawable, DrawTarget};
use core::mem::MaybeUninit; use core::mem::MaybeUninit;
use embedded_graphics::pixelcolor::PixelColor; use embedded_graphics::pixelcolor::Rgb888;
use core::marker::PhantomData; use core::marker::PhantomData;
struct DisplayDriver<'a, T, C> struct DisplayDriver<'a, T>
where where
T: DrawTarget<C>, T: DrawTarget<Rgb888>,
C: PixelColor
{ {
pub raw: lvgl_sys::lv_disp_drv_t, pub raw: lvgl_sys::lv_disp_drv_t,
display_buffer: MaybeUninit<lvgl_sys::lv_disp_buf_t>, display_buffer: MaybeUninit<lvgl_sys::lv_disp_buf_t>,
refresh_buffer: [MaybeUninit<lvgl_sys::lv_color_t>; lvgl_sys::LV_HOR_RES_MAX as usize * 10], refresh_buffer: [MaybeUninit<lvgl_sys::lv_color_t>; lvgl_sys::LV_HOR_RES_MAX as usize * 10],
phantom: &'a PhantomData<T>, phantom: &'a PhantomData<T>,
phantom1: PhantomData<C>,
} }
impl<'a, T, C> DisplayDriver<'a, T, C> where impl<'a, T> DisplayDriver<'a, T> where
T: DrawTarget<C>, T: DrawTarget<Rgb888>
C: PixelColor
{ {
pub fn new(device: &'a mut T) -> Self { pub fn new(device: &'a mut T) -> Self {
// Create a display buffer for LittlevGL // Create a display buffer for LittlevGL
@ -46,7 +43,7 @@ impl<'a, T, C> DisplayDriver<'a, T, C> where
// Basic initialization // Basic initialization
lvgl_sys::lv_disp_drv_init(&mut disp_drv); lvgl_sys::lv_disp_drv_init(&mut disp_drv);
// Set your driver function // Set your driver function
disp_drv.flush_cb = Some(display_callback_wrapper::<T, C>); disp_drv.flush_cb = Some(display_callback_wrapper::<T>);
disp_drv.user_data = device as *mut _ as *mut cty::c_void; disp_drv.user_data = device as *mut _ as *mut cty::c_void;
disp_drv disp_drv
}; };
@ -61,7 +58,6 @@ impl<'a, T, C> DisplayDriver<'a, T, C> where
display_buffer, display_buffer,
refresh_buffer, refresh_buffer,
phantom: &PhantomData, phantom: &PhantomData,
phantom1: PhantomData,
} }
} }
@ -70,13 +66,12 @@ impl<'a, T, C> DisplayDriver<'a, T, C> where
} }
} }
unsafe extern "C" fn display_callback_wrapper<T, C>( unsafe extern "C" fn display_callback_wrapper<T>(
disp_drv: *mut lvgl_sys::lv_disp_drv_t, disp_drv: *mut lvgl_sys::lv_disp_drv_t,
area: *const lvgl_sys::lv_area_t, area: *const lvgl_sys::lv_area_t,
color_p: *mut lvgl_sys::lv_color_t, color_p: *mut lvgl_sys::lv_color_t,
) where ) where
T: DrawTarget<C>, T: DrawTarget<Rgb888>,
C: PixelColor
{ {
// We need to make sure panics can't escape across the FFI boundary. // We need to make sure panics can't escape across the FFI boundary.
//let _ = panic::catch_unwind(|| { //let _ = panic::catch_unwind(|| {
@ -91,8 +86,9 @@ unsafe extern "C" fn display_callback_wrapper<T, C>(
// Convert C color representation to high-level Rust // Convert C color representation to high-level Rust
let raw_color = *color_p.add(i); let raw_color = *color_p.add(i);
i = i + 1; i = i + 1;
let color = Rgb888::new(raw_color.ch.red, raw_color.ch.green, raw_color.ch.blue);
// Callback the Rust closure to flush the new points to the screen // Callback the Rust closure to flush the new points to the screen
let _ = device.draw_pixel(drawable::Pixel(Point::new(x as i32, y as i32), raw_color.into())); let _ = device.draw_pixel(drawable::Pixel(Point::new(x as i32, y as i32), color));
} }
} }
// Indicate to LittlevGL that you are ready with the flushing // Indicate to LittlevGL that you are ready with the flushing