]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
7 years agoMinor clean-up
Rene Hagdorn [Fri, 27 Apr 2018 09:07:18 +0000 (11:07 +0200)]
Minor clean-up

7 years agoCorrected register addresses for Generator
Rene Hagdorn [Thu, 26 Apr 2018 16:27:25 +0000 (18:27 +0200)]
Corrected register addresses for Generator

7 years agoChanged connections to/from Generator, 'declocked' DataSelector
Rene Hagdorn [Thu, 26 Apr 2018 16:10:36 +0000 (18:10 +0200)]
Changed connections to/from Generator, 'declocked' DataSelector

7 years agoPseudo data generator and Multiplexer added
Rene Hagdorn [Thu, 26 Apr 2018 13:37:03 +0000 (15:37 +0200)]
Pseudo data generator and Multiplexer added

7 years agoConfiguration file for mupix serdes links.
Tobias Weber [Thu, 26 Apr 2018 09:46:57 +0000 (11:46 +0200)]
Configuration file for mupix serdes links.

7 years agomissing cores
Tobias Weber [Wed, 25 Apr 2018 13:26:34 +0000 (15:26 +0200)]
missing cores

7 years agoadd config.vhd
Tobias Weber [Wed, 25 Apr 2018 13:25:38 +0000 (15:25 +0200)]
add config.vhd

7 years agomodify drive strength
Tobias Weber [Wed, 25 Apr 2018 13:23:24 +0000 (15:23 +0200)]
modify drive strength

7 years agoStarting with a frame generator for soda.
Tobias Weber [Tue, 17 Apr 2018 14:59:06 +0000 (16:59 +0200)]
Starting with a frame generator for soda.

