Stephan/solo_altera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9,308 commits 2 branches 0 tags 40 MiB
Commit graph

744 commits

Author SHA1 Message Date
wetzel
8ee5339bf2 step slow control: fixed SIMULATION msg 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4199 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 12:11:00 +00:00
wetzel
e61b94ae1d step slow control: increased STROBE to 12MHz, fixed two correlated bugs 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4198 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 11:38:27 +00:00
wetzel
7dbc644265 step: assigned zeros to unused DEBUGs 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4197 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 10:49:25 +00:00
wetzel
fc0c4ac5de step: assigned counters to error/single of middleend 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4196 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 10:47:05 +00:00
wetzel
b178017009 step: removed two comments 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4195 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 10:43:50 +00:00
wetzel
20b00a9d75 step: removed adc_chn from ix_controller 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4194 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-15 10:22:51 +00:00
stephan
2a4a2a9f43 ix_reset: allow to send in ix_reste to only one instance 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4177 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-14 10:00:54 +00:00
stephan
59ec439713 stein: merge -c 4161,4164,4165,4166 from step/v01 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4168 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-13 15:34:33 +00:00
stephan
a3ca706ef3 stein sc: fix MCLK ref: 24 MHz, not 48MHz 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4167 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-13 15:12:21 +00:00
stephan
3d67afe02c fpgas: add module por: Power On Reset 
por is treated as abort
	por resets the opheater

	There is a 1 in 256 chance that the por will not happen
	if registers initialize randomly at power on.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4152 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-04-12 19:47:48 +00:00
wetzel
7bc8bb262d step test jig: flood the tfifo 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4088 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-31 13:02:33 +00:00
wetzel
960dc015bc stein_core: reassigned fe_cntrs analog to het/ept 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4087 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-31 13:02:05 +00:00
terasa
0b68842ae2 stein_ix_controller.v: Also swapped sign of temp read. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4071 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-30 10:05:20 +00:00
wetzel
643f47471d step adc controller: switched sign of adc controller 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4070 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-30 10:01:54 +00:00
wetzel
3b0b8e6001 stein_core: connected slow control commands to fe counters 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4069 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-30 09:59:26 +00:00
stephan
47b34680d1 stein pulser: swap tp_sel Idef-X assignment 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4056 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-27 09:35:18 +00:00
wetzel
0c235809cc step: fixed simulation (wait longer after reset) 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4045 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-26 15:36:59 +00:00
wetzel
36d90ec1fd step: improved control flow of state machine for streaming 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4044 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-26 13:46:58 +00:00
wetzel
2418060bf1 step.gtkw: added signal to search for x in pha 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4037 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-25 22:33:33 +00:00
wetzel
2b93e97afb step: major changes to streaming state machine 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4034 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-25 19:16:25 +00:00
wetzel
3e05b141c5 step: fixed streaming 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4033 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-25 14:56:25 +00:00
wetzel
3fdb30125a step: extended test jig 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4032 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-25 14:55:38 +00:00
wetzel
1169ed0992 step slow control: fixed minor bugs and fixed sim msgs 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4020 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-23 17:57:49 +00:00
wetzel
728ecf886b step slow control: separated slow control and its scheduler 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4018 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-23 17:10:03 +00:00
stephan
063705ca33 stein_ix_slow_control: minor rework 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4016 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-23 15:23:16 +00:00
stephan
c40234a552 stein_sc_scheduler: rewrite state machine 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4015 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-23 13:43:34 +00:00
terasa
b8f028f136 stein_ix_controller.v: Changed sign of temp_diff. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3983 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-19 16:09:17 +00:00
terasa
5a8927c6c7 stein_ix_controller.v: Fixed output of dtime in streaming mode. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3982 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-19 14:30:07 +00:00
terasa
a12b02bcac stein_ix_controller.v: Moved declarations to allow compilation in iverilog 0.10. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3980 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-19 11:17:38 +00:00
terasa
b47c089cd4 stein_core.v, stein_ix_controller.v: Reverted 3976. acq_time1 is now used for science readouts, acq_time2 is now used for temperature readouts. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3979 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-19 09:54:09 +00:00
stephan
812bab8a21 backend...: 
Reorganization of reset/abort/atbrk.
	Argument size warnings.
	Preparation for iverilog 0.10 (git)

	Icarus verilog version 0.10 issues warnings for unsized (0)
	connected to single ports.  These were fixed.

	Version 0.10 (git of today) does time 0 initializations
	differently.  The tfifo used to get reset a time 0, not any 
	more.  A simple reset issued to message() did not succeed, 
	because undefined state from the tfifo trickles through the tport
	chain, to set the message module back to undefined.  This was
	fixed by wireing abort into tports.

	errors[4] = atbrk is fixed.  It was always triggering itself 
	via strobes[0].  Now it really just triggers by the atbrk
	sequence.

	Gold for step, flyrena, heteptdig.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3978 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 19:41:12 +00:00
