updated 4conn design for optional additional trigger outputs

diff --git a/base/trb3_periph_padiwa.lpf b/base/trb3_periph_padiwa.lpf
index b61f29f9bb2c0f2fe980fdbcd5559b3084a9b9c1..a2d23c9f09c6ecf381703e8f0e6dc39059cc83bb 100644 (file)
--- a/base/trb3_periph_padiwa.lpf
+++ b/base/trb3_periph_padiwa.lpf
@@ -135,27 +135,39 @@ LOCATE COMP  "INP_44"   SITE "W23";
 LOCATE COMP  "INP_45"   SITE "AA25";
 LOCATE COMP  "INP_46"   SITE "AA26";
 LOCATE COMP  "INP_47"   SITE "W21";
 LOCATE COMP  "INP_45"   SITE "AA25";
 LOCATE COMP  "INP_46"   SITE "AA26";
 LOCATE COMP  "INP_47"   SITE "W21";

-LOCATE COMP  "INP_48"   SITE "H24";
-LOCATE COMP  "INP_49"   SITE "L20";
-LOCATE COMP  "INP_50"   SITE "K24";
-LOCATE COMP  "INP_51"   SITE "M23";
-LOCATE COMP  "INP_52"   SITE "L24";
-LOCATE COMP  "INP_53"   SITE "M22";
-LOCATE COMP  "INP_54"   SITE "J26";
-LOCATE COMP  "INP_55"   SITE "N23";
-LOCATE COMP  "INP_56"   SITE "K19";
-LOCATE COMP  "INP_57"   SITE "P23";                                         
-LOCATE COMP  "INP_58"   SITE "L25";
-LOCATE COMP  "INP_59"   SITE "P21";
-LOCATE COMP  "INP_60"   SITE "R25";
-LOCATE COMP  "INP_61"   SITE "T25";
-LOCATE COMP  "INP_62"   SITE "T26";
-LOCATE COMP  "INP_63"   SITE "V21";
+
+# LOCATE COMP  "INP_48"   SITE "H24";
+# LOCATE COMP  "INP_49"   SITE "L20";
+# LOCATE COMP  "INP_50"   SITE "K24";
+# LOCATE COMP  "INP_51"   SITE "M23";
+# LOCATE COMP  "INP_52"   SITE "L24";
+# LOCATE COMP  "INP_53"   SITE "M22";
+# LOCATE COMP  "INP_54"   SITE "J26";
+# LOCATE COMP  "INP_55"   SITE "N23";
+# LOCATE COMP  "INP_56"   SITE "K19";
+# LOCATE COMP  "INP_57"   SITE "P23";
+# LOCATE COMP  "INP_58"   SITE "L25";
+# LOCATE COMP  "INP_59"   SITE "P21";
+# LOCATE COMP  "INP_60"   SITE "R25";
+# LOCATE COMP  "INP_61"   SITE "T25";
+# LOCATE COMP  "INP_62"   SITE "T26";
+# LOCATE COMP  "INP_63"   SITE "V21";

 
 DEFINE PORT GROUP "INP_group" "INP*" ;
 IOBUF GROUP "INP_group" IO_TYPE=LVDS25 DIFFRESISTOR=100;
 
 
 
 DEFINE PORT GROUP "INP_group" "INP*" ;
 IOBUF GROUP "INP_group" IO_TYPE=LVDS25 DIFFRESISTOR=100;
 
 

+LOCATE COMP  "ADDON_TRIGGER_OUT_0"   SITE "M22"; #Pair 5 #counting from 0
+LOCATE COMP  "ADDON_TRIGGER_OUT_1"   SITE "N23"; #Pair 7
+LOCATE COMP  "ADDON_TRIGGER_OUT_2"   SITE "K19"; #Pair 8
+LOCATE COMP  "ADDON_TRIGGER_OUT_3"   SITE "P21"; #Pair 11
+LOCATE COMP  "ADDON_TRIGGER_OUT_4"   SITE "T25"; #Pair 13
+LOCATE COMP  "ADDON_TRIGGER_OUT_5"   SITE "C3";  #Pair 17
+LOCATE COMP  "ADDON_TRIGGER_OUT_6"   SITE "L5";  #Pair 18
+LOCATE COMP  "ADDON_TRIGGER_OUT_7"   SITE "K8";  #Pair 19
+
+DEFINE PORT GROUP "ADDON_TRIGGER_OUT_group" "ADDON_TRIGGER_OUT*" ;
+IOBUF GROUP "ADDON_TRIGGER_OUT_group" IO_TYPE=LVDS25 ;

 
 
 
 
 
 

