]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
Jan Michel [Thu, 6 Mar 2014 09:53:56 +0000 (10:53 +0100)]
changed to new tdc constraint file
Jan Michel [Thu, 6 Mar 2014 09:53:14 +0000 (10:53 +0100)]
fixed coarse counter source for designs with few channels
Jan Michel [Thu, 6 Mar 2014 09:52:28 +0000 (10:52 +0100)]
finished input monitoring for the hades start detector design
Jan Michel [Thu, 6 Mar 2014 09:51:47 +0000 (10:51 +0100)]
added no-ctc mode for testing
Manuel Penschuck [Wed, 5 Mar 2014 16:57:18 +0000 (17:57 +0100)]
Merge branch 'master' of jspc29:trb3
Manuel Penschuck [Wed, 5 Mar 2014 16:57:00 +0000 (17:57 +0100)]
Bugfix regarding Output MUX
Cahit [Wed, 5 Mar 2014 15:13:05 +0000 (16:13 +0100)]
working lpf file is changed to the original name
Cahit [Wed, 5 Mar 2014 15:04:02 +0000 (16:04 +0100)]
trb3_periph_padiwa is upgraded to tdc_v1.6 and config package
Cahit [Wed, 5 Mar 2014 15:02:58 +0000 (16:02 +0100)]
more relaxing constraints
Cahit [Wed, 5 Mar 2014 15:02:27 +0000 (16:02 +0100)]
unnecessary designs after tdc_v1.6 are removed
Cahit [Wed, 5 Mar 2014 15:01:42 +0000 (16:01 +0100)]
compile script is made more generic
Cahit [Wed, 5 Mar 2014 15:00:54 +0000 (16:00 +0100)]
unnecessary pll for calibration is removed
Cahit [Wed, 5 Mar 2014 14:59:46 +0000 (15:59 +0100)]
AddOn type constant is included
Cahit [Wed, 5 Mar 2014 11:25:11 +0000 (12:25 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Wed, 5 Mar 2014 11:25:04 +0000 (12:25 +0100)]
Constraints for successful timing
Manuel Penschuck [Mon, 3 Mar 2014 16:41:17 +0000 (17:41 +0100)]
THIS RELEASE MAY BREAK HARD-CODED REGISTER MAPPINGS.
PLEASE CHECK YOUR CONFIGS especially related to addon input.
- unified input multiplexer (inputs from trb3 rj45 jacks + cts-addon are now treaded the same way)
- added "any" line for several input jacks
- included trigger input from peripheral fpga
- included output mux that can select any itc/input and map them to the addon-outputs
Manuel Penschuck [Mon, 3 Mar 2014 16:28:55 +0000 (17:28 +0100)]
Merge branch 'master' of jspc29:trb3
Cahit [Mon, 3 Mar 2014 08:29:45 +0000 (09:29 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Mon, 3 Mar 2014 08:29:39 +0000 (09:29 +0100)]
Changes in the code and constraint to meet the timing
Jan Michel [Fri, 28 Feb 2014 19:30:29 +0000 (20:30 +0100)]
Merge branch 'master' of jspc29:trb3
Cahit [Fri, 28 Feb 2014 19:29:34 +0000 (20:29 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 28 Feb 2014 19:29:26 +0000 (20:29 +0100)]
Changes in the code and constraint to meet the timing
Jan Michel [Fri, 28 Feb 2014 18:58:07 +0000 (19:58 +0100)]
compiling constraings for Frankfurt and new nodelist
Manuel Penschuck [Fri, 28 Feb 2014 14:22:55 +0000 (15:22 +0100)]
Merge branch 'master' of jspc29:trb3
Andreas Neiser [Fri, 28 Feb 2014 13:45:35 +0000 (14:45 +0100)]
CTS: Works with A2 ETM and v1.6 TDC, Lattice 2.1 was the clue
Jan Michel [Thu, 27 Feb 2014 18:53:48 +0000 (19:53 +0100)]
the rest
Jan Michel [Thu, 27 Feb 2014 18:45:36 +0000 (19:45 +0100)]
corrected my errors in constraints
Jan Michel [Thu, 27 Feb 2014 18:31:42 +0000 (19:31 +0100)]
re-connected GbE to clock...
Jan Michel [Thu, 27 Feb 2014 18:30:50 +0000 (19:30 +0100)]
moved PLL into ADC block
Jan Michel [Thu, 27 Feb 2014 18:30:15 +0000 (19:30 +0100)]
updated ADC AddOn files
Jan Michel [Thu, 27 Feb 2014 18:28:47 +0000 (19:28 +0100)]
added new 40MHz PLL
Andreas Neiser [Thu, 27 Feb 2014 17:10:43 +0000 (18:10 +0100)]
CTS: Try with Cahits LPF
Andreas Neiser [Thu, 27 Feb 2014 13:27:14 +0000 (14:27 +0100)]
Finally the linkdesignfiles business works!
Andreas Neiser [Thu, 27 Feb 2014 09:44:43 +0000 (10:44 +0100)]
Commenting out some unused ngo file links (confirmed by Greg), again
Andreas Neiser [Thu, 27 Feb 2014 09:43:45 +0000 (10:43 +0100)]
Commenting out some unused ngo file links (confirmed by Greg)
Andreas Neiser [Thu, 27 Feb 2014 09:21:06 +0000 (10:21 +0100)]
Deleting symlinks in workdir, compilescripts should take care of that!
Andreas Neiser [Thu, 27 Feb 2014 09:08:44 +0000 (10:08 +0100)]
CTS: Adapted more to Frankfurt compile script...previous settings generated broken bitfile, no ping
Andreas Neiser [Wed, 26 Feb 2014 16:45:09 +0000 (17:45 +0100)]
CTS: Bitfile generated with A2 EventId receiver and TDC v1.6
Andreas Neiser [Wed, 26 Feb 2014 12:29:52 +0000 (13:29 +0100)]
Switch to TDC v1.6, compiles at least, but still not tested
Andreas Neiser [Wed, 26 Feb 2014 11:59:52 +0000 (12:59 +0100)]
Compiles with v1.5.1, but totally untested any further
Cahit [Wed, 26 Feb 2014 12:03:42 +0000 (13:03 +0100)]
compile script adapted for the gsi
Cahit [Wed, 26 Feb 2014 12:02:41 +0000 (13:02 +0100)]
Merge branch 'v1.6'
Cahit [Wed, 26 Feb 2014 12:01:03 +0000 (13:01 +0100)]
tdc_v1.6: first working version
Andreas Neiser [Wed, 26 Feb 2014 10:38:22 +0000 (11:38 +0100)]
Some improvements for GSI compile scripts, not tested yet
Manuel Penschuck [Tue, 25 Feb 2014 10:46:34 +0000 (11:46 +0100)]
Merge branch 'master' of jspc29:trb3
Jan Michel [Mon, 24 Feb 2014 11:08:15 +0000 (12:08 +0100)]
added logic for trigger output to central hub
Jan Michel [Mon, 24 Feb 2014 11:07:19 +0000 (12:07 +0100)]
started to implement trigger input statistics
Jan Michel [Wed, 12 Feb 2014 16:39:28 +0000 (17:39 +0100)]
some more stuff to ignore
Jan Michel [Wed, 12 Feb 2014 16:38:19 +0000 (17:38 +0100)]
latest version of start design
Jan Michel [Wed, 12 Feb 2014 12:44:43 +0000 (13:44 +0100)]
moved to Diamond 3.0
Manuel Penschuck [Wed, 19 Feb 2014 10:26:36 +0000 (11:26 +0100)]
Merge branch 'master' of jspc29:trb3
Cahit [Mon, 17 Feb 2014 07:56:10 +0000 (08:56 +0100)]
config changed to 65 channels
Ludwig Maier [Mon, 17 Feb 2014 02:13:00 +0000 (03:13 +0100)]
nxyter histogram bug removed, i2c handler update
Ludwig Maier [Thu, 13 Feb 2014 19:38:17 +0000 (20:38 +0100)]
nxyter update, not working
Cahit [Thu, 13 Feb 2014 10:59:57 +0000 (11:59 +0100)]
modified for tdc_v1.6
Jan Michel [Tue, 11 Feb 2014 17:48:30 +0000 (18:48 +0100)]
added clock and trigger input selection to GbE design
Jan Michel [Tue, 11 Feb 2014 17:47:46 +0000 (18:47 +0100)]
some new files for ADC addon
Jan Michel [Tue, 11 Feb 2014 17:46:58 +0000 (18:46 +0100)]
new design for hades start readout
Cahit [Tue, 11 Feb 2014 13:48:16 +0000 (14:48 +0100)]
Top design file for 32PinAddOn is added
Cahit [Tue, 11 Feb 2014 13:42:13 +0000 (14:42 +0100)]
conflict fix
Conflicts:
32PinAddOn/trb3_periph_32PinAddOn.vhd
Cahit [Tue, 11 Feb 2014 13:36:46 +0000 (14:36 +0100)]
intermediate commit
Andreas Neiser [Thu, 6 Feb 2014 12:24:34 +0000 (13:24 +0100)]
Padiwa_Amps: Discharge on leading edge of FAST until trailing edge of SLOW
Andreas Neiser [Wed, 5 Feb 2014 13:29:37 +0000 (14:29 +0100)]
Padiwa: Modify compilation for GSI machine lxhadeb07, hopefully in Frankfurt it still works
Jan Michel [Mon, 3 Feb 2014 17:44:44 +0000 (18:44 +0100)]
trigger generation logic for Hades Start Detector
Jan Michel [Mon, 3 Feb 2014 17:43:17 +0000 (18:43 +0100)]
Added ADC design files
Ludwig Maier [Fri, 31 Jan 2014 19:03:17 +0000 (20:03 +0100)]
new readout modes
Ludwig Maier [Tue, 28 Jan 2014 12:17:06 +0000 (13:17 +0100)]
ADC I2C readout implemented
Ludwig Maier [Fri, 24 Jan 2014 12:20:06 +0000 (13:20 +0100)]
added histograms for pileup and overflow per channel
Ludwig Maier [Sun, 15 Dec 2013 11:58:21 +0000 (12:58 +0100)]
nxyter working design
Ludwig Maier [Wed, 11 Dec 2013 08:59:28 +0000 (09:59 +0100)]
nxyter: window ts validation improved
Ludwig Maier [Mon, 9 Dec 2013 16:00:51 +0000 (17:00 +0100)]
tmp
Jan Michel [Mon, 27 Jan 2014 09:33:57 +0000 (10:33 +0100)]
added project for 32PinAddOn, make TDC 1.5.1 compiling with it.
Jan Michel [Fri, 24 Jan 2014 16:23:27 +0000 (17:23 +0100)]
added correct reset for hades hub & other fifo in gbe
Cahit [Thu, 23 Jan 2014 15:21:51 +0000 (16:21 +0100)]
Calibration trigger for the reference channel
Cahit [Thu, 23 Jan 2014 11:45:54 +0000 (12:45 +0100)]
Calibration trigger from the internal oscillator
Cahit [Tue, 21 Jan 2014 15:29:58 +0000 (16:29 +0100)]
epoch counter bug fix
Cahit [Tue, 21 Jan 2014 15:28:56 +0000 (16:28 +0100)]
epoch counter bug fix
Cahit [Mon, 20 Jan 2014 16:10:58 +0000 (17:10 +0100)]
first version of the tdc_v1.6
Jan Michel [Fri, 3 Jan 2014 17:22:56 +0000 (18:22 +0100)]
fixed pixel bug
Jan Michel [Thu, 2 Jan 2014 18:51:28 +0000 (19:51 +0100)]
adjusted paths
Jan Michel [Thu, 2 Jan 2014 18:44:34 +0000 (19:44 +0100)]
added lcd lib for padiwa incl. design
Jan Michel [Thu, 19 Dec 2013 11:28:15 +0000 (12:28 +0100)]
corrected mvd roc pinout
Manuel Penschuck [Fri, 13 Dec 2013 16:27:37 +0000 (17:27 +0100)]
- Trigger: All inputs are now selected via multiplexers, i.e. inputs from TRB3's RJ45 jacks are now treaded the same way input from the addon are
- Output-Multiplexer: The CTS now can drive the LVDS outputs of the input. The 8 bit pin-headers currently and the two LVDS-RJ45 jacks are currently connected, outputting the same 8-bit vector.
Ludwig Maier [Fri, 29 Nov 2013 11:35:22 +0000 (12:35 +0100)]
nxyter ADC Working, TS Working
Manuel Penschuck [Thu, 28 Nov 2013 20:48:24 +0000 (21:48 +0100)]
Trigger from peripheral FPGAs
Jan Michel [Tue, 26 Nov 2013 11:58:30 +0000 (12:58 +0100)]
changed padiwa test register
Ludwig Maier [Mon, 25 Nov 2013 02:22:17 +0000 (03:22 +0100)]
nxyter update
Ludwig Maier [Mon, 25 Nov 2013 02:07:39 +0000 (03:07 +0100)]
all working, hope so
Ludwig Maier [Sat, 23 Nov 2013 01:28:13 +0000 (02:28 +0100)]
working ts, adc almost
Manuel Penschuck [Sun, 24 Nov 2013 16:33:09 +0000 (17:33 +0100)]
Unknown Address instead of Timeout when writing to read-only registers
Ludwig Maier [Wed, 20 Nov 2013 20:42:59 +0000 (21:42 +0100)]
NXYTER working TS so far
Ludwig Maier [Tue, 12 Nov 2013 00:20:48 +0000 (01:20 +0100)]
nxyter: new i2c handler working
Jan Michel [Wed, 20 Nov 2013 18:38:33 +0000 (19:38 +0100)]
first final padiwa_amps design
Jan Michel [Tue, 19 Nov 2013 13:58:56 +0000 (14:58 +0100)]
added design for simple padiwa amps with fixed delay
Jan Michel [Mon, 18 Nov 2013 10:53:12 +0000 (11:53 +0100)]
Added lpf for new CB
Ludwig Maier [Mon, 11 Nov 2013 23:32:45 +0000 (00:32 +0100)]
new i2c handler
Ludwig Maier [Sun, 3 Nov 2013 18:04:29 +0000 (19:04 +0100)]
nxyter new adc reset handler
grzegorz.korcyl [Sun, 10 Nov 2013 18:28:27 +0000 (19:28 +0100)]
updated trb3_central.prj
Manuel Penschuck [Mon, 4 Nov 2013 18:15:46 +0000 (19:15 +0100)]
Improvements to the CTS AddOn
Added RoundRobin for EventBuilders
Manuel Penschuck [Fri, 1 Nov 2013 20:01:19 +0000 (21:01 +0100)]
CTS AddOn supported added (input multiplexer for JIN1/2, NIM1/2, ECL)