]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
6 years agooutput and input pipeline stages for data simulation.
Tobias Weber [Thu, 19 Jul 2018 10:03:41 +0000 (12:03 +0200)]
output and input pipeline stages for data simulation.

6 years agoMake changes to project file.
Tobias Weber [Thu, 19 Jul 2018 09:23:06 +0000 (11:23 +0200)]
Make changes to project file.

6 years agoMoving source files to subfolders.
Tobias Weber [Thu, 19 Jul 2018 08:44:18 +0000 (10:44 +0200)]
Moving source files to subfolders.

6 years agoLink gets synchronized on all four channels. Unpacker delivers data which still needs...
Tobias Weber [Tue, 17 Jul 2018 15:23:16 +0000 (17:23 +0200)]
Link gets synchronized on all four channels. Unpacker delivers data which still needs to be checked. Data Width Conversion gives strange results if receiving clock is slower than trbnet clock.

6 years agoslow control reset of counters.
Tobias Weber [Tue, 17 Jul 2018 09:54:31 +0000 (11:54 +0200)]
slow control reset of counters.

6 years agosome changes and debugging due to link simulation
Tobias Weber [Tue, 17 Jul 2018 08:15:42 +0000 (10:15 +0200)]
some changes and debugging due to link simulation

6 years agotest bench for link simulation.
Tobias Weber [Tue, 17 Jul 2018 08:15:13 +0000 (10:15 +0200)]
test bench for link simulation.

6 years agoip cores for link simulation.
Tobias Weber [Tue, 17 Jul 2018 08:14:47 +0000 (10:14 +0200)]
ip cores for link simulation.

6 years agoSimulation of Mupix Data Link (current speed 400 Mbit/s).
Tobias Weber [Tue, 17 Jul 2018 08:13:26 +0000 (10:13 +0200)]
Simulation of Mupix Data Link (current speed 400 Mbit/s).

6 years agoworking version
Tobias Weber [Thu, 12 Jul 2018 07:23:18 +0000 (09:23 +0200)]
working version

6 years agoMerge branch 'master' into Mupix8ReadoutRework
Tobias Weber [Wed, 11 Jul 2018 11:53:28 +0000 (13:53 +0200)]
Merge branch 'master' into Mupix8ReadoutRework

6 years agoreadback of mupix 8 shift register.
Tobias Weber [Tue, 10 Jul 2018 12:58:46 +0000 (14:58 +0200)]
readback of mupix 8 shift register.

6 years agoremoving some warnings from compiling
Tobias Weber [Fri, 6 Jul 2018 10:17:03 +0000 (12:17 +0200)]
removing some warnings from compiling

6 years agothis version builds successfully. Needs to be tested.
Tobias Weber [Fri, 6 Jul 2018 09:31:36 +0000 (11:31 +0200)]
this version builds successfully. Needs to be tested.

6 years agomaking the new code synthesis. Still not working and two bugs need fixing.
Tobias Weber [Fri, 6 Jul 2018 07:29:19 +0000 (09:29 +0200)]
making the new code synthesis. Still not working and two bugs need fixing.

6 years agofirst version ready for synthesis.
Tobias Weber [Thu, 5 Jul 2018 13:02:05 +0000 (15:02 +0200)]
first version ready for synthesis.

6 years agoworking version of the SODA test module.
Tobias Weber [Wed, 4 Jul 2018 13:41:09 +0000 (15:41 +0200)]
working version of the SODA test module.

6 years agosaving some unfinished work
Tobias Weber [Wed, 27 Jun 2018 09:10:08 +0000 (17:10 +0800)]
saving some unfinished work

6 years agocorrect mistake in test bench.
Tobias Weber [Sat, 23 Jun 2018 14:11:58 +0000 (16:11 +0200)]
correct mistake in test bench.

6 years agoadjusting fifo input data with to 40 bit
Tobias Weber [Fri, 22 Jun 2018 09:51:52 +0000 (11:51 +0200)]
adjusting fifo input data with to 40 bit

6 years agomodified test bench
Tobias Weber [Fri, 22 Jun 2018 09:13:12 +0000 (11:13 +0200)]
modified test bench