diff --git a/wasa/config.vhd b/wasa/config.vhd
index f4e3ba0b5f732cc2a3c3c268b6e60f52db34a404..6901402a5469591c1510809ff0778b15cac578c2 100644 (file)
--- a/wasa/config.vhd
+++ b/wasa/config.vhd
@@ -37,19 +37,20 @@ package config is
   constant USE_PADIWA_FAST_ONLY : integer := c_NO;
 
 --Include SPI on AddOn connector
   constant USE_PADIWA_FAST_ONLY : integer := c_NO;
 
 --Include SPI on AddOn connector

-  constant INCLUDE_UART           : integer  := c_YES;
+  constant INCLUDE_UART           : integer  := c_NO;

   constant INCLUDE_SPI            : integer  := c_YES;
   constant INCLUDE_LCD            : integer  := c_NO;
   constant INCLUDE_SPI            : integer  := c_YES;
   constant INCLUDE_LCD            : integer  := c_NO;

-  constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;
+  constant INCLUDE_DEBUG_INTERFACE: integer  := c_NO;

 
 --Add logic to generate configurable trigger signal from input signals.
   constant INCLUDE_TRIGGER_LOGIC : integer := c_YES;
   constant INCLUDE_STATISTICS    : integer := c_YES;  --Do histos of all inputs
 
 --Add logic to generate configurable trigger signal from input signals.
   constant INCLUDE_TRIGGER_LOGIC : integer := c_YES;
   constant INCLUDE_STATISTICS    : integer := c_YES;  --Do histos of all inputs

-  constant PHYSICAL_INPUTS       : integer := 52;  --number of inputs connected
-  constant TRIG_GEN_OUTPUT_NUM   : integer := 4;
+  constant PHYSICAL_INPUTS       : integer := 48;  --number of inputs connected
+  constant TRIG_GEN_OUTPUT_NUM   : integer := 8;

   constant MONITOR_INPUT_NUM     : integer := PHYSICAL_INPUTS+TRIG_GEN_OUTPUT_NUM;    
   constant TRIG_GEN_INPUT_NUM    : integer := PHYSICAL_INPUTS;
   constant USE_SINGLE_FIFO       : integer := c_YES;  -- single fifo for statistics
   constant MONITOR_INPUT_NUM     : integer := PHYSICAL_INPUTS+TRIG_GEN_OUTPUT_NUM;    
   constant TRIG_GEN_INPUT_NUM    : integer := PHYSICAL_INPUTS;
   constant USE_SINGLE_FIFO       : integer := c_YES;  -- single fifo for statistics

+  constant USE_ADDON_TRIGGER_OUT : integer := c_YES; --trigger out on 4th 40pin connector

 
 --Run wih 125 MHz instead of 100 MHz, use received clock from serdes or external clock input
   constant USE_125_MHZ               : integer    := c_NO;  --not implemented yet!  
 
 --Run wih 125 MHz instead of 100 MHz, use received clock from serdes or external clock input
   constant USE_125_MHZ               : integer    := c_NO;  --not implemented yet!  

diff --git a/wasa/par.p2t b/wasa/par.p2t
index 6788abcd979be085f48e4bb67cfa95f8388a44ea..17d0e60939ecce0aff43694c85aacf2a73b58f98 100644 (file)
--- a/wasa/par.p2t
+++ b/wasa/par.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 12
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 12

--t 23
+-t 24

 -c 1
 -e 2
 -i 15
 -c 1
 -e 2
 -i 15