[DAQ-drivers] driver/ctp branch, devel, updated. 0004-13-g3ca2664
Bryan Moffit
moffit at jlab.org
Tue Jul 8 17:41:46 EDT 2014
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/ctp".
The branch, devel has been updated
via 3ca2664419475717670e38e3472c604f97afe6a4 (commit)
via befa38f569cdb4cf37497b19bb582bfa21808144 (commit)
via 1501c88c9c2eda0d34b272570a3845c26c5060c9 (commit)
via 70619d97cfc3b205fdf38fa52f457c59a6f94252 (commit)
via faee1f9bd76c0d55192f1d4a097e0e1f499fafbd (commit)
via 278ecba133c8420bd947d24751f4eb3febc5ed33 (commit)
via 9182565f74a77747b9cda0d37443d8f2ca282f44 (commit)
via 159daa77ddf5dbdc24aa16d229c3bfb572ed963b (commit)
via 99e11012cc382a83d72a365af4f0e90b4f88dafa (commit)
via ec59b6b5cb5664f5c4e2d9a7e18a2b881ac908eb (commit)
via 7aa56a39e67c31d211e85ebda5f8a6b482e6b67c (commit)
via cffb9300eac8835cd9ef1e9224b01d3767519f50 (commit)
via 2badd975e7cfab335a7b637fd64b5f2bf6a00b73 (commit)
from f6b3dea228e28fcb08aa7e240303ca16165fcc42 (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 3ca2664419475717670e38e3472c604f97afe6a4
Merge: 70619d9 befa38f
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Jul 8 17:41:12 2014 -0400
Merge branch 'feature-firmware-fpga-checking' into devel
commit befa38f569cdb4cf37497b19bb582bfa21808144
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Jul 8 17:40:05 2014 -0400
Support version 3 of BCAL U24 firmware.
firmware/Makefile
- Remove "current" version of U24 firmware, since it's different for each
subsystem
commit 1501c88c9c2eda0d34b272570a3845c26c5060c9
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Jul 8 17:34:44 2014 -0400
Update firmware tools to obtain CHIP and Revision from MCS files.
ctpLib.{c,h}
- New firmware updating routines
int ctpFirmwareRevFromFpgaID(int pflag)
int ctpFirmwareChipFromFpgaID(int pflag)
- ctpFirmwareUpload
Remove firmware file argument
- Move prototype for ctpReadFirmwareFile to header file
firmware/*.mcs
- Add CHIP and Revision ID into data of End of File record type.
firmware/ctpFirmwareUpdate.c
- Remove FPGA argument.
- Properly handle what happens when FPGA ID is not present in MCS file.
commit 70619d97cfc3b205fdf38fa52f457c59a6f94252
Merge: 278ecba faee1f9
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue May 20 12:35:05 2014 -0400
Merge branch 'feature-bcal_scalers' into devel
commit faee1f9bd76c0d55192f1d4a097e0e1f499fafbd
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue May 20 12:33:22 2014 -0400
Support Updated BCAL U24 firmware 0x0601. New scaler routines.
ctpLib.{c,h}
- Updated U24 register map
- New routines for configuring and readout of BCAL scalers
int ctpSetBCALScalerThresholds(int thres1, int thres2, int thres3, int thres4);
int ctpGetBCALScalerThreshold(int scal);
int ctpReadBCALData(int latch, int clear, volatile unsigned int *data);
int ctpPrintBCALData(int latch, int clear);
commit 278ecba133c8420bd947d24751f4eb3febc5ed33
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue May 20 09:44:05 2014 -0400
Updated U24 Tagger firmware (0x0A01)
commit 9182565f74a77747b9cda0d37443d8f2ca282f44
Merge: f6b3dea 159daa7
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon May 19 14:09:20 2014 -0400
Merge branch 'feature-hodoscope_microscope' into devel
commit 159daa77ddf5dbdc24aa16d229c3bfb572ed963b
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon May 19 14:03:47 2014 -0400
Remove obsolete 0404 firmware. Rename Spectrometer to TAG for Hodoscope/Microscope firmware.
commit 99e11012cc382a83d72a365af4f0e90b4f88dafa
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon May 19 13:59:19 2014 -0400
Some formatting changes to stdout messages.
ctpLib.{c,h}
- ctpInit:
Make sure u24FirmwareVersion is filled
- ctpStatus:
Show Microscope/Hodoscope paramters
- Make sure CR is done on ERROR messages.
- Make unique firmware mask for U24 status2
commit ec59b6b5cb5664f5c4e2d9a7e18a2b881ac908eb
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri May 16 14:21:15 2014 -0400
Updated U24 Hall-D Spectrometer firmware
commit 7aa56a39e67c31d211e85ebda5f8a6b482e6b67c
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue May 13 16:08:59 2014 -0400
Supported Beta U24 Firmware Version 0xA01
ctpLib.{c,h}
- ctpInit:
Simplified Firmware Version checking.
Check for beta version... warn if using one.
- ctpSetFinalSumThreshold
Check if using BCAL Firmware.
Arm History Buffer, if specified.
- New routines for Hodoscope/Microscope History Buffer:
int ctpSetHistoryBufferTriggerMask(unsigned int mask, int arm);
unsigned int ctpGetHistoryBufferTriggerMask(int pflag);
commit cffb9300eac8835cd9ef1e9224b01d3767519f50
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Apr 25 14:09:08 2014 -0400
Support for Hodoscope/Microscope trigger algorhythm firmare (0x0axx)
ctpLib.{c,h}
- Added masks and bits associated with U24 config3
hodoscope/microscope select
coincident window width
- Routines added:
int ctpSetScopeTrigger(int type, int windowwidth)
int ctpGetScopeTrigger(int pflag)
int ctpGetScopeTriggerWidth()
- Fixed spelling error in macro definition
commit 2badd975e7cfab335a7b637fd64b5f2bf6a00b73
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Apr 25 13:23:09 2014 -0400
Fix comment.
ctpLib.c
- Fix comment that said TI to CTP
-----------------------------------------------------------------------
Summary of changes:
ctpLib.c | 604 +-
ctpLib.h | 65 +-
firmware/.currentfw | 1 -
...0.mcs => BCAL_CTPV2_FX100T_U24_TOP_ver0603.mcs} |217474 ++++++++++----------
firmware/CTPV2_FX70T_U1_TOP_ver0104.mcs | 2 +-
firmware/CTPV2_FX70T_U3_TOP_ver0304.mcs | 2 +-
firmware/Makefile | 2 -
...04.mcs => TAG_ctpv2_fx100t_u24_top_ver0A01.mcs} |200022 +++++++++---------
firmware/ctpFirmwareUpdate.c | 114 +-
9 files changed, 209410 insertions(+), 208876 deletions(-)
rename firmware/{BCAL_CTPV2_FX100T_U24_TOP_ver0600.mcs => BCAL_CTPV2_FX100T_U24_TOP_ver0603.mcs} (83%)
rename firmware/{CTPV2_FX100T_U24_TOP_ver0404.mcs => TAG_ctpv2_fx100t_u24_top_ver0A01.mcs} (83%)
hooks/post-receive
--
driver/ctp
More information about the Daq-drivers
mailing list