Update various files

diff --git a/.gitignore b/.gitignore
index d7cc176ab3ad770ab691a6fe9ae3500101c2ac95..292a09ce2b38a763369dc43bd4a130ae29871501 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ licbug.txt
 **/*workdir
 **/diamond
 config_compile.pl
+projectfrankfurt

diff --git a/base/code/input_to_trigger_logic_record.vhd b/base/code/input_to_trigger_logic_record.vhd
index 295a8dcb213fdc0c3d2862c8b135d5e4ad6e4257..9d530935024baef83f525e896393caf3f0e3e90e 100644 (file)
--- a/base/code/input_to_trigger_logic_record.vhd
+++ b/base/code/input_to_trigger_logic_record.vhd
@@ -226,13 +226,13 @@ got_simplecoin    <= coin_in_1 and coin_in_2 and coin_enable when rising_edge(CL
 --  Multiplicity Trigger
 ----------------------------
 
-gen_mult : if OUTPUTS >= 2 generate
+-- gen_mult : if OUTPUTS >= 2 generate
   PROC_MULT : process 
     variable m : integer range 0 to INPUTS-1;
   begin
     wait until rising_edge(CLK);
     m := 0;
-    for i in 0 to 31 loop  --was INPUTS-1 @ 09.17
+    for i in 0 to minimum(INPUTS-1,31) loop  --was INPUTS-1 @ 09.17
       if inp_verylong(i) = '1' and multiplicity_enable(i) = '1' then
         m := m + 1;
       end if;  
@@ -245,10 +245,10 @@ gen_mult : if OUTPUTS >= 2 generate
       multiplicity_trigger <= '0';
     end if;
   end process;
-end generate;  
-gen_no_mult : if OUTPUTS < 2 generate 
-  multiplicity_trigger <= '0';
-end generate;
+-- end generate;  
+-- gen_no_mult : if OUTPUTS < 2 generate 
+--   multiplicity_trigger <= '0';
+-- end generate;
 
 
 ----------------------------

diff --git a/cts/config_default.vhd b/cts/config_default.vhd
index 89063915e195088ebc666701290ba39026c03a39..2e4c5f3ec04b6742c8137231912013d4548d6e1b 100644 (file)
--- a/cts/config_default.vhd
+++ b/cts/config_default.vhd
@@ -51,7 +51,9 @@ package config is
     constant TRIGGER_PULSER_COUNT : integer := 2;
     constant TRIGGER_RAND_PULSER  : integer := 1;
     constant TRIGGER_ADDON_COUNT  : integer := 8;
-    constant PERIPH_TRIGGER_COUNT : integer := 2;      
+    constant PERIPH_TRIGGER_COUNT : integer := 2;
+    constant ADDON_LINE_COUNT        : integer := 38;    
+    constant CTS_OUTPUT_MULTIPLEXERS : integer := 8;
     
 ------------------------------------------------------------------------------
 --End of configuration

diff --git a/fpgatest/trb3_periph_test.vhd b/fpgatest/trb3_periph_test.vhd
index 1ef74270ba23e5ad25e9e1ce523d2566f2182e9a..22443868a6ca73c2b60fd098cd79ef51cb1b2084 100644 (file)
--- a/fpgatest/trb3_periph_test.vhd
+++ b/fpgatest/trb3_periph_test.vhd
@@ -95,7 +95,7 @@ end entity;
 architecture trb3_periph_arch of trb3_periph_test is
   --Constants
   constant POWER_TEST : integer := 0;
-  constant CDT_TEST   : integer := 1;
+  constant CDT_TEST   : integer := 0;
 
   attribute syn_keep : boolean;
   attribute syn_preserve : boolean;
@@ -464,4 +464,4 @@ THE_SPI_RELOAD : entity work.spi_flash_and_fpga_reload
       time_counter <= time_counter + 1;
     end process;
 
-end architecture;
\ No newline at end of file
+end architecture;