]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
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
Andreas Neiser [Wed, 3 Dec 2014 08:02:09 +0000 (09:02 +0100)]
CTS: Minor compile scripts fixes
Manuel Penschuck [Tue, 2 Dec 2014 21:37:51 +0000 (22:37 +0100)]
CTS: Clock select based on config-constant
Manuel Penschuck [Tue, 2 Dec 2014 21:37:21 +0000 (22:37 +0100)]
CTS: ITC on input mux
Manuel Penschuck [Tue, 2 Dec 2014 21:37:04 +0000 (22:37 +0100)]
CTS: Total dead time counter
Andreas Neiser [Tue, 2 Dec 2014 14:57:33 +0000 (15:57 +0100)]
CTS: Compile script uses single core par, fix bitgen call
Andreas Neiser [Tue, 2 Dec 2014 14:37:26 +0000 (15:37 +0100)]
CTS: Remove DRIVE for JTTL ports
Andreas Neiser [Tue, 2 Dec 2014 12:48:32 +0000 (13:48 +0100)]
Should be rom_encoder_3...
Andreas Neiser [Tue, 2 Dec 2014 12:00:01 +0000 (13:00 +0100)]
CTS: Make it work if no CBM but TDC is enabled
Andreas Neiser [Tue, 2 Dec 2014 11:59:15 +0000 (12:59 +0100)]
CTS compile script fixes to make it work for Manuel...
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
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
Cahit [Tue, 2 Dec 2014 10:41:50 +0000 (11:41 +0100)]
rom encoder update for tdc 1.6.3
Cahit [Tue, 2 Dec 2014 10:27:17 +0000 (11:27 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Tue, 2 Dec 2014 10:27:11 +0000 (11:27 +0100)]
tdc_components.vhd for tdc version 1.6.x
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?
Andreas Neiser [Tue, 2 Dec 2014 08:24:07 +0000 (09:24 +0100)]
CTS: Compile scripts updated, syncing config.vhd
Jan Michel [Mon, 1 Dec 2014 18:41:24 +0000 (19:41 +0100)]
update ADC code
Cahit [Mon, 1 Dec 2014 15:18:21 +0000 (16:18 +0100)]
32PinAddOn Design updated for tdc_v2.0
Cahit [Mon, 1 Dec 2014 15:10:04 +0000 (16:10 +0100)]
tdc release notes update
Cahit [Mon, 1 Dec 2014 15:07:33 +0000 (16:07 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Cahit [Mon, 1 Dec 2014 15:07:21 +0000 (16:07 +0100)]
GPIN addon design pin correction
Cahit [Mon, 1 Dec 2014 14:29:14 +0000 (15:29 +0100)]
top files and component files for the tdc version 2.0
Cahit [Mon, 1 Dec 2014 11:35:14 +0000 (12:35 +0100)]
unnecessary files are removed from tdc test folder
Cahit [Mon, 1 Dec 2014 11:33:19 +0000 (12:33 +0100)]
constraints update for version 1.6.3
Cahit [Mon, 1 Dec 2014 11:32:23 +0000 (12:32 +0100)]
tdc_v2.0 release
Andreas Neiser [Fri, 28 Nov 2014 15:28:29 +0000 (16:28 +0100)]
ADC: correct address range to include invalid words as well
Jan Michel [Fri, 28 Nov 2014 14:25:46 +0000 (15:25 +0100)]
one more attribute to get timing right
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.
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
Jan Michel [Fri, 21 Nov 2014 15:17:24 +0000 (16:17 +0100)]
fixed timeout on sctrl bus in hub without gbe
Tobias Weber [Fri, 21 Nov 2014 12:23:35 +0000 (13:23 +0100)]
FiFo 2k depth, 36 bit width
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.
Tobias Weber [Thu, 6 Nov 2014 10:26:38 +0000 (11:26 +0100)]
Independent register for second injection DAC
Tobias Weber [Thu, 6 Nov 2014 10:25:14 +0000 (11:25 +0100)]
Add a clock divider to the graycount generator
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
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)
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 ;)
Manuel Penschuck [Mon, 3 Nov 2014 09:09:35 +0000 (10:09 +0100)]
CTS: Back up TDC 1.6.3, Better constraints for design
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
Manuel Penschuck [Mon, 3 Nov 2014 09:02:24 +0000 (10:02 +0100)]
MBS-Recv(+Billboard): Introduced optional Timestamps and Regio-Master
Manuel Penschuck [Mon, 3 Nov 2014 09:00:24 +0000 (10:00 +0100)]
CBMNet: Misc. Clean-Up
Manuel Penschuck [Mon, 3 Nov 2014 08:50:52 +0000 (09:50 +0100)]
CBMNet: Remove OBuf as not required anymore
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
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
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
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
Manuel Penschuck [Sun, 26 Oct 2014 20:20:32 +0000 (21:20 +0100)]
Billboard: Corrected HW-ID
Manuel Penschuck [Sun, 26 Oct 2014 20:18:29 +0000 (21:18 +0100)]
Merge conflict
Jan Michel [Sun, 26 Oct 2014 18:28:14 +0000 (19:28 +0100)]
added checker for ADC words
Manuel Penschuck [Sat, 25 Oct 2014 19:33:20 +0000 (21:33 +0200)]
CBMNET: TX-GEAR back-up
Manuel Penschuck [Fri, 24 Oct 2014 20:38:38 +0000 (22:38 +0200)]
Add Billboard design (includes storage billboard and MBS receiver)
Jan Michel [Thu, 23 Oct 2014 17:11:38 +0000 (19:11 +0200)]
added sed checker to ADC design
Manuel Penschuck [Thu, 23 Oct 2014 14:59:36 +0000 (16:59 +0200)]
CTS: Backup before migrating to TDC v1.6.3 and MBS
Cahit [Mon, 20 Oct 2014 14:38:33 +0000 (16:38 +0200)]
symbolic links for the top entities
Cahit [Mon, 20 Oct 2014 14:33:44 +0000 (16:33 +0200)]
conflict fix
Cahit [Mon, 20 Oct 2014 14:13:50 +0000 (16:13 +0200)]
tdc release 2.0.xx
Cahit [Mon, 20 Oct 2014 14:12:55 +0000 (16:12 +0200)]
tdc release 1.7.xx
Cahit [Mon, 20 Oct 2014 14:10:06 +0000 (16:10 +0200)]
top file update for designs
Cahit [Mon, 20 Oct 2014 14:08:37 +0000 (16:08 +0200)]
base folder update
Cahit [Mon, 20 Oct 2014 14:07:29 +0000 (16:07 +0200)]
wasa design update
Cahit [Mon, 20 Oct 2014 14:06:40 +0000 (16:06 +0200)]
ADA Addon design update
Cahit [Mon, 20 Oct 2014 14:06:08 +0000 (16:06 +0200)]
32PinAddOn design update
Cahit [Mon, 20 Oct 2014 14:05:33 +0000 (16:05 +0200)]
cbmtof design update
Cahit [Mon, 20 Oct 2014 14:04:54 +0000 (16:04 +0200)]
new pll core
Andreas Neiser [Mon, 20 Oct 2014 13:59:55 +0000 (15:59 +0200)]
ADC: Compile script now actually works...
Cahit [Mon, 20 Oct 2014 13:59:08 +0000 (15:59 +0200)]
remove obselete files
Andreas Neiser [Mon, 20 Oct 2014 11:48:27 +0000 (13:48 +0200)]
ADC: Patch compile script for GSI machines
Manuel Penschuck [Sat, 18 Oct 2014 19:12:52 +0000 (21:12 +0200)]
CBMNet: Script to convert TrbNet into CBMNet time using TDC data. Tool will now be moved to daqtools
Manuel Penschuck [Thu, 16 Oct 2014 19:32:17 +0000 (21:32 +0200)]
CTS: Timestamp-Included flag was missing in the CTS header
Manuel Penschuck [Thu, 16 Oct 2014 19:31:15 +0000 (21:31 +0200)]
CTS: Included bigger CBMNET read-out buffer in project (and adopted placement), routed add-on input to TDC
Manuel Penschuck [Thu, 16 Oct 2014 19:28:20 +0000 (21:28 +0200)]
CBMNET: Adopted peripherial test design to new pattern generator
Manuel Penschuck [Thu, 16 Oct 2014 19:27:00 +0000 (21:27 +0200)]
CBMNet: Private tool to analyse sync-scheme of bridge
Manuel Penschuck [Thu, 16 Oct 2014 19:24:45 +0000 (21:24 +0200)]
CBMNet: Increase read-out buffer to 128 kb, TrbNet pattern generator for testing the read-out in periph FPGA, small improvements and bug-fix to the bridge
Manuel Penschuck [Wed, 15 Oct 2014 20:02:30 +0000 (22:02 +0200)]
CreateProject: Now supports verilog-includePath and FDC files. Generates ldf-files version 3.2
Manuel Penschuck [Wed, 15 Oct 2014 10:07:58 +0000 (12:07 +0200)]
CBMNet: Test design adopted to new cbmnet_bridge component
Manuel Penschuck [Tue, 14 Oct 2014 21:11:42 +0000 (23:11 +0200)]
CTS: Included TDC v1.7.1 and replace individual CBMNET instance by cbmnet_bridge component
Manuel Penschuck [Tue, 14 Oct 2014 21:05:48 +0000 (23:05 +0200)]
Trigger and Clock Select (not working, but commit necessary as already included in CTS)
Manuel Penschuck [Tue, 14 Oct 2014 21:02:42 +0000 (23:02 +0200)]
CBMNet: Encapsulated whole stack into a dedicated entity
Manuel Penschuck [Tue, 14 Oct 2014 21:01:16 +0000 (23:01 +0200)]
CBMNET: Fine-Tuning of PHY
Tobias Weber [Mon, 13 Oct 2014 16:00:12 +0000 (17:00 +0100)]
Inverting signals from the sensorboard
Tobias Weber [Mon, 13 Oct 2014 15:58:48 +0000 (16:58 +0100)]
Own FiFo
Tobias Weber [Mon, 13 Oct 2014 15:58:26 +0000 (16:58 +0100)]
Seperate address for second injection DAC register
Tobias Weber [Mon, 13 Oct 2014 15:57:53 +0000 (16:57 +0100)]
The physics trigger seems to be working now. All data from frame generator is read
Tobias Weber [Fri, 10 Oct 2014 16:57:32 +0000 (17:57 +0100)]
Additional trigger_release and trigger_data_valid states. Still Output looks strange
Jan Michel [Fri, 10 Oct 2014 15:07:16 +0000 (17:07 +0200)]
latest version of ADC code. Processor seems to be fine in simulation.
Tobias Weber [Fri, 10 Oct 2014 15:02:58 +0000 (16:02 +0100)]
Readout is working with somewhat faulty readout data. The event trailer of last event is send first then event header with the data. This is followd by strange data words and the data trailer.
Jan Michel [Fri, 10 Oct 2014 14:39:59 +0000 (16:39 +0200)]
added clock for power converters to central FPGA
Jan Michel [Mon, 6 Oct 2014 19:10:27 +0000 (21:10 +0200)]
Latest version of adc code, with status trigger
Tobias Weber [Thu, 2 Oct 2014 13:43:30 +0000 (15:43 +0200)]
Board Interface to sync and invert signals from mupix sensorboard
Tobias Weber [Thu, 2 Oct 2014 11:48:19 +0000 (13:48 +0200)]
Removed last bugs found by simulation. Now let's see if synthesis is successfull and everythink works on TRB
Tobias Weber [Thu, 2 Oct 2014 11:45:05 +0000 (13:45 +0200)]
Found some errors during simulation in trigger handler and mupix interface
Tobias Weber [Thu, 2 Oct 2014 08:27:02 +0000 (10:27 +0200)]
A lot corrections of typos and stupid little mistakes
Jan Michel [Tue, 30 Sep 2014 13:55:57 +0000 (15:55 +0200)]
added SED to hub design and switched to new Diamond
Jan Michel [Tue, 30 Sep 2014 13:50:25 +0000 (15:50 +0200)]
added 4 MHz clock output for Enpirion regulators
Manuel Penschuck [Sun, 28 Sep 2014 18:38:54 +0000 (20:38 +0200)]
CTS: Back-Up before migrating to CBMNet LPv3
Manuel Penschuck [Sun, 28 Sep 2014 18:37:39 +0000 (20:37 +0200)]
CBM: Wrong status bits for event packer; CTS: clean up
Tobias Weber [Fri, 26 Sep 2014 16:10:48 +0000 (18:10 +0200)]
Solved bug in event buffer that last fifo entry was not read on slow control channel (simulated)
Tobias Weber [Fri, 26 Sep 2014 15:00:18 +0000 (17:00 +0200)]
Clock generator for mupix 50 MHz clock
Tobias Weber [Fri, 26 Sep 2014 14:58:45 +0000 (16:58 +0200)]
small changes related to changes in event buffer and trigger handler