]> jspc29.x-matter.uni-frankfurt.de Git - adcm.git/commitdiff
trigger,IPU and slow controll are working, apvs not synced yet
authorlocal account <hadaq@lxhadeb07.gsi.de>
Tue, 8 Sep 2015 19:46:44 +0000 (21:46 +0200)
committerlocal account <hadaq@lxhadeb07.gsi.de>
Tue, 8 Sep 2015 19:46:44 +0000 (21:46 +0200)
adcmv3.lpf
adcmv3_constraints.lpf
design/adcmv3.vhd
design/rich_trb.vhd
setenv.sh [new file with mode: 0644]
stdout.log [deleted file]

index 3798a017e6028ef6ee5f5bd8bb38f49b49186b83..f0f5feabc62f76d49bdc2b6e72456d9be63d0415 100755 (executable)
@@ -151,8 +151,8 @@ LOCATE COMP "ENA_LVDS_0" SITE "AG15" ;
 # IOBUF PORT "FPGA_SECTOR_4" IO_TYPE=LVTTL33 ;\r
 # Backplane sense wires: sector number\r
 # small assembly bug: switch is 180degree rotated, so number are mirrored\r
-#LOCATE COMP "BP_SECTOR_3" SITE "AF11" ; # was "AF15"\r
-#IOBUF PORT "BP_SECTOR_3" IO_TYPE=LVTTL33 PULLMODE=UP  ;\r
+LOCATE COMP "BP_SECTOR_3" SITE "AF11" ; # was "AF15"\r
+IOBUF PORT "BP_SECTOR_3" IO_TYPE=LVTTL33 PULLMODE=UP  ;\r
 LOCATE COMP "BP_SECTOR_2" SITE "AF12" ; # was "AF13"\r
 IOBUF PORT "BP_SECTOR_2" IO_TYPE=LVTTL33 PULLMODE=UP ;\r
 LOCATE COMP "BP_SECTOR_1" SITE "AF13" ; # was "AF12"\r
@@ -416,8 +416,8 @@ LOCATE COMP "ENB_LVDS_0" SITE "D12" ;
 # LOCATE COMP "FPGA_BP_12" SITE "C14" ;\r
 # IOBUF PORT "FPGA_BP_12" IO_TYPE=LVTTL33 ;\r
 # Backplane sense wires: backplane number\r
-#LOCATE COMP "BP_MODULE_3" SITE "A14" ;\r
-#IOBUF PORT "BP_MODULE_3" IO_TYPE=LVTTL33 PULLMODE=UP ;\r
+LOCATE COMP "BP_MODULE_3" SITE "A14" ;\r
+IOBUF PORT "BP_MODULE_3" IO_TYPE=LVTTL33 PULLMODE=UP ;\r
 LOCATE COMP "BP_MODULE_2" SITE "F13" ;\r
 IOBUF PORT "BP_MODULE_2" IO_TYPE=LVTTL33 PULLMODE=UP ;\r
 LOCATE COMP "BP_MODULE_1" SITE "E12" ;\r
index c3130a57785b34671ca55d22a11d174d88786d33..f5a93599d62c849be63acf896fef84cf204ce8e0 100755 (executable)
@@ -1,6 +1,6 @@
 # Clock\r
 #  Extern CLK100M\r
-#                  -> DLL_100M -> sysclk_c\r
+#                  -> DLL_100M -> sysclk\r
 #                  -> PLL_40M  -> clk_apv    -> APVxy_CLK (0A,0B,1A.1B)\r
 #                              -> clk_adc    -> ADCx_CLK (0,1)\r
 # Extern ADC0_LCLK   (bitclock ADC0)\r
@@ -14,7 +14,7 @@ BLOCK PATH FROM CLKNET "clk_apv*" TO CLKNET "sysclk*";
 # PLL 100MHz -> 40MHz\r
 ######################################################################\r
 FREQUENCY NET "CLK100M_c" 100.000000 MHz ;\r
-FREQUENCY NET "sysclk_c" 100.000000 MHz ;\r
+FREQUENCY NET "sysclk" 100.000000 MHz ;\r
 \r
 LOCATE COMP "THE_40M_PLL/PLLDInst_0" SITE "PLL_R103C3" ;\r
 FREQUENCY NET "clk_adc" 40.000000 MHz ;\r
