]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
11 years agore-connected GbE to clock...
Jan Michel [Thu, 27 Feb 2014 18:31:42 +0000 (19:31 +0100)]
re-connected GbE to clock...

11 years agomoved PLL into ADC block
Jan Michel [Thu, 27 Feb 2014 18:30:50 +0000 (19:30 +0100)]
moved PLL into ADC block

11 years agoupdated ADC AddOn files
Jan Michel [Thu, 27 Feb 2014 18:30:15 +0000 (19:30 +0100)]
updated ADC AddOn files

11 years agoadded new 40MHz PLL
Jan Michel [Thu, 27 Feb 2014 18:28:47 +0000 (19:28 +0100)]
added new 40MHz PLL

11 years agoCTS: Try with Cahits LPF
Andreas Neiser [Thu, 27 Feb 2014 17:10:43 +0000 (18:10 +0100)]
CTS: Try with Cahits LPF

11 years agoFinally the linkdesignfiles business works!
Andreas Neiser [Thu, 27 Feb 2014 13:27:14 +0000 (14:27 +0100)]
Finally the linkdesignfiles business works!

11 years agoCommenting out some unused ngo file links (confirmed by Greg), again
Andreas Neiser [Thu, 27 Feb 2014 09:44:43 +0000 (10:44 +0100)]
Commenting out some unused ngo file links (confirmed by Greg), again

11 years agoCommenting out some unused ngo file links (confirmed by Greg)
Andreas Neiser [Thu, 27 Feb 2014 09:43:45 +0000 (10:43 +0100)]
Commenting out some unused ngo file links (confirmed by Greg)

11 years agoDeleting symlinks in workdir, compilescripts should take care of that!
Andreas Neiser [Thu, 27 Feb 2014 09:21:06 +0000 (10:21 +0100)]
Deleting symlinks in workdir, compilescripts should take care of that!

11 years agoCTS: Adapted more to Frankfurt compile script...previous settings generated broken...
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

11 years agoCTS: Bitfile generated with A2 EventId receiver and TDC v1.6
Andreas Neiser [Wed, 26 Feb 2014 16:45:09 +0000 (17:45 +0100)]
CTS: Bitfile generated with A2 EventId receiver and TDC v1.6

11 years agoSwitch to TDC v1.6, compiles at least, but still not tested
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

11 years agoCompiles with v1.5.1, but totally untested any further
Andreas Neiser [Wed, 26 Feb 2014 11:59:52 +0000 (12:59 +0100)]
Compiles with v1.5.1, but totally untested any further

11 years agocompile script adapted for the gsi
Cahit [Wed, 26 Feb 2014 12:03:42 +0000 (13:03 +0100)]
compile script adapted for the gsi

11 years agoMerge branch 'v1.6'
Cahit [Wed, 26 Feb 2014 12:02:41 +0000 (13:02 +0100)]
Merge branch 'v1.6'

11 years agotdc_v1.6: first working version
Cahit [Wed, 26 Feb 2014 12:01:03 +0000 (13:01 +0100)]
tdc_v1.6: first working version

11 years agoSome improvements for GSI compile scripts, not tested yet
Andreas Neiser [Wed, 26 Feb 2014 10:38:22 +0000 (11:38 +0100)]
Some improvements for GSI compile scripts, not tested yet

11 years agoadded logic for trigger output to central hub
Jan Michel [Mon, 24 Feb 2014 11:08:15 +0000 (12:08 +0100)]
added logic for trigger output to central hub

11 years agostarted to implement trigger input statistics
Jan Michel [Mon, 24 Feb 2014 11:07:19 +0000 (12:07 +0100)]
started to implement trigger input statistics

11 years agosome more stuff to ignore
Jan Michel [Wed, 12 Feb 2014 16:39:28 +0000 (17:39 +0100)]
some more stuff to ignore

11 years agolatest version of start design
Jan Michel [Wed, 12 Feb 2014 16:38:19 +0000 (17:38 +0100)]
latest version of start design

11 years agomoved to Diamond 3.0
Jan Michel [Wed, 12 Feb 2014 12:44:43 +0000 (13:44 +0100)]
moved to Diamond 3.0

11 years agoconfig changed to 65 channels
Cahit [Mon, 17 Feb 2014 07:56:10 +0000 (08:56 +0100)]
config changed to 65 channels

11 years agonxyter histogram bug removed, i2c handler update
Ludwig Maier [Mon, 17 Feb 2014 02:13:00 +0000 (03:13 +0100)]
nxyter histogram bug removed, i2c handler update

