]>
jspc29.x-matter.uni-frankfurt.de Git - trb3.git/log
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
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
Andreas Neiser [Thu, 5 Mar 2015 09:27:57 +0000 (10:27 +0100)]
Revert "CONTROL better clock domain crossing..."
This reverts commit
353dbfcd01b570f6ce82ee3a7644cde2171565ee.
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.
Andreas Neiser [Thu, 5 Mar 2015 09:13:46 +0000 (10:13 +0100)]
use 16 cores now
Andreas Neiser [Mon, 2 Mar 2015 12:29:02 +0000 (13:29 +0100)]
Lets try without the state debug stuff
Andreas Neiser [Mon, 2 Mar 2015 10:27:06 +0000 (11:27 +0100)]
some more registers for slow control signals
Andreas Neiser [Fri, 27 Feb 2015 15:08:27 +0000 (16:08 +0100)]
CONTROL better clock domain crossing...
Andreas Neiser [Fri, 27 Feb 2015 14:49:19 +0000 (15:49 +0100)]
snapshot modelsim project file
Andreas Neiser [Fri, 27 Feb 2015 15:03:04 +0000 (16:03 +0100)]
DEBUG should be in clk_rd aka ADC clock domain
Andreas Neiser [Fri, 27 Feb 2015 14:47:29 +0000 (15:47 +0100)]
snapshot epoch counter at trigger
Andreas Neiser [Fri, 27 Feb 2015 14:42:52 +0000 (15:42 +0100)]
implement trigger delay
Andreas Neiser [Fri, 27 Feb 2015 14:24:52 +0000 (15:24 +0100)]
writing out the epoch counter
Andreas Neiser [Fri, 27 Feb 2015 13:23:54 +0000 (14:23 +0100)]
adding dpram_50x16
Andreas Neiser [Fri, 27 Feb 2015 13:23:11 +0000 (14:23 +0100)]
statebits also to ADC clock domain
Andreas Neiser [Fri, 27 Feb 2015 13:19:47 +0000 (14:19 +0100)]
TRIGGER_OUT in adc clock domain
Andreas Neiser [Fri, 27 Feb 2015 13:06:50 +0000 (14:06 +0100)]
Moving CONF to ADC clock domain...
Andreas Neiser [Fri, 27 Feb 2015 13:07:22 +0000 (14:07 +0100)]
Simu works
Andreas Neiser [Fri, 27 Feb 2015 12:39:23 +0000 (13:39 +0100)]
Multicycle does not really solve it I guess
Andreas Neiser [Fri, 27 Feb 2015 12:38:35 +0000 (13:38 +0100)]
Use ringbuffer in adc readout
Andreas Neiser [Fri, 27 Feb 2015 12:17:21 +0000 (13:17 +0100)]
adding 50x16 ringbuffer
Andreas Neiser [Thu, 26 Feb 2015 16:56:00 +0000 (17:56 +0100)]
enabling multicycles again
Andreas Neiser [Thu, 26 Feb 2015 13:35:21 +0000 (14:35 +0100)]
Add constraints with pure underscore inst specifiers...
Andreas Neiser [Thu, 26 Feb 2015 13:10:59 +0000 (14:10 +0100)]
adding timings for synplify
Andreas Neiser [Thu, 26 Feb 2015 12:40:08 +0000 (13:40 +0100)]
Now all regions are defined properly according to floorplan view
Andreas Neiser [Thu, 26 Feb 2015 12:39:49 +0000 (13:39 +0100)]
Snapshot modellsim project file
Andreas Neiser [Thu, 26 Feb 2015 12:05:53 +0000 (13:05 +0100)]
left adc stuff is larger...args
Andreas Neiser [Thu, 26 Feb 2015 10:59:04 +0000 (11:59 +0100)]
Manually locating the ADC processor stuff
Andreas Neiser [Thu, 26 Feb 2015 08:07:15 +0000 (09:07 +0100)]
Maybe improved config signal handling
Andreas Neiser [Thu, 26 Feb 2015 07:54:22 +0000 (08:54 +0100)]
also modify ram readout for buffered ram
Andreas Neiser [Thu, 26 Feb 2015 07:42:39 +0000 (08:42 +0100)]
Enable outreg again
Andreas Neiser [Wed, 25 Feb 2015 11:18:06 +0000 (12:18 +0100)]
defining UGROUPS
Andreas Neiser [Wed, 25 Feb 2015 11:17:25 +0000 (12:17 +0100)]
Revert "Adding HGROUPs again..."
This reverts commit
ee73bdbd52b4c87e40f2ed1cc13585d8525ab3b3.
Andreas Neiser [Wed, 25 Feb 2015 08:17:01 +0000 (09:17 +0100)]
Adding HGROUPs again...
Andreas Neiser [Wed, 25 Feb 2015 07:57:46 +0000 (08:57 +0100)]
Remove hierarchical stuff
Andreas Neiser [Tue, 24 Feb 2015 14:30:00 +0000 (15:30 +0100)]
unconstrain also other direction...
Andreas Neiser [Tue, 24 Feb 2015 09:41:08 +0000 (10:41 +0100)]
snapshot modelsim project file
Andreas Neiser [Tue, 24 Feb 2015 09:40:45 +0000 (10:40 +0100)]
relax clock constraints for slowcontrol stuff
Andreas Neiser [Tue, 24 Feb 2015 09:40:15 +0000 (10:40 +0100)]
Minor index offset fix
Andreas Neiser [Mon, 23 Feb 2015 11:16:13 +0000 (12:16 +0100)]
adding files to project
Andreas Neiser [Mon, 23 Feb 2015 11:12:07 +0000 (12:12 +0100)]
little fix
Andreas Neiser [Mon, 23 Feb 2015 11:05:37 +0000 (12:05 +0100)]
finished config register stuff (untested...)
Andreas Neiser [Mon, 23 Feb 2015 09:59:54 +0000 (10:59 +0100)]
Preparing CFD readout mode config
Andreas Neiser [Mon, 23 Feb 2015 09:46:54 +0000 (10:46 +0100)]
Reformat source of ADC handler
Andreas Neiser [Mon, 23 Feb 2015 09:33:41 +0000 (10:33 +0100)]
Revert "testing with smaller ram counter"
This reverts commit
4d1d73448ee31788e34c3fc190bd75b9e56d47ac.
Andreas Neiser [Mon, 23 Feb 2015 09:33:19 +0000 (10:33 +0100)]
this trigger should produce readout race condition
Andreas Neiser [Mon, 23 Feb 2015 08:33:47 +0000 (09:33 +0100)]
resize ram counters properly
Andreas Neiser [Mon, 23 Feb 2015 08:30:24 +0000 (09:30 +0100)]
testing with smaller ram counter
Andreas Neiser [Mon, 23 Feb 2015 08:10:05 +0000 (09:10 +0100)]
Add busy logic to prevent race conditions
Andreas Neiser [Fri, 20 Feb 2015 16:38:11 +0000 (17:38 +0100)]
Maybe works
Andreas Neiser [Fri, 20 Feb 2015 16:29:07 +0000 (17:29 +0100)]
Try this as ram readout
Andreas Neiser [Fri, 20 Feb 2015 16:13:53 +0000 (17:13 +0100)]
No output reg for dpram
Andreas Neiser [Fri, 20 Feb 2015 15:14:35 +0000 (16:14 +0100)]
Adding buffer readout
Andreas Neiser [Fri, 20 Feb 2015 08:49:55 +0000 (09:49 +0100)]
Finish RAM event writing
Andreas Neiser [Thu, 19 Feb 2015 16:50:10 +0000 (17:50 +0100)]
Adding dual port RAM for readout
Andreas Neiser [Thu, 19 Feb 2015 16:17:35 +0000 (17:17 +0100)]
Integral delay correctly set
Andreas Neiser [Thu, 19 Feb 2015 15:48:09 +0000 (16:48 +0100)]
Integrator, ZeroX detect
Andreas Neiser [Thu, 19 Feb 2015 14:31:48 +0000 (15:31 +0100)]
Simulation runs with no warnings
Andreas Neiser [Thu, 19 Feb 2015 13:57:22 +0000 (14:57 +0100)]
Init config prevents sim messages
Andreas Neiser [Thu, 19 Feb 2015 13:49:16 +0000 (14:49 +0100)]
Little fix and formatting
Andreas Neiser [Thu, 19 Feb 2015 13:29:10 +0000 (14:29 +0100)]
CFD signal implemented, not tested yet
Andreas Neiser [Thu, 19 Feb 2015 10:16:32 +0000 (11:16 +0100)]
Changes to properly init for simulation...
Andreas Neiser [Thu, 19 Feb 2015 09:51:11 +0000 (10:51 +0100)]
Implement debug slowcontrol stuff
Andreas Neiser [Thu, 19 Feb 2015 08:45:14 +0000 (09:45 +0100)]
Rename config record names
Andreas Neiser [Thu, 19 Feb 2015 08:42:07 +0000 (09:42 +0100)]
Correct baseline subtracted signal generated
Andreas Neiser [Thu, 19 Feb 2015 08:13:54 +0000 (09:13 +0100)]
Finally defined baseline, but averaging not working yet
Andreas Neiser [Thu, 19 Feb 2015 07:43:16 +0000 (08:43 +0100)]
Default value in ADC makes baseline calculation work
Andreas Neiser [Wed, 18 Feb 2015 18:43:28 +0000 (19:43 +0100)]
Baseline init problem to be solved, but simulation runs
Andreas Neiser [Wed, 18 Feb 2015 18:39:51 +0000 (19:39 +0100)]
Correct shift register
Andreas Neiser [Wed, 18 Feb 2015 18:30:23 +0000 (19:30 +0100)]
Make the testbench test the CFD processor
Andreas Neiser [Wed, 18 Feb 2015 18:26:39 +0000 (19:26 +0100)]
Baseline averaging works maybe...
Andreas Neiser [Wed, 18 Feb 2015 17:17:08 +0000 (18:17 +0100)]
Starting standalone CFD processor
Andreas Neiser [Wed, 18 Feb 2015 14:54:20 +0000 (15:54 +0100)]
Minor config update
Andreas Neiser [Wed, 18 Feb 2015 14:26:34 +0000 (15:26 +0100)]
Fix for Modelsim
Andreas Neiser [Wed, 18 Feb 2015 14:11:34 +0000 (15:11 +0100)]
Run ADC FIFO in continuous mode if CFD readout
Andreas Neiser [Wed, 18 Feb 2015 11:24:32 +0000 (12:24 +0100)]
Introduce READOUT_MODE config option
Andreas Neiser [Wed, 18 Feb 2015 10:53:13 +0000 (11:53 +0100)]
Make extra modelsim project for CFD
Andreas Neiser [Wed, 18 Feb 2015 10:41:05 +0000 (11:41 +0100)]
Snapshot modelsim project file
Andreas Neiser [Wed, 18 Feb 2015 10:11:26 +0000 (11:11 +0100)]
Data output fix
Andreas Neiser [Wed, 18 Feb 2015 09:52:30 +0000 (10:52 +0100)]
Restart FIFO properly, otherwise sim does not work
Andreas Neiser [Wed, 18 Feb 2015 09:43:31 +0000 (10:43 +0100)]
use restart
Andreas Neiser [Wed, 18 Feb 2015 09:19:02 +0000 (10:19 +0100)]
another fix
Andreas Neiser [Wed, 18 Feb 2015 09:05:53 +0000 (10:05 +0100)]
more sophisticated inter process signaling...
Andreas Neiser [Wed, 18 Feb 2015 08:56:45 +0000 (09:56 +0100)]
Maybe working dummy dqsinput
Andreas Neiser [Wed, 18 Feb 2015 07:23:22 +0000 (08:23 +0100)]
Introduce dqsinput, sufficient to simulate deserialize functionality
Andreas Neiser [Tue, 17 Feb 2015 16:32:58 +0000 (17:32 +0100)]
Fix
Andreas Neiser [Tue, 17 Feb 2015 16:29:34 +0000 (17:29 +0100)]
Counter on data
Andreas Neiser [Tue, 17 Feb 2015 15:01:35 +0000 (16:01 +0100)]
Feed all ADCs...
Andreas Neiser [Tue, 17 Feb 2015 13:53:03 +0000 (14:53 +0100)]
Sim works somehow, now feed in reasonable data
Andreas Neiser [Tue, 17 Feb 2015 13:35:45 +0000 (14:35 +0100)]
Maybe works
Andreas Neiser [Tue, 17 Feb 2015 13:32:35 +0000 (14:32 +0100)]
Sim not working yet
Andreas Neiser [Tue, 17 Feb 2015 12:54:17 +0000 (13:54 +0100)]
Testbenching the AD9219 entity
Andreas Neiser [Tue, 17 Feb 2015 10:31:57 +0000 (11:31 +0100)]
Register i'th fifo_empty signal
Andreas Neiser [Thu, 12 Feb 2015 20:05:16 +0000 (21:05 +0100)]
Try with 80MHz
Andreas Neiser [Thu, 12 Feb 2015 17:27:05 +0000 (18:27 +0100)]
Revert "Made each ADC chip separate entity"
This reverts commit
6968103bf7cbfdc80b86ca0d9c23bed88576fad7.
Conflicts:
ADC/source/adc_ad9219.vhd
ADC/source/adc_ad9219_chip.vhd
Andreas Neiser [Thu, 12 Feb 2015 17:18:58 +0000 (18:18 +0100)]
Revert "Add ADC chip entity to project"
This reverts commit
45d99340f008c2c8a11234808468b4e24a2722f5.
Andreas Neiser [Thu, 12 Feb 2015 15:46:11 +0000 (16:46 +0100)]
Remove HGROUP stuff again, maybe this is finally the solution
Andreas Neiser [Thu, 12 Feb 2015 11:13:54 +0000 (12:13 +0100)]
Try with 64MHz
Andreas Neiser [Wed, 11 Feb 2015 18:05:52 +0000 (19:05 +0100)]
Add HGROUP to FIFO, to identify it easier in floorplan
Andreas Neiser [Wed, 11 Feb 2015 16:54:36 +0000 (17:54 +0100)]
Add ADC chip entity to project