terasa
e814db3220 stein_ix_controller.v: stein_ix_temp: Delay acquisition by 8*acq_time to allow analog signal to settle. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3976 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 14:58:43 +00:00
terasa
cd8219fa8d stein_ix_controller.v: Moved digitization one STROBE later. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3975 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 14:49:32 +00:00
stephan
f8785018d2 stein_ix_acquire_switch: fix a bug in p reset 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3974 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 13:05:50 +00:00
wetzel
694a8a2d8b stein_core: revertet parts of r3935 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3973 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 12:41:12 +00:00
stephan
7e4fe0ae5b stein_ix_acquire_switch: rewrite for readability and resources 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3970 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-18 00:00:32 +00:00
stephan
1beeea2d5f step: gold 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3968 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 22:46:24 +00:00
wetzel
24eddb2ebd step test jig: extended test jig, testing all classes of events 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3964 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 16:12:52 +00:00
wetzel
4f3fa3da2a idefx sim model: set DOUT to X on negedge of TRIG 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3963 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 16:11:55 +00:00
wetzel
2ff885262b stein_ix_acquire_switch: reduced edac go from 1 to a signal -> fix for error-counting bug 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3962 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 14:34:10 +00:00
wetzel
61ed0a7c05 stein core: pinned unused counter to zero 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3961 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 12:47:40 +00:00
terasa
9e4ee9e775 step.v: Reverted r3953. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3959 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-17 10:21:57 +00:00
stephan
b2922724c0 counters: 
When a counter input is stuck high, there will be a deadlock
	of the complete memory readback machive as soon as a readback
	of that counter memory was started.

	Wire up the abort to be able to clear this deadlock.

	Todo:	consider a timeout.
	Todo:	consider sending an abort to the counter memory when 
		any memory readback is started.
	


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3958 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-16 21:08:54 +00:00
terasa
9b48ffc931 step.v: hardwired TxEs. 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3953 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-16 12:08:11 +00:00
stephan
67404f4bb7 step: fix PHA readout sim 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3942 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-13 14:32:04 +00:00
wetzel
68baff11bf step test jig: updated l3v file 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3941 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-13 13:37:16 +00:00
wetzel
814b06b106 step_phatest.l3v: birth 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3940 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-13 13:30:42 +00:00
wetzel
b40669a76c step.gtkw: - 
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3937 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-12 21:32:42 +00:00
wetzel
f107d1e41f stein_ix_controller: 
acquire/general: widened dtime to 11 bits, fixed: dtime is no more counting during acquire
	temp: added port (you can now read temp diff AND raw adc values), really moved digitization one STROBE to the left
	slow control scheduler: due to widening of sc_data to 192 major changes in the control machine (interface has not changed, but improved in details)


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3936 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-12 21:31:21 +00:00
wetzel
fa32fd87f0 step core: 
low speed streaming is now blocking the IX which came last
	reassigned rbx ports to temp adc values and diffs
	added infrastructure for above points


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3935 bc5caf13-1734-44f8-af43-603852e9ee25
 2015-03-12 21:24:21 +00:00