diff --git a/.gitignore b/.gitignore index 0e205d4..eb5a316 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1 @@ - -# Configuration file -Settings.* - -# Generated by Cargo -# will have compiled files and executables -debug/ -target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk - -# MSVC Windows builds of rustc generate these, which store debugging information -*.pdb - -.idea +target diff --git a/Cargo.toml b/Cargo.toml index 1b4a46d..435bde2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -config = "0.13.3" ctrlc = "3.4.0" helios-dac = { version = "0.1", default-features = false, features = ["native"] } redis = "0.23.0" diff --git a/copyme.Settings.toml b/copyme.Settings.toml deleted file mode 100644 index c9c3513..0000000 --- a/copyme.Settings.toml +++ /dev/null @@ -1,6 +0,0 @@ -laser_id = 1 -debug = "true" -redis_url = "127.0.0.1" -dac_family = "Helios" -dac_id = 1 -dac_url = "192.168.1.68" diff --git a/src/conf.rs b/src/conf.rs deleted file mode 100644 index 871d044..0000000 --- a/src/conf.rs +++ /dev/null @@ -1,47 +0,0 @@ - -use config::Config; -use serde::Deserialize; - - -#[derive(Deserialize,Debug)] -pub enum DacFamily { - Helios, - Etherdream - } - -#[derive(Deserialize,Debug)] -pub struct Conf{ - laser_id : u8, - debug : bool, - redis_url : String, - dac_family: DacFamily, - dac_id : Option, - dac_url : Option -} - - -pub fn load_config( path : &str )-> Result> { - - let conf_builder = Config::builder() - .add_source(config::File::with_name(path)); - - - let settings = match conf_builder.build() { - Ok(conf) => conf, - Err(err) => { - println!("Invalid configuration file / missing file: {:?}", err); - return Err(Box::new(err)) - } - }; - - let conf = settings - .try_deserialize::()?; - // .try_deserialize::>()?; - - println!( - "{:?}", - conf - ); - - Ok(conf) -} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index b5ae005..ddf3328 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,6 @@ /// mod redis_ctrl; -mod conf; use helios_dac::{Frame, Point, @@ -16,15 +15,11 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use redis_ctrl::{RedisCtrl,Order}; -use conf::{load_config}; - const CENTER : (u16,u16) = (2000, 2000); -pub fn main() -> Result<(), Box> { - let config = load_config("Settings")?; - +pub fn main() -> Result<(), Box> { let running = Arc::new(AtomicBool::new(true)); let r = running.clone();