Pin fix, improve fifo handling

This commit is contained in:
Caleb Jamison 2023-05-09 17:05:39 -04:00 committed by Caleb Jamison
parent d737e3dcbb
commit 1be6e53316

View File

@ -48,6 +48,8 @@ impl<'d, P: Instance, const S: usize> Ws2812<'d, P, S> {
// Pin config // Pin config
let out_pin = pio.make_pio_pin(pin); let out_pin = pio.make_pio_pin(pin);
cfg.set_out_pins(&[&out_pin]);
cfg.set_set_pins(&[&out_pin]);
let relocated = RelocatedProgram::new(&prg); let relocated = RelocatedProgram::new(&prg);
cfg.use_program(&pio.load_program(&relocated), &[&out_pin]); cfg.use_program(&pio.load_program(&relocated), &[&out_pin]);
@ -76,10 +78,12 @@ impl<'d, P: Instance, const S: usize> Ws2812<'d, P, S> {
pub async fn write(&mut self, colors: &[RGB8]) { pub async fn write(&mut self, colors: &[RGB8]) {
for color in colors { for color in colors {
let word = (u32::from(color.g) << 24) | (u32::from(color.r) << 16) | (u32::from(color.b) << 8); let word = (u32::from(color.g) << 24) | (u32::from(color.r) << 16) | (u32::from(color.b) << 8);
if !self.sm.tx().try_push(word) {
self.sm.tx().wait_push(word).await; self.sm.tx().wait_push(word).await;
} }
} }
} }
}
/// Input a value 0 to 255 to get a color value /// Input a value 0 to 255 to get a color value
/// The colours are a transition r - g - b - back to r. /// The colours are a transition r - g - b - back to r.