[DAQ-drivers] driver/caen1190 branch, devel, updated. 2d33e5577ef4069b2041b5d3801f30c6bc8641e7
Bryan Moffit
moffit at jlab.org
Tue Apr 28 15:48:43 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "driver/caen1190".
The branch, devel has been updated
via 2d33e5577ef4069b2041b5d3801f30c6bc8641e7 (commit)
via a9f6cff1b66a52574b1800970853d511dc402255 (commit)
via 626540a6dc4984cb2bd2a4440d17c2dc8fc71b60 (commit)
via 2aafcf4abdac32fd89c772a44c1df11073126ac0 (commit)
via b44f12bc5f5b052eb05d6f42f74d9bdd61c9eedf (commit)
via 5341db8bbbf79f7b93380c63f99b6d270207cafd (commit)
via 8375013a60ec00be18dcb65bb60dc333d7882fcd (commit)
via 0e35a43ab562899b11c95f45832bf86e82359838 (commit)
via 66c31e58f4fa93e669c5716b2bb3d3eac7e50550 (commit)
from 8de80b4d9ab7a1f3217d4e9dc1be1ea092ea3ee8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d33e5577ef4069b2041b5d3801f30c6bc8641e7
Merge: 8de80b4 a9f6cff
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 28 15:48:17 2015 -0400
Merge branch 'feature-EventBlocking' into devel
commit a9f6cff1b66a52574b1800970853d511dc402255
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 28 14:40:03 2015 -0400
Finished testing. Appears to be good to go for event blocking.
caen1190Lib.c c1190Lib.h:
- tdc1190CBLTReadBlock(..)
Make sure not to go beyond the data boundary. Repeat CBLT as necessary to obtain all of
the blocked data (or up to the user defined limit).
- Add in missing routine prototypes for new global routines.
commit 626540a6dc4984cb2bd2a4440d17c2dc8fc71b60
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Apr 23 22:11:30 2015 -0400
More global commands.
Tinkering with Block Reading routines for optimization.
commit 2aafcf4abdac32fd89c772a44c1df11073126ac0
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Apr 23 00:27:15 2015 -0400
Optimized routines for setting microcontroller parameters for all init'd modules.
Completed tdc1190GStatus(int mcFlag).
caen1190Lib.c
- New routines for setting microcontroller parameters for all modules
- Added 25ps resolution option in tdc1190ReadAcquisitionMode(...)
- Finished up tdc1190GStatus(..)
commit b44f12bc5f5b052eb05d6f42f74d9bdd61c9eedf
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 21 21:44:26 2015 -0400
New microcontroller readout routines optimized for readout of all
initialized TDCs.
Makefile:
- Make sure debugging flags are separated from optimization flags
caen1190Lib.c c1190Lib.h
- tdc1190GStatus(..)
Add a mcFlag (to turn on or off display of microcontroller parameters)
- Working tdc1190GReadMicro(..) routine
- New global routines utilizing new tdc1190GReadMicro routine.
- Source cleanup, in terms of removing unused variables.
commit 5341db8bbbf79f7b93380c63f99b6d270207cafd
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 21 15:41:39 2015 -0400
New routines to supported more optimized writes to microcontroller for
all initialized modules.
caen1190Lib.c c1190Lib.h:
- New routine:
STATUS tdc1190GWriteMicro(UINT16 data);
- New routines that mimic the individual write routines.
- New routine to return the MASK of initialized modules:
UINT32 tdc1190ScanMask();
commit 8375013a60ec00be18dcb65bb60dc333d7882fcd
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 21 01:10:58 2015 -0400
Skeleton of new routine to show status of all initialized TDCs.
caen1190Lib.c
- New routine:
int tdc1190GStatus()
commit 0e35a43ab562899b11c95f45832bf86e82359838
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 21 01:03:27 2015 -0400
Support for CBLT.
Added Data decoding routine.
Makefile:
- Compile with WITHLL by default
caen1190Lib.c
- Initialize MCST/CBLT pointer to NULL in globals
- tdc1190CommonInit(..)
- Rewrite printf's to show VME and Local addresses
- tdc1190Status(..)
- Show MCST/CBLT base address and control register
- tdc1190ResetMCST(..)
- Set MCST/CBLT pointer to NULL
- New routine to support readout via CBLT
int tdc1190CBLTReadBlock(int id, volatile UINT32 *data, int nwrds, int rflag)
- tdc1190ReadBlock(...)
- Fix stat to 1, because there shouldn't be a BERR for a linked list DMA
- tdc1190InitMCST(..)
- Calculate the MCST base address based off of address of last module in the List of TDCs
- New routine to decode TDC data words:
void tdc1190DataDecode(UINT32 data)
commit 66c31e58f4fa93e669c5716b2bb3d3eac7e50550
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Apr 17 11:34:11 2015 -0400
Add a test routine for testing c1190 readout.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 +-
c1190Lib.h | 58 +-
caen1190Lib.c | 1540 ++++++++++++++++++++++++++++++++++++++++++++++++---
test/Makefile | 40 ++
test/c1190LibTest.c | 384 +++++++++++++
5 files changed, 1938 insertions(+), 92 deletions(-)
create mode 100644 test/Makefile
create mode 100644 test/c1190LibTest.c
hooks/post-receive
--
driver/caen1190
More information about the Daq-drivers
mailing list