Commits · fd60668227092cdf01d492a6ed32164b0af6ae77 · Projects / Scalable MAROC Charge Sensitive Readout

07 Oct, 2016 1 commit

Repairing code-rot in Maroc example firmware. · fd606682

David Cussans authored Oct 07, 2016

Modified "demo" to work with newer WhiteRabbit core

Write "simple" example that just uses IPBus and Maroc cores ( no White Rabbit )

Started on the path towards "build out of the box" but not there yet.

fd606682

16 May, 2016 4 commits
- Getting rid of whiteRabbit directory... · d79561af
  David Cussans authored May 16, 2016
  
  d79561af
- Copying White Rabbit cores into local repo · 96ed1886
  David Cussans authored May 16, 2016
  
  96ed1886
- Adding local copy of WhiteRabbit code · af18fe26
  David Cussans authored May 16, 2016
  
  af18fe26
- Moving PyChips inside scripts directory · 191b82ce
  David Cussans authored May 16, 2016
  
  191b82ce
27 Apr, 2016 1 commit
- Updated block diagram to reflect move away from 1 SFP , 1 Phy to 2 SFP · 6b43ddd1
  David Cussans authored Apr 27, 2016
  
  6b43ddd1
15 Apr, 2016 5 commits

Making a copy of IPBus into local respository · 6710cc6e
David Cussans authored Apr 15, 2016

6710cc6e

Adding files before Git migration · b5df7685

David Cussans authored Apr 15, 2016



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@50 e1591323-3689-4d5a-aa31-d1a7cbdc5706

b5df7685

Checking in design files before Git migration · 991b7e64

David Cussans authored Apr 15, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@49 e1591323-3689-4d5a-aa31-d1a7cbdc5706

991b7e64

Checking in design files before Git migration · 3e589629

David Cussans authored Apr 15, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@48 e1591323-3689-4d5a-aa31-d1a7cbdc5706

3e589629

Checking in files before another attempted Git migration. · f79f13e7

David Cussans authored Apr 15, 2016

More firmware development:

Took copies of firmware/hdl/i2c_master_* to avoid having to pull in.

Wrote some test-benches for data mux code:
dummyMarocADC_behavioural.vhd
marocTimeStampMuxArray_tb.vhd
marocTimeStampMux_tb.vhd
marocTriggerTimeStampArray_tb.vhd
marocTriggerTimeStamp_tb.vhd

Added pick-and-place information to BoM



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@47 e1591323-3689-4d5a-aa31-d1a7cbdc5706

f79f13e7

06 Apr, 2016 1 commit

Checking in timestamp multiplexing code · 9ce72440

David Cussans authored Apr 06, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@46 e1591323-3689-4d5a-aa31-d1a7cbdc5706

9ce72440

24 Mar, 2016 1 commit

Committing changes before moving to Git · f9bf008a

David Cussans authored Mar 24, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@45 e1591323-3689-4d5a-aa31-d1a7cbdc5706

f9bf008a

18 Mar, 2016 2 commits
- Added external trigger on GPIO. Tidied up firmware. Still doesn't meet timing constraints :-( · 3df8f56d
  David Cussans authored Mar 18, 2016
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@44 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
  3df8f56d
- Added some protection against buffer over-run. Unfortunately doesn't work at start of run .... · 4608124b
  David Cussans authored Mar 18, 2016
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@43 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
  4608124b
17 Mar, 2016 1 commit

marocInterface_rtl.vhd - Added external trigger from GPIO header as well as… · d64c82c3

David Cussans authored Mar 17, 2016

marocInterface_rtl.vhd - Added external trigger from GPIO header as well as from DIN41612 connectors

marocTriggerGenerator_rtl.vhd - added attributes to prevent synchronization steps being optimized to a shift register

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@42 e1591323-3689-4d5a-aa31-d1a7cbdc5706

d64c82c3

07 Mar, 2016 1 commit
- Edited import statements to make it easier to more to multiprocess rather than Theading interface · df9b217a
  David Cussans authored Mar 07, 2016
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@41 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
  df9b217a
03 Mar, 2016 2 commits

Checking in example configuration file. · a4ada180

David Cussans authored Mar 03, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@40 e1591323-3689-4d5a-aa31-d1a7cbdc5706

a4ada180

- MarocConfiguration.py - passes configuration file name to MarocSC object and… · c735d6df

David Cussans authored Mar 03, 2016

- MarocConfiguration.py  - passes configuration file name to MarocSC object and reads from configuration file.

- MarocHistograms.py - replaced print statements with logger.info / logger.debug

- MarocSC.py - debugged so can now read flags, parameters and register values from configuration file.

- takeMarocData.py - added command line switch to set configuration file name



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@39 e1591323-3689-4d5a-aa31-d1a7cbdc5706

c735d6df

02 Mar, 2016 2 commits

Checking in PyChips address map for takeMarocData.py · e6393c94

David Cussans authored Mar 02, 2016

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@38 e1591323-3689-4d5a-aa31-d1a7cbdc5706

e6393c94

MarocConfiguration - class that writes to registers in FPGA , including register… · 716ff8db

David Cussans authored Mar 02, 2016

MarocConfiguration - class that writes to registers in FPGA , including register that controls interface to MAROC slow control. Reads data to write to slow control from CSV file.

takeMarocData.py - passes number of events to readout thread. Passes file name to recording thread. Waits for threads to finish before exiting

MarocRecording.py - eventually sorted out how to record to a ROOT file. Inefficient at the moment.

