search

HERA-Team / hera_corr_f

HERA F-Engine on SNAP
1 stars 5 forks source link

Merge #43

Closed jkocz closed 3 years ago

jkocz commented 3 years ago

This is a merge of the h4cv2 branch and the vivado2019 branch. - All code control changes (e.g. updates of python code for py3) from the vivado2019 branch were discarded in favour of the h4cv2 branch.

All FPGA updates (model files, IP cores) were kept from vivado2019.

The casperfpga submodule is correct.

Still to do: create a HERA specific mlib_devel version of the casper libraries and update the submodule to point there.

jkocz commented 3 years ago

out or order merges have made this difficult to merge. Will fix conflict and resubmit.