Commit 6580fe29 authored by Matthieu Cattin's avatar Matthieu Cattin

fmc_adc: Fix returned data order.

Was returning two channels per row.
parent d6d4275f
......@@ -891,14 +891,18 @@ class CFmcAdc100m:
# carrier_addr and length are in 32-bit word
def get_data(self, carrier_addr, length):
ret = []
data = []
cc = self.bus.iwrite(0, self.DDR_ADR_ADDR, 4, carrier_addr)
#print('[get_data] write: addr=0x%.8X cc=%d'%(self.DDR_ADR_ADDR, cc))
for i in range(length):
#adr_cnt_b = self.bus.iread(0, self.DDR_ADR_ADDR, 4)
ret.append(self.bus.iread(0, self.DDR_DAT_ADDR, 4))
data.append(self.bus.iread(0, self.DDR_DAT_ADDR, 4))
#print('[get_data] read: addr=0x%.9X i=%d'%(self.DDR_DAT_ADDR, i))
#adr_cnt = self.bus.iread(0, self.DDR_ADR_ADDR, 4)
#print('[get_data] address counter: before=0x%.8X after=0x%.8X'%(adr_cnt_b, adr_cnt))
for i in range(length/4):
ret.append(data[i] & 0xFFFF)
ret.append(data[i]>>16)
return ret
# Write data to DDR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment