[DAQ-drivers] driver/fadc branch, devel, updated. v1D-13-g7aa54cf
Bryan Moffit
moffit at jlab.org
Mon Oct 27 14:58:54 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/fadc".
The branch, devel has been updated
via 7aa54cf502275bfa9d359707ab59e8ae643ba54e (commit)
via 4251c9a60e49ff00811d0d707d7d38bf03312cbd (commit)
via 49546b2cadd05eb6742fcc84a194d56a3f9efbeb (commit)
via 13c178179956060a75bb34359b6327afa7c8ecf2 (commit)
via d3f507684e37417973bfedd729ee46c22198523d (commit)
via d0c873a5ce4f7253781b251bf4c66188a3280e49 (commit)
from 78d47a53e85321ce001b7340ac9c8a661c969780 (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 7aa54cf502275bfa9d359707ab59e8ae643ba54e
Merge: 78d47a5 4251c9a
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Oct 27 14:58:13 2014 -0400
Merge branch 'feature-Control_v23' into devel
commit 4251c9a60e49ff00811d0d707d7d38bf03312cbd
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Oct 27 14:49:37 2014 -0400
Supports Control v23 Proc v90D
Final commits before push.
fadcLib.{c,h}
- faInit
Change ERRORs to WARNs when looping through addresses to find fADCs
- faGStatus, faStatus
Change voltage,temperature,a24address,structure arrays to correct size.
- faReset, faGReset
Add some more delay, after the HARD reset, to allow for temperature and voltage readbacks
to update.
- faEnableSyncSrc
Add some delay to allow time for fADC2CTP lanes to come back up
- faGetCtrlFPGAVoltage
Get register first... do math later
- faDataDecode
Add in decoding of BLOCKHEADER continuation word (with window parameters)
fadcFirmwareTools.c
- New routine to return Passed Modules Mask
DoxyfileC
- Update version number.
commit 49546b2cadd05eb6742fcc84a194d56a3f9efbeb
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Oct 10 14:07:50 2014 -0400
Fix bug in checking proc firmware version.
Add temp and voltage output on faStatus and faGStatus.
fadcLib.{c,h}
- faInit
- fix mistake made in using the wrong pointer to check proc firmware version.
- faStatus, faGStatus
- Add fpga temp and voltage to output
- faReset
- Add a couple extra taskDelay ticks to allow for registers to update
- Add temperature alerts to FA_CSR_ERROR_MASK
- faGetCtrlFPGATemp, faGetProcFPGATemp
- Fix mistake in floating point calculation.
- Add prototypes to header for newly created routines.
commit 13c178179956060a75bb34359b6327afa7c8ecf2
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Oct 9 15:05:41 2014 -0400
Directory cleanup.. removed items that were specific and only available to fADC250V1.
Makefile:
- When building, put current directory first for includes and library paths
- Remove build of readout lists in main directory
fadcLib.{c,h}
- Remove everything involving internal triggering
- Remove HPS Routines - These will come back when the firmware has been updated
to support new Control FPGA Firmware.
- New Registers (and supporting bits/mask macros) in structure:
/* 0x00FC */ volatile unsigned int system_monitor;
/* 0x019C */ volatile unsigned int status3;
- New routines to support features of new firmware:
int faDataInsertAdcParameters(int id, int enable)
int faDataSuppressTriggerTime(int id, int suppress)
unsigned int faGetCtrlFPGAData(int id)
unsigned int faGetProcFPGAData(int id)
float faGetCtrlFPGATemp(int id, int pflag)
float faGetCtrlFPGAVoltage(int id, int vtype, int pflag)
float faGetProcFPGATemp(int id, int pflag)
commit d3f507684e37417973bfedd729ee46c22198523d
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Oct 9 10:01:15 2014 -0400
After writing DAC values, read them back to make sure they were written properly.
fadcLib.{c,h}
faSetDAC(..)
- Read the registers back, after written.
- Check that they are consistent.. if not, output error message.
commit d0c873a5ce4f7253781b251bf4c66188a3280e49
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Oct 8 16:41:38 2014 -0400
Supported Control Firmware Version 0x223.
Supported Proc Firmware Version 0x90D.
fadcLib.{c,h}
- Since Control and Proc firmware must both be updated, we now lock in proc version
similarly to how it's handled with the CTP U24 firmware (with a list of supported versions).
-----------------------------------------------------------------------
Summary of changes:
v2.0/GEN_source.h | 103 -
v2.0/Makefile | 13 +-
v2.0/Makefile-rol | 83 -
v2.0/doc/doxygen/DoxyfileC | 2 +-
v2.0/faItrig.c | 428 -
v2.0/fadcFirmwareTools.c | 19 +-
v2.0/fadcLib.c | 1173 +-
v2.0/fadcLib.h | 80 +-
v2.0/firmware/.currentfw_ctrl | 2 +-
v2.0/firmware/.currentfw_proc | 2 +-
v2.0/firmware/CTRL_FPGA_V2_TOP_0x021D.mcs |211189 ----------------
..._TOP_0x021C.mcs => CTRL_FPGA_V2_TOP_0x0223.mcs} |205464 ++++++++--------
...V2_TOP_ver90C.mcs => FADC250_V2_TOP_ver90D.mcs} |255748 ++++++++++----------
v2.0/firmware/Makefile | 2 +-
v2.0/flexio_rol.c | 245 -
v2.0/mollerLib.c | 844 -
v2.0/rol/Makefile | 84 +-
v2.0/rol/moller_list.c | 399 -
v2.0/test/fadcLibTest.c | 43 +-
v2.0/test/fadcLibTest2.c | 170 -
v2.0/test/fadcLibTest3.c | 433 -
21 files changed, 231458 insertions(+), 445068 deletions(-)
delete mode 100644 v2.0/GEN_source.h
delete mode 100644 v2.0/Makefile-rol
delete mode 100644 v2.0/faItrig.c
delete mode 100644 v2.0/firmware/CTRL_FPGA_V2_TOP_0x021D.mcs
rename v2.0/firmware/{CTRL_FPGA_V2_TOP_0x021C.mcs => CTRL_FPGA_V2_TOP_0x0223.mcs} (73%)
rename v2.0/firmware/{FADC250_V2_TOP_ver90C.mcs => FADC250_V2_TOP_ver90D.mcs} (71%)
delete mode 100644 v2.0/flexio_rol.c
delete mode 100644 v2.0/mollerLib.c
mode change 120000 => 100644 v2.0/rol/Makefile
delete mode 100644 v2.0/rol/moller_list.c
delete mode 100644 v2.0/test/fadcLibTest2.c
delete mode 100644 v2.0/test/fadcLibTest3.c
hooks/post-receive
--
driver/fadc
More information about the Daq-drivers
mailing list