]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
Jan Michel [Mon, 22 Jul 2024 07:25:56 +0000 (09:25 +0200)]
updated 4conn design for optional additional trigger outputs
Jan Michel [Tue, 12 Mar 2024 10:02:35 +0000 (11:02 +0100)]
various minor edits to many projects
Jan Michel [Thu, 15 Feb 2024 13:23:22 +0000 (14:23 +0100)]
add Trb3 periph inputs to regular Input multiplexers
Jan Michel [Thu, 15 Feb 2024 13:22:27 +0000 (14:22 +0100)]
increase number of coincidences from 16 to 24 to cover all inputs
Jan Michel [Fri, 12 May 2023 13:49:35 +0000 (15:49 +0200)]
update ADA design to contain fee test signals
Jan Michel [Fri, 12 May 2023 13:49:04 +0000 (15:49 +0200)]
add option of reference time output on output multiplexers to CTS
Jan Michel [Tue, 18 Apr 2023 11:20:06 +0000 (13:20 +0200)]
allow to have more than 8 cts input multiplexer
Jan Michel [Wed, 12 Apr 2023 12:04:45 +0000 (14:04 +0200)]
add downscaling option to CTS input modules
Jan Michel [Thu, 15 Dec 2022 11:07:41 +0000 (12:07 +0100)]
add CTS busy signal as option in output multiplexer
Jan Michel [Thu, 15 Dec 2022 11:07:16 +0000 (12:07 +0100)]
enable monitoring counters by default
Jan Michel [Thu, 11 Aug 2022 08:11:58 +0000 (10:11 +0200)]
CTS: support new platform on Trb3sc backplane master
HADES DAQ [Wed, 29 Jun 2022 23:37:46 +0000 (01:37 +0200)]
added needed links for trb5sc/gbe_template to compile, mt
Jan Michel [Tue, 28 Jun 2022 15:03:28 +0000 (17:03 +0200)]
change compile script back to synplify_premier_dp
Jan Michel [Tue, 28 Jun 2022 15:02:20 +0000 (17:02 +0200)]
fix address decoder for SED
Jan Michel [Tue, 28 Jun 2022 15:02:05 +0000 (17:02 +0200)]
add R3B timestamp receiver to CTS
Jan Michel [Tue, 2 Nov 2021 17:27:10 +0000 (18:27 +0100)]
fix readback of df35 register (mult logic 0)
Jan Michel [Mon, 11 Oct 2021 18:09:03 +0000 (20:09 +0200)]
trigger generation: option to use edge detect before stretcher
Jan Michel [Mon, 11 Oct 2021 18:03:23 +0000 (20:03 +0200)]
update 32 pin addon
Jan Michel [Mon, 11 Oct 2021 18:00:45 +0000 (20:00 +0200)]
add module to receive R3B white rabbit timestamps to CTS
Jan Michel [Wed, 3 Mar 2021 14:39:46 +0000 (15:39 +0100)]
trigger_logic: Extend multiplicity to 3 instances
Jan Michel [Wed, 3 Mar 2021 14:39:07 +0000 (15:39 +0100)]
Remove TDC from Trb3 CTS
Jan Michel [Wed, 3 Mar 2021 14:37:55 +0000 (15:37 +0100)]
Include MDC as option in compile.pl for TDC constraints
Jan Michel [Wed, 3 Mar 2021 14:37:33 +0000 (15:37 +0100)]
Update TDC Project and Config files
Thomas Gessler [Thu, 8 Oct 2020 09:06:14 +0000 (11:06 +0200)]
ECP3 SERDES: Add core for 2.4 Gbps with 240 MHz
Jan Michel [Thu, 23 Jul 2020 14:31:47 +0000 (16:31 +0200)]
increase coincidence window and delay from 150 to 630 ns.
Jan Michel [Thu, 23 Jul 2020 14:28:55 +0000 (16:28 +0200)]
correct polarity of JIN inputs
Jan Michel [Thu, 23 Jul 2020 14:27:59 +0000 (16:27 +0200)]
add another trigger output to central hub
Jan Michel [Thu, 23 Jul 2020 14:25:16 +0000 (16:25 +0200)]
extend stretcher option in trigger logic
Jan Michel [Fri, 22 May 2020 15:35:09 +0000 (17:35 +0200)]
update compile script
Jan Michel [Sat, 9 May 2020 13:53:00 +0000 (15:53 +0200)]
correct non-existent mult registers for channels<=32
Jan Michel [Sat, 9 May 2020 13:52:23 +0000 (15:52 +0200)]
fix handling of non-existing counters on bus
Jan Michel [Mon, 16 Mar 2020 12:44:47 +0000 (13:44 +0100)]
add two trigger signal outputs on CLK_RJ3/4
Jan Michel [Mon, 16 Mar 2020 12:44:34 +0000 (13:44 +0100)]
re-add TRB3 central hub without GbE
Jan Michel [Mon, 16 Mar 2020 12:43:15 +0000 (13:43 +0100)]
extend multiplicity logic to 64 channels
Jan Michel [Fri, 22 Nov 2019 13:52:05 +0000 (14:52 +0100)]
update ADC AddOn with 200 Mhz on Trb3sc
Jan Michel [Mon, 28 Oct 2019 14:25:02 +0000 (15:25 +0100)]
update CTS for more different pinouts
Jan Michel [Fri, 30 Aug 2019 12:23:17 +0000 (14:23 +0200)]
Merge branch 'master' of jspc29:trb3
Jan Michel [Fri, 30 Aug 2019 12:20:59 +0000 (14:20 +0200)]
apply patches by Thomas Geßler - syntax fixes
Jan Michel [Fri, 26 Jul 2019 09:56:58 +0000 (11:56 +0200)]
remove log file
Jan Michel [Mon, 22 Jul 2019 09:23:45 +0000 (11:23 +0200)]
Update TRB3 central GbE design with trb3tools & new trigger logic
Jan Michel [Tue, 23 Apr 2019 15:58:17 +0000 (17:58 +0200)]
Include baseline subtraction in the ADC design
Jan Michel [Mon, 8 Apr 2019 13:30:34 +0000 (15:30 +0200)]
fix a bug in ADC code when switching off PSA
Jan Michel [Mon, 8 Apr 2019 13:29:13 +0000 (15:29 +0200)]
Update sed check with simple edge counter for errors
Jan Michel [Thu, 31 Jan 2019 14:19:09 +0000 (15:19 +0100)]
ADA Addon with extended trigger logic
Jan Michel [Thu, 31 Jan 2019 14:18:43 +0000 (15:18 +0100)]
update 4conn design to new toolchain
Jan Michel [Thu, 31 Jan 2019 14:18:31 +0000 (15:18 +0100)]
change trb3_tools for new SPI features
Jan Michel [Thu, 31 Jan 2019 14:18:12 +0000 (15:18 +0100)]
update CTS with mux output option on RJ and new toolchain
Tobias Weber [Fri, 18 Jan 2019 13:18:54 +0000 (14:18 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:trb3
Tobias Weber [Fri, 18 Jan 2019 13:18:06 +0000 (14:18 +0100)]
trying to implement a reset for the mupix timestamps. So far it is now working.
Jan Michel [Wed, 16 Jan 2019 15:19:47 +0000 (16:19 +0100)]
Add plattform setting to CTS - different connectors for AddOn multiplexer
Tobias Weber [Thu, 10 Jan 2019 12:40:20 +0000 (13:40 +0100)]
Merge branch 'feature/mupixspeedregister' into 'master'
adding a register to read the mupix clock speed
See merge request Mupix/Mupix-Firmware!6
Tobias Weber [Thu, 10 Jan 2019 12:17:03 +0000 (13:17 +0100)]
adding a register to read the mupix clock speed
Tobias Weber [Wed, 19 Dec 2018 15:07:55 +0000 (16:07 +0100)]
Merge branch 'feature/newheader' into 'master'
adding header version and timestamp
See merge request Mupix/Mupix-Firmware!5
Tobias Weber [Wed, 19 Dec 2018 15:06:44 +0000 (16:06 +0100)]
adding header version and timestamp
Tobias Weber [Wed, 19 Dec 2018 12:49:10 +0000 (13:49 +0100)]
Merge branch 'GrayAndAddressDecode' into 'master'
wrong width for counter decoder.
See merge request Mupix/Mupix-Firmware!4
Tobias Weber [Wed, 19 Dec 2018 12:48:23 +0000 (13:48 +0100)]
wrong width for counter decoder.
Tobias Weber [Wed, 19 Dec 2018 12:40:50 +0000 (13:40 +0100)]
Merge branch 'GrayAndAddressDecode' into 'master'
Gray and address decode
See merge request Mupix/Mupix-Firmware!3
Tobias Weber [Wed, 19 Dec 2018 10:46:39 +0000 (11:46 +0100)]
just a tiny change to the gray converter. Everything seems to be working still.
Rene Hagdorn [Tue, 18 Dec 2018 09:42:23 +0000 (10:42 +0100)]
fixed variable names in DataDecoder
Rene Hagdorn [Tue, 18 Dec 2018 09:35:48 +0000 (10:35 +0100)]
reworked DataDecoder
Tobias Weber [Mon, 17 Dec 2018 15:18:21 +0000 (16:18 +0100)]
more detailed test of pixel data decoding.
Tobias Weber [Thu, 13 Dec 2018 09:24:35 +0000 (10:24 +0100)]
this seems to solve the limitation for large readout events using the UDP readout mode.
Rene Hagdorn [Wed, 12 Dec 2018 14:45:05 +0000 (15:45 +0100)]
fixed write enable bug for decoder bypass
Rene Hagdorn [Mon, 3 Dec 2018 14:40:19 +0000 (15:40 +0100)]
PixelAddressDecoder and ToT/TS GrayDecoder added to readout
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.