7 years agoadd constraints for soda hub/mupix.
Tobias Weber [Tue, 17 Apr 2018 14:55:02 +0000 (16:55 +0200)]
add constraints for soda hub/mupix.

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Wed, 11 Apr 2018 08:40:24 +0000 (10:40 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

7 years agosmaller bugfixes to slow control addresses.
Tobias Weber [Thu, 29 Mar 2018 16:04:37 +0000 (18:04 +0200)]
smaller bugfixes to slow control addresses.

7 years agoupdate trb3_gbe design with settings for old central Hades hub
Jan Michel [Wed, 28 Mar 2018 14:23:21 +0000 (16:23 +0200)]
update trb3_gbe design with settings for old central Hades hub

7 years agoupdate media interface ports in TRB3 periph hub
Jan Michel [Wed, 28 Mar 2018 14:22:01 +0000 (16:22 +0200)]
update media interface ports in TRB3 periph hub

7 years agoBlock Memory Reset
Tobias Weber [Wed, 21 Feb 2018 14:01:31 +0000 (15:01 +0100)]
Block Memory Reset

7 years agoadd round robin arbiter to mupix 8 readout.
Tobias Weber [Wed, 21 Feb 2018 14:01:08 +0000 (15:01 +0100)]
add round robin arbiter to mupix 8 readout.

7 years agobasic round robin arbiter to replace priority type multiplexing of fifos.
Tobias Weber [Sun, 11 Feb 2018 09:11:50 +0000 (17:11 +0800)]
basic round robin arbiter to replace priority type multiplexing of fifos.

7 years agoadding error counters for serdes block.
Tobias Weber [Sat, 10 Feb 2018 12:46:54 +0000 (20:46 +0800)]
adding error counters for serdes block.

7 years agofirst compiling version of complete firmware. However untested in hardware and a...
Tobias Weber [Thu, 8 Feb 2018 02:51:57 +0000 (03:51 +0100)]
first compiling version of complete firmware. However untested in hardware and a lot of stuff to debug.

7 years agoUpdate project files
Jan Michel [Fri, 2 Feb 2018 10:58:42 +0000 (11:58 +0100)]
Update project files

7 years agostarting to work on serdes data readout from mupix. so far only status signal and...
Tobias Weber [Thu, 1 Feb 2018 16:08:57 +0000 (17:08 +0100)]
starting to work on serdes data readout from mupix. so far only status signal and assuming generic 8b10b mode of serdes pcs. maybe more level approach is needed.

7 years agonew addon board layout and several minor bugfixes.
Tobias Weber [Thu, 1 Feb 2018 14:29:34 +0000 (15:29 +0100)]
new addon board layout and several minor bugfixes.

7 years ago32 bit counters for injection length and pause. Additional register to start injections.
Tobias Weber [Fri, 26 Jan 2018 15:17:25 +0000 (16:17 +0100)]
32 bit counters for injection length and pause. Additional register to start injections.

7 years agocleanup of some code issues
Jan Michel [Mon, 22 Jan 2018 11:00:15 +0000 (12:00 +0100)]
cleanup of some code issues

7 years agoclean-up of CTS settings, 4 SFP as default, no timestamp in data
Jan Michel [Fri, 19 Jan 2018 15:13:30 +0000 (16:13 +0100)]
clean-up of CTS settings, 4 SFP as default, no timestamp in data

7 years agoupdate 32 Pin AddOn project
Guenter Knittel [Fri, 12 Jan 2018 10:01:44 +0000 (11:01 +0100)]
update 32 Pin AddOn project

7 years agoadd new lib path to perl
Guenter Knittel [Fri, 12 Jan 2018 10:01:33 +0000 (11:01 +0100)]
add new lib path to perl

7 years agowork on trigger handler
Tobias Weber [Wed, 10 Jan 2018 17:33:09 +0000 (18:33 +0100)]
work on trigger handler

7 years agocomponents related to mupix readout. Still Missing Serdes and trigger logic.
Tobias Weber [Wed, 10 Jan 2018 10:41:23 +0000 (11:41 +0100)]
components related to mupix readout. Still Missing Serdes and trigger logic.

7 years agoTestbench for sensor board slow control and minor bugfixes to corresponding source...
Tobias Weber [Wed, 3 Jan 2018 14:36:55 +0000 (15:36 +0100)]
Testbench for sensor board slow control and minor bugfixes to corresponding source files.

7 years agoclocking for mupix through pll and ddr resources.
Tobias Weber [Fri, 22 Dec 2017 12:10:18 +0000 (13:10 +0100)]
clocking for mupix through pll and ddr resources.

7 years agosynchronisation and clock signals.
Tobias Weber [Fri, 22 Dec 2017 10:01:51 +0000 (11:01 +0100)]
synchronisation and clock signals.

7 years agocompiling version of mupix 8 slow control firmware
Tobias Weber [Fri, 15 Dec 2017 11:04:28 +0000 (12:04 +0100)]
compiling version of mupix 8 slow control firmware

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Wed, 13 Dec 2017 09:39:11 +0000 (10:39 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

7 years agominor changes
Tobias Weber [Wed, 13 Dec 2017 09:38:53 +0000 (10:38 +0100)]
minor changes

7 years agoadd pause function to injection generator
Tobias Weber [Mon, 27 Nov 2017 10:56:26 +0000 (11:56 +0100)]
add pause function to injection generator

7 years agosimple multiplexer for data fifos.
Tobias Weber [Mon, 27 Nov 2017 10:37:00 +0000 (11:37 +0100)]
simple multiplexer for data fifos.

7 years agoadd monitoring flags and counters to circular buffer.
Tobias Weber [Mon, 27 Nov 2017 10:36:24 +0000 (11:36 +0100)]
add monitoring flags and counters to circular buffer.

7 years agocircular memory buffer.
Tobias Weber [Wed, 22 Nov 2017 09:13:00 +0000 (10:13 +0100)]
circular memory buffer.

7 years agoUpdate ADA AddOn to newer TDC files
Jan Michel [Fri, 17 Nov 2017 14:44:39 +0000 (15:44 +0100)]
Update ADA AddOn to newer TDC files

7 years agoUpdate various files
Jan Michel [Fri, 17 Nov 2017 14:44:04 +0000 (15:44 +0100)]
Update various files

7 years agoUpdate CTS timestamp generator with records
Jan Michel [Fri, 17 Nov 2017 14:36:12 +0000 (15:36 +0100)]
Update CTS timestamp generator with records

7 years agoRevert "gkorcyl gbe with configurable ip address"
Jan Michel [Fri, 17 Nov 2017 14:40:12 +0000 (15:40 +0100)]
Revert "gkorcyl gbe with configurable ip address"
reinclude CTS in CTS, correct TDC version and outdated setting
This reverts commit e35c607b1da004b911a163c981b5c97939b97a2a.

7 years agogkorcyl gbe with configurable ip address
Your Name [Fri, 17 Nov 2017 12:39:50 +0000 (13:39 +0100)]
gkorcyl gbe with configurable ip address

7 years agoIntegrate slow control changes into Mupix8 board top-level.
Tobias Weber [Fri, 10 Nov 2017 10:45:57 +0000 (11:45 +0100)]
Integrate slow control changes into Mupix8 board top-level.

7 years agoMupix 8 Pixel Control. Works in Simulation.
Tobias Weber [Fri, 10 Nov 2017 10:38:28 +0000 (11:38 +0100)]
Mupix 8 Pixel Control. Works in Simulation.

7 years agoTestbenches for Mupix 8 Chip Slow Control.
Tobias Weber [Fri, 10 Nov 2017 10:38:07 +0000 (11:38 +0100)]
Testbenches for Mupix 8 Chip Slow Control.

7 years agoInjection generator for Mupix 8.
Tobias Weber [Mon, 6 Nov 2017 14:31:14 +0000 (15:31 +0100)]
Injection generator for Mupix 8.

7 years agocorrectly read back values from DACs.
Tobias Weber [Mon, 6 Nov 2017 13:34:44 +0000 (14:34 +0100)]
correctly read back values from DACs.

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Fri, 3 Nov 2017 09:24:27 +0000 (10:24 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

7 years agocode for control of ads1018 ADC
Tobias Weber [Tue, 10 Oct 2017 14:17:37 +0000 (16:17 +0200)]
code for control of ads1018 ADC

7 years agopartial commit of initial mupix 8 source code and test benches.
Tobias Weber [Tue, 10 Oct 2017 08:47:42 +0000 (10:47 +0200)]
partial commit of initial mupix 8 source code and test benches.

7 years agoFix CTS slow control register addresses
Hadaq [Mon, 2 Oct 2017 14:41:53 +0000 (16:41 +0200)]
Fix CTS slow control register addresses

7 years agoRemove wrong constraint files
Jan Michel [Fri, 29 Sep 2017 08:53:37 +0000 (10:53 +0200)]
Remove wrong constraint files

7 years agoRemove unused generics in CTS, now in config.vhd if necessary
Jan Michel [Tue, 26 Sep 2017 08:34:58 +0000 (10:34 +0200)]
Remove unused generics in CTS, now in config.vhd if necessary

7 years agoslightly better handling of different port number for input logic
Jan Michel [Tue, 26 Sep 2017 08:33:59 +0000 (10:33 +0200)]
slightly better handling of different port number for input logic

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Fri, 22 Sep 2017 08:50:07 +0000 (10:50 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

7 years agonew pixel control
Tobias Weber [Fri, 22 Sep 2017 08:48:52 +0000 (10:48 +0200)]
new pixel control

7 years agoAdd option of trigger forwarding to central gbe design
Jan Michel [Wed, 20 Sep 2017 16:41:20 +0000 (18:41 +0200)]
Add option of trigger forwarding to central gbe design

7 years agoUpdate ADA AddOn design for new trb3_tools and record-busses
Jan Michel [Wed, 20 Sep 2017 16:40:55 +0000 (18:40 +0200)]
Update ADA AddOn design for new trb3_tools and record-busses

7 years agogbe with forwarder
Your Name [Mon, 18 Sep 2017 13:04:59 +0000 (15:04 +0200)]
gbe with forwarder

7 years agogbe with forwarder
Your Name [Mon, 18 Sep 2017 12:42:15 +0000 (14:42 +0200)]
gbe with forwarder

7 years agoadd experimental double edge detection to monitor design
Jan Michel [Mon, 11 Sep 2017 11:17:26 +0000 (13:17 +0200)]
add experimental double edge detection to monitor design

7 years agoUpdate ADA AddOn with new entities, trb3_tools etc.
Jan Michel [Mon, 11 Sep 2017 11:16:28 +0000 (13:16 +0200)]
Update ADA AddOn with new entities, trb3_tools etc.

7 years agocreating new directories for Mupix6 and Mupix8 source code.
Tobias Weber [Thu, 31 Aug 2017 07:31:40 +0000 (09:31 +0200)]
creating new directories for Mupix6 and Mupix8 source code.

7 years agoSpeed up slow control configuration of chip.
Tobias Weber [Thu, 31 Aug 2017 07:24:24 +0000 (09:24 +0200)]
Speed up slow control configuration of chip.

7 years agochanges to improve timing. timing reports show improved timing on before critical...
Tobias Weber [Wed, 23 Aug 2017 11:18:11 +0000 (13:18 +0200)]
changes to improve timing. timing reports show improved timing on before critical registers.

7 years agosynchronous reset
Tobias Weber [Tue, 22 Aug 2017 16:14:51 +0000 (18:14 +0200)]
synchronous reset

7 years agomulticycle for hitbus_timeout
Tobias Weber [Tue, 22 Aug 2017 16:14:35 +0000 (18:14 +0200)]
multicycle for hitbus_timeout

7 years agoremoving some warnings from synplify.
Tobias Weber [Tue, 22 Aug 2017 10:07:26 +0000 (12:07 +0200)]
removing some warnings from synplify.

7 years agouse hitbus/szintillator from 100 MHz domain to increment number of seen edges counters.
Tobias Weber [Fri, 11 Aug 2017 13:29:51 +0000 (15:29 +0200)]
use hitbus/szintillator from 100 MHz domain to increment number of seen edges counters.

7 years agoRewriting the Hitbus/Latency Histogram to use external triggers for latency measurement.
Tobias Weber [Wed, 9 Aug 2017 15:20:44 +0000 (17:20 +0200)]
Rewriting the Hitbus/Latency Histogram to use external triggers for latency measurement.

7 years agomod to gitignore list
Tobias Weber [Tue, 8 Aug 2017 12:26:51 +0000 (14:26 +0200)]
mod to gitignore list

7 years agominor change to compile script.
Tobias Weber [Tue, 8 Aug 2017 12:26:27 +0000 (14:26 +0200)]
minor change to compile script.

7 years agotwo procedure to generate trb register read/writes.
Tobias Weber [Tue, 8 Aug 2017 12:25:35 +0000 (14:25 +0200)]
two procedure to generate trb register read/writes.

7 years agoSimulation for Mupix readout interface.
Tobias Weber [Tue, 8 Aug 2017 11:56:31 +0000 (13:56 +0200)]
Simulation for Mupix readout interface.

7 years agoseparating mupix readout and hit generation state machines.
Tobias Weber [Tue, 8 Aug 2017 11:41:26 +0000 (13:41 +0200)]
separating mupix readout and hit generation state machines.

7 years agoMiscallenous changes. Having issues with persisting timing violations showing up...
Tobias Weber [Mon, 7 Aug 2017 13:45:06 +0000 (15:45 +0200)]
Miscallenous changes. Having issues with persisting timing violations showing up every second compile.

7 years agousing records at mupix readout state machine.
Tobias Weber [Mon, 7 Aug 2017 12:38:22 +0000 (14:38 +0200)]
using records at mupix readout state machine.

7 years agoGetting back to working compilation after latest pull from master branch.
Tobias Weber [Mon, 7 Aug 2017 11:34:42 +0000 (13:34 +0200)]
Getting back to working compilation after latest pull from master branch.

7 years agointroduce records to short entity declarations a bit.
Tobias Weber [Mon, 7 Aug 2017 11:34:06 +0000 (13:34 +0200)]
introduce records to short entity declarations a bit.

7 years agoBugfixing and minor code additions of existing code.
Tobias Weber [Thu, 3 Aug 2017 13:19:47 +0000 (15:19 +0200)]
Bugfixing and minor code additions of existing code.

7 years agoComponent to convert hit address to physical pixel position.
Tobias Weber [Thu, 3 Aug 2017 13:15:04 +0000 (15:15 +0200)]
Component to convert hit address to physical pixel position.

7 years agoAdd missing signal delay component.
Tobias Weber [Thu, 3 Aug 2017 13:09:34 +0000 (15:09 +0200)]
Add missing signal delay component.

7 years agoInclude code for synchronous read-out and busy in CTS
Jan Michel [Wed, 26 Jul 2017 16:14:04 +0000 (18:14 +0200)]
Include code for synchronous read-out and busy in CTS

7 years agoUpdate compile script to current Diamond default settings
Jan Michel [Wed, 26 Jul 2017 16:10:58 +0000 (18:10 +0200)]
Update compile script to current Diamond default settings

7 years agoFinish backport of ADC AddOn from TRB3sc to TRB3, fix bug in "samples after trigger...
Jan Michel [Wed, 26 Jul 2017 16:09:23 +0000 (18:09 +0200)]
Finish backport of ADC AddOn from TRB3sc to TRB3, fix bug in "samples after trigger" setting

8 years agoUpdate blank design with dummy data sender
Jan Michel [Thu, 11 May 2017 11:31:26 +0000 (13:31 +0200)]
Update blank design with dummy data sender

8 years agoremove large fifo option for monitoring by default. Fix registers in trigger logic
Jan Michel [Thu, 11 May 2017 11:30:58 +0000 (13:30 +0200)]
remove large fifo option for monitoring by default. Fix registers in trigger logic

8 years agoUpdate ADC design with newer entities, e.g. records
Jan Michel [Thu, 11 May 2017 11:30:07 +0000 (13:30 +0200)]
Update ADC design with newer entities, e.g. records

8 years agoUpdate CTS configuration files and M26 module (fixed timing)
Jan Michel [Thu, 11 May 2017 11:29:26 +0000 (13:29 +0200)]
Update CTS configuration files and M26 module (fixed timing)

8 years agoAdd coincidence logic to trigger generation;
Jan Michel [Fri, 3 Feb 2017 17:42:49 +0000 (18:42 +0100)]
Add coincidence logic to trigger generation;
TRB3 blank project update

8 years agoA bit of clean-up in the repo
Jan Michel [Tue, 24 Jan 2017 17:35:10 +0000 (18:35 +0100)]
A bit of clean-up in the repo

8 years agoEnable trb3 central hub without GbE again.
Jan Michel [Mon, 28 Nov 2016 15:54:31 +0000 (16:54 +0100)]
Enable trb3 central hub without GbE again.

8 years agoUpdate input statistics to be able to use external trigger
Jan Michel [Mon, 21 Nov 2016 13:40:48 +0000 (14:40 +0100)]
Update input statistics to be able to use external trigger
Add monitoring FPGA design, w/o read-out

8 years agoadd an optional timestamp generator module to CTS, based on external clock and reset...
Jan Michel [Fri, 18 Nov 2016 10:38:57 +0000 (11:38 +0100)]
add an optional timestamp generator module to CTS, based on external clock and reset signals.

8 years agomunich is back, science bitch!
local account [Mon, 7 Nov 2016 17:04:22 +0000 (18:04 +0100)]
munich is back, science bitch!
tidy up some files and make the compilation working.

8 years agoadd blank project file
Jan Michel [Mon, 10 Oct 2016 15:55:02 +0000 (17:55 +0200)]
add blank project file

8 years agoAuto-answer readout in blank project
Jan Michel [Fri, 7 Oct 2016 13:49:15 +0000 (15:49 +0200)]
Auto-answer readout in blank project

8 years agoCTS: Pinout constraints for flexible I/O are now selected based on configuration.
Jan Michel [Mon, 12 Sep 2016 08:27:08 +0000 (10:27 +0200)]
CTS: Pinout constraints for flexible I/O are now selected based on configuration.