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

Update demo app to use new api

Browse source
This commit is contained in:
Rafael Caricio 2021-06-02 01:31:05 +02:00
parent c9180d6c83
commit e99a2267de
Signed by: rafaelcaricio
GPG key ID: 3C86DBCE8E93C947
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
examples/demo.rs
View file

@ -5,15 +5,18 @@ use embedded_graphics_simulator::{
OutputSettingsBuilder, SimulatorDisplay, SimulatorEvent, Window, OutputSettingsBuilder, SimulatorDisplay, SimulatorEvent, Window,
}; };
use lvgl; use lvgl;
use lvgl::display::{DefaultDisplay, Display};
use lvgl::style::Style; use lvgl::style::Style;
use lvgl::widgets::{Label, LabelAlign}; use lvgl::widgets::{Label, LabelAlign};
use lvgl::{Align, Color, LvError, Part, State, Widget, UI}; use lvgl::{Align, Color, LvError, Part, State, Widget, UI};
use lvgl_sys; use lvgl_sys;
use parking_lot::Mutex;
use std::sync::Arc as SyncArc;
use std::thread::sleep; use std::thread::sleep;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
fn main() -> Result<(), LvError> { fn main() -> Result<(), LvError> {
let display: SimulatorDisplay<Rgb565> = SimulatorDisplay::new(Size::new( let embedded_graphics_display: SimulatorDisplay<Rgb565> = SimulatorDisplay::new(Size::new(
lvgl_sys::LV_HOR_RES_MAX, lvgl_sys::LV_HOR_RES_MAX,
lvgl_sys::LV_VER_RES_MAX, lvgl_sys::LV_VER_RES_MAX,
)); ));
@ -21,30 +24,33 @@ fn main() -> Result<(), LvError> {
let output_settings = OutputSettingsBuilder::new().scale(2).build(); let output_settings = OutputSettingsBuilder::new().scale(2).build();
let mut window = Window::new("PineTime", &output_settings); let mut window = Window::new("PineTime", &output_settings);
let mut ui = UI::init()?; lvgl::init();
// let mut ui = UI::init()?;
// Implement and register your display: // Implement and register your display:
ui.disp_drv_register(display).unwrap(); let shared_native_display = SyncArc::new(Mutex::new(embedded_graphics_display));
let _display = Display::register_shared(&shared_native_display)?;
// ui.disp_drv_register(embedded_graphics_display).unwrap();
// Create screen and widgets // Create screen and widgets
let mut screen = ui.scr_act()?; let mut screen = DefaultDisplay::get_scr_act()?;
let mut screen_style = Style::default(); let mut screen_style = Style::default();
screen_style.set_bg_color(State::DEFAULT, Color::from_rgb((0, 0, 0))); screen_style.set_bg_color(State::DEFAULT, Color::from_rgb((0, 0, 0)));
screen_style.set_radius(State::DEFAULT, 0); screen_style.set_radius(State::DEFAULT, 0);
screen.add_style(Part::Main, screen_style)?; screen.add_style(Part::Main, &mut screen_style)?;
let mut time = Label::new(&mut screen)?; let mut time = Label::new()?;
let mut style_time = Style::default(); let mut style_time = Style::default();
//style_time.set_text_font(font_noto_sans_numeric_28); // style_time.set_text_font(font_noto_sans_numeric_28);
style_time.set_text_color(State::DEFAULT, Color::from_rgb((255, 255, 255))); style_time.set_text_color(State::DEFAULT, Color::from_rgb((255, 255, 255)));
time.add_style(Part::Main, style_time)?; time.add_style(Part::Main, &mut style_time)?;
time.set_align(&mut screen, Align::Center, 0, 0)?; time.set_align(&mut screen, Align::Center, 0, 0)?;
time.set_text(CString::new("20:46").unwrap().as_c_str())?; time.set_text(CString::new("20:46").unwrap().as_c_str())?;
time.set_width(240)?; time.set_width(240)?;
time.set_height(240)?; time.set_height(240)?;
let mut bt = Label::new(&mut screen)?; let mut bt = Label::new()?;
bt.set_width(50)?; bt.set_width(50)?;
bt.set_height(80)?; bt.set_height(80)?;
bt.set_recolor(true)?; bt.set_recolor(true)?;
@ -52,7 +58,7 @@ fn main() -> Result<(), LvError> {
bt.set_label_align(LabelAlign::Left)?; bt.set_label_align(LabelAlign::Left)?;
bt.set_align(&mut screen, Align::InTopLeft, 0, 0)?; bt.set_align(&mut screen, Align::InTopLeft, 0, 0)?;
let mut power = Label::new(&mut screen)?; let mut power = Label::new()?;
power.set_recolor(true)?; power.set_recolor(true)?;
power.set_width(80)?; power.set_width(80)?;
power.set_height(20)?; power.set_height(20)?;
@ -66,12 +72,20 @@ fn main() -> Result<(), LvError> {
if i > 59 { if i > 59 {
i = 0; i = 0;
} }
println!("i = {}", i);
let val = CString::new(format!("21:{:02}", i)).unwrap(); let val = CString::new(format!("21:{:02}", i)).unwrap();
time.set_text(&val)?; time.set_text(&val)?;
i = 1 + i; i = 1 + i;
ui.task_handler(); let wait_for = lvgl::task_handler();
window.update(ui.get_display_ref().unwrap()); println!("wait for = {} ms", wait_for.unwrap().as_secs());
{
let native_display = shared_native_display.lock();
window.update(&native_display);
}
// ui.task_handler();
// window.update(ui.get_display_ref().unwrap());
lvgl::tick_inc(loop_started.elapsed());
for event in window.events() { for event in window.events() {
match event { match event {
@ -81,7 +95,6 @@ fn main() -> Result<(), LvError> {
} }
sleep(Duration::from_secs(1)); sleep(Duration::from_secs(1));
ui.tick_inc(loop_started.elapsed());
loop_started = Instant::now(); loop_started = Instant::now();
} }