accidentally worked in stable branch oops

unstable
Penguin 3 years ago
parent 267db1c049
commit c7e7a1da83

4
Cargo.lock generated

@ -181,6 +181,10 @@ dependencies = [
[[package]] [[package]]
name = "igloo_agent" name = "igloo_agent"
version = "0.1.0" version = "0.1.0"
dependencies = [
"igloo_base",
"igloo_core",
]
[[package]] [[package]]
name = "igloo_base" name = "igloo_base"

@ -7,3 +7,5 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
igloo_base = {path = "../igloo_base"}
igloo_core = {path = "../igloo_core"}

@ -3,7 +3,9 @@ use std::process::{Command, Stdio};
use std::sync::mpsc::{channel, Sender}; use std::sync::mpsc::{channel, Sender};
use std::thread; use std::thread;
fn openocd_thread(sender: &Sender<String>, child: std::process::Child) use igloo_base::*;
use igloo_core::igloo_target;
fn openocd_thread(sender: Sender<String>, child: std::process::Child)
{ {
let mut f = BufReader::new(child.stdout.unwrap()); let mut f = BufReader::new(child.stdout.unwrap());
loop loop
@ -43,7 +45,7 @@ fn gdb_thread(sender: &Sender<String>, child: std::process::Child)
} }
} }
fn start_openocd_listener(sender: &Sender<String>, board_cfg_file: &str) fn start_openocd_listener(sender: Sender<String>, board_cfg_file: &str)
{ {
let child = Command::new("openocd") let child = Command::new("openocd")
.args(["-f", board_cfg_file]) .args(["-f", board_cfg_file])
@ -56,7 +58,7 @@ fn start_openocd_listener(sender: &Sender<String>, board_cfg_file: &str)
thread::spawn(move || openocd_thread(sender, child)); thread::spawn(move || openocd_thread(sender, child));
} }
fn ia_push(target: &IglooTarget) -> Result< fn ia_push(target: &igloo_target::IglooTarget) -> Result<String, igloo_base::IglooErrType>
{ {
Ok(String::from("working"))
} }

@ -6,7 +6,7 @@ extern crate config;
mod igloo_action; mod igloo_action;
mod igloo_project; mod igloo_project;
mod igloo_target; pub mod igloo_target;
use igloo_base::*; use igloo_base::*;
use igloo_base::IglooInstType::*; use igloo_base::IglooInstType::*;

Loading…
Cancel
Save