11 years agonxyter update, not working
Ludwig Maier [Thu, 13 Feb 2014 19:38:17 +0000 (20:38 +0100)]
nxyter update, not working

11 years agomodified for tdc_v1.6
Cahit [Thu, 13 Feb 2014 10:59:57 +0000 (11:59 +0100)]
modified for tdc_v1.6

11 years agoadded clock and trigger input selection to GbE design
Jan Michel [Tue, 11 Feb 2014 17:48:30 +0000 (18:48 +0100)]
added clock and trigger input selection to GbE design

11 years agosome new files for ADC addon
Jan Michel [Tue, 11 Feb 2014 17:47:46 +0000 (18:47 +0100)]
some new files for ADC addon

11 years agonew design for hades start readout
Jan Michel [Tue, 11 Feb 2014 17:46:58 +0000 (18:46 +0100)]
new design for hades start readout

11 years agoTop design file for 32PinAddOn is added
Cahit [Tue, 11 Feb 2014 13:48:16 +0000 (14:48 +0100)]
Top design file for 32PinAddOn is added

11 years agoconflict fix
Cahit [Tue, 11 Feb 2014 13:42:13 +0000 (14:42 +0100)]
conflict fix

Conflicts:
32PinAddOn/trb3_periph_32PinAddOn.vhd

11 years agointermediate commit
Cahit [Tue, 11 Feb 2014 13:36:46 +0000 (14:36 +0100)]
intermediate commit

11 years agoPadiwa_Amps: Discharge on leading edge of FAST until trailing edge of SLOW
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

11 years agoPadiwa: Modify compilation for GSI machine lxhadeb07, hopefully in Frankfurt it still...
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

11 years agotrigger generation logic for Hades Start Detector
Jan Michel [Mon, 3 Feb 2014 17:44:44 +0000 (18:44 +0100)]
trigger generation logic for Hades Start Detector

11 years agoAdded ADC design files
Jan Michel [Mon, 3 Feb 2014 17:43:17 +0000 (18:43 +0100)]
Added ADC design files

11 years agonew readout modes
Ludwig Maier [Fri, 31 Jan 2014 19:03:17 +0000 (20:03 +0100)]
new readout modes

11 years agoADC I2C readout implemented
Ludwig Maier [Tue, 28 Jan 2014 12:17:06 +0000 (13:17 +0100)]
ADC I2C readout implemented

11 years agoadded histograms for pileup and overflow per channel
Ludwig Maier [Fri, 24 Jan 2014 12:20:06 +0000 (13:20 +0100)]
added histograms for pileup and overflow per channel

11 years agonxyter working design
Ludwig Maier [Sun, 15 Dec 2013 11:58:21 +0000 (12:58 +0100)]
nxyter working design

11 years agonxyter: window ts validation improved
Ludwig Maier [Wed, 11 Dec 2013 08:59:28 +0000 (09:59 +0100)]
nxyter: window ts validation improved

11 years agotmp
Ludwig Maier [Mon, 9 Dec 2013 16:00:51 +0000 (17:00 +0100)]
tmp

11 years agoadded project for 32PinAddOn, make TDC 1.5.1 compiling with it.
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.

11 years agoadded correct reset for hades hub & other fifo in gbe
Jan Michel [Fri, 24 Jan 2014 16:23:27 +0000 (17:23 +0100)]
added correct reset for hades hub & other fifo in gbe

11 years agoCalibration trigger for the reference channel
Cahit [Thu, 23 Jan 2014 15:21:51 +0000 (16:21 +0100)]
Calibration trigger for the reference channel

11 years agoCalibration trigger from the internal oscillator
Cahit [Thu, 23 Jan 2014 11:45:54 +0000 (12:45 +0100)]
Calibration trigger from the internal oscillator

11 years agoepoch counter bug fix
Cahit [Tue, 21 Jan 2014 15:29:58 +0000 (16:29 +0100)]
epoch counter bug fix

11 years agoepoch counter bug fix
Cahit [Tue, 21 Jan 2014 15:28:56 +0000 (16:28 +0100)]
epoch counter bug fix

11 years agofirst version of the tdc_v1.6
Cahit [Mon, 20 Jan 2014 16:10:58 +0000 (17:10 +0100)]
first version of the tdc_v1.6

11 years agofixed pixel bug
Jan Michel [Fri, 3 Jan 2014 17:22:56 +0000 (18:22 +0100)]
fixed pixel bug

11 years agoadjusted paths
Jan Michel [Thu, 2 Jan 2014 18:51:28 +0000 (19:51 +0100)]
adjusted paths

