]> jspc29.x-matter.uni-frankfurt.de Git - dirich.git/log
dirich.git
4 years agoswitch threshold firmware between DiRICh versions by config and selection of pinout...
Adrian Weber [Tue, 1 Jun 2021 08:46:03 +0000 (10:46 +0200)]
switch threshold firmware between DiRICh versions by config and selection of pinout. Add register 0xFE with DiRICH Version info

4 years agofix online calibration for full backplane in CBM environment
Adrian Weber [Mon, 24 May 2021 18:10:23 +0000 (20:10 +0200)]
fix online calibration for full backplane in CBM environment

4 years agoconnection of trigger type to DLM trigger generator (related to comm. f2f0cb2 in...
Adrian Weber [Tue, 16 Mar 2021 11:54:28 +0000 (12:54 +0100)]
connection of trigger type to DLM trigger generator (related to comm. f2f0cb2 in cri)

4 years agoinclude original register 0x006 information to calibration entity
Adrian Weber [Mon, 1 Feb 2021 15:04:51 +0000 (16:04 +0100)]
include original register 0x006 information to calibration entity

4 years agoIncrease number of connected boards for calib from 12 to 16.
Adrian Weber [Mon, 1 Feb 2021 14:55:05 +0000 (15:55 +0100)]
Increase number of connected boards for calib from 12 to 16.

New feature: bit 20 of config register
  Select or deselect the calibration of channel 0 of local TDC (e.g. on
combiner in CBM RICH) only with trigger 0xD. This is needed as the
trigger signal is correlated to the on board clock

4 years agoadd missing files from last commit
Adrian Weber [Tue, 19 Jan 2021 17:24:01 +0000 (18:24 +0100)]
add missing files from last commit

4 years agoexchange MBS logic to new DLm to CTS logic. No inbetween mbs communication is needed.
Adrian Weber [Tue, 19 Jan 2021 15:21:05 +0000 (16:21 +0100)]
exchange MBS logic to new DLm to CTS logic. No inbetween mbs communication is needed.

4 years agochange of the calibration clock to a derived clock from the recovered clock via a...
Adrian Weber [Tue, 12 Jan 2021 16:25:55 +0000 (17:25 +0100)]
change of the calibration clock to a derived clock from the recovered clock via a 240->50 PLL

4 years agoAdded DLM signal to RJ45 Port for debugging
Adrian Weber [Thu, 15 Oct 2020 09:12:57 +0000 (11:12 +0200)]
Added DLM signal to RJ45 Port for debugging

4 years agocombiner_cts: Change uplink to 2.4 Gbps
Thomas Gessler [Thu, 8 Oct 2020 09:34:15 +0000 (11:34 +0200)]
combiner_cts: Change uplink to 2.4 Gbps

4 years agoextra control for refTime channel on online calibration
Adrian Weber [Tue, 6 Oct 2020 10:49:17 +0000 (12:49 +0200)]
extra control for refTime channel on online calibration

4 years agocombiner CTS with calibration and TDC activated.
Adrian Weber [Fri, 2 Oct 2020 11:54:51 +0000 (13:54 +0200)]
combiner CTS with calibration and TDC activated.

4 years agominor changes to TDC/Calib handling
Adrian Weber [Wed, 30 Sep 2020 07:08:31 +0000 (09:08 +0200)]
minor changes to TDC/Calib handling

4 years agopreparation and inclusion for calibration on data path to CRI
Adrian Weber [Wed, 23 Sep 2020 15:17:53 +0000 (17:17 +0200)]
preparation and inclusion for calibration on data path to CRI

4 years agodifferent way of calculation for ram addressing due to modelsim issue
Adrian Weber [Wed, 23 Sep 2020 15:16:44 +0000 (17:16 +0200)]
different way of calculation for ram addressing due to modelsim issue

4 years agombs trigger isgnal generation is moved to deciated entitiy in CRI repo.
Adrian Weber [Mon, 21 Sep 2020 11:00:56 +0000 (13:00 +0200)]
mbs trigger isgnal generation is moved to deciated entitiy in CRI repo.

4 years agominor fix for a version without TDC. Now CTS is functional again.
Adrian Weber [Mon, 21 Sep 2020 08:09:54 +0000 (10:09 +0200)]
minor fix for a version without TDC. Now CTS is functional again.

4 years agoIncluded MBS, TDC and a online calib entity for MBS-TDC; TDC and calib not used....
Adrian Weber [Fri, 18 Sep 2020 11:22:24 +0000 (13:22 +0200)]
Included MBS, TDC and a online calib entity for MBS-TDC; TDC and calib not used. Still problems with Placing!

4 years agorecovered clock for mbs and debug outputs on rj45
Adrian Weber [Thu, 3 Sep 2020 08:34:33 +0000 (10:34 +0200)]
recovered clock for mbs and debug outputs on rj45

4 years agoadded MBS to combiner. First test. Will be optimised
Adrian Weber [Mon, 31 Aug 2020 10:23:17 +0000 (12:23 +0200)]
added MBS to combiner. First test. Will be optimised

4 years agodeleted obsolet files; file are now in cri repository
Adrian Weber [Mon, 31 Aug 2020 07:18:32 +0000 (09:18 +0200)]
deleted obsolet files; file are now in cri repository

4 years agocleanup of code and deleted obsolet files
Adrian Weber [Tue, 14 Jul 2020 13:47:41 +0000 (15:47 +0200)]
cleanup of code and deleted obsolet files

4 years agodata sending from combiner; NOT as GbeEvents. Now own packaging
Adrian Weber [Mon, 13 Jul 2020 14:39:09 +0000 (16:39 +0200)]
data sending from combiner; NOT as GbeEvents. Now own packaging

4 years agomerge
Adrian Weber [Mon, 6 Jul 2020 10:37:30 +0000 (12:37 +0200)]
merge

4 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
Adrian Weber [Mon, 6 Jul 2020 10:36:33 +0000 (12:36 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

4 years agodata is sending from combiner and is received by CTS trb3sc; Data sending has to...
Adrian Weber [Mon, 6 Jul 2020 10:36:10 +0000 (12:36 +0200)]
data is sending from combiner and is received by CTS trb3sc; Data sending has to be activated by hand. If it is coming to early, there is  no data transmport -> per hand

4 years agosmall fixes to make it compile again
Ingo Froehlich [Fri, 3 Jul 2020 09:39:00 +0000 (11:39 +0200)]
small fixes to make it compile again

4 years agoentity to send data from event packer to API/CRI; not debugged yet
Adrian Weber [Thu, 2 Jul 2020 15:00:18 +0000 (17:00 +0200)]
entity to send data from event packer to API/CRI; not debugged yet

4 years agodata handler and changed hub for CRI data receiving. Needed to test combiner with...
Adrian Weber [Tue, 30 Jun 2020 15:03:40 +0000 (17:03 +0200)]
data handler and changed hub for CRI data receiving. Needed to test combiner with cts readout

4 years agopseudo data readout for combiner with cts. Test has to be done; Receiver is missing
Adrian Weber [Tue, 30 Jun 2020 15:02:37 +0000 (17:02 +0200)]
pseudo data readout for combiner with cts. Test has to be done; Receiver is missing

4 years agofunctional Combiner cts readout with internal trigger. Data is sendet until event...
Adrian Weber [Sat, 27 Jun 2020 11:44:52 +0000 (13:44 +0200)]
functional Combiner cts readout with internal trigger. Data is sendet until event constructor, there it is trown away. Further steps to be implememnted, but are also already partially implemented; Small cleanup of folder

4 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
Adrian Weber [Wed, 24 Jun 2020 11:19:04 +0000 (13:19 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

4 years agoFunctional Trigger with integrated CTS, if no Readout is used. Data is just thrown...
Adrian Weber [Wed, 24 Jun 2020 11:18:35 +0000 (13:18 +0200)]
Functional Trigger with integrated CTS, if no Readout is used. Data is just thrown away. Readout is prepared but not ready for use. Still some issues with full buffers if Readout generic is used.

4 years agochange dirich project to new Serdes files
Jan Michel [Tue, 23 Jun 2020 14:41:59 +0000 (16:41 +0200)]
change dirich project to new Serdes files

4 years agoStart of inclusion of Data from FEE in Path to CRI. Fix for CTS Readout: Additional...
Adrian Weber [Mon, 22 Jun 2020 15:09:43 +0000 (17:09 +0200)]
Start of inclusion of Data from FEE in Path to CRI. Fix for CTS Readout: Additional RDO must be set to finished to prevent Stop of trigger release

4 years agofixed the reset to a more stable and well known solution. -> Gives some Setup Time...
Adrian Weber [Thu, 18 Jun 2020 09:51:36 +0000 (11:51 +0200)]
fixed the reset to a more stable and well known solution. -> Gives some Setup Time Problmes. To be checked!

4 years agoCombiner with onboard CTS. SlowControl only. Reset is now fixed
Adrian Weber [Wed, 17 Jun 2020 12:36:50 +0000 (14:36 +0200)]
Combiner with onboard CTS. SlowControl only. Reset is now fixed

5 years agoprepared for retransmission
Ingo Froehlich [Thu, 4 Jun 2020 14:01:49 +0000 (16:01 +0200)]
prepared for retransmission

5 years ago30 seconds timeout for cfg flash, fixed typo
Ingo Froehlich [Fri, 22 May 2020 14:38:47 +0000 (16:38 +0200)]
30 seconds timeout for cfg flash, fixed typo

5 years ago30 seconds timeout for cfg flash
Ingo Froehlich [Fri, 22 May 2020 13:30:43 +0000 (15:30 +0200)]
30 seconds timeout for cfg flash

5 years agoupdate software version and media interface files
Jan Michel [Sat, 9 May 2020 13:39:30 +0000 (15:39 +0200)]
update software version and media interface files

5 years agomake SED FPGA size flexible to cope with e.g. MDC-FEE
Jan Michel [Sat, 9 May 2020 13:38:22 +0000 (15:38 +0200)]
make SED FPGA size flexible to cope with e.g. MDC-FEE

5 years agoconfig_compile script for CRI server in giessen/JLU
Adrian Weber [Tue, 21 Apr 2020 13:29:00 +0000 (15:29 +0200)]
config_compile script for CRI server in giessen/JLU

5 years agostart of combiner with integrated CTS. (files for online calib already added)
Adrian Weber [Mon, 20 Apr 2020 11:33:14 +0000 (13:33 +0200)]
start of combiner with integrated CTS. (files for online calib already added)

5 years agopreparation of threshold FPGA for DiRICH4; still compatible with old one if set in...
Adrian Weber [Fri, 3 Jan 2020 10:33:54 +0000 (11:33 +0100)]
preparation of threshold FPGA for DiRICH4; still compatible with old one if set in generic to use i2c_prog := c_NO and use of old thresholds.lpf

5 years agofix of backpressure problem in online calibration with LUT based almost Full/Empty...
Adrian Weber [Wed, 1 Jan 2020 10:27:59 +0000 (11:27 +0100)]
fix of backpressure problem in online calibration with LUT based almost Full/Empty FIFO wrapper

5 years agosome fixes for startup in calibration monitoring
Adrian Weber [Wed, 1 Jan 2020 10:25:26 +0000 (11:25 +0100)]
some fixes for startup in calibration monitoring

6 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
Ingo Froehlich [Mon, 13 May 2019 12:35:53 +0000 (14:35 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

6 years agoadjusted cfg timeout
Ingo Froehlich [Mon, 13 May 2019 12:35:48 +0000 (14:35 +0200)]
adjusted cfg timeout

6 years agoStartup fix for Online Calibration
Adrian Weber [Mon, 29 Apr 2019 07:27:24 +0000 (09:27 +0200)]
Startup fix for Online Calibration

6 years agoResize media interface region.
Jan Michel [Tue, 19 Feb 2019 11:37:39 +0000 (12:37 +0100)]
Resize media interface region.

6 years agoMove TDC input stage closer to inputs
Jan Michel [Thu, 23 Aug 2018 14:34:50 +0000 (16:34 +0200)]
Move TDC input stage closer to inputs

6 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
Ingo Froehlich [Mon, 18 Feb 2019 14:18:10 +0000 (15:18 +0100)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

6 years agochanged config
Ingo Froehlich [Mon, 18 Feb 2019 14:17:55 +0000 (15:17 +0100)]
changed config

6 years agobetetr flexibility + less hardware consuming monitoring
Adrian Weber [Tue, 13 Nov 2018 13:06:13 +0000 (14:06 +0100)]
betetr flexibility + less hardware consuming  monitoring

6 years agobugfix in monitoring -AW
Adrian Weber [Tue, 11 Sep 2018 14:40:45 +0000 (16:40 +0200)]
bugfix in  monitoring -AW

6 years agoadded Monitoring -AW
Adrian Weber [Sat, 8 Sep 2018 08:24:56 +0000 (10:24 +0200)]
added Monitoring -AW

6 years agoclean up of Calibration -AW
Adrian Weber [Mon, 27 Aug 2018 12:09:03 +0000 (14:09 +0200)]
clean up of Calibration -AW

6 years agoerror fixes + debuging outputs
Adrian Weber [Fri, 24 Aug 2018 13:24:29 +0000 (15:24 +0200)]
error fixes + debuging outputs

6 years agodelete sim.mpf -AW
a.weber [Wed, 22 Aug 2018 14:20:34 +0000 (16:20 +0200)]
delete sim.mpf -AW

6 years agofixes due to simulation -AW
Adrian Weber [Wed, 22 Aug 2018 14:15:16 +0000 (16:15 +0200)]
fixes due to simulation -AW

6 years agoEBR file
a.weber [Tue, 21 Aug 2018 12:28:45 +0000 (14:28 +0200)]
EBR file

6 years ago...was not in last commit
a.weber [Tue, 21 Aug 2018 11:56:17 +0000 (13:56 +0200)]
...was not in last commit

6 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
a.weber [Mon, 20 Aug 2018 14:23:17 +0000 (16:23 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

6 years agonew calibration Method; old one did not fit in FPGA -W
a.weber [Mon, 20 Aug 2018 14:23:01 +0000 (16:23 +0200)]
new calibration Method; old one did not fit in FPGA -W

6 years agofix 'included features' in Concentrator
Jan Michel [Thu, 16 Aug 2018 11:19:31 +0000 (13:19 +0200)]
fix 'included features' in Concentrator

6 years agoFirst working Calibration;All FPGAs as one; Chnls are separat calibrated -AW
a.weber [Tue, 14 Aug 2018 11:25:24 +0000 (13:25 +0200)]
First working Calibration;All FPGAs as one; Chnls are separat calibrated -AW

6 years agoCalibration Files; First Try -AW
a.weber [Mon, 13 Aug 2018 14:08:14 +0000 (16:08 +0200)]
Calibration Files; First Try -AW

6 years agoaddress in data ; FIFO too slow (<4MB/s) -AW
a.weber [Wed, 8 Aug 2018 08:42:26 +0000 (10:42 +0200)]
address in data ; FIFO too slow (<4MB/s) -AW

6 years agoworking fifo; missing HubAddress in Data -AW
a.weber [Tue, 7 Aug 2018 19:06:10 +0000 (21:06 +0200)]
working fifo; missing HubAddress in Data -AW

6 years agoNew Project: combiner with internal calibration - AW
a.weber [Tue, 24 Jul 2018 11:54:56 +0000 (13:54 +0200)]
New Project: combiner with internal calibration - AW

6 years agodisable unused debug registers
Jan Michel [Mon, 16 Jul 2018 15:51:29 +0000 (17:51 +0200)]
disable unused debug registers

6 years agochange reset handler to newer scheme
Jan Michel [Thu, 14 Jun 2018 14:40:22 +0000 (16:40 +0200)]
change reset handler to newer scheme

6 years agofix calibration clock for DiRich 3
Jan Michel [Thu, 14 Jun 2018 14:39:51 +0000 (16:39 +0200)]
fix calibration clock for DiRich 3

6 years agocombiner: select right reference time input by default
Jan Michel [Thu, 14 Jun 2018 14:25:55 +0000 (16:25 +0200)]
combiner: select right reference time input by default

6 years agoinclude dynamic word limit and increase buffer size
Jan Michel [Thu, 14 Jun 2018 13:58:14 +0000 (15:58 +0200)]
include dynamic word limit and increase buffer size

7 years agofix order of interfaces and I/O standards on combiner
Jan Michel [Wed, 28 Mar 2018 14:21:02 +0000 (16:21 +0200)]
fix order of interfaces and I/O standards on combiner

7 years agopwm with 133MHz
local account [Thu, 8 Mar 2018 16:16:33 +0000 (17:16 +0100)]
pwm with 133MHz

7 years agopwm with 133MHz
local account [Thu, 8 Mar 2018 16:15:26 +0000 (17:15 +0100)]
pwm with 133MHz

7 years ago16 bit flash, IF
Ingo Froehlich [Thu, 8 Mar 2018 12:00:23 +0000 (13:00 +0100)]
16 bit flash, IF

7 years agoMerge branch 'master' of jspc29:dirich
Ingo Froehlich [Thu, 25 Jan 2018 15:23:57 +0000 (16:23 +0100)]
Merge branch 'master' of jspc29:dirich

7 years agoadjustment, IF
Ingo Froehlich [Thu, 25 Jan 2018 15:23:17 +0000 (16:23 +0100)]
adjustment, IF

7 years agoUpdate dirich diamond project and combiner trigger output
Jan Michel [Fri, 22 Dec 2017 16:13:48 +0000 (17:13 +0100)]
Update dirich diamond project and combiner trigger output

7 years agochange of Trigger Connection, AW
local account [Fri, 24 Nov 2017 14:00:20 +0000 (15:00 +0100)]
change of Trigger Connection,  AW

7 years agochange of Trigger Connection, AW
local account [Fri, 24 Nov 2017 13:59:55 +0000 (14:59 +0100)]
change of Trigger Connection,  AW

7 years agoUpdate Dirich with latest TDC code
Jan Michel [Thu, 9 Nov 2017 14:03:46 +0000 (15:03 +0100)]
Update Dirich with latest TDC code

7 years agosmall change for new flash ctrl, IF
Ingo Froehlich [Fri, 25 Aug 2017 14:58:46 +0000 (16:58 +0200)]
small change for new flash ctrl, IF

7 years agonew dirich flash scheme, IF
Ingo Froehlich [Tue, 22 Aug 2017 14:33:24 +0000 (16:33 +0200)]
new dirich flash scheme, IF

7 years agonew dirich flash scheme, IF
Ingo Froehlich [Tue, 22 Aug 2017 14:22:32 +0000 (16:22 +0200)]
new dirich flash scheme, IF

7 years agonew dirich flash scheme, IF
Ingo Froehlich [Tue, 22 Aug 2017 14:16:12 +0000 (16:16 +0200)]
new dirich flash scheme, IF

7 years agoMove threshold FPGA design files to new vhdlbasics repository
Jan Michel [Thu, 27 Jul 2017 12:39:58 +0000 (14:39 +0200)]
Move threshold FPGA design files to new vhdlbasics repository

7 years agoUse raw clock rather than 200 MHz output from PLL
Jan Michel [Tue, 18 Jul 2017 16:42:29 +0000 (18:42 +0200)]
Use raw clock rather than 200 MHz output from PLL

7 years agoAdd override option for Link control signals in combiner
Jan Michel [Tue, 18 Jul 2017 16:41:56 +0000 (18:41 +0200)]
Add override option for Link control signals in combiner

7 years agoUpdate Serdes settings
Jan Michel [Tue, 18 Jul 2017 16:41:33 +0000 (18:41 +0200)]
Update Serdes settings

7 years agoremove Dirich1 features by default
Jan Michel [Tue, 18 Jul 2017 16:41:16 +0000 (18:41 +0200)]
remove Dirich1 features by default

7 years agoUpdate compile settings to defaults from Diamond
Jan Michel [Tue, 18 Jul 2017 16:40:39 +0000 (18:40 +0200)]
Update compile settings to defaults from Diamond

7 years agoUpdate pull resistors on Link control lines
Jan Michel [Tue, 18 Jul 2017 16:39:22 +0000 (18:39 +0200)]
Update pull resistors on Link control lines

7 years agoMove some MachXO3 files to new repository 'vhdlbasics'
Jan Michel [Tue, 18 Jul 2017 16:37:42 +0000 (18:37 +0200)]
Move some MachXO3 files to new repository 'vhdlbasics'

7 years agoMerge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich
local account [Thu, 22 Jun 2017 08:31:20 +0000 (10:31 +0200)]
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:dirich

7 years agolatest Version of threshold FPGA - FLASH included
local account [Thu, 22 Jun 2017 08:30:12 +0000 (10:30 +0200)]
latest Version of threshold FPGA - FLASH included