jane
/
leds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move parse out of loop

This commit is contained in:
jane 2021-12-28 15:43:21 -05:00
parent 2016f85fb0
commit b03eae4f0e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.rs
View File

@ -12,6 +12,7 @@ pub const BRIGHTNESS: u8 = 150;
fn main() { fn main() {
let p: RawColor = [0, 0, 0, 0]; let p: RawColor = [0, 0, 0, 0];
let lock = Arc::new(RwLock::new([p; LED_SIZE])); let lock = Arc::new(RwLock::new([p; LED_SIZE]));
let pattern: Arc<RwLock<Vec<Box<dyn Pattern>>>> = Arc::new(RwLock::new(Vec::new()));
let read = Arc::clone(&lock); let read = Arc::clone(&lock);
thread::spawn(move || { thread::spawn(move || {
let mut controller: Controller = ControllerBuilder::new() let mut controller: Controller = ControllerBuilder::new()
@ -29,19 +30,22 @@ fn main() {
run_lights(&mut controller, &lights).expect("Error running lights controller."); run_lights(&mut controller, &lights).expect("Error running lights controller.");
} }
}); });
let mul_string = format_multiline("unit");
let res: Result<Vec<Box<dyn Pattern>>, ParseError> = mul_string.iter()
.map(|x: &Vec<String>| parse_line((*x).clone()))
.collect();
if res.is_ok() {
let mut p = pattern.write().unwrap();
*p = res.unwrap();
}
let lock_c = Arc::clone(&lock);
let mut lights = lock_c.write().unwrap();
loop { loop {
let lock_c = Arc::clone(&lock);
thread::sleep(time::Duration::from_millis(250)); thread::sleep(time::Duration::from_millis(250));
let pattern = format_multiline("unit"); let pattern_c = Arc::clone(&pattern);
let res: Result<Vec<Box<dyn Pattern>>, ParseError> = pattern.iter() let v = pattern_c.read().expect("could not read pattern");
.map(|x: &Vec<String>| parse_line((*x).clone())) (*v).iter().for_each(move |x: &Box<dyn Pattern>| {
.collect(); x.execute(&mut lights);
if res.is_ok() { });
let mut lights = lock_c.write().unwrap();
let v: Vec<Box<dyn Pattern>> = res.unwrap();
v.iter().for_each(move |x| {
x.execute(&mut lights);
})
}
} }
} }