srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

suservo: fix coefficient data writing 

Signed-off-by: Thomas Harty <thomas.harty@physics.ox.ac.uk>
This commit is contained in:
hartytp 2019-01-31 14:59:58 +00:00 committed by Robert Jördens
parent d6eb2b023a
commit 87e85bcc14
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/gateware/rtio/phy/servo.py Normal file → Executable file
View File

@ -81,8 +81,13 @@ class RTServoMem(Module):
1 + # state_sel 1 + # state_sel
1 + # config_sel 1 + # config_sel
len(m_state.adr)) len(m_state.adr))
internal_address = Signal(internal_address_width) internal_address = Signal(internal_address_width)
self.comb += internal_address.eq(Cat(self.rtlink.o.address, self.rtlink.o.data[w.coeff:])) self.comb += internal_address.eq(Cat(self.rtlink.o.address,
self.rtlink.o.data[w.coeff:]))
coeff_data = Signal(w.coeff)
self.comb += coeff_data.eq(self.rtlink.o.data[:w.coeff])
we = internal_address[-1] we = internal_address[-1]
state_sel = internal_address[-2] state_sel = internal_address[-2]
@ -91,7 +96,7 @@ class RTServoMem(Module):
self.comb += [ self.comb += [
self.rtlink.o.busy.eq(0), self.rtlink.o.busy.eq(0),
m_coeff.adr.eq(internal_address[1:]), m_coeff.adr.eq(internal_address[1:]),
m_coeff.dat_w.eq(Cat(self.rtlink.o.data, self.rtlink.o.data)), m_coeff.dat_w.eq(Cat(coeff_data, coeff_data)),
m_coeff.we[0].eq(self.rtlink.o.stb & ~high_coeff & m_coeff.we[0].eq(self.rtlink.o.stb & ~high_coeff &
we & ~state_sel), we & ~state_sel),
m_coeff.we[1].eq(self.rtlink.o.stb & high_coeff & m_coeff.we[1].eq(self.rtlink.o.stb & high_coeff &