M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

siphaser: bugfixes 

* Fix integer overflow in degree computation
* Add some phase slips after the first transition to get out of the jitter zone and avoid intermittent short windows
This commit is contained in:
Sebastien Bourdeauducq 2019-01-30 16:56:38 +08:00
parent c591009220
commit ec8560911f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/firmware/libboard_artiq/si5324.rs
View File

@ -304,7 +304,7 @@ pub mod siphaser {
} }
} }
fn find_edge(target: bool) -> Result<u16> { fn find_edge(target: bool) -> Result<u32> {
let mut nshifts = 0; let mut nshifts = 0;
let mut previous = has_error(); let mut previous = has_error();
@ -323,8 +323,13 @@ pub mod siphaser {
} }
pub fn calibrate_skew() -> Result<()> { pub fn calibrate_skew() -> Result<()> {
let jitter_margin = 32;
let lead = find_edge(false)?; let lead = find_edge(false)?;
let width = find_edge(true)?; for _ in 0..jitter_margin {
phase_shift(1);
}
let width = find_edge(true)? + jitter_margin;
// width is 360 degrees (one full rotation of the phase between s/h limits) minus jitter
info!("calibration successful, lead: {}, width: {} ({}deg)", lead, width, width*360/(56*8)); info!("calibration successful, lead: {}, width: {} ({}deg)", lead, width, width*360/(56*8));
// Apply reverse phase shift for half the width to get into the // Apply reverse phase shift for half the width to get into the