Compare commits
No commits in common. "833000e1223195d3ddaef688806bd58252105166" and "e45e92593d3f89baae5cbcb1d19fc2964efa70b9" have entirely different histories.
833000e122
...
e45e92593d
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1,5 +1,3 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
|
||||||
# It is not intended for manual editing.
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "0.1.6"
|
version = "0.1.6"
|
||||||
|
@ -6,6 +6,6 @@
|
|||||||
"bit_ref": 0,
|
"bit_ref": 0,
|
||||||
"bit_meas": 1,
|
"bit_meas": 1,
|
||||||
|
|
||||||
"refpll_ki": 429496,
|
"refpll_ki": 4294967,
|
||||||
"refpll_kp": 4294967
|
"refpll_kl": 85899345
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ let
|
|||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "nmigen";
|
repo = "nmigen";
|
||||||
rev = "2168ff512bfe04806b35c09d3b1d265a16c4ddbc";
|
rev = "2168ff512bfe04806b35c09d3b1d265a16c4ddbc";
|
||||||
sha256 = "0ij9idvlqsjzzr50vyg2ziabj7lv7yi8s0826g3acrn45hfv4535";
|
sha256 = "1zs2xkihdkvzy5lw5kr08aw9irjn4d1imalv49zxvf6zqanghx6z";
|
||||||
};
|
};
|
||||||
checkPhase = "PATH=${pkgs.yosys}/bin:${pkgs.symbiyosys}/bin:${pkgs.yices}/bin:$PATH python -m unittest discover nmigen.test -v";
|
checkPhase = "PATH=${pkgs.yosys}/bin:${pkgs.symbiyosys}/bin:${pkgs.yices}/bin:$PATH python -m unittest discover nmigen.test -v";
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [ bitarray pyvcd jinja2 ];
|
propagatedBuildInputs = with pkgs.python3Packages; [ bitarray pyvcd jinja2 ];
|
||||||
|
@ -20,7 +20,7 @@ struct Config {
|
|||||||
bit_ref: u8,
|
bit_ref: u8,
|
||||||
bit_meas: u8,
|
bit_meas: u8,
|
||||||
refpll_ki: i64,
|
refpll_ki: i64,
|
||||||
refpll_kp: i64
|
refpll_kl: i64
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_config_from_file<P: AsRef<Path>>(path: P) -> Result<Config, Box<Error>> {
|
fn read_config_from_file<P: AsRef<Path>>(path: P) -> Result<Config, Box<Error>> {
|
||||||
@ -36,7 +36,7 @@ fn main() {
|
|||||||
noptica::Dpll::frequency_to_ftw(config.freq_min, config.sample_rate),
|
noptica::Dpll::frequency_to_ftw(config.freq_min, config.sample_rate),
|
||||||
noptica::Dpll::frequency_to_ftw(config.freq_max, config.sample_rate),
|
noptica::Dpll::frequency_to_ftw(config.freq_max, config.sample_rate),
|
||||||
config.refpll_ki,
|
config.refpll_ki,
|
||||||
config.refpll_kp);
|
config.refpll_kl);
|
||||||
let mut tracker = noptica::Tracker::new();
|
let mut tracker = noptica::Tracker::new();
|
||||||
let mut decimator = noptica::Decimator::new(200000);
|
let mut decimator = noptica::Decimator::new(200000);
|
||||||
noptica::sample(&config.sample_command, |rising, _falling| {
|
noptica::sample(&config.sample_command, |rising, _falling| {
|
||||||
|
Loading…
Reference in New Issue
Block a user