]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
9 years agoConversion of mupix digis to physical digis. Simulation ok, but test in hardware... MuPix
Tobias Weber [Wed, 15 Jul 2015 06:53:50 +0000 (08:53 +0200)]
Conversion of mupix digis to physical digis. Simulation ok, but test in hardware needed.

10 years agosolve multiple drivers error.
Tobias Weber [Tue, 24 Mar 2015 16:16:48 +0000 (17:16 +0100)]
solve multiple drivers error.

10 years agoRemoved async reset input in graycounter since this was not used anymore.
Tobias Weber [Tue, 24 Mar 2015 16:16:23 +0000 (17:16 +0100)]
Removed async reset input in graycounter since this was not used anymore.

10 years agodelay the hitbus signal for time walk measurement.
Tobias Weber [Sat, 21 Mar 2015 14:44:44 +0000 (15:44 +0100)]
delay the hitbus signal for time walk measurement.

10 years agoHitbus histogram respects after oscillation of hitbus signal.
Tobias Weber [Sat, 21 Mar 2015 14:44:15 +0000 (15:44 +0100)]
Hitbus histogram respects after oscillation of hitbus signal.

10 years agoMerge branch 'MuPix-Refactor' into MuPix
Tobias Weber [Wed, 11 Mar 2015 09:29:25 +0000 (10:29 +0100)]
Merge branch 'MuPix-Refactor' into MuPix

10 years agoexchange pins for injection pulses on board 2 and add constraints of unconnected...
Tobias Weber [Wed, 11 Mar 2015 09:25:31 +0000 (10:25 +0100)]
exchange pins for injection pulses on board 2 and add constraints of unconnected pins

10 years agotie unused signals from fpga to 0
Tobias Weber [Wed, 11 Mar 2015 09:14:04 +0000 (10:14 +0100)]
tie unused signals from fpga to 0

10 years agoconnect fifo read signal from slow control read to FiFo
Tobias Weber [Wed, 11 Mar 2015 09:13:21 +0000 (10:13 +0100)]
connect fifo read signal from slow control read to FiFo

10 years agoReset for leading edge counters. Not checked due to timing violations.
Tobias Weber [Thu, 26 Feb 2015 15:37:10 +0000 (16:37 +0100)]
Reset for leading edge counters. Not checked due to timing violations.

10 years agodefine standard values of mupix readout control signals in readout state machine...
Tobias Weber [Thu, 26 Feb 2015 09:19:34 +0000 (10:19 +0100)]
define standard values of mupix readout control signals in readout state machine. Simulation looks ok. Test in hardware needed.

10 years agoend of mupix event has no purpose in current event buffer design. Remove it.
Tobias Weber [Thu, 26 Feb 2015 09:18:02 +0000 (10:18 +0100)]
end of mupix event has no purpose in current event buffer design. Remove it.

10 years agogen_hit_time not needed since graycounter is used directly.
Tobias Weber [Wed, 25 Feb 2015 10:04:02 +0000 (11:04 +0100)]
gen_hit_time not needed since graycounter is used directly.

10 years agoMove readout state and memory default values to top of readout process. Not tested...
Tobias Weber [Wed, 25 Feb 2015 10:02:15 +0000 (11:02 +0100)]
Move readout state and memory default values to top of readout process. Not tested but works in simulation.

10 years agoRefactor: Change check of priout at load column.
Tobias Weber [Wed, 25 Feb 2015 09:33:52 +0000 (10:33 +0100)]
Refactor: Change check of priout at load column.

10 years agoUpdate compile script to diamond 3.2_x64 and add multicycle constraint for reset...
Tobias Weber [Wed, 25 Feb 2015 08:58:36 +0000 (09:58 +0100)]
Update compile script to diamond 3.2_x64 and add multicycle constraint for reset signal.

10 years agoadditional buffers for synchronizing hitbus and szintilator signals
Tobias Weber [Tue, 24 Feb 2015 13:46:36 +0000 (14:46 +0100)]
additional buffers for synchronizing hitbus and szintilator signals

10 years agohigh active reset used in all entities and synchronous reset.
Tobias Weber [Tue, 24 Feb 2015 13:45:16 +0000 (14:45 +0100)]
high active reset used in all entities and synchronous reset.

10 years agoMerge branch 'master' into MuPix
Tobias Weber [Mon, 23 Feb 2015 14:12:00 +0000 (15:12 +0100)]
Merge branch 'master' into MuPix

