Public/rust_musiclight
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Limit main loop and packet send rates

Browse source 
LED data packets are now sent with at most 60 updates per second. The
main loop tries to uniformly distribute calculation updates over time.
This commit is contained in:
Thomas Kolb 2021-02-23 22:32:34 +01:00
parent 45475cb89d
commit a9202d8303
1 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main.rs
View file

@ -17,6 +17,9 @@ use crate::udpproto::UdpProto;
use std::rc::Rc; use std::rc::Rc;
use std::cell::RefCell; use std::cell::RefCell;
use std::thread::sleep;
use std::time::{Duration, Instant};
fn main() fn main()
{ {
let mut stdin = std::io::stdin(); let mut stdin = std::io::stdin();
@ -41,7 +44,7 @@ fn main()
println!("Loading user script..."); println!("Loading user script...");
let mut script = match UserScript::new(sigproc.clone(), "test.lua") { let mut script = match UserScript::new(sigproc.clone(), "particles.lua") {
Ok(script) => script, Ok(script) => script,
Err(e) => { Err(e) => {
println!("=== Lua Error ===\n{}\n====> Terminating.", e); println!("=== Lua Error ===\n{}\n====> Terminating.", e);
@ -61,6 +64,14 @@ fn main()
println!("Done! Starting main loop…"); println!("Done! Starting main loop…");
// Timing setup
let block_period = Duration::from_nanos((0.95 * (config::SAMPLES_PER_UPDATE as f32) * 1e9 / config::SAMP_RATE) as u64);
let send_period = Duration::from_nanos(1000000000 / 60);
let mut next_block_instant = Instant::now() + block_period;
let mut next_send_instant = Instant::now() + send_period;
// array for samples directly read from stream // array for samples directly read from stream
let mut samples: VecDeque<i16> = VecDeque::with_capacity(config::BLOCK_LEN); let mut samples: VecDeque<i16> = VecDeque::with_capacity(config::BLOCK_LEN);
@ -111,16 +122,27 @@ fn main()
// FIXME: only send with 60 FPS! // FIXME: only send with 60 FPS!
for i in 0..script.colorlists[0].len() { if Instant::now() > next_send_instant {
udpproto.set_color((i / config::NUM_LEDS_PER_STRIP) as u8, for i in 0..script.colorlists[0].len() {
(i % config::NUM_LEDS_PER_STRIP) as u8, udpproto.set_color((i / config::NUM_LEDS_PER_STRIP) as u8,
(script.colorlists[0][i] * 255.0) as u8, (i % config::NUM_LEDS_PER_STRIP) as u8,
(script.colorlists[1][i] * 255.0) as u8, (script.colorlists[0][i] * 255.0) as u8,
(script.colorlists[2][i] * 255.0) as u8, (script.colorlists[1][i] * 255.0) as u8,
(script.colorlists[3][i] * 255.0) as u8).unwrap(); (script.colorlists[2][i] * 255.0) as u8,
(script.colorlists[3][i] * 255.0) as u8).unwrap();
}
udpproto.commit().unwrap();
next_send_instant += send_period;
} }
udpproto.commit().unwrap(); let now = Instant::now();
if now < next_block_instant {
sleep(next_block_instant - now);
}
next_block_instant = Instant::now() + block_period;
} }
} }