11 years agoadded lcd lib for padiwa incl. design
Jan Michel [Thu, 2 Jan 2014 18:44:34 +0000 (19:44 +0100)]
added lcd lib for padiwa incl. design

11 years agocorrected mvd roc pinout
Jan Michel [Thu, 19 Dec 2013 11:28:15 +0000 (12:28 +0100)]
corrected mvd roc pinout

11 years agonxyter ADC Working, TS Working
Ludwig Maier [Fri, 29 Nov 2013 11:35:22 +0000 (12:35 +0100)]
nxyter ADC Working, TS Working

11 years agoTrigger from peripheral FPGAs
Manuel Penschuck [Thu, 28 Nov 2013 20:48:24 +0000 (21:48 +0100)]
Trigger from peripheral FPGAs

11 years agochanged padiwa test register
Jan Michel [Tue, 26 Nov 2013 11:58:30 +0000 (12:58 +0100)]
changed padiwa test register

11 years agonxyter update
Ludwig Maier [Mon, 25 Nov 2013 02:22:17 +0000 (03:22 +0100)]
nxyter update

11 years agoall working, hope so
Ludwig Maier [Mon, 25 Nov 2013 02:07:39 +0000 (03:07 +0100)]
all working, hope so

11 years agoworking ts, adc almost
Ludwig Maier [Sat, 23 Nov 2013 01:28:13 +0000 (02:28 +0100)]
working ts, adc almost

11 years agoUnknown Address instead of Timeout when writing to read-only registers
Manuel Penschuck [Sun, 24 Nov 2013 16:33:09 +0000 (17:33 +0100)]
Unknown Address instead of Timeout when writing to read-only registers

11 years agoNXYTER working TS so far
Ludwig Maier [Wed, 20 Nov 2013 20:42:59 +0000 (21:42 +0100)]
NXYTER working TS so far

11 years agonxyter: new i2c handler working
Ludwig Maier [Tue, 12 Nov 2013 00:20:48 +0000 (01:20 +0100)]
nxyter: new i2c handler working

11 years agofirst final padiwa_amps design
Jan Michel [Wed, 20 Nov 2013 18:38:33 +0000 (19:38 +0100)]
first final padiwa_amps design

11 years agoadded design for simple padiwa amps with fixed delay
Jan Michel [Tue, 19 Nov 2013 13:58:56 +0000 (14:58 +0100)]
added design for simple padiwa amps with fixed delay

11 years agoAdded lpf for new CB
Jan Michel [Mon, 18 Nov 2013 10:53:12 +0000 (11:53 +0100)]
Added lpf for new CB

11 years agonew i2c handler
Ludwig Maier [Mon, 11 Nov 2013 23:32:45 +0000 (00:32 +0100)]
new i2c handler

11 years agonxyter new adc reset handler
Ludwig Maier [Sun, 3 Nov 2013 18:04:29 +0000 (19:04 +0100)]
nxyter new adc reset handler

11 years agoupdated trb3_central.prj
grzegorz.korcyl [Sun, 10 Nov 2013 18:28:27 +0000 (19:28 +0100)]
updated trb3_central.prj

11 years agoImprovements to the CTS AddOn
Manuel Penschuck [Mon, 4 Nov 2013 18:15:46 +0000 (19:15 +0100)]
Improvements to the CTS AddOn
Added RoundRobin for EventBuilders

11 years agoCTS AddOn supported added (input multiplexer for JIN1/2, NIM1/2, ECL)
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)