10 years agoSolved some timing error. But there is one timing error in SPI Master of trb3 ??
Tobias Weber [Mon, 23 Feb 2015 13:25:17 +0000 (14:25 +0100)]
Solved some timing error. But there is one timing error in SPI Master of trb3 ??

10 years agosome typo errors. Design generates bitstream but has timing errors.
Tobias Weber [Mon, 23 Feb 2015 10:09:14 +0000 (11:09 +0100)]
some typo errors. Design generates bitstream but has timing errors.

10 years agoadjustable max size for a mupix data frame
Tobias Weber [Mon, 23 Feb 2015 10:07:57 +0000 (11:07 +0100)]
adjustable max size for a mupix data frame

10 years agoError in constraints for auxilliary signals
Tobias Weber [Mon, 23 Feb 2015 10:07:23 +0000 (11:07 +0100)]
Error in constraints for auxilliary signals

10 years agoInclude time walk measurement into existing design
Tobias Weber [Mon, 23 Feb 2015 09:19:16 +0000 (10:19 +0100)]
Include time walk measurement into existing design

10 years agoentity for time walk measurement
Tobias Weber [Mon, 23 Feb 2015 09:18:38 +0000 (10:18 +0100)]
entity for time walk measurement

10 years agoAdd a Sensor ID to data frames.
Tobias Weber [Wed, 21 Jan 2015 11:21:08 +0000 (12:21 +0100)]
Add a Sensor ID to data frames.

10 years agoTrigger bypass is working now. Inactive sensors are identified by 0xfff00000
Tobias Weber [Wed, 14 Jan 2015 18:51:10 +0000 (19:51 +0100)]
Trigger bypass is working now. Inactive sensors are identified by 0xfff00000

10 years agoBroadcast for reseting the of eventcounters and timestamps (works). The trigger bypas...
Tobias Weber [Wed, 14 Jan 2015 15:47:27 +0000 (16:47 +0100)]
Broadcast for reseting the of eventcounters and timestamps (works). The trigger bypass results in a stop the cts read out

10 years agoAdd trigger bypass to Trigger Handler and flag to ignore pixel (0,0) on thinned Mupix...
Tobias Weber [Mon, 22 Dec 2014 14:33:21 +0000 (15:33 +0100)]
Add trigger bypass to Trigger Handler and flag to ignore pixel (0,0) on thinned Mupix6 in Mupix3 Interface. Design synthesizes and will be tested after christmas

10 years agoupdated ADC with new pulse shape processing. Simulation ok, par works fine, but not...
Jan Michel [Wed, 17 Dec 2014 18:27:08 +0000 (19:27 +0100)]
updated ADC with new pulse shape processing. Simulation ok, par works fine, but not tested in hardware yet

10 years agoadded MAC component
Jan Michel [Wed, 17 Dec 2014 15:55:07 +0000 (16:55 +0100)]
added MAC component