MarocSC.py - started to add ability to store register values in CSV file as well as contents of MAROC SC registers.

MarocHistogrammingThread.py,MarocReadoutThread.py,MarocRecordingThread.py,MarocUnpackingThread.py - when readout thread reaches event limit it passes a "special" event along processing pipeline that causes threads to exit.

MarocRunControlThread.py - beginnings of a run-control thread. Not used at the moment.

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@37 e1591323-3689-4d5a-aa31-d1a7cbdc5706

716ff8db

01 Mar, 2016 1 commit

Adding more Python readout scripts. · 311a7be8

David Cussans authored Mar 01, 2016

takeMarocData - multi-threaded top level script to take data.

MarocReadoutThread , MarocHistogrammingThread , MarocRecordingThread - classes that inherit from Threading class

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@36 e1591323-3689-4d5a-aa31-d1a7cbdc5706

311a7be8

29 Jan, 2016 1 commit

Checking in current code. · 227bbaa4

David Cussans authored Jan 29, 2016

Some documentation changes

Changed Slow control shift register to have optional reset before shifting data.
( Still at least one bug - doesn't store data shifted out of MAROC correctly )

Added register stages to risingEdgeDetect




git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@35 e1591323-3689-4d5a-aa31-d1a7cbdc5706

227bbaa4

17 Dec, 2015 1 commit

Adding scripts before modifying MarocSC.py · e48ef112

David Cussans authored Dec 17, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@34 e1591323-3689-4d5a-aa31-d1a7cbdc5706

e48ef112

26 May, 2015 1 commit

Comitting changes for working demo version · 8a83cba7

David Cussans authored May 26, 2015

* marocInterface_rtl.vhd - detects the falling edge of status from marocADC
* circuit to detect falling edge of status hdl/fallingEdgeDetect_rtl.vhd



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@33 e1591323-3689-4d5a-aa31-d1a7cbdc5706

8a83cba7

31 Mar, 2015 2 commits

Starting to write simulation test-bench · bd6c7e83

David Cussans authored Mar 31, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@32 e1591323-3689-4d5a-aa31-d1a7cbdc5706

bd6c7e83

Starting to write simulation test-bench · 42660563

David Cussans authored Mar 31, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@31 e1591323-3689-4d5a-aa31-d1a7cbdc5706

42660563

30 Mar, 2015 1 commit

Edited UCF to specify termination of some of the LVDS lines. · de1cbaf1

David Cussans authored Mar 30, 2015

Edited pc049a_top.vhd in order to only build the IPBus ( not the White Rabbit ) cores by default. Reduces power dissipation and keeps chip cooler.



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@30 e1591323-3689-4d5a-aa31-d1a7cbdc5706

de1cbaf1

27 Mar, 2015 1 commit

Comissioning boards. · b31f50a2

David Cussans authored Mar 27, 2015

* Took pictures of assembled boards.

* Exported netlist from Circuit schematic.

* Changed clocks to be 31.25MHz IPBus clock.

* General tidying. Unfortunately, latest design doesn't respond to "ping"....



git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@29 e1591323-3689-4d5a-aa31-d1a7cbdc5706

b31f50a2

23 Mar, 2015 2 commits

Checking in files before copying to GIT · dfeb5646

David Cussans authored Mar 23, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@27 e1591323-3689-4d5a-aa31-d1a7cbdc5706

dfeb5646

Checking in files before copying to GIT · 85443d56

David Cussans authored Mar 23, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@26 e1591323-3689-4d5a-aa31-d1a7cbdc5706

85443d56

23 Feb, 2015 3 commits

Tidying artwork · 70e06b2c

David Cussans authored Feb 23, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@25 e1591323-3689-4d5a-aa31-d1a7cbdc5706

70e06b2c

Adding artwork after glossing and power supply capacitor changes · c17c65fc
David Cussans authored Feb 23, 2015
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@24 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
c17c65fc
Adding artwork after glossing and power supply capacitor changes · b4cce114
David Cussans authored Feb 23, 2015
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@23 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
b4cce114

12 Feb, 2015 2 commits

Changing clearanges to get ground pins on DIN connectors connected to ground… · 8c9cd0d7

David Cussans authored Feb 12, 2015

Changing clearanges to get ground pins on DIN connectors connected to ground planes on layers 7 , 10

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@22 e1591323-3689-4d5a-aa31-d1a7cbdc5706

8c9cd0d7

Minor changes following PCB checking · e1318150

David Cussans authored Feb 12, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@21 e1591323-3689-4d5a-aa31-d1a7cbdc5706

e1318150

11 Feb, 2015 1 commit

Adding artwork from final files before manufacture · 1bad2acc

David Cussans authored Feb 11, 2015

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@20 e1591323-3689-4d5a-aa31-d1a7cbdc5706

1bad2acc

06 Oct, 2014 2 commits
- New schematic ( minor bug fixes. Connect SFP cages to ground, connect IC16 power pins correctly · 59606a97
  David Cussans authored Oct 06, 2014
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@19 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
  59606a97
- Committing design before importing from latest *.brd file · cec1277f
  David Cussans authored Oct 06, 2014
```
git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@18 e1591323-3689-4d5a-aa31-d1a7cbdc5706
```
  cec1277f
29 Jul, 2014 1 commit

Checking in files after doing most of Erik S's changes · 3c6b2988

David Cussans authored Jul 29, 2014

git-svn-id: https://svn2.phy.bris.ac.uk/svn/uob-hep-pc049a/trunk@17 e1591323-3689-4d5a-aa31-d1a7cbdc5706

3c6b2988