]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
Manuel Penschuck [Mon, 30 Jun 2014 14:24:10 +0000 (16:24 +0200)]
Added CBMNet support to CTS - not working yet
Manuel Penschuck [Mon, 30 Jun 2014 14:22:55 +0000 (16:22 +0200)]
added module configuration to CTS prj-file: All include-statements from config.vhd are converted into tcl code and thus can be used to include only necessary hdl-files. for example, TDC and CBMNET are only loaded when needed
Manuel Penschuck [Mon, 30 Jun 2014 14:19:59 +0000 (16:19 +0200)]
initial version of the (yet incomplete) read-out handler for cbmnet
Manuel Penschuck [Mon, 30 Jun 2014 14:19:18 +0000 (16:19 +0200)]
cbmnet phy: additional debug tools .. data transport works ... sometimes
Manuel Penschuck [Mon, 30 Jun 2014 14:17:58 +0000 (16:17 +0200)]
moved CBMNet SFP to base
Manuel Penschuck [Wed, 25 Jun 2014 17:46:19 +0000 (19:46 +0200)]
CBMNet: Relaxed Timing Constraints - Seems to work
Manuel Penschuck [Wed, 25 Jun 2014 08:57:05 +0000 (10:57 +0200)]
CBMNet: Relaxed some time critical components. Design currently broken; back-up
Ludwig Maier [Tue, 24 Jun 2014 22:26:20 +0000 (00:26 +0200)]
nxyter: additional debug line out for new addon board
Ludwig Maier [Tue, 10 Jun 2014 18:51:45 +0000 (20:51 +0200)]
nxyter update
Ludwig Maier [Wed, 28 May 2014 20:17:15 +0000 (22:17 +0200)]
nxyter update
Cahit [Tue, 24 Jun 2014 08:44:50 +0000 (10:44 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 24 Jun 2014 08:44:47 +0000 (10:44 +0200)]
tdc release 1.6.3
Jan Michel [Mon, 23 Jun 2014 09:46:03 +0000 (11:46 +0200)]
changed enable handling in trigger logic
Jan Michel [Mon, 23 Jun 2014 09:43:20 +0000 (11:43 +0200)]
changed enable handling in trigger logic
Cahit [Sat, 21 Jun 2014 06:28:48 +0000 (08:28 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Manuel Penschuck [Wed, 18 Jun 2014 16:41:01 +0000 (18:41 +0200)]
Data transport works in the straight-forward case
Jan Michel [Fri, 13 Jun 2014 12:42:09 +0000 (14:42 +0200)]
updated coincidence logic
Cahit [Fri, 13 Jun 2014 08:10:34 +0000 (10:10 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 13 Jun 2014 08:08:05 +0000 (10:08 +0200)]
Standard AddOn Project is brought up to date with tdc_v1.6.2
Manuel Penschuck [Fri, 13 Jun 2014 07:25:03 +0000 (09:25 +0200)]
Synthesisable with new CBMNet, however initialisation of link fails
Jan Michel [Thu, 12 Jun 2014 16:35:00 +0000 (18:35 +0200)]
very simple coincidence logic for trigger logic
Manuel Penschuck [Wed, 4 Jun 2014 15:45:14 +0000 (17:45 +0200)]
Changes before adopting to new CBMNet version
Manuel Penschuck [Wed, 4 Jun 2014 15:44:38 +0000 (17:44 +0200)]
create_project: more helpful error messages & bug-fix
Manuel Penschuck [Wed, 4 Jun 2014 15:43:27 +0000 (17:43 +0200)]
Changes before adopting to new CBMNet version
Jan Michel [Tue, 27 May 2014 10:55:35 +0000 (12:55 +0200)]
added included features map to trb3_gbe design
Jan Michel [Fri, 23 May 2014 09:06:01 +0000 (11:06 +0200)]
small change in definition of included features tables
Ludwig Maier [Mon, 26 May 2014 18:37:47 +0000 (20:37 +0200)]
nxyter update
Ludwig Maier [Sun, 25 May 2014 15:41:53 +0000 (17:41 +0200)]
nxyter trb3_periph.prj update
Ludwig Maier [Sun, 25 May 2014 12:07:07 +0000 (14:07 +0200)]
nxyter timestamp histogram added
Andreas Neiser [Fri, 23 May 2014 13:27:10 +0000 (15:27 +0200)]
ADC Addon: Better CS mapping, probably...
Manuel Penschuck [Fri, 23 May 2014 14:00:36 +0000 (16:00 +0200)]
CTS typo
Manuel Penschuck [Fri, 23 May 2014 14:00:13 +0000 (16:00 +0200)]
CBMNet before refactoring to slave-only version
Manuel Penschuck [Fri, 23 May 2014 13:57:51 +0000 (15:57 +0200)]
Typo
Andreas Neiser [Fri, 23 May 2014 13:06:10 +0000 (15:06 +0200)]
ADC Addon: Fix SPI connections to FPGA (single ended!)
Andreas Neiser [Fri, 23 May 2014 13:03:49 +0000 (15:03 +0200)]
Fixing group name clash in LPF for ADC addon
Andreas Neiser [Fri, 23 May 2014 09:12:56 +0000 (11:12 +0200)]
Multiplex the SPI communication for the ADC addon
Andreas Neiser [Fri, 23 May 2014 09:12:23 +0000 (11:12 +0200)]
Somewhat better grepping for errors in compile script
Andreas Neiser [Fri, 23 May 2014 07:20:56 +0000 (09:20 +0200)]
Adding GSI compile script for ADC addon
Andreas Neiser [Thu, 22 May 2014 16:05:07 +0000 (18:05 +0200)]
Adding bus_register_handler.vhd to the project files
Manuel Penschuck [Thu, 22 May 2014 11:38:11 +0000 (13:38 +0200)]
Diamond project creation tool. See daqdocu
Andreas Neiser [Thu, 22 May 2014 07:22:57 +0000 (09:22 +0200)]
Commenting duplicate declaration of FIFO_DC_36x32_OutReg/FIFO_DC_36x16_OutReg
Jan Michel [Wed, 21 May 2014 09:40:04 +0000 (11:40 +0200)]
added included features bitmap to hadesstart design
Ludwig Maier [Tue, 20 May 2014 09:38:33 +0000 (11:38 +0200)]
nxyter all working, seems to be at least
Ludwig Maier [Sun, 11 May 2014 21:54:21 +0000 (23:54 +0200)]
updated adc handler, improved timing
Ludwig Maier [Thu, 1 May 2014 13:52:53 +0000 (15:52 +0200)]
nxyter working design, adc still slightly buggy...
Ludwig Maier [Tue, 29 Apr 2014 08:53:47 +0000 (10:53 +0200)]
nxyter tmp
Manuel Penschuck [Mon, 19 May 2014 14:12:07 +0000 (16:12 +0200)]
Bug-Fix: Slow-control timing problem when no TDC included. Peripheral Trigger input mapping now (10 downto 6)
Jan Michel [Thu, 15 May 2014 15:11:48 +0000 (17:11 +0200)]
fixing trb3_components after two people changing the same thing
Cahit [Thu, 15 May 2014 15:04:20 +0000 (17:04 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Thu, 15 May 2014 15:04:12 +0000 (17:04 +0200)]
different FIFOs for different ring buffer sizes
Jan Michel [Thu, 15 May 2014 13:35:54 +0000 (15:35 +0200)]
Fixing the hadesstart to compile again with updated TDC
Manuel Penschuck [Thu, 15 May 2014 08:58:58 +0000 (10:58 +0200)]
Sequential EB selection
Jan Michel [Thu, 15 May 2014 08:40:39 +0000 (10:40 +0200)]
updated Cts for tdc v1.6.1
Jan Michel [Wed, 14 May 2014 16:44:48 +0000 (18:44 +0200)]
added default values for slow control inputs
Cahit [Wed, 14 May 2014 11:13:16 +0000 (13:13 +0200)]
conflict fix
Jan Michel [Mon, 12 May 2014 14:58:29 +0000 (16:58 +0200)]
updated input monitor, single FIFO mode available
Jan Michel [Mon, 12 May 2014 14:11:13 +0000 (16:11 +0200)]
updated TDC version and added default values on slow control bus
Jan Michel [Mon, 12 May 2014 14:09:49 +0000 (16:09 +0200)]
removed old debug stuff
Jan Michel [Mon, 12 May 2014 14:09:19 +0000 (16:09 +0200)]
added input statistics and trigger
Jan Michel [Mon, 12 May 2014 14:08:06 +0000 (16:08 +0200)]
updated trb3_gbe config files
Jan Michel [Mon, 12 May 2014 14:06:53 +0000 (16:06 +0200)]
fixed trigger logic generator with stretcher for short pulses
Jan Michel [Mon, 12 May 2014 14:05:13 +0000 (16:05 +0200)]
added new constraints file for diamond 3
Cahit [Fri, 9 May 2014 12:42:10 +0000 (14:42 +0200)]
tdc version 1.6.2 is added with option of different ringbuffer size.
Cahit [Tue, 6 May 2014 12:53:58 +0000 (14:53 +0200)]
constraint files are individual for each design
Cahit [Tue, 6 May 2014 12:53:37 +0000 (14:53 +0200)]
constraint files are individual for each design
Cahit [Tue, 6 May 2014 12:52:39 +0000 (14:52 +0200)]
bug fix for missing data with calibration trigger and for duplicate data when trigger window is enabled
Cahit [Tue, 6 May 2014 12:52:00 +0000 (14:52 +0200)]
constraint files are individual for each design
Cahit [Tue, 6 May 2014 12:46:18 +0000 (14:46 +0200)]
bug fix for missing data with calibration trigger and for duplicate data when trigger window is enabled
Cahit [Tue, 6 May 2014 08:03:04 +0000 (10:03 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 6 May 2014 08:02:59 +0000 (10:02 +0200)]
hit counters are directly synchronised to 100MHz
Maps [Fri, 2 May 2014 15:18:07 +0000 (17:18 +0200)]
Merge branch 'master' of jspc29:trb3
Michael Wiebusch [Fri, 2 May 2014 15:17:34 +0000 (17:17 +0200)]
fix in ada addon
Cahit [Fri, 2 May 2014 08:59:36 +0000 (10:59 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 2 May 2014 08:59:33 +0000 (10:59 +0200)]
config file for tdc test
Cahit [Fri, 2 May 2014 08:59:18 +0000 (10:59 +0200)]
compile script for hadesstart
Cahit [Fri, 2 May 2014 08:56:42 +0000 (10:56 +0200)]
upgrade to tdc 1.6.1
Cahit [Fri, 2 May 2014 08:56:26 +0000 (10:56 +0200)]
Channel FSM bug fix
Cahit [Fri, 2 May 2014 08:52:13 +0000 (10:52 +0200)]
upgrade to tdc 1.6.1
Cahit [Fri, 2 May 2014 08:50:35 +0000 (10:50 +0200)]
New bus added (0xc200) for the channel debug FSMs
Ludwig Maier [Mon, 28 Apr 2014 07:22:41 +0000 (09:22 +0200)]
nxyter update, timing corrections etc.
Cahit [Fri, 25 Apr 2014 16:08:09 +0000 (18:08 +0200)]
typo correction
Cahit [Fri, 25 Apr 2014 16:06:16 +0000 (18:06 +0200)]
corrected path for the tdc version package
Cahit [Fri, 25 Apr 2014 16:02:29 +0000 (18:02 +0200)]
uniportant line constraints are separated for each project
Cahit [Thu, 24 Apr 2014 21:38:10 +0000 (23:38 +0200)]
corrected clock name for timing constraints
Cahit [Thu, 24 Apr 2014 21:37:33 +0000 (23:37 +0200)]
bug fix for high hit rates
Cahit [Thu, 24 Apr 2014 21:35:54 +0000 (23:35 +0200)]
bug fix for high hit rates
Cahit [Thu, 24 Apr 2014 21:32:29 +0000 (23:32 +0200)]
tdc_version package added
Cahit [Thu, 24 Apr 2014 07:08:43 +0000 (09:08 +0200)]
deleted mistakenly added folder
Cahit [Thu, 24 Apr 2014 07:07:16 +0000 (09:07 +0200)]
corrected clock names in the constraints
Cahit [Wed, 23 Apr 2014 21:07:01 +0000 (23:07 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Wed, 23 Apr 2014 21:06:54 +0000 (23:06 +0200)]
dasta finished counter pulse fix
Ludwig Maier [Wed, 23 Apr 2014 20:26:22 +0000 (22:26 +0200)]
nxyter update, beamtime May ready?
Cahit [Tue, 22 Apr 2014 13:31:34 +0000 (15:31 +0200)]
tcd_v1.6.1 release note
Cahit [Tue, 22 Apr 2014 13:28:38 +0000 (15:28 +0200)]
correct clock names for the multicycle constraint
Cahit [Tue, 22 Apr 2014 13:28:03 +0000 (15:28 +0200)]
64 word ring buffer option
Cahit [Tue, 22 Apr 2014 13:05:41 +0000 (15:05 +0200)]
timing constraints for unimportant data lines is seperated from tdc placement constraints
Cahit [Tue, 22 Apr 2014 13:04:21 +0000 (15:04 +0200)]
necessary fifo for tdc v1.6.1
Cahit [Tue, 22 Apr 2014 12:58:36 +0000 (14:58 +0200)]
tdc v1.6.1 is released
Cahit [Tue, 22 Apr 2014 12:58:05 +0000 (14:58 +0200)]
timing constraints for unimportant data lines is seperated from tdc placement constraints
Cahit [Fri, 18 Apr 2014 06:33:58 +0000 (08:33 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
jspc29 / trb3.git / log