]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
10 years agofew more debugging regs for ADC
Jan Michel [Fri, 25 Jul 2014 16:16:28 +0000 (18:16 +0200)]
few more debugging regs for ADC

10 years agosome additional registers for ADC control
Jan Michel [Thu, 24 Jul 2014 16:00:51 +0000 (18:00 +0200)]
some additional registers for ADC control

10 years agofirst running ADC AddOn version
Jan Michel [Wed, 23 Jul 2014 17:41:43 +0000 (19:41 +0200)]
first running ADC AddOn version

10 years agonext step towards running ADC board
Jan Michel [Tue, 22 Jul 2014 12:05:03 +0000 (14:05 +0200)]
next step towards running ADC board

10 years agoCBMNet: Simulation of TrbNet -> CBMNet readout path seems to work
Manuel Penschuck [Fri, 18 Jul 2014 19:05:20 +0000 (21:05 +0200)]
CBMNet: Simulation of TrbNet -> CBMNet readout path seems to work

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 18 Jul 2014 08:39:24 +0000 (10:39 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agotidy up
Cahit [Fri, 18 Jul 2014 08:39:18 +0000 (10:39 +0200)]
tidy up

10 years agonxyter ts/adc timestamp delay auto adjust entity implemented, works now
Ludwig Maier [Thu, 17 Jul 2014 22:04:12 +0000 (00:04 +0200)]
nxyter ts/adc timestamp delay auto adjust entity implemented, works now

10 years agoCBMNet readout backup
Manuel Penschuck [Thu, 17 Jul 2014 20:55:34 +0000 (22:55 +0200)]
CBMNet readout backup

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Thu, 17 Jul 2014 07:34:57 +0000 (09:34 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agoTDC version v1.6.3 brought uptodate with the new config file
Cahit [Thu, 17 Jul 2014 07:32:31 +0000 (09:32 +0200)]
TDC version v1.6.3 brought uptodate with the new config file

10 years agoGeneral Purpose project brought uptodate with tdc core v1.6.3
Cahit [Thu, 17 Jul 2014 07:31:55 +0000 (09:31 +0200)]
General Purpose project brought uptodate with tdc core v1.6.3

10 years agonxyter ts/adc timestamp delay auto adjust entity implemented
Ludwig Maier [Wed, 16 Jul 2014 22:52:26 +0000 (00:52 +0200)]
nxyter ts/adc timestamp delay auto adjust entity implemented

10 years agonxyter: bug fix in slow control
Ludwig Maier [Mon, 7 Jul 2014 08:41:34 +0000 (10:41 +0200)]
nxyter: bug fix in slow control

10 years agoADC: Keeping the ADC SPI pins low (also PULLMODE=DOWN), prevent entering power on...
Andreas Neiser [Wed, 16 Jul 2014 08:04:01 +0000 (10:04 +0200)]
ADC: Keeping the ADC SPI pins low (also PULLMODE=DOWN), prevent entering power on test mode

10 years agoadded flexible UART to all 4conn AddOns via FPGA5_3V3 lines
Jan Michel [Mon, 7 Jul 2014 16:51:11 +0000 (18:51 +0200)]
added flexible UART to all 4conn AddOns via FPGA5_3V3 lines

10 years agoADC: Adding many missing things to LPF files...how stupid!
Andreas Neiser [Mon, 7 Jul 2014 16:08:39 +0000 (18:08 +0200)]
ADC: Adding many missing things to LPF files...how stupid!

10 years agoADC: More nxyter like CLK usage...not tested yet
Andreas Neiser [Mon, 7 Jul 2014 15:29:54 +0000 (17:29 +0200)]
ADC: More nxyter like CLK usage...not tested yet

10 years agoADC: Switching to other CLK also does not help...
Andreas Neiser [Mon, 7 Jul 2014 15:20:06 +0000 (17:20 +0200)]
ADC: Switching to other CLK also does not help...

10 years agoADC Addon: Fix CS numbering
Andreas Neiser [Mon, 7 Jul 2014 09:04:26 +0000 (11:04 +0200)]
ADC Addon: Fix CS numbering

10 years agoupdate to CTS project file for TDCs
Jan Michel [Wed, 2 Jul 2014 17:00:42 +0000 (19:00 +0200)]
update to CTS project file for TDCs

10 years agoremoved fast signals from debug word
Jan Michel [Wed, 2 Jul 2014 17:00:07 +0000 (19:00 +0200)]
removed fast signals from debug word

10 years agoadded UART to trb3_gbe design
Jan Michel [Wed, 2 Jul 2014 16:58:37 +0000 (18:58 +0200)]
added UART to trb3_gbe design

10 years agoAdded CBMNet support to CTS - not working yet
Manuel Penschuck [Mon, 30 Jun 2014 14:24:10 +0000 (16:24 +0200)]
Added CBMNet support to CTS - not working yet

10 years agoadded module configuration to CTS prj-file: All include-statements from config.vhd...
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

10 years agoinitial version of the (yet incomplete) read-out handler for cbmnet
Manuel Penschuck [Mon, 30 Jun 2014 14:19:59 +0000 (16:19 +0200)]
initial version of the (yet incomplete) read-out handler for cbmnet

10 years agocbmnet phy: additional debug tools .. data transport works ... sometimes
Manuel Penschuck [Mon, 30 Jun 2014 14:19:18 +0000 (16:19 +0200)]
cbmnet phy: additional debug tools .. data transport works ... sometimes

10 years agomoved CBMNet SFP to base
Manuel Penschuck [Mon, 30 Jun 2014 14:17:58 +0000 (16:17 +0200)]
moved CBMNet SFP to base

10 years agoCBMNet: Relaxed Timing Constraints - Seems to work
Manuel Penschuck [Wed, 25 Jun 2014 17:46:19 +0000 (19:46 +0200)]
CBMNet: Relaxed Timing Constraints - Seems to work

10 years agoCBMNet: Relaxed some time critical components. Design currently broken; back-up
Manuel Penschuck [Wed, 25 Jun 2014 08:57:05 +0000 (10:57 +0200)]
CBMNet: Relaxed some time critical components. Design currently broken; back-up

10 years agonxyter: additional debug line out for new addon board
Ludwig Maier [Tue, 24 Jun 2014 22:26:20 +0000 (00:26 +0200)]
nxyter: additional debug line out for new addon board

10 years agonxyter update
Ludwig Maier [Tue, 10 Jun 2014 18:51:45 +0000 (20:51 +0200)]
nxyter update

10 years agonxyter update
Ludwig Maier [Wed, 28 May 2014 20:17:15 +0000 (22:17 +0200)]
nxyter update

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 24 Jun 2014 08:44:50 +0000 (10:44 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agotdc release 1.6.3
Cahit [Tue, 24 Jun 2014 08:44:47 +0000 (10:44 +0200)]
tdc release 1.6.3

10 years agochanged enable handling in trigger logic
Jan Michel [Mon, 23 Jun 2014 09:46:03 +0000 (11:46 +0200)]
changed enable handling in trigger logic

10 years agochanged enable handling in trigger logic
Jan Michel [Mon, 23 Jun 2014 09:43:20 +0000 (11:43 +0200)]
changed enable handling in trigger logic

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Sat, 21 Jun 2014 06:28:48 +0000 (08:28 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agoData transport works in the straight-forward case
Manuel Penschuck [Wed, 18 Jun 2014 16:41:01 +0000 (18:41 +0200)]
Data transport works in the straight-forward case

10 years agoupdated coincidence logic
Jan Michel [Fri, 13 Jun 2014 12:42:09 +0000 (14:42 +0200)]
updated coincidence logic

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 13 Jun 2014 08:10:34 +0000 (10:10 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agoStandard AddOn Project is brought up to date with tdc_v1.6.2
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

10 years agoSynthesisable with new CBMNet, however initialisation of link fails
Manuel Penschuck [Fri, 13 Jun 2014 07:25:03 +0000 (09:25 +0200)]
Synthesisable with new CBMNet, however initialisation of link fails

10 years agovery simple coincidence logic for trigger logic
Jan Michel [Thu, 12 Jun 2014 16:35:00 +0000 (18:35 +0200)]
very simple coincidence logic for trigger logic

11 years agoChanges before adopting to new CBMNet version
Manuel Penschuck [Wed, 4 Jun 2014 15:45:14 +0000 (17:45 +0200)]
Changes before adopting to new CBMNet version

11 years agocreate_project: more helpful error messages & bug-fix
Manuel Penschuck [Wed, 4 Jun 2014 15:44:38 +0000 (17:44 +0200)]
create_project: more helpful error messages & bug-fix

11 years agoChanges before adopting to new CBMNet version
Manuel Penschuck [Wed, 4 Jun 2014 15:43:27 +0000 (17:43 +0200)]
Changes before adopting to new CBMNet version

11 years agoadded included features map to trb3_gbe design
Jan Michel [Tue, 27 May 2014 10:55:35 +0000 (12:55 +0200)]
added included features map to trb3_gbe design

11 years agosmall change in definition of included features tables
Jan Michel [Fri, 23 May 2014 09:06:01 +0000 (11:06 +0200)]
small change in definition of included features tables

11 years agonxyter update
Ludwig Maier [Mon, 26 May 2014 18:37:47 +0000 (20:37 +0200)]
nxyter update

11 years agonxyter trb3_periph.prj update
Ludwig Maier [Sun, 25 May 2014 15:41:53 +0000 (17:41 +0200)]
nxyter trb3_periph.prj update

11 years agonxyter timestamp histogram added
Ludwig Maier [Sun, 25 May 2014 12:07:07 +0000 (14:07 +0200)]
nxyter timestamp histogram added

11 years agoADC Addon: Better CS mapping, probably...
Andreas Neiser [Fri, 23 May 2014 13:27:10 +0000 (15:27 +0200)]
ADC Addon: Better CS mapping, probably...

11 years agoCTS typo
Manuel Penschuck [Fri, 23 May 2014 14:00:36 +0000 (16:00 +0200)]
CTS typo

11 years agoCBMNet before refactoring to slave-only version
Manuel Penschuck [Fri, 23 May 2014 14:00:13 +0000 (16:00 +0200)]
CBMNet before refactoring to slave-only version

11 years agoTypo
Manuel Penschuck [Fri, 23 May 2014 13:57:51 +0000 (15:57 +0200)]
Typo

11 years agoADC Addon: Fix SPI connections to FPGA (single ended!)
Andreas Neiser [Fri, 23 May 2014 13:06:10 +0000 (15:06 +0200)]
ADC Addon: Fix SPI connections to FPGA (single ended!)

11 years agoFixing group name clash in LPF for ADC addon
Andreas Neiser [Fri, 23 May 2014 13:03:49 +0000 (15:03 +0200)]
Fixing group name clash in LPF for ADC addon

11 years agoMultiplex the SPI communication for the ADC addon
Andreas Neiser [Fri, 23 May 2014 09:12:56 +0000 (11:12 +0200)]
Multiplex the SPI communication for the ADC addon

11 years agoSomewhat better grepping for errors in compile script
Andreas Neiser [Fri, 23 May 2014 09:12:23 +0000 (11:12 +0200)]
Somewhat better grepping for errors in compile script

11 years agoAdding GSI compile script for ADC addon
Andreas Neiser [Fri, 23 May 2014 07:20:56 +0000 (09:20 +0200)]
Adding GSI compile script for ADC addon

11 years agoAdding bus_register_handler.vhd to the project files
Andreas Neiser [Thu, 22 May 2014 16:05:07 +0000 (18:05 +0200)]
Adding bus_register_handler.vhd to the project files

11 years agoDiamond project creation tool. See daqdocu
Manuel Penschuck [Thu, 22 May 2014 11:38:11 +0000 (13:38 +0200)]
Diamond project creation tool. See daqdocu

11 years agoCommenting duplicate declaration of FIFO_DC_36x32_OutReg/FIFO_DC_36x16_OutReg
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

11 years agoadded included features bitmap to hadesstart design
Jan Michel [Wed, 21 May 2014 09:40:04 +0000 (11:40 +0200)]
added included features bitmap to hadesstart design

11 years agonxyter all working, seems to be at least
Ludwig Maier [Tue, 20 May 2014 09:38:33 +0000 (11:38 +0200)]
nxyter all working, seems to be at least

11 years agoupdated adc handler, improved timing
Ludwig Maier [Sun, 11 May 2014 21:54:21 +0000 (23:54 +0200)]
updated adc handler, improved timing

11 years agonxyter working design, adc still slightly buggy...
Ludwig Maier [Thu, 1 May 2014 13:52:53 +0000 (15:52 +0200)]
nxyter working design, adc still slightly buggy...

11 years agonxyter tmp
Ludwig Maier [Tue, 29 Apr 2014 08:53:47 +0000 (10:53 +0200)]
nxyter tmp

11 years agoBug-Fix: Slow-control timing problem when no TDC included. Peripheral Trigger input...
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)

11 years agofixing trb3_components after two people changing the same thing
Jan Michel [Thu, 15 May 2014 15:11:48 +0000 (17:11 +0200)]
fixing trb3_components after two people changing the same thing

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Thu, 15 May 2014 15:04:20 +0000 (17:04 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agodifferent FIFOs for different ring buffer sizes
Cahit [Thu, 15 May 2014 15:04:12 +0000 (17:04 +0200)]
different FIFOs for different ring buffer sizes

11 years agoFixing the hadesstart to compile again with updated TDC
Jan Michel [Thu, 15 May 2014 13:35:54 +0000 (15:35 +0200)]
Fixing the hadesstart to compile again with updated TDC

11 years agoSequential EB selection
Manuel Penschuck [Thu, 15 May 2014 08:58:58 +0000 (10:58 +0200)]
Sequential EB selection

11 years agoupdated Cts for tdc v1.6.1
Jan Michel [Thu, 15 May 2014 08:40:39 +0000 (10:40 +0200)]
updated Cts for tdc v1.6.1

11 years agoadded default values for slow control inputs
Jan Michel [Wed, 14 May 2014 16:44:48 +0000 (18:44 +0200)]
added default values for slow control inputs

11 years agoconflict fix
Cahit [Wed, 14 May 2014 11:13:16 +0000 (13:13 +0200)]
conflict fix

11 years agoupdated input monitor, single FIFO mode available
Jan Michel [Mon, 12 May 2014 14:58:29 +0000 (16:58 +0200)]
updated input monitor, single FIFO mode available

11 years agoupdated TDC version and added default values on slow control bus
Jan Michel [Mon, 12 May 2014 14:11:13 +0000 (16:11 +0200)]
updated TDC version and added default values on slow control bus

11 years agoremoved old debug stuff
Jan Michel [Mon, 12 May 2014 14:09:49 +0000 (16:09 +0200)]
removed old debug stuff

11 years agoadded input statistics and trigger
Jan Michel [Mon, 12 May 2014 14:09:19 +0000 (16:09 +0200)]
added input statistics and trigger

11 years agoupdated trb3_gbe config files
Jan Michel [Mon, 12 May 2014 14:08:06 +0000 (16:08 +0200)]
updated trb3_gbe config files

11 years agofixed trigger logic generator with stretcher for short pulses
Jan Michel [Mon, 12 May 2014 14:06:53 +0000 (16:06 +0200)]
fixed trigger logic generator with stretcher for short pulses

11 years agoadded new constraints file for diamond 3
Jan Michel [Mon, 12 May 2014 14:05:13 +0000 (16:05 +0200)]
added new constraints file for diamond 3

11 years agotdc version 1.6.2 is added with option of different ringbuffer size.
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.

11 years agoconstraint files are individual for each design
Cahit [Tue, 6 May 2014 12:53:58 +0000 (14:53 +0200)]
constraint files are individual for each design

11 years agoconstraint 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

11 years agobug fix for missing data with calibration trigger and for duplicate data when trigger...
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

11 years agoconstraint files are individual for each design
Cahit [Tue, 6 May 2014 12:52:00 +0000 (14:52 +0200)]
constraint files are individual for each design

11 years agobug fix for missing data with calibration trigger and for duplicate data when trigger...
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

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 6 May 2014 08:03:04 +0000 (10:03 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agohit counters are directly synchronised to 100MHz
Cahit [Tue, 6 May 2014 08:02:59 +0000 (10:02 +0200)]
hit counters are directly synchronised to 100MHz

11 years agoMerge branch 'master' of jspc29:trb3
Maps [Fri, 2 May 2014 15:18:07 +0000 (17:18 +0200)]
Merge branch 'master' of jspc29:trb3

updated from  repo on second may 2014

11 years agofix in ada addon
Michael Wiebusch [Fri, 2 May 2014 15:17:34 +0000 (17:17 +0200)]
fix in ada addon

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 2 May 2014 08:59:36 +0000 (10:59 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agoconfig file for tdc test
Cahit [Fri, 2 May 2014 08:59:33 +0000 (10:59 +0200)]
config file for tdc test

11 years agocompile script for hadesstart
Cahit [Fri, 2 May 2014 08:59:18 +0000 (10:59 +0200)]
compile script for hadesstart

11 years agoupgrade to tdc 1.6.1
Cahit [Fri, 2 May 2014 08:56:42 +0000 (10:56 +0200)]
upgrade to tdc 1.6.1

11 years agoChannel FSM bug fix
Cahit [Fri, 2 May 2014 08:56:26 +0000 (10:56 +0200)]
Channel FSM bug fix