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

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

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

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

- 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

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

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

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

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

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

* 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

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

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

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

* 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* Started to construct top level schematic

* Added some block diagrams




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

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

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

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

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

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

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

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