10 years agoCTS: Moved selection of trigger module into config file; added config for tof
Manuel Penschuck [Mon, 15 Dec 2014 21:31:10 +0000 (22:31 +0100)]
CTS: Moved selection of trigger module into config file; added config for tof

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Thu, 11 Dec 2014 14:15:11 +0000 (15:15 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agolight mode tdc is implemented
Cahit [Thu, 11 Dec 2014 14:13:35 +0000 (15:13 +0100)]
light mode tdc is implemented

10 years agotp modules are linked to the current release directory
Cahit [Thu, 11 Dec 2014 14:08:06 +0000 (15:08 +0100)]
tp modules are linked to the current release directory

10 years agocbmtof design brought up to tdc_v2.0
Cahit [Thu, 11 Dec 2014 13:39:24 +0000 (14:39 +0100)]
cbmtof design brought up to tdc_v2.0

10 years agoADC: Sim: Cosmetic fixes
Andreas Neiser [Mon, 8 Dec 2014 15:47:56 +0000 (16:47 +0100)]
ADC: Sim: Cosmetic fixes

10 years agoADC: Sim: Correct compile order for VHDL files
Andreas Neiser [Mon, 8 Dec 2014 15:39:13 +0000 (16:39 +0100)]
ADC: Sim: Correct compile order for VHDL files

10 years agoADC: Sim: Add dummy version.vhd for simulation
Andreas Neiser [Mon, 8 Dec 2014 13:31:29 +0000 (14:31 +0100)]
ADC: Sim: Add dummy version.vhd for simulation

10 years agoADC: Sim: use relative path names, work library still needs to be recreated
Andreas Neiser [Mon, 8 Dec 2014 13:28:15 +0000 (14:28 +0100)]
ADC: Sim: use relative path names, work library still needs to be recreated

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Fri, 5 Dec 2014 14:59:49 +0000 (15:59 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agocalibration and data trigger switching problem is fixed
Cahit [Fri, 5 Dec 2014 14:59:04 +0000 (15:59 +0100)]
calibration and data trigger switching problem is fixed

10 years agoadded buffer size setting to config file of 32pin AddOn
Jan Michel [Fri, 5 Dec 2014 13:44:27 +0000 (14:44 +0100)]
added buffer size setting to config file of 32pin AddOn

10 years agoadded included features to ADC config file
Jan Michel [Fri, 5 Dec 2014 12:49:35 +0000 (13:49 +0100)]
added included features to ADC config file

10 years agoadded few more control registers for ADC
Jan Michel [Fri, 5 Dec 2014 12:32:05 +0000 (13:32 +0100)]
added few more control registers for ADC

10 years agoCTS: map needs correct arguments...args
Andreas Neiser [Thu, 4 Dec 2014 12:48:19 +0000 (13:48 +0100)]
CTS: map needs correct arguments...args

10 years agoprojects made compatible with tdc_v2.0.0
Cahit [Thu, 4 Dec 2014 09:10:12 +0000 (10:10 +0100)]
projects made compatible with tdc_v2.0.0

10 years agotrigger window bug fix and constraints update for v2.0.0
Cahit [Thu, 4 Dec 2014 09:08:12 +0000 (10:08 +0100)]
trigger window bug fix and constraints update for v2.0.0

10 years agoconflict fix
Cahit [Wed, 3 Dec 2014 08:25:49 +0000 (09:25 +0100)]
conflict fix

10 years agotdc_v1.6.3 is made back compatible
Cahit [Wed, 3 Dec 2014 08:22:43 +0000 (09:22 +0100)]
tdc_v1.6.3 is made back compatible

10 years agoencoder name correctiongit add Channel.vhd Channel_200.vhd Encoder_304_Bit.vhd Readou...
Cahit [Wed, 3 Dec 2014 08:20:53 +0000 (09:20 +0100)]
encoder name correctiongit add Channel.vhd Channel_200.vhd Encoder_304_Bit.vhd Readout.vhd TDC.vhd tdc_components.vhd

10 years agoCTS: Minor compile scripts fixes
Andreas Neiser [Wed, 3 Dec 2014 08:02:09 +0000 (09:02 +0100)]
CTS: Minor compile scripts fixes

10 years agoCTS: Clock select based on config-constant
Manuel Penschuck [Tue, 2 Dec 2014 21:37:51 +0000 (22:37 +0100)]
CTS: Clock select based on config-constant

10 years agoCTS: ITC on input mux
Manuel Penschuck [Tue, 2 Dec 2014 21:37:21 +0000 (22:37 +0100)]
CTS: ITC on input mux

10 years agoCTS: Total dead time counter
Manuel Penschuck [Tue, 2 Dec 2014 21:37:04 +0000 (22:37 +0100)]
CTS: Total dead time counter

10 years agoCTS: Compile script uses single core par, fix bitgen call
Andreas Neiser [Tue, 2 Dec 2014 14:57:33 +0000 (15:57 +0100)]
CTS: Compile script uses single core par, fix bitgen call

10 years agoCTS: Remove DRIVE for JTTL ports
Andreas Neiser [Tue, 2 Dec 2014 14:37:26 +0000 (15:37 +0100)]
CTS: Remove DRIVE for JTTL ports

10 years agoShould be rom_encoder_3...
Andreas Neiser [Tue, 2 Dec 2014 12:48:32 +0000 (13:48 +0100)]
Should be rom_encoder_3...

10 years agoCTS: Make it work if no CBM but TDC is enabled
Andreas Neiser [Tue, 2 Dec 2014 12:00:01 +0000 (13:00 +0100)]
CTS: Make it work if no CBM but TDC is enabled

10 years agoCTS compile script fixes to make it work for Manuel...
Andreas Neiser [Tue, 2 Dec 2014 11:59:15 +0000 (12:59 +0100)]
CTS compile script fixes to make it work for Manuel...

10 years agoCTS changes to make 1.7.x / 1.6.3 TDC switch easier
Andreas Neiser [Tue, 2 Dec 2014 11:58:39 +0000 (12:58 +0100)]
CTS changes to make 1.7.x / 1.6.3 TDC switch easier

10 years agoTDC 1.6.3 changes to conform with 1.7.x component handling
Andreas Neiser [Tue, 2 Dec 2014 11:57:47 +0000 (12:57 +0100)]
TDC 1.6.3 changes to conform with 1.7.x component handling

10 years agorom encoder update for tdc 1.6.3
Cahit [Tue, 2 Dec 2014 10:41:50 +0000 (11:41 +0100)]
rom encoder update for tdc 1.6.3

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 2 Dec 2014 10:27:17 +0000 (11:27 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agotdc_components.vhd for tdc version 1.6.x
Cahit [Tue, 2 Dec 2014 10:27:11 +0000 (11:27 +0100)]
tdc_components.vhd for tdc version 1.6.x

10 years agoCTS: Compile on lxhadeb07 does not work...Synplify cant handle missing component...
Andreas Neiser [Tue, 2 Dec 2014 09:28:41 +0000 (10:28 +0100)]
CTS: Compile on lxhadeb07 does not work...Synplify cant handle missing component declaration?

10 years agoCTS: Compile scripts updated, syncing config.vhd
Andreas Neiser [Tue, 2 Dec 2014 08:24:07 +0000 (09:24 +0100)]
CTS: Compile scripts updated, syncing config.vhd

10 years agoupdate ADC code
Jan Michel [Mon, 1 Dec 2014 18:41:24 +0000 (19:41 +0100)]
update ADC code

10 years ago32PinAddOn Design updated for tdc_v2.0
Cahit [Mon, 1 Dec 2014 15:18:21 +0000 (16:18 +0100)]
32PinAddOn Design updated for tdc_v2.0

10 years agotdc release notes update
Cahit [Mon, 1 Dec 2014 15:10:04 +0000 (16:10 +0100)]
tdc release notes update

10 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Mon, 1 Dec 2014 15:07:33 +0000 (16:07 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

10 years agoGPIN addon design pin correction
Cahit [Mon, 1 Dec 2014 15:07:21 +0000 (16:07 +0100)]
GPIN addon design pin correction

10 years agotop files and component files for the tdc version 2.0
Cahit [Mon, 1 Dec 2014 14:29:14 +0000 (15:29 +0100)]
top files and component files for the tdc version 2.0

10 years agounnecessary files are removed from tdc test folder
Cahit [Mon, 1 Dec 2014 11:35:14 +0000 (12:35 +0100)]
unnecessary files are removed from tdc test folder

10 years agoconstraints update for version 1.6.3
Cahit [Mon, 1 Dec 2014 11:33:19 +0000 (12:33 +0100)]
constraints update for version 1.6.3

10 years agotdc_v2.0 release
Cahit [Mon, 1 Dec 2014 11:32:23 +0000 (12:32 +0100)]
tdc_v2.0 release

10 years agoADC: correct address range to include invalid words as well
Andreas Neiser [Fri, 28 Nov 2014 15:28:29 +0000 (16:28 +0100)]
ADC: correct address range to include invalid words as well

10 years agoone more attribute to get timing right
Jan Michel [Fri, 28 Nov 2014 14:25:46 +0000 (15:25 +0100)]
one more attribute to get timing right

10 years agoFinally Desgin with 2 mupix boards at one periph fpga seems to work nicely after...
Tobias Weber [Sun, 23 Nov 2014 12:53:22 +0000 (13:53 +0100)]
Finally Desgin with 2 mupix boards at one periph fpga seems to work nicely after replacing old fifo with version from lattice. Only cosmetic changes should be necessary from here.

10 years agoNow Readout of first sensor works, but second does not despite readout control signal...
Tobias Weber [Fri, 21 Nov 2014 16:09:03 +0000 (17:09 +0100)]
Now Readout of first sensor works, but second does not despite readout control signals look good

10 years agofixed timeout on sctrl bus in hub without gbe
Jan Michel [Fri, 21 Nov 2014 15:17:24 +0000 (16:17 +0100)]
fixed timeout on sctrl bus in hub without gbe

10 years agoFiFo 2k depth, 36 bit width
Tobias Weber [Fri, 21 Nov 2014 12:23:35 +0000 (13:23 +0100)]
FiFo 2k depth, 36 bit width

10 years agoWorks fine with 1 sensor per fpga. Implementing 2 sensors leads to timing violation...
Tobias Weber [Fri, 21 Nov 2014 08:50:42 +0000 (09:50 +0100)]
Works fine with 1 sensor per fpga. Implementing 2 sensors leads to timing violation. First FiFo does not save data persistently, while second does.

10 years agoIndependent register for second injection DAC
Tobias Weber [Thu, 6 Nov 2014 10:26:38 +0000 (11:26 +0100)]
Independent register for second injection DAC

10 years agoAdd a clock divider to the graycount generator
Tobias Weber [Thu, 6 Nov 2014 10:25:14 +0000 (11:25 +0100)]
Add a clock divider to the graycount generator

10 years agoCBMNet: Reboot DLM availabe (send 3 DLMS: 0xd, 0x1, 0xe). Optional GBE disable
Manuel Penschuck [Thu, 6 Nov 2014 08:10:48 +0000 (09:10 +0100)]
CBMNet: Reboot DLM availabe (send 3 DLMS: 0xd, 0x1, 0xe). Optional GBE disable

10 years agoCTS: JTTL(15) functions as reboot input (provide 1.28us high-pulse)
Manuel Penschuck [Thu, 6 Nov 2014 08:09:40 +0000 (09:09 +0100)]
CTS: JTTL(15) functions as reboot input (provide 1.28us high-pulse)

10 years agoCBMNet: Reminder to myself: Don't connect the Reset-Input of a synchroniser to the...
Manuel Penschuck [Mon, 3 Nov 2014 09:37:31 +0000 (10:37 +0100)]
CBMNet: Reminder to myself: Don't connect the Reset-Input of a synchroniser to the very reset-signal you want to synchronise ;)

10 years agoCTS: Back up TDC 1.6.3, Better constraints for design
Manuel Penschuck [Mon, 3 Nov 2014 09:09:35 +0000 (10:09 +0100)]
CTS: Back up TDC 1.6.3, Better constraints for design

10 years agoCBMNet: Test design compatible to bridge, test-lines added, clean-up, constraints
Manuel Penschuck [Mon, 3 Nov 2014 09:06:24 +0000 (10:06 +0100)]
CBMNet: Test design compatible to bridge, test-lines added, clean-up, constraints

10 years agoMBS-Recv(+Billboard): Introduced optional Timestamps and Regio-Master
Manuel Penschuck [Mon, 3 Nov 2014 09:02:24 +0000 (10:02 +0100)]
MBS-Recv(+Billboard): Introduced optional Timestamps and Regio-Master

10 years agoCBMNet: Misc. Clean-Up
Manuel Penschuck [Mon, 3 Nov 2014 09:00:24 +0000 (10:00 +0100)]
CBMNet: Misc. Clean-Up

10 years agoCBMNet: Remove OBuf as not required anymore
Manuel Penschuck [Mon, 3 Nov 2014 08:50:52 +0000 (09:50 +0100)]
CBMNet: Remove OBuf as not required anymore

10 years agoCBMNet: Undo new-style CTRLBUS as incompatible with ChipScope. Migrated to new new...
Manuel Penschuck [Mon, 3 Nov 2014 08:49:33 +0000 (09:49 +0100)]
CBMNet: Undo new-style CTRLBUS as incompatible with ChipScope. Migrated to new new CBMNet PCS-Init-Module, Added some synchroniser (that should not be vital), code clean-up

10 years agoCTS: Migrated back to TDC 1.6.3 and code clean up
Manuel Penschuck [Sun, 26 Oct 2014 20:25:06 +0000 (21:25 +0100)]
CTS: Migrated back to TDC 1.6.3 and code clean up

10 years agoCTS: Migrated back to TDC 1.6.3 and code clean up
Manuel Penschuck [Sun, 26 Oct 2014 20:24:37 +0000 (21:24 +0100)]
CTS: Migrated back to TDC 1.6.3 and code clean up

10 years agoCBMNet: PCS-Reset issued when receive a Link-Reinit, Generic signal_sync in contrast...
Manuel Penschuck [Sun, 26 Oct 2014 20:22:30 +0000 (21:22 +0100)]
CBMNet: PCS-Reset issued when receive a Link-Reinit, Generic signal_sync in contrast to manual syncs, code clean-up

10 years agoBillboard: Corrected HW-ID
Manuel Penschuck [Sun, 26 Oct 2014 20:20:32 +0000 (21:20 +0100)]
Billboard: Corrected HW-ID

10 years agoMerge conflict
Manuel Penschuck [Sun, 26 Oct 2014 20:18:29 +0000 (21:18 +0100)]
Merge conflict

10 years agoadded checker for ADC words
Jan Michel [Sun, 26 Oct 2014 18:28:14 +0000 (19:28 +0100)]
added checker for ADC words