]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
trb3.git
9 years agoRevert "Revert to Diamond 2.1 and TDC v1.6.3"
Andreas Neiser [Wed, 17 Jun 2015 16:03:56 +0000 (18:03 +0200)]
Revert "Revert to Diamond 2.1 and TDC v1.6.3"

This reverts commit d0971cde640bbcea1e0de28613bb1cc187652e08.

9 years agoRevert "Compiles at least"
Andreas Neiser [Wed, 17 Jun 2015 16:03:41 +0000 (18:03 +0200)]
Revert "Compiles at least"

This reverts commit 27079dae38eb93866a02b07866f22c7c677b71f3.

9 years agoCompiles at least
Andreas Neiser [Wed, 17 Jun 2015 12:51:01 +0000 (14:51 +0200)]
Compiles at least

9 years agoRevert to Diamond 2.1 and TDC v1.6.3
Andreas Neiser [Wed, 17 Jun 2015 11:44:02 +0000 (13:44 +0200)]
Revert to Diamond 2.1 and TDC v1.6.3

9 years agoCTS: At least compiles
Andreas Neiser [Sat, 13 Jun 2015 16:23:07 +0000 (18:23 +0200)]
CTS: At least compiles

9 years agoCTS: Make Mainz A2 receiver module work again (hopefully)
Andreas Neiser [Sat, 13 Jun 2015 16:11:46 +0000 (18:11 +0200)]
CTS: Make Mainz A2 receiver module work again (hopefully)

9 years agoCTS: More technical updates/changes
Andreas Neiser [Sat, 13 Jun 2015 16:05:36 +0000 (18:05 +0200)]
CTS: More technical updates/changes

9 years agoLet's try with this ADC phase determination
Andreas Neiser [Thu, 11 Jun 2015 11:17:39 +0000 (13:17 +0200)]
Let's try with this ADC phase determination

9 years agoRevert "Revert "Changes for new record-based interface to FEE readout""
Andreas Neiser [Tue, 9 Jun 2015 18:34:43 +0000 (20:34 +0200)]
Revert "Revert "Changes for new record-based interface to FEE readout""

This reverts commit b00611784470736cba7ca420e1c3e1f808387546.

9 years agoRevert "Changes for new record-based interface to FEE readout"
Andreas Neiser [Tue, 9 Jun 2015 13:56:51 +0000 (15:56 +0200)]
Revert "Changes for new record-based interface to FEE readout"

This reverts commit bc3ae690fde7c384659eec7932b8bb364b9563cd.

9 years agoRegister the global epoch counter when distributing
Andreas Neiser [Tue, 9 Jun 2015 07:42:49 +0000 (09:42 +0200)]
Register the global epoch counter when distributing

9 years agoTry to fix readout bug
Andreas Neiser [Tue, 9 Jun 2015 07:36:51 +0000 (09:36 +0200)]
Try to fix readout bug

9 years agoMinor fix
Andreas Neiser [Mon, 8 Jun 2015 13:26:47 +0000 (15:26 +0200)]
Minor fix

9 years agoChanges for new record-based interface to FEE readout
Andreas Neiser [Mon, 8 Jun 2015 13:23:54 +0000 (15:23 +0200)]
Changes for new record-based interface to FEE readout

9 years agoRework the EPOCH counter handling
Andreas Neiser [Mon, 8 Jun 2015 12:00:02 +0000 (14:00 +0200)]
Rework the EPOCH counter handling

9 years agoUse correct channel input for TDC, should not change much
Andreas Neiser [Wed, 3 Jun 2015 16:44:56 +0000 (18:44 +0200)]
Use correct channel input for TDC, should not change much

9 years agoFix little TDC ctrl reg bug
Andreas Neiser [Wed, 3 Jun 2015 11:52:06 +0000 (13:52 +0200)]
Fix little TDC ctrl reg bug

9 years agoForgot to change one constraint for newer Diamond version...args
Andreas Neiser [Wed, 3 Jun 2015 07:20:45 +0000 (09:20 +0200)]
Forgot to change one constraint for newer Diamond version...args

9 years agoFix MULTICYCLE statement
Andreas Neiser [Tue, 2 Jun 2015 07:57:26 +0000 (09:57 +0200)]
Fix MULTICYCLE statement

