From: Andreas Neiser <neiser@kph.uni-mainz.de>
Date: Fri, 6 Feb 2015 12:48:32 +0000 (+0100)
Subject: Minor edits to get simulation running
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=551c0f1244dc80086f072db90524e080b7b53c00;p=trb3.git

Minor edits to get simulation running
---

diff --git a/ADC/sim/lattice-diamond b/ADC/sim/lattice-diamond
index 5a510ac..c6e9783 120000
--- 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 3df92e0..b8c94ff 120000
--- 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 df9c4e4..4aea223 100644
--- 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'));