M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 03:08:27 +08:00
Code Issues Projects Releases Wiki Activity

clean up ccc279b8

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2018-02-17 12:10:46 +08:00
parent ccc279b8da
commit fb8b36cd41
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/firmware/libboard_artiq/build.rs
View File

@ -1,29 +1,5 @@
extern crate build_misoc;
use std::env;
use std::fs::File;
use std::io::Write;
use std::path::Path;
use std::process::Command;
fn gen_hmc7043_writes() {
println!("cargo:rerun-if-changed=hmc7043_gen_writes.py");
println!("cargo:rerun-if-changed=hmc7043_guiexport_6gbps.py");
let hmc7043_writes =
Command::new("python3")
.arg("hmc7043_gen_writes.py")
.arg("hmc7043_guiexport_6gbps.py")
.output()
.ok()
.and_then(|o| String::from_utf8(o.stdout).ok())
.unwrap();
let out_dir = env::var("OUT_DIR").unwrap();
let mut f = File::create(Path::new(&out_dir).join("hmc7043_writes.rs")).unwrap();
write!(f, "{}", hmc7043_writes).unwrap();
}
fn main() {
build_misoc::cfg();
gen_hmc7043_writes();
}

3
artiq/firmware/libboard_artiq/hmc830_7043.rs
View File

@ -113,8 +113,7 @@ mod hmc830 {
if addr == 0x0d || addr == 0x0e { continue; }
error!("[0x{:02x}] = 0x{:04x}", addr, read(addr));
}
// return Err("HMC830 lock timeout");
break;
return Err("HMC830 lock timeout");
}
}