9 years agoMake DEBUG completely synchronous
Andreas Neiser [Tue, 2 Jun 2015 07:48:52 +0000 (09:48 +0200)]
Make DEBUG completely synchronous

9 years agoUse par instead of mpartrce
Andreas Neiser [Mon, 1 Jun 2015 08:48:25 +0000 (10:48 +0200)]
Use par instead of mpartrce

9 years agoMake tdc_ctrl_reg less strictly timed
Andreas Neiser [Mon, 1 Jun 2015 08:09:43 +0000 (10:09 +0200)]
Make tdc_ctrl_reg less strictly timed

9 years agoMake regions larger, maybe that's enough to get par working
Andreas Neiser [Fri, 29 May 2015 10:17:33 +0000 (12:17 +0200)]
Make regions larger, maybe that's enough to get par working

9 years agoMake regions larger, maybe that's enough to get par working
Andreas Neiser [Fri, 29 May 2015 10:17:33 +0000 (12:17 +0200)]
Make regions larger, maybe that's enough to get par working

9 years agoCreate lpf symlink for newer diamond versions in create_project.pl
Andreas Neiser [Fri, 29 May 2015 10:05:38 +0000 (12:05 +0200)]
Create lpf symlink for newer diamond versions in create_project.pl

9 years agoSkip ADC1, also problematic...
Andreas Neiser [Thu, 28 May 2015 14:26:50 +0000 (16:26 +0200)]
Skip ADC1, also problematic...

9 years agoadd dqs 6x5 to project file
Andreas Neiser [Thu, 28 May 2015 13:43:40 +0000 (15:43 +0200)]
add dqs 6x5 to project file

9 years agoRemove ADC5 of left side as well
Andreas Neiser [Thu, 28 May 2015 13:42:15 +0000 (15:42 +0200)]
Remove ADC5 of left side as well

9 years agoAdding ipx files back
Andreas Neiser [Thu, 28 May 2015 13:31:59 +0000 (15:31 +0200)]
Adding ipx files back

9 years agoAdd dqsinput 6x5, add 4x5 ipx file
Andreas Neiser [Thu, 28 May 2015 13:24:42 +0000 (15:24 +0200)]
Add dqsinput 6x5, add 4x5 ipx file

9 years agoForgot ADC_DCO skip of ADC10
Andreas Neiser [Thu, 28 May 2015 12:32:34 +0000 (14:32 +0200)]
Forgot ADC_DCO skip of ADC10

9 years agoRevert "Another try to properly disable the problematic ADC"
Andreas Neiser [Thu, 28 May 2015 12:29:57 +0000 (14:29 +0200)]
Revert "Another try to properly disable the problematic ADC"

This reverts commit e9ebfe851da3c4d529930f13eb399f0ee7db8903.

9 years agoAnother try to properly disable the problematic ADC
Andreas Neiser [Thu, 28 May 2015 12:16:55 +0000 (14:16 +0200)]
Another try to properly disable the problematic ADC

9 years agoAdd dqsinput_4x5 file to project
Andreas Neiser [Thu, 28 May 2015 11:41:59 +0000 (13:41 +0200)]
Add dqsinput_4x5 file to project

9 years agoSkip ADC10 for lattice >2.1 compatibility
Andreas Neiser [Thu, 28 May 2015 11:40:07 +0000 (13:40 +0200)]
Skip ADC10 for lattice >2.1 compatibility

