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

Fix examples

Browse source
This commit is contained in:
Rafael Caricio 2020-06-14 16:16:59 +02:00
parent 655300d3e9
commit 3c8f892c19
4 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/arc.rs
View file

@ -39,8 +39,8 @@ fn main() -> Result<(), LvError> {
let mut arc = Arc::new(&mut screen)?; let mut arc = Arc::new(&mut screen)?;
arc.set_size(150, 150)?; arc.set_size(150, 150)?;
arc.set_align(&mut screen, Align::Center, 0, 10)?; arc.set_align(&mut screen, Align::Center, 0, 10)?;
arc.set_start_angle(135, ArcPart::Indicator)?; arc.set_start_angle(135)?;
arc.set_end_angle(135, ArcPart::Indicator)?; arc.set_end_angle(135)?;
let mut loading_lbl = Label::new(&mut screen)?; let mut loading_lbl = Label::new(&mut screen)?;
loading_lbl.set_text("Loading...")?; loading_lbl.set_text("Loading...")?;
@ -75,7 +75,7 @@ fn main() -> Result<(), LvError> {
i = 1; i = 1;
} }
angle = if forward { angle + 1 } else { angle - 1 }; angle = if forward { angle + 1 } else { angle - 1 };
arc.set_end_angle(angle + 135, ArcPart::Indicator)?; arc.set_end_angle(angle + 135)?;
i += 1; i += 1;
sleep(Duration::from_millis(10)); sleep(Duration::from_millis(10));

2
examples/bar.rs
View file

@ -43,7 +43,7 @@ fn main() -> Result<(), LvError> {
// // Set the indicator style for the bar object // // Set the indicator style for the bar object
let mut ind_style = Style::default(); let mut ind_style = Style::default();
ind_style.set_bg_color(State::DEFAULT, Color::from_rgb((100, 245, 100))); ind_style.set_bg_color(State::DEFAULT, Color::from_rgb((100, 245, 100)));
bar.add_style(BarPart::Indicator, ind_style)?; bar.add_style(Part::All, ind_style)?;
let mut loading_lbl = Label::new(&mut screen)?; let mut loading_lbl = Label::new(&mut screen)?;
loading_lbl.set_text("Loading...")?; loading_lbl.set_text("Loading...")?;

2
examples/gauge.rs
View file

@ -53,7 +53,7 @@ fn main() -> Result<(), LvError> {
gauge_style.set_scale_end_border_width(State::DEFAULT, 4); gauge_style.set_scale_end_border_width(State::DEFAULT, 4);
let mut gauge = Gauge::new(&mut screen)?; let mut gauge = Gauge::new(&mut screen)?;
gauge.add_style(GaugePart::Main, gauge_style)?; gauge.add_style(Part::Main, gauge_style)?;
gauge.set_align(&mut screen, Align::Center, 0, 0)?; gauge.set_align(&mut screen, Align::Center, 0, 0)?;
gauge.set_value(0, 50)?; gauge.set_value(0, 50)?;

28
lvgl-sys/src/string_impl.rs
View file

@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE. // SOFTWARE.
use core::{mem, ptr, slice, usize}; use core::{ptr, usize};
use cty::*; use cty::*;
#[no_mangle] #[no_mangle]
@ -147,7 +147,7 @@ pub unsafe extern "C" fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn strrchr(s: *const c_char, c: c_int) -> *mut c_char { pub unsafe extern "C" fn strrchr(s: *const c_char, c: c_int) -> *mut c_char {
let len = strlen(s) as isize; let len = strlen(s) as isize;
let c = c as i8; let c = c as c_char;
let mut i = len - 1; let mut i = len - 1;
while i >= 0 { while i >= 0 {
if *s.offset(i) == c { if *s.offset(i) == c {
@ -157,27 +157,3 @@ pub unsafe extern "C" fn strrchr(s: *const c_char, c: c_int) -> *mut c_char {
} }
ptr::null_mut() ptr::null_mut()
} }
unsafe fn inner_strstr(
mut haystack: *const c_char,
needle: *const c_char,
mask: c_char,
) -> *mut c_char {
while *haystack != 0 {
let mut i = 0;
loop {
if *needle.offset(i) == 0 {
// We reached the end of the needle, everything matches this far
return haystack as *mut c_char;
}
if *haystack.offset(i) & mask != *needle.offset(i) & mask {
break;
}
i += 1;
}
haystack = haystack.offset(1);
}
ptr::null_mut()
}