cleanup
parent
911e745be1
commit
a2d97d6d92
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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| {
|
||||||
|
|
Loading…
Reference in New Issue