9 years agoRevert "Minimal change to hopefully fix par error at M22 site", fails
Andreas Neiser [Thu, 28 May 2015 10:21:39 +0000 (12:21 +0200)]
Revert "Minimal change to hopefully fix par error at M22 site", fails
already at premap :(

This reverts commit 63f85fe1ed7a932e44e1baba1e8e97968303f641.

9 years agoadding dqsinput 4x5, removing ipx files
Andreas Neiser [Thu, 28 May 2015 10:31:06 +0000 (12:31 +0200)]
adding dqsinput 4x5, removing ipx files

9 years agoMinimal change to hopefully fix par error at M22 site
Andreas Neiser [Thu, 28 May 2015 10:15:03 +0000 (12:15 +0200)]
Minimal change to hopefully fix par error at M22 site

9 years agoAdding more TDC constraints manually
Andreas Neiser [Thu, 28 May 2015 10:10:17 +0000 (12:10 +0200)]
Adding more TDC constraints manually

9 years agoRevert "Switching back to Lattice 2.1, since some Pins are not available in newer...
Andreas Neiser [Thu, 28 May 2015 10:07:24 +0000 (12:07 +0200)]
Revert "Switching back to Lattice 2.1, since some Pins are not available in newer versions arrrrg"

This reverts commit e4c41384e614ff8e54eb13782657441c39e9ff7f.

9 years agoRevert "Minor fix in LPF"
Andreas Neiser [Thu, 28 May 2015 10:07:04 +0000 (12:07 +0200)]
Revert "Minor fix in LPF"

This reverts commit bff7aa3c8cc6262a359c18806641b291cd394a9b.

9 years agoMinor fix in LPF
Andreas Neiser [Thu, 28 May 2015 07:55:50 +0000 (09:55 +0200)]
Minor fix in LPF

9 years agoSwitching back to Lattice 2.1, since some Pins are not available in newer versions...
Andreas Neiser [Wed, 27 May 2015 20:38:47 +0000 (22:38 +0200)]
Switching back to Lattice 2.1, since some Pins are not available in newer versions arrrrg

9 years agoFix correct ADC selection for TDC input
Andreas Neiser [Wed, 27 May 2015 17:53:17 +0000 (19:53 +0200)]
Fix correct ADC selection for TDC input

9 years agoAdding hopefully reasonable input to TDC
Andreas Neiser [Wed, 27 May 2015 17:47:09 +0000 (19:47 +0200)]
Adding hopefully reasonable input to TDC

9 years agoMake space for TDC
Andreas Neiser [Wed, 27 May 2015 17:30:06 +0000 (19:30 +0200)]
Make space for TDC

9 years agoTDC constraints (untested), needs smaller ADC regions
Andreas Neiser [Wed, 27 May 2015 17:24:02 +0000 (19:24 +0200)]
TDC constraints (untested), needs smaller ADC regions

9 years agoSwitching to recommended synplify
Andreas Neiser [Wed, 27 May 2015 16:17:45 +0000 (18:17 +0200)]
Switching to recommended synplify

9 years agoRegistering debug signals, fixes strange synplify errors. This version at least compiles.
Andreas Neiser [Wed, 27 May 2015 16:05:52 +0000 (18:05 +0200)]
Registering debug signals, fixes strange synplify errors. This version at least compiles.

9 years agoRewrite TDC control reg handling
Andreas Neiser [Wed, 27 May 2015 15:54:17 +0000 (17:54 +0200)]
Rewrite TDC control reg handling

9 years agoFixing compile errors/warnings
Andreas Neiser [Wed, 27 May 2015 15:14:50 +0000 (17:14 +0200)]
Fixing compile errors/warnings

9 years agoReformat config.vhd, add missing TDC constants
Andreas Neiser [Wed, 27 May 2015 15:06:42 +0000 (17:06 +0200)]
Reformat config.vhd, add missing TDC constants

9 years agoExtending compile_constraints to optionally include TDC
Andreas Neiser [Wed, 27 May 2015 14:53:49 +0000 (16:53 +0200)]
Extending compile_constraints to optionally include TDC

9 years agoAdding the TDC entity (untested)
Andreas Neiser [Wed, 27 May 2015 13:28:50 +0000 (15:28 +0200)]
Adding the TDC entity (untested)

9 years agoRevert "Refine delay"
Andreas Neiser [Wed, 27 May 2015 08:25:00 +0000 (10:25 +0200)]
Revert "Refine delay"

This reverts commit cc71945c5c1013c7d2939b360715862468438c7f.

9 years agoRevert "Make delay=0 totally correct, for testing in firmware"
Andreas Neiser [Wed, 27 May 2015 07:59:20 +0000 (09:59 +0200)]
Revert "Make delay=0 totally correct, for testing in firmware"

This reverts commit 6529cb26987c86e43181069cb9d0374272cbb437.

9 years agoRevert "Add edge samples dump, timing untested"
Andreas Neiser [Wed, 27 May 2015 07:56:05 +0000 (09:56 +0200)]
Revert "Add edge samples dump, timing untested"

This reverts commit 0464c68bcc92f880c85c24b274bf7276010af8d9.

9 years agoTry with 80 again
Andreas Neiser [Mon, 18 May 2015 14:10:28 +0000 (16:10 +0200)]
Try with 80 again

9 years agoImprove simulation of noisy signal
Andreas Neiser [Thu, 23 Apr 2015 15:11:51 +0000 (17:11 +0200)]
Improve simulation of noisy signal

9 years agoFix media region location
Andreas Neiser [Wed, 22 Apr 2015 08:03:11 +0000 (10:03 +0200)]
Fix media region location

9 years agoIncrease REGION sizes
Andreas Neiser [Wed, 22 Apr 2015 07:54:14 +0000 (09:54 +0200)]
Increase REGION sizes

9 years agoMinor simulation changes
Andreas Neiser [Tue, 21 Apr 2015 14:29:48 +0000 (16:29 +0200)]
Minor simulation changes

9 years agoFix simulation
Andreas Neiser [Tue, 21 Apr 2015 14:01:28 +0000 (16:01 +0200)]
Fix simulation

9 years agoAdd edge samples dump, timing untested
Andreas Neiser [Tue, 21 Apr 2015 14:00:22 +0000 (16:00 +0200)]
Add edge samples dump, timing untested

9 years agoSnapshot simulation changes
Andreas Neiser [Mon, 20 Apr 2015 17:12:43 +0000 (19:12 +0200)]
Snapshot simulation changes

9 years agoAdd one bit to baseline average
Andreas Neiser [Mon, 20 Apr 2015 17:12:25 +0000 (19:12 +0200)]
Add one bit to baseline average

9 years agoMake delay=0 totally correct, for testing in firmware
Andreas Neiser [Mon, 20 Apr 2015 17:06:32 +0000 (19:06 +0200)]
Make delay=0 totally correct, for testing in firmware

9 years agoRefine delay
Andreas Neiser [Mon, 20 Apr 2015 16:51:12 +0000 (18:51 +0200)]
Refine delay

9 years agoSet one bit to prevent becoming end marker
Andreas Neiser [Fri, 17 Apr 2015 15:32:29 +0000 (17:32 +0200)]
Set one bit to prevent becoming end marker

9 years agoAnother fix for readout words, run with 24 cores only
Andreas Neiser [Thu, 16 Apr 2015 13:30:52 +0000 (15:30 +0200)]
Another fix for readout words, run with 24 cores only

9 years agoMake readout more compatible
Andreas Neiser [Thu, 16 Apr 2015 08:47:58 +0000 (10:47 +0200)]
Make readout more compatible

9 years agoAdding missing config registers
Andreas Neiser [Tue, 14 Apr 2015 16:31:19 +0000 (18:31 +0200)]
Adding missing config registers

9 years agoSimulation changes
Andreas Neiser [Tue, 14 Apr 2015 16:15:06 +0000 (18:15 +0200)]
Simulation changes

9 years agoFix missing comma
Andreas Neiser [Tue, 14 Apr 2015 15:55:49 +0000 (17:55 +0200)]
Fix missing comma

9 years agoRemove padding word
Andreas Neiser [Tue, 14 Apr 2015 15:52:57 +0000 (17:52 +0200)]
Remove padding word

9 years agoImplement DebugMode
Andreas Neiser [Tue, 14 Apr 2015 15:46:16 +0000 (17:46 +0200)]
Implement DebugMode

9 years agoImplementing channel disable
Andreas Neiser [Tue, 14 Apr 2015 11:56:33 +0000 (13:56 +0200)]
Implementing channel disable

9 years agoMake busy signal synced for all four channels
Andreas Neiser [Tue, 14 Apr 2015 09:00:06 +0000 (11:00 +0200)]
Make busy signal synced for all four channels

9 years agoIntroduce processing mode
Andreas Neiser [Tue, 14 Apr 2015 08:26:57 +0000 (10:26 +0200)]
Introduce processing mode

9 years agoMulticycle for debug state signal
Andreas Neiser [Mon, 9 Mar 2015 07:19:31 +0000 (08:19 +0100)]
Multicycle for debug state signal

9 years agoTry with 64 MHz, 80 seems a little bit unstable on ADC init
Andreas Neiser [Fri, 6 Mar 2015 14:29:21 +0000 (15:29 +0100)]
Try with 64 MHz, 80 seems a little bit unstable on ADC init

9 years agoback to 32 cores
Andreas Neiser [Fri, 6 Mar 2015 06:56:09 +0000 (07:56 +0100)]
back to 32 cores

9 years agoMulticycle on busy_in, maybe that produces a timing error free design
Andreas Neiser [Fri, 6 Mar 2015 06:55:14 +0000 (07:55 +0100)]
Multicycle on busy_in, maybe that produces a timing error free design

9 years agoadd specific multicycle to config register
Andreas Neiser [Thu, 5 Mar 2015 16:32:13 +0000 (17:32 +0100)]
add specific multicycle to config register

9 years agosnapshot modelsim
Andreas Neiser [Thu, 5 Mar 2015 16:31:52 +0000 (17:31 +0100)]
snapshot modelsim

9 years agoNow locking should work
Andreas Neiser [Thu, 5 Mar 2015 13:23:11 +0000 (14:23 +0100)]
Now locking should work

9 years agoImprove locking of readout
Andreas Neiser [Thu, 5 Mar 2015 13:03:16 +0000 (14:03 +0100)]
Improve locking of readout

9 years agoUse gray counter for CDC
Andreas Neiser [Thu, 5 Mar 2015 12:31:38 +0000 (13:31 +0100)]
Use gray counter for CDC

9 years agoRevert "Moving CONF to ADC clock domain..."
Andreas Neiser [Thu, 5 Mar 2015 09:37:43 +0000 (10:37 +0100)]
Revert "Moving CONF to ADC clock domain..."

This reverts commit 0c38850a23e6cec161e7b5e0fa57ae098f9529a8.

Conflicts:
ADC/source/adc_handler.vhd
ADC/source/adc_processor_cfd.vhd

9 years agoRevert "TRIGGER_OUT in adc clock domain"
Andreas Neiser [Thu, 5 Mar 2015 09:33:33 +0000 (10:33 +0100)]
Revert "TRIGGER_OUT in adc clock domain"

This reverts commit 28614f883959e6e9c0691236e245beea34a7caed.

Conflicts:
ADC/source/adc_processor_cfd.vhd

9 years agoRevert "statebits also to ADC clock domain"
Andreas Neiser [Thu, 5 Mar 2015 09:32:11 +0000 (10:32 +0100)]
Revert "statebits also to ADC clock domain"

This reverts commit 2c86b4b98dcbe5fac40b29e116320c6a7b9cea52.

Conflicts:
ADC/source/adc_processor_cfd.vhd

9 years agoRevert "DEBUG should be in clk_rd aka ADC clock domain"
Andreas Neiser [Thu, 5 Mar 2015 09:29:13 +0000 (10:29 +0100)]
Revert "DEBUG should be in clk_rd aka ADC clock domain"

This reverts commit 9f9eae72dd826bac4f1023e802d6c913de96dad1.

Conflicts:
ADC/source/adc_ad9219.vhd

9 years agoRevert "CONTROL better clock domain crossing..."
Andreas Neiser [Thu, 5 Mar 2015 09:27:57 +0000 (10:27 +0100)]
Revert "CONTROL better clock domain crossing..."

This reverts commit 353dbfcd01b570f6ce82ee3a7644cde2171565ee.

9 years agoRevert "Lets try without the state debug stuff"
Andreas Neiser [Thu, 5 Mar 2015 09:26:27 +0000 (10:26 +0100)]
Revert "Lets try without the state debug stuff"

This reverts commit f3e25f1e7ce05bc738872e86b4f96155aa61e7f6.

9 years agouse 16 cores now
Andreas Neiser [Thu, 5 Mar 2015 09:13:46 +0000 (10:13 +0100)]
use 16 cores now

9 years agoLets try without the state debug stuff
Andreas Neiser [Mon, 2 Mar 2015 12:29:02 +0000 (13:29 +0100)]
Lets try without the state debug stuff

9 years agosome more registers for slow control signals
Andreas Neiser [Mon, 2 Mar 2015 10:27:06 +0000 (11:27 +0100)]
some more registers for slow control signals

9 years agoCONTROL better clock domain crossing...
Andreas Neiser [Fri, 27 Feb 2015 15:08:27 +0000 (16:08 +0100)]
CONTROL better clock domain crossing...

9 years agosnapshot modelsim project file
Andreas Neiser [Fri, 27 Feb 2015 14:49:19 +0000 (15:49 +0100)]
snapshot modelsim project file

9 years agoDEBUG should be in clk_rd aka ADC clock domain
Andreas Neiser [Fri, 27 Feb 2015 15:03:04 +0000 (16:03 +0100)]
DEBUG should be in clk_rd aka ADC clock domain