Compare commits
3 Commits
e45e92593d
...
833000e122
Author | SHA1 | Date |
---|---|---|
Sebastien Bourdeauducq | 833000e122 | |
Sebastien Bourdeauducq | a2d97d6d92 | |
Sebastien Bourdeauducq | 911e745be1 |
|
@ -1,3 +1,5 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "0.1.6"
|
||||
|
|
|
@ -6,6 +6,6 @@
|
|||
"bit_ref": 0,
|
||||
"bit_meas": 1,
|
||||
|
||||
"refpll_ki": 4294967,
|
||||
"refpll_kl": 85899345
|
||||
"refpll_ki": 429496,
|
||||
"refpll_kp": 4294967
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@ let
|
|||
owner = "m-labs";
|
||||
repo = "nmigen";
|
||||
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";
|
||||
propagatedBuildInputs = with pkgs.python3Packages; [ bitarray pyvcd jinja2 ];
|
||||
|
@ -69,9 +69,9 @@ let
|
|||
patches = [ ./glasgow-applet.diff ];
|
||||
nativeBuildInputs = with pkgs; [ gnumake sdcc ];
|
||||
propagatedBuildInputs = (
|
||||
[ fx2 nmigen ] ++
|
||||
(with pkgs.python3Packages; [ libusb1 aiohttp pyvcd bitarray crcmod ]) ++
|
||||
(with pkgs; [ yosys nextpnr icestorm ]));
|
||||
[ fx2 nmigen ] ++
|
||||
(with pkgs.python3Packages; [ libusb1 aiohttp pyvcd bitarray crcmod ]) ++
|
||||
(with pkgs; [ yosys nextpnr icestorm ]));
|
||||
preBuild = ''
|
||||
cd software
|
||||
python setup.py build_ext
|
||||
|
|
|
@ -20,7 +20,7 @@ struct Config {
|
|||
bit_ref: u8,
|
||||
bit_meas: u8,
|
||||
refpll_ki: i64,
|
||||
refpll_kl: i64
|
||||
refpll_kp: i64
|
||||
}
|
||||
|
||||
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_max, config.sample_rate),
|
||||
config.refpll_ki,
|
||||
config.refpll_kl);
|
||||
config.refpll_kp);
|
||||
let mut tracker = noptica::Tracker::new();
|
||||
let mut decimator = noptica::Decimator::new(200000);
|
||||
noptica::sample(&config.sample_command, |rising, _falling| {
|
||||
|
|
Loading…
Reference in New Issue