index 6d52b730273fc17e26e0dacf0abb3ed45b21a475..e9eeb99881d58ff91be55def3a61d59a83a828ed 100755 (executable)
@@ -1373,9 +1373,9 @@ THE_SYNC_PROC: process( sysclk )
 begin\r
        if( rising_edge(sysclk) ) then\r
                bp_module_qq   <= bp_module_q;\r
-               bp_module_q    <= not bp_module;\r
+               bp_module_q    <= not BP_MODULE;\r
                bp_sector_qq   <= bp_sector_q;\r
-               bp_sector_q    <= not bp_sector;\r
+               bp_sector_q    <= not BP_SECTOR;\r
                not_configured <= next_not_configured; -- status bit\r
                fe_error       <= next_fe_error; -- status bit\r
        end if;\r
index c71d950af3e6153b2d0a7d90e24a7523ed573ac2..b89b7234173cb6afced00b034732b4ba86fc7df5 100755 (executable)
@@ -214,7 +214,7 @@ THE_UNIFIED_ENDPOINT: trb_net16_endpoint_hades_full
     MED_CTRL_OP_OUT             => med_ctrl_op,
  
     -- LVL1 trigger APL
-    TRG_TIMING_TRG_RECEIVED_IN  => open,
+    TRG_TIMING_TRG_RECEIVED_IN  => TIMING_TRG_FOUND_IN,
     LVL1_TRG_DATA_VALID_OUT     => LVL1_TRG_RECEIVED_OUT,
     LVL1_TRG_VALID_TIMING_OUT   => open, --valid timing trigger has been received
     LVL1_TRG_VALID_NOTIMING_OUT => open, --valid trigger without timing trigger has been received
diff --git a/setenv.sh b/setenv.sh
new file mode 100644 (file)
index 0000000..23d22ae
--- /dev/null
+++ b/setenv.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+export SNPSLMD_LICENSE_FILE="27000@lxcad01.gsi.de"
+export LM_LICENSE_FILE="1702@hadeb05"
+
+export LATTICE_PATH=/opt/lattice/diamond/3.4_x64
+export LATTICE_BIN_PATH=${LATTICE_PATH}/bin/lin64
+export SYNPLIFY="/opt/synplicity/I-2013.09-SP1"
+export SYN_DISABLE_RAINBOW_DONGLE=1
+
+bindir=$LATTICE_BIN_PATH . ${LATTICE_BIN_PATH}/diamond_env 
diff --git a/stdout.log b/stdout.log
deleted file mode 100644 (file)
index 392deb2..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-
-Starting:    /opt/synplicity/I-2013.09-SP1/linux_a_64/mbin/synbatch_orig
-Install:     /opt/synplicity/I-2013.09-SP1
-Date:        Tue Sep  8 16:09:24 2015
-Version:     I-2013.09-SP1 
-
-Arguments:   -product synplify_premier_dp -batch adcmv3.prj
-ProductType: synplify_premier_dp
-
-License checkout: synplifypremierdp
-License: synplifypremierdp from server lxcad01.gsi.de 
-Licensed Vendor: All FPGA
-License Option: ident
-
-
-
-
-Generating DM database...
-
-compile_dm Completed
-Return Code: 0
-Run Time:00h:00m:01s
-
-
-log file: "/home/hadaq/lmaier/ADCM/adcm/workdir/adcmv3.srr"
-
-
-
-
-
-Running adcmv3|workdir
-
-
-Running: Compile on adcmv3|workdir
-
-
-Running: Compile HDL/EDIF on adcmv3|workdir
-
-
-Running: Compile Input on adcmv3|workdir
-
-Copied /home/hadaq/lmaier/ADCM/adcm/workdir/synwork/adcmv3_comp.srs to /home/hadaq/lmaier/ADCM/adcm/workdir/adcmv3.srs
-
-compiler Completed
-Return Code: 0
-Run Time:00h:00m:16s
-
-
-Complete: Compile HDL/EDIF on adcmv3|workdir
-
-
-Running: Premap on adcmv3|workdir
-
-premap Completed with warnings
-Return Code: 1
-Run Time:00h:00m:04s
-
-
-Complete: Compile on adcmv3|workdir
-
-
-Running: Map on adcmv3|workdir
-
-
-Running: Map & Optimize on adcmv3|workdir
-
-fpga_mapper Completed with warnings
-Return Code: 1
-Run Time:00h:03m:27s
-
-
-Complete: Map on adcmv3|workdir
-
-Complete: Logic Synthesis on adcmv3|workdir
-
-exit status=0
-
-
-exit status=0
-
-
-License checkin: synplifypremierdp
-