diff --git a/HISTORY.txt b/HISTORY.txt index f3c1c7d11a09c8be24baf11e94cea897b710c272..0a6004069cae862372c07d19155eb68a9411f720 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,3 +1,13 @@ +v1.4, 2017-04-10 + added more documentation + added Python CLI + fixed inverted pulse mode + updated submodules general-cores, vme64x-core and uvm_agents + added wbgen2 generated files + added WB-SPI core for AD9512 (can override HW control) + added signal back loop (connected to front panel LEMOs) + typos, small bugfixes + v1.3, 2016-09-21 transformed Python driver to OOP code, simplified interface fixed temperature readout diff --git a/hdl/ffpg/rtl/FfpgPkg.vhd b/hdl/ffpg/rtl/FfpgPkg.vhd index 18dc681b0bda480bc61017c367fdca9f4c1f927d..1cadb422ca5a1017b0e97a1f4fb27189ab9f5f70 100644 --- a/hdl/ffpg/rtl/FfpgPkg.vhd +++ b/hdl/ffpg/rtl/FfpgPkg.vhd @@ -41,7 +41,7 @@ use work.wishbone_pkg.all; package FfpgPkg is constant VersionMajor: natural := 1; - constant VersionMinor: natural := 3; + constant VersionMinor: natural := 4; constant VersionRevision: natural := 0; type t_Ad5600Interface is record diff --git a/sw/Ffpg.py b/sw/Ffpg.py index bb92009a9f394a8b4bce2a70959e50568e03be85..3b1d641c7e4e43aaa372e342b737d509fce6c69c 100644 --- a/sw/Ffpg.py +++ b/sw/Ffpg.py @@ -58,7 +58,7 @@ class Ffpg(object): self.wb = WbOverlay("fmc_fpg", fmcSlot) self.temp = DS18B20(wbOverlay = self.wb) self.ad9512 = AD9512(wbOverlay = self.wb, SpiBaseAddress = "SpiBase") - assert self.CompareVersion(1, 3, 0) == 0, "Bad gateware version detected! Get the appropriate driver from http://www.ohwr.org/projects/fmc-del-1ns-2cha/repository/revisions/master/show/sw" + assert self.CompareVersion(1, 4, 0) == 0, "Bad gateware version detected! Get the appropriate driver from http://www.ohwr.org/projects/fmc-del-1ns-2cha/repository/revisions/master/show/sw" def GetFmcSlot(self): return self.fmcSlot