diff --git a/config.json b/config.json index e2460fd..0926e99 100644 --- a/config.json +++ b/config.json @@ -6,6 +6,6 @@ "bit_ref": 0, "bit_meas": 1, - "refpll_ki": 4294967, - "refpll_kl": 85899345 + "refpll_ki": 429496, + "refpll_kp": 4294967 } diff --git a/shell.nix b/shell.nix index 08635d5..670c363 100644 --- a/shell.nix +++ b/shell.nix @@ -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 diff --git a/src/main.rs b/src/main.rs index 5d977c8..8a4dc9f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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>(path: P) -> Result> { @@ -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| {