Initial groundwork of animatrix

This commit is contained in:
Luke
2020-05-31 12:21:04 +12:00
parent ca5d625cec
commit d9fc7de5cb
14 changed files with 490 additions and 162 deletions

View File

@@ -0,0 +1,13 @@
use rog_aura::AnimatrixDbusWriter;
fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut writer = AnimatrixDbusWriter::new()?;
let mut send_buffer = [vec![0; 640], vec![0; 640]];
loop {
writer.write_image(&send_buffer)?;
//std::thread::sleep(std::time::Duration::from_millis(60));
}
}

View File

@@ -23,7 +23,5 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
}
writer.write_colour_block(&key_colours)?;
//std::thread::sleep(std::time::Duration::from_millis(250));
}
}

View File

@@ -0,0 +1,55 @@
use super::*;
use dbus::channel::Sender;
use dbus::{blocking::Connection, Message};
use std::error::Error;
use std::sync::{
atomic::{AtomicBool, Ordering},
Arc,
};
use std::{thread, time::Duration};
/// Simplified way to write a effect block
pub struct AnimatrixDbusWriter {
connection: Box<Connection>,
block_time: u64,
stop: Arc<AtomicBool>,
}
impl AnimatrixDbusWriter {
#[inline]
pub fn new() -> Result<Self, Box<dyn Error>> {
let connection = Connection::new_system()?;
Ok(AnimatrixDbusWriter {
connection: Box::new(connection),
block_time: 100,
stop: Arc::new(AtomicBool::new(false)),
})
}
/// Write an Animatrix image
///
/// The expected input here is *two* Vectors, 640 bytes in length. The two vectors
/// are each one half of the full image write.
///
/// After each write a flush is written, it is assumed that this tells the device to
/// go ahead and display the written bytes
///
/// # Note:
/// The vectors are expected to contain the full sequence of bytes as follows
///
/// - Write pane 1: 0x5e 0xc0 0x02 0x01 0x00 0x73 0x02 .. <led brightness>
/// - Write pane 2: 0x5e 0xc0 0x02 0x74 0x02 0x73 0x02 .. <led brightness>
///
/// Where led brightness is 0..255, low to high
#[inline]
pub fn write_image(&mut self, image: &[Vec<u8>; 2]) -> Result<(), Box<dyn Error>> {
let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "AnimatrixWrite")?
.append2(image[0].to_vec(), image[1].to_vec());
self.connection.send(msg).unwrap();
thread::sleep(Duration::from_millis(self.block_time));
if self.stop.load(Ordering::Relaxed) {
panic!("Got signal to stop!");
}
Ok(())
}
}

View File

@@ -59,7 +59,7 @@ impl AuraDbusWriter {
&mut self,
key_colour_array: &KeyColourArray,
) -> Result<(), Box<dyn Error>> {
self.connection.process(Duration::from_micros(300))?;
// self.connection.process(Duration::from_micros(300))?;
let group = key_colour_array.get();
let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "LedWriteEffect")?

View File

@@ -15,6 +15,9 @@ pub use aura_dbus::*;
pub use fancy::*;
mod animatrix_dbus;
pub use animatrix_dbus::*;
pub mod error;
use crate::cli_options::*;