11 years agoCorrected Site Locations for CTS AddOn
Manuel Penschuck [Fri, 1 Nov 2013 19:59:03 +0000 (20:59 +0100)]
Corrected Site Locations for CTS AddOn

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Ludwig Maier [Thu, 24 Oct 2013 04:20:56 +0000 (06:20 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agonxyter, new working Timestamp Handler, ADC still not working correctly
Ludwig Maier [Thu, 24 Oct 2013 04:19:43 +0000 (06:19 +0200)]
nxyter, new working Timestamp Handler, ADC still not working correctly

11 years agoupdated trb3_gbe to new gbe
Jan Michel [Wed, 23 Oct 2013 15:54:39 +0000 (17:54 +0200)]
updated trb3_gbe to new gbe

11 years agochanged hub to Diamond 2.1
Jan Michel [Wed, 23 Oct 2013 15:54:22 +0000 (17:54 +0200)]
changed hub to Diamond 2.1

11 years agochanged CTS compile script for Diamond 2.1
Jan Michel [Wed, 23 Oct 2013 15:53:01 +0000 (17:53 +0200)]
changed CTS compile script for Diamond 2.1

11 years agoChanges in order to simulate design
Manuel Penschuck [Tue, 22 Oct 2013 16:15:05 +0000 (18:15 +0200)]
Changes in order to simulate design

11 years agoMerge branch 'master' of jspc27:trb3
Manuel Penschuck [Tue, 22 Oct 2013 16:13:20 +0000 (18:13 +0200)]
Merge branch 'master' of jspc27:trb3

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Ludwig Maier [Wed, 16 Oct 2013 00:40:40 +0000 (02:40 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agonxyter updates, cleanup
Ludwig Maier [Wed, 16 Oct 2013 00:40:33 +0000 (02:40 +0200)]
nxyter updates, cleanup

11 years agoupdated central_hub2 design, added mode for central Hades Hub
Jan Michel [Tue, 15 Oct 2013 16:02:52 +0000 (18:02 +0200)]
updated central_hub2 design, added mode for central Hades Hub

11 years agoBackup: Design now synthesizable.
Manuel Penschuck [Mon, 14 Oct 2013 17:15:09 +0000 (19:15 +0200)]
Backup: Design now synthesizable.

11 years agoMerge branch 'master' of jspc29:trb3
Manuel Penschuck [Mon, 14 Oct 2013 08:52:56 +0000 (10:52 +0200)]
Merge branch 'master' of jspc29:trb3

11 years agoAdded Link Tester Modules (cannot synthesize)
Manuel Penschuck [Mon, 14 Oct 2013 08:52:49 +0000 (10:52 +0200)]
Added Link Tester Modules (cannot synthesize)
Added Debugging Tools for 4ns issue
Some cleaning up to prevent some synplifiy warnings
Reduced output to stdout when compiling (drop not "has no load" warning)

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Ludwig Maier [Fri, 11 Oct 2013 16:31:46 +0000 (18:31 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agonxyter update...
Ludwig Maier [Fri, 11 Oct 2013 16:31:37 +0000 (18:31 +0200)]
nxyter update...

11 years agocorrected region declaration
Cahit [Wed, 9 Oct 2013 14:47:56 +0000 (16:47 +0200)]
corrected region declaration

11 years agoBackup (still got 4ns issue)
Manuel Penschuck [Tue, 8 Oct 2013 09:18:18 +0000 (11:18 +0200)]
Backup (still got 4ns issue)

11 years agoadded Diamond project for Padiwa
Jan Michel [Mon, 7 Oct 2013 15:43:16 +0000 (17:43 +0200)]
added Diamond project for Padiwa

11 years agoTX Gear added, however still buggy
Manuel Penschuck [Mon, 7 Oct 2013 14:35:02 +0000 (16:35 +0200)]
TX Gear added, however still buggy

11 years agocleanup nxyter stuff
Ludwig Maier [Fri, 4 Oct 2013 21:58:37 +0000 (23:58 +0200)]
cleanup nxyter stuff

11 years agoCBMNet Litte clean up in code
Manuel Penschuck [Thu, 3 Oct 2013 17:45:49 +0000 (19:45 +0200)]
CBMNet Litte clean up in code

11 years agoCBMNet DLM seem to work. Need to measure whether system
Manuel Penschuck [Thu, 3 Oct 2013 14:40:53 +0000 (16:40 +0200)]
CBMNet DLM seem to work. Need to measure whether system
really has a fixed latency.

11 years agoMerge branch 'master' of jspc29:trb3
Manuel Penschuck [Thu, 3 Oct 2013 13:33:40 +0000 (15:33 +0200)]
Merge branch 'master' of jspc29:trb3

11 years agoPhy finally operational (again)
Manuel Penschuck [Thu, 3 Oct 2013 13:33:12 +0000 (15:33 +0200)]
Phy finally operational (again)

11 years agocompiling version with ADC PLLs rearranged
Jan Michel [Wed, 2 Oct 2013 22:57:28 +0000 (00:57 +0200)]
compiling version with ADC PLLs rearranged

11 years agojetzt mit fifo_ts_12to12_dc..
Ludwig Maier [Wed, 2 Oct 2013 21:27:58 +0000 (23:27 +0200)]
jetzt mit fifo_ts_12to12_dc..

11 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Ludwig Maier [Wed, 2 Oct 2013 20:37:53 +0000 (22:37 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

11 years agoall is fine
Ludwig Maier [Wed, 2 Oct 2013 20:30:53 +0000 (22:30 +0200)]
all is fine

11 years agopending
Ludwig Maier [Wed, 2 Oct 2013 20:30:53 +0000 (22:30 +0200)]
pending