6 years agodata multiplexer with conversion from 40 to 32 bit
Tobias Weber [Fri, 22 Jun 2018 09:12:55 +0000 (11:12 +0200)]
data multiplexer with conversion from 40 to 32 bit

6 years agomoving some constants into vhdl package.
Tobias Weber [Fri, 22 Jun 2018 08:10:07 +0000 (10:10 +0200)]
moving some constants into vhdl package.

6 years agoWorking towards triggering with soda.
Tobias Weber [Wed, 20 Jun 2018 10:31:37 +0000 (12:31 +0200)]
Working towards triggering with soda.

7 years agodecoding of pixel hit addresses.
Tobias Weber [Mon, 4 Jun 2018 09:56:12 +0000 (11:56 +0200)]
decoding of pixel hit addresses.

7 years agobypass logic
Tobias Weber [Sun, 3 Jun 2018 08:50:12 +0000 (10:50 +0200)]
bypass logic

7 years agoGray code to binary converter
Tobias Weber [Sat, 2 Jun 2018 21:23:34 +0000 (23:23 +0200)]
Gray code to binary converter

7 years agoa fast sorting network algorithm. Different approach compared to Heidelberg sorting.
Tobias Weber [Fri, 1 Jun 2018 19:54:38 +0000 (21:54 +0200)]
a fast sorting network algorithm. Different approach compared to Heidelberg sorting.

7 years agolink synchronizer for Mupix 8.
Tobias Weber [Thu, 31 May 2018 10:40:50 +0000 (12:40 +0200)]
link synchronizer for Mupix 8.

7 years agopixelcontrol interlude
Tobias Weber [Thu, 31 May 2018 10:40:22 +0000 (12:40 +0200)]
pixelcontrol interlude

7 years agoMupix Word Unpacker
Tobias Weber [Thu, 31 May 2018 08:46:23 +0000 (10:46 +0200)]
Mupix Word Unpacker

7 years agoserdes core with manual control of word alignment
Tobias Weber [Fri, 25 May 2018 08:08:39 +0000 (10:08 +0200)]
serdes core with manual control of word alignment

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Wed, 23 May 2018 12:41:23 +0000 (14:41 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3

7 years agogk: added sodanet project
Your Name [Mon, 21 May 2018 09:46:25 +0000 (11:46 +0200)]
gk: added sodanet project

7 years agoBugfixes to trigger code.
Tobias Weber [Thu, 3 May 2018 09:37:27 +0000 (11:37 +0200)]
Bugfixes to trigger code.

7 years agoMerge branch 'feature/HitGenerator'
Tobias Weber [Wed, 2 May 2018 12:30:48 +0000 (14:30 +0200)]
Merge branch 'feature/HitGenerator'

7 years agoenable trigger bypass by default.
Tobias Weber [Wed, 2 May 2018 12:22:01 +0000 (14:22 +0200)]
enable trigger bypass by default.

7 years agoadding additional if clause to generate data words without pause inbetween.
Tobias Weber [Mon, 30 Apr 2018 07:50:16 +0000 (09:50 +0200)]
adding additional if clause to generate data words without pause inbetween.

7 years agoMerge branch 'bugfix/SerdesLink' into 'master'
Tobias Weber [Sat, 28 Apr 2018 16:31:27 +0000 (18:31 +0200)]
Merge branch 'bugfix/SerdesLink' into 'master'

moving serdes readout into mupix board entity.

See merge request Mupix/Mupix-Firmware!2

7 years agomoving serdes readout into mupix board entity.
Tobias Weber [Sat, 28 Apr 2018 16:31:00 +0000 (18:31 +0200)]
moving serdes readout into mupix board entity.

7 years agoMerge branch 'HitGenerator' into 'master'
Tobias Weber [Sat, 28 Apr 2018 12:43:14 +0000 (14:43 +0200)]
Merge branch 'HitGenerator' into 'master'

Hit generator

See merge request Mupix/Mupix-Firmware!1

7 years agoSome minor changes of FrameGen. Should work now...
Rene Hagdorn [Fri, 27 Apr 2018 12:24:20 +0000 (14:24 +0200)]
Some minor changes of FrameGen. Should work now...

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