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

grabber: fix frame size off-by-1

This commit is contained in:
Robert Jördens 2018-09-07 15:30:04 +02:00
parent ec62eb9373
commit 312256a18d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/firmware/libboard_artiq/grabber.rs
View File

@ -134,8 +134,12 @@ pub fn tick() {
if clock_pattern_ok(g) { if clock_pattern_ok(g) {
let last_xy = get_last_pixels(g); let last_xy = get_last_pixels(g);
if last_xy != unsafe { INFO[g].frame_size } { if last_xy != unsafe { INFO[g].frame_size } {
// x capture is on ~LVAL which is after
// the last increment on DVAL
// y capture is on ~FVAL which coincides with the
// last increment on ~LVAL
info!("grabber{} frame size: {}x{}", info!("grabber{} frame size: {}x{}",
g, last_xy.0 + 1, last_xy.1 + 1); g, last_xy.0, last_xy.1 + 1);
unsafe { INFO[g].frame_size = last_xy } unsafe { INFO[g].frame_size = last_xy }
} }
State::Watch State::Watch

12
artiq/gateware/grabber/core.py
View File

@ -89,14 +89,16 @@ class Parser(Module, AutoCSR):
pix.x.eq(pix.x + 1), pix.x.eq(pix.x + 1),
), ),
If(~lval, If(~lval,
If(last_lval, last_x.eq(pix.x)), If(last_lval,
pix.x.eq(0), last_x.eq(pix.x),
If(last_fval & last_lval,
pix.y.eq(pix.y + 1) pix.y.eq(pix.y + 1)
) ),
pix.x.eq(0)
), ),
If(~fval, If(~fval,
If(last_fval, last_y.eq(pix.y)), If(last_fval,
last_y.eq(pix.y)
),
pix.y.eq(0) pix.y.eq(0)
) )
] ]