move redis stuff to its own file

This commit is contained in:
Marc Planard 2023-06-03 15:21:36 +02:00
parent b5f6f03151
commit 86d5ea0522
3 changed files with 59 additions and 24 deletions

View File

@ -6,6 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
ctrlc = "3.4.0"
helios-dac = { version = "0.1", default-features = false, features = ["native"] }
redis = "0.23.0"
ron = "0.8.0"

View File

@ -3,30 +3,31 @@
/// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md
///
mod redis_ctrl;
use helios_dac::{Frame,
Point,
DeviceStatus,
// Coordinate,
Color};
use helios_dac::NativeHeliosDacController;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use redis::{ //RedisResult,
Client,
Connection,
Commands
};
use ron::de::from_str;
type Line = Vec<(f32,f32,u32)>;
use redis_ctrl::RedisCtrl;
const CENTER : (u16,u16) = (2000, 2000);
pub fn main() -> Result<(), Box<dyn std::error::Error>> {
use helios_dac::NativeHeliosDacController;
let client = Client::open("redis://127.0.0.1/")?;
let mut con = client.get_connection()?;
pub fn main() -> Result<(), Box<dyn std::error::Error>> {
let running = Arc::new(AtomicBool::new(true));
let r = running.clone();
ctrlc::set_handler(move || {
r.store(false, Ordering::SeqCst);
}).expect("Error setting Ctrl-C handler");
let mut rs = RedisCtrl::new()?;
let controller = NativeHeliosDacController::new()?;
let devices = controller.list_devices()?;
@ -34,24 +35,25 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
let device = devices.into_iter().next().unwrap();
let mut device = device.open()?;
for _ in 0..100 {
let frame = get_next_frame(1000, &mut con)?;
while running.load(Ordering::SeqCst) {
let frame = get_next_frame(1000, &mut rs)?;
while let Ok(DeviceStatus::NotReady) = device.status() {
}
device.write_frame(frame)?;
}
println!("Exiting, stoping device.");
device.stop()?;
Ok(())
}
fn get_next_frame(
speed: u32,
con: &mut Connection
rs: &mut RedisCtrl
) -> Result<Frame, Box<dyn std::error::Error>> {
let val : String = con.get("/pl/0/0")?;
let line : Line = from_str(&val)?;
let line = rs.get("/pl/0/0")?;
let line : Vec<Point> = line.iter()
.map(tuple_to_point)
.collect();

32
src/redis_ctrl.rs Normal file
View File

@ -0,0 +1,32 @@
use redis::{
Client,
Connection,
Commands
};
use ron::de::from_str;
pub type Line = Vec<(f32,f32,u32)>;
pub struct RedisCtrl {
pub client: Client,
pub connection: Connection
}
impl RedisCtrl {
pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
let client = Client::open("redis://127.0.0.1/")?;
let connection = client.get_connection()?;
Ok(RedisCtrl { client, connection })
}
pub fn get(
&mut self,
key: &str
) -> Result<Line, Box<dyn std::error::Error>> {
let val : String = self.connection.get(key)?;
let line : Line = from_str(&val)?;
Ok(line)
}
}