Minor edits to get simulation running

diff --git a/ADC/sim/lattice-diamond b/ADC/sim/lattice-diamond
index 5a510acab3e48e6975607734c3df8b2048d3f154..c6e97831b5773a98c2638a68f9bc93522c07aef9 120000 (symlink)
--- a/ADC/sim/lattice-diamond
+++ b/ADC/sim/lattice-diamond
@@ -1 +1 @@
-lattice-diamond-frankfurt
\ No newline at end of file
+lattice-diamond-gsi
\ No newline at end of file

diff --git a/ADC/sim/lattice-diamond-gsi b/ADC/sim/lattice-diamond-gsi
index 3df92e0bd8fe9af76c4dab48f8031bb231ebf90d..b8c94ffd5e04eee574858db50c96f855290943ca 120000 (symlink)
--- a/ADC/sim/lattice-diamond-gsi
+++ b/ADC/sim/lattice-diamond-gsi
@@ -1 +1 @@
-/opt/lattice/diamond/2.0
\ No newline at end of file
+/opt/lattice/diamond/3.2_x64
\ No newline at end of file

diff --git a/ADC/source/adc_processor.vhd b/ADC/source/adc_processor.vhd
index df9c4e4e406dc3f7ae44c1d52f2189d5eefae29f..4aea223e3e031af4e088388637246301c4f6ea21 100644 (file)
--- a/ADC/source/adc_processor.vhd
+++ b/ADC/source/adc_processor.vhd
@@ -153,7 +153,7 @@ signal cfd_delay_ram         :  cfd_delay_ram_arr_t := (others => (others => (ot
 --signal subtracted    : signed(16 downto 0) := (others => '0');
 signal cfd_integral_sum  : signed(20 downto 0) := (others => '0');
 type cfd_signed19_t is array(CHANNELS-1 downto 0) of signed(18 downto 0);
-type cfd_signed17_t is array(CHANNELS-1 downto 0) of signed(18 downto 0);
+type cfd_signed17_t is array(CHANNELS-1 downto 0) of signed(16 downto 0);
 
 signal cfd_prev      : cfd_signed19_t := (others => (others => '0'));
 signal cfd           : cfd_signed19_t := (others => (others => '0'));