sb10q/noptica-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: sb10q:e45e92593d3f89baae5cbcb1d19fc2964efa70b9
Branches Tags
sb10q:master
...
compare: sb10q:833000e1223195d3ddaef688806bd58252105166
Branches Tags
sb10q:master

3 Commits
e45e92593d ... 833000e122

Author SHA1 Message Date
Sebastien Bourdeauducq
833000e122 shell.nix: fix nmigen sha256 2019-10-03 19:07:08 +08:00
Sebastien Bourdeauducq
a2d97d6d92 cleanup 2019-10-03 19:06:41 +08:00
Sebastien Bourdeauducq
911e745be1 cargo.lock: add header for recent cargo 2019-10-03 19:06:21 +08:00
4 changed files with 10 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1,3 +1,5 @@
# 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"

4
config.json
View File

@ -6,6 +6,6 @@
"bit_ref": 0, "bit_ref": 0,
"bit_meas": 1, "bit_meas": 1,
"refpll_ki": 4294967, "refpll_ki": 429496,
"refpll_kl": 85899345 "refpll_kp": 4294967
} }

8
shell.nix
View File

@ -51,7 +51,7 @@ let
owner = "m-labs"; owner = "m-labs";
repo = "nmigen"; repo = "nmigen";
rev = "2168ff512bfe04806b35c09d3b1d265a16c4ddbc"; rev = "2168ff512bfe04806b35c09d3b1d265a16c4ddbc";
sha256 = "1zs2xkihdkvzy5lw5kr08aw9irjn4d1imalv49zxvf6zqanghx6z"; sha256 = "0ij9idvlqsjzzr50vyg2ziabj7lv7yi8s0826g3acrn45hfv4535";
}; };
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 ];
@ -69,9 +69,9 @@ let
patches = [ ./glasgow-applet.diff ]; patches = [ ./glasgow-applet.diff ];
nativeBuildInputs = with pkgs; [ gnumake sdcc ]; nativeBuildInputs = with pkgs; [ gnumake sdcc ];
propagatedBuildInputs = ( propagatedBuildInputs = (
[ fx2 nmigen ] ++ [ fx2 nmigen ] ++
(with pkgs.python3Packages; [ libusb1 aiohttp pyvcd bitarray crcmod ]) ++ (with pkgs.python3Packages; [ libusb1 aiohttp pyvcd bitarray crcmod ]) ++
(with pkgs; [ yosys nextpnr icestorm ])); (with pkgs; [ yosys nextpnr icestorm ]));
preBuild = '' preBuild = ''
cd software cd software
python setup.py build_ext python setup.py build_ext

4
src/main.rs
View File

@ -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_kl: i64 refpll_kp: 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_kl); config.refpll_kp);
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| {