]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
Tobias Weber [Wed, 21 Nov 2018 10:30:11 +0000 (11:30 +0100)]
changes seem to lead to stable triggers
Tobias Weber [Fri, 16 Nov 2018 14:18:47 +0000 (15:18 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Fri, 16 Nov 2018 14:17:28 +0000 (15:17 +0100)]
modify trigger state machine reset
Tobias Weber [Wed, 14 Nov 2018 14:08:06 +0000 (15:08 +0100)]
this should fix the multiple hit readout bug.
Tobias Weber [Tue, 13 Nov 2018 15:47:41 +0000 (16:47 +0100)]
trying to find bugfix for reading same data word several times.
Jan Michel [Wed, 31 Oct 2018 14:58:34 +0000 (15:58 +0100)]
change timestamp generator in CTS to allow notiming triggers
Jan Michel [Wed, 24 Oct 2018 11:08:49 +0000 (13:08 +0200)]
update blank project
Tobias Weber [Wed, 17 Oct 2018 08:07:44 +0000 (10:07 +0200)]
trying to improve timing with trbnet clock. somewhat successfull.
Tobias Weber [Wed, 17 Oct 2018 08:06:56 +0000 (10:06 +0200)]
replacing data width conversion with a data filter removing the sendcounters and the serializer id.
Jan Michel [Wed, 26 Sep 2018 10:01:58 +0000 (12:01 +0200)]
update compile script for trb5sc
Jan Michel [Wed, 26 Sep 2018 10:01:45 +0000 (12:01 +0200)]
remove cbmnet from CTS design
Tobias Weber [Wed, 12 Sep 2018 14:00:53 +0000 (16:00 +0200)]
new version of circular buffer. needs testing in simulation and hardware.
Tobias Weber [Thu, 6 Sep 2018 05:44:34 +0000 (07:44 +0200)]
only put boundary words at beginning and end of conversion.
Tobias Weber [Thu, 30 Aug 2018 08:06:39 +0000 (10:06 +0200)]
changes to improve timing. note that the minimal pause between two pulses is three clock cycles.
Tobias Weber [Thu, 30 Aug 2018 08:05:52 +0000 (10:05 +0200)]
change size of memory for circullar buffer.
Tobias Weber [Thu, 30 Aug 2018 07:40:52 +0000 (09:40 +0200)]
change size of memory for circullar buffer.
Tobias Weber [Fri, 24 Aug 2018 07:38:52 +0000 (09:38 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Fri, 24 Aug 2018 07:38:17 +0000 (09:38 +0200)]
fixing some bugs in hitbus histograms.
Jan Michel [Thu, 16 Aug 2018 11:25:04 +0000 (13:25 +0200)]
add some registers to multiplicity logic
Tobias Weber [Thu, 16 Aug 2018 09:35:18 +0000 (11:35 +0200)]
enable/disable for fifos.
Tobias Weber [Wed, 15 Aug 2018 08:22:35 +0000 (10:22 +0200)]
fixing bug in serdes monitoring and removing dummy reset of mupix time stamps.
Tobias Weber [Fri, 10 Aug 2018 12:45:42 +0000 (14:45 +0200)]
Merge with faster Link Simulation. Simulation with 80 MHz results in timing issues.
Jan Michel [Fri, 10 Aug 2018 09:52:25 +0000 (11:52 +0200)]
better handling for large number of inputs in input statistics module
Jan Michel [Fri, 10 Aug 2018 09:52:02 +0000 (11:52 +0200)]
add edge detect to trigger logic
Jan Michel [Fri, 10 Aug 2018 09:51:08 +0000 (11:51 +0200)]
Updata 4conn and gpin TDC designs
Tobias Weber [Fri, 10 Aug 2018 08:46:30 +0000 (10:46 +0200)]
start signal for fast pixel configuration. FIFO has to be filled before issuing this signal.
Tobias Weber [Thu, 9 Aug 2018 14:41:46 +0000 (16:41 +0200)]
increase speed of fast slow control to 5 MHz
Tobias Weber [Thu, 9 Aug 2018 13:18:21 +0000 (15:18 +0200)]
pipe for generator output.
Tobias Weber [Thu, 9 Aug 2018 12:25:55 +0000 (14:25 +0200)]
reduce fanout of slow control signals.
Tobias Weber [Wed, 8 Aug 2018 11:46:37 +0000 (13:46 +0200)]
ip cores for serdes at 4 different clock speeds.
Tobias Weber [Thu, 2 Aug 2018 11:51:58 +0000 (13:51 +0200)]
Merge branch 'feature/LinkSimulation'
Tobias Weber [Wed, 1 Aug 2018 11:35:15 +0000 (13:35 +0200)]
modifications to fast pixel slow control.
Tobias Weber [Tue, 31 Jul 2018 08:58:06 +0000 (10:58 +0200)]
some more piping.
Tobias Weber [Mon, 23 Jul 2018 19:58:23 +0000 (21:58 +0200)]
debugging of mupix unpacker.
Tobias Weber [Mon, 23 Jul 2018 13:39:51 +0000 (15:39 +0200)]
better working version of data width converter in simulation. However, hades38 is down and a new firmware could not be compiled.
Tobias Weber [Fri, 20 Jul 2018 13:56:24 +0000 (15:56 +0200)]
preliminary version of new data width adjustment for slow serdes clocks. Not best solution since it only works well for limited number of hits from mupix sensor.
Tobias Weber [Thu, 19 Jul 2018 13:28:44 +0000 (15:28 +0200)]
because modelsim wants it
Tobias Weber [Thu, 19 Jul 2018 13:28:27 +0000 (15:28 +0200)]
replace block memory in circular buffer with ip from Lattice.
Tobias Weber [Thu, 19 Jul 2018 12:45:27 +0000 (14:45 +0200)]
get rid of some warnings due to unassigned pins.
Tobias Weber [Thu, 19 Jul 2018 10:03:41 +0000 (12:03 +0200)]
output and input pipeline stages for data simulation.
Tobias Weber [Thu, 19 Jul 2018 09:23:06 +0000 (11:23 +0200)]
Make changes to project file.
Tobias Weber [Thu, 19 Jul 2018 08:44:18 +0000 (10:44 +0200)]
Moving source files to subfolders.
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.
Tobias Weber [Tue, 17 Jul 2018 09:54:31 +0000 (11:54 +0200)]
slow control reset of counters.
Tobias Weber [Tue, 17 Jul 2018 08:15:42 +0000 (10:15 +0200)]
some changes and debugging due to link simulation
Tobias Weber [Tue, 17 Jul 2018 08:15:13 +0000 (10:15 +0200)]
test bench for link simulation.
Tobias Weber [Tue, 17 Jul 2018 08:14:47 +0000 (10:14 +0200)]
ip cores for link simulation.
Tobias Weber [Tue, 17 Jul 2018 08:13:26 +0000 (10:13 +0200)]
Simulation of Mupix Data Link (current speed 400 Mbit/s).
Tobias Weber [Thu, 12 Jul 2018 07:23:18 +0000 (09:23 +0200)]
working version
Tobias Weber [Wed, 11 Jul 2018 11:53:28 +0000 (13:53 +0200)]
Merge branch 'master' into Mupix8ReadoutRework
Tobias Weber [Tue, 10 Jul 2018 12:58:46 +0000 (14:58 +0200)]
readback of mupix 8 shift register.
Tobias Weber [Fri, 6 Jul 2018 10:17:03 +0000 (12:17 +0200)]
removing some warnings from compiling
Tobias Weber [Fri, 6 Jul 2018 09:31:36 +0000 (11:31 +0200)]
this version builds successfully. Needs to be tested.
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.
Tobias Weber [Thu, 5 Jul 2018 13:02:05 +0000 (15:02 +0200)]
first version ready for synthesis.
Tobias Weber [Wed, 4 Jul 2018 13:41:09 +0000 (15:41 +0200)]
working version of the SODA test module.
Tobias Weber [Wed, 27 Jun 2018 09:10:08 +0000 (17:10 +0800)]
saving some unfinished work
Tobias Weber [Sat, 23 Jun 2018 14:11:58 +0000 (16:11 +0200)]
correct mistake in test bench.
Tobias Weber [Fri, 22 Jun 2018 09:51:52 +0000 (11:51 +0200)]
adjusting fifo input data with to 40 bit
Tobias Weber [Fri, 22 Jun 2018 09:13:12 +0000 (11:13 +0200)]
modified test bench
Tobias Weber [Fri, 22 Jun 2018 09:12:55 +0000 (11:12 +0200)]
data multiplexer with conversion from 40 to 32 bit
Tobias Weber [Fri, 22 Jun 2018 08:10:07 +0000 (10:10 +0200)]
moving some constants into vhdl package.
Tobias Weber [Wed, 20 Jun 2018 10:31:37 +0000 (12:31 +0200)]
Working towards triggering with soda.
Tobias Weber [Mon, 4 Jun 2018 09:56:12 +0000 (11:56 +0200)]
decoding of pixel hit addresses.
Tobias Weber [Sun, 3 Jun 2018 08:50:12 +0000 (10:50 +0200)]
bypass logic
Tobias Weber [Sat, 2 Jun 2018 21:23:34 +0000 (23:23 +0200)]
Gray code to binary converter
Tobias Weber [Fri, 1 Jun 2018 19:54:38 +0000 (21:54 +0200)]
a fast sorting network algorithm. Different approach compared to Heidelberg sorting.
Tobias Weber [Thu, 31 May 2018 10:40:50 +0000 (12:40 +0200)]
link synchronizer for Mupix 8.
Tobias Weber [Thu, 31 May 2018 10:40:22 +0000 (12:40 +0200)]
pixelcontrol interlude
Tobias Weber [Thu, 31 May 2018 08:46:23 +0000 (10:46 +0200)]
Mupix Word Unpacker
Tobias Weber [Fri, 25 May 2018 08:08:39 +0000 (10:08 +0200)]
serdes core with manual control of word alignment
Tobias Weber [Wed, 23 May 2018 12:41:23 +0000 (14:41 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Your Name [Mon, 21 May 2018 09:46:25 +0000 (11:46 +0200)]
gk: added sodanet project
Tobias Weber [Thu, 3 May 2018 09:37:27 +0000 (11:37 +0200)]
Bugfixes to trigger code.
Tobias Weber [Wed, 2 May 2018 12:30:48 +0000 (14:30 +0200)]
Merge branch 'feature/HitGenerator'
Tobias Weber [Wed, 2 May 2018 12:22:01 +0000 (14:22 +0200)]
enable trigger bypass by default.
Tobias Weber [Mon, 30 Apr 2018 07:50:16 +0000 (09:50 +0200)]
adding additional if clause to generate data words without pause inbetween.
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
Tobias Weber [Sat, 28 Apr 2018 16:31:00 +0000 (18:31 +0200)]
moving serdes readout into mupix board entity.
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
Rene Hagdorn [Fri, 27 Apr 2018 12:24:20 +0000 (14:24 +0200)]
Some minor changes of FrameGen. Should work now...
Rene Hagdorn [Fri, 27 Apr 2018 09:07:18 +0000 (11:07 +0200)]
Minor clean-up
Rene Hagdorn [Thu, 26 Apr 2018 16:27:25 +0000 (18:27 +0200)]
Corrected register addresses for Generator
Rene Hagdorn [Thu, 26 Apr 2018 16:10:36 +0000 (18:10 +0200)]
Changed connections to/from Generator, 'declocked' DataSelector
Rene Hagdorn [Thu, 26 Apr 2018 13:37:03 +0000 (15:37 +0200)]
Pseudo data generator and Multiplexer added
Tobias Weber [Thu, 26 Apr 2018 09:46:57 +0000 (11:46 +0200)]
Configuration file for mupix serdes links.
Tobias Weber [Wed, 25 Apr 2018 13:26:34 +0000 (15:26 +0200)]
missing cores
Tobias Weber [Wed, 25 Apr 2018 13:25:38 +0000 (15:25 +0200)]
add config.vhd
Tobias Weber [Wed, 25 Apr 2018 13:23:24 +0000 (15:23 +0200)]
modify drive strength
Tobias Weber [Tue, 17 Apr 2018 14:59:06 +0000 (16:59 +0200)]
Starting with a frame generator for soda.
Tobias Weber [Tue, 17 Apr 2018 14:55:02 +0000 (16:55 +0200)]
add constraints for soda hub/mupix.
Tobias Weber [Wed, 11 Apr 2018 08:40:24 +0000 (10:40 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Thu, 29 Mar 2018 16:04:37 +0000 (18:04 +0200)]
smaller bugfixes to slow control addresses.
Jan Michel [Wed, 28 Mar 2018 14:23:21 +0000 (16:23 +0200)]
update trb3_gbe design with settings for old central Hades hub
Jan Michel [Wed, 28 Mar 2018 14:22:01 +0000 (16:22 +0200)]
update media interface ports in TRB3 periph hub
Tobias Weber [Wed, 21 Feb 2018 14:01:31 +0000 (15:01 +0100)]
Block Memory Reset
Tobias Weber [Wed, 21 Feb 2018 14:01:08 +0000 (15:01 +0100)]
add round robin arbiter to mupix 8 readout.
Tobias Weber [Sun, 11 Feb 2018 09:11:50 +0000 (17:11 +0800)]
basic round robin arbiter to replace priority type multiplexing of fifos.
Tobias Weber [Sat, 10 Feb 2018 12:46:54 +0000 (20:46 +0800)]
adding error counters for serdes block.
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.