[DAQ-drivers] driver/fadc branch, devel, updated. v1A-13-g6ec147b
Bryan Moffit
moffit at jlab.org
Mon May 5 17:16:24 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 6ec147b2cbe7c14ea057ff445c8d1043b293d2ae (commit)
via afebf3a6d50a45d8099449b9c2293806ccb3ed52 (commit)
via 57b7429edbdfd7fc7d4faeb03dca5a58eed80a56 (commit)
via 0e714fc3335c53207511b7f0aaa9e4e21c96dcee (commit)
via 04a4b825337ea21caf2939571582f9bef661ca04 (commit)
via c3852a8cf14d0ab076ef6a19639983839441b446 (commit)
via a08bd7e4cfc70cec4c6bfc15e03295bcba9d5976 (commit)
via 83b152fb8e40fb3dc41bbc5b876eece1df9a15f4 (commit)
via 6f5f342d95fa224cca56f20a961696071172acf8 (commit)
via 2217acba9f337617b5a1421f09bc5bf12dd87eab (commit)
via 5b234ba8c7211eda04f7102f9945cb7ba9f956aa (commit)
from b6f4032ae77fde8f1d496ac9ae4cf38849d65c7b (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 6ec147b2cbe7c14ea057ff445c8d1043b293d2ae
Merge: 5b234ba afebf3a
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon May 5 17:15:18 2014 -0400
Merge branch 'feature-proc_fw_90c' into devel
commit afebf3a6d50a45d8099449b9c2293806ccb3ed52
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon May 5 17:11:30 2014 -0400
SUPPORTED VERSION 0x21B.
Deprecate faSetMGTTestMode in favor of faEnableSyncSrc.
Makefile:
- Do not install, by default
fadcLib.{c,h}
- Rename macros FA_RELEASE_MGT_RESET<->FA_MGT_RESET since their
on/off state was changed in firmware
- faInit:
- move noBoardInit to beginning
- "continue" instead of relying on "else" if module not found
- Move slot number check before firmware check
so slot number can be used when warning or erroring on bad firmware
- faEnableSyncSrc:
- Fix sequence so it works properly.
- faSetMGTTestMode:
- Add warning saying the routine is deprecated and provide prescription
for fixing it.
firmware/CTRL_FPGA_V2_TOP_0x021B.mcs
- Updated control FPGA firmware
commit 57b7429edbdfd7fc7d4faeb03dca5a58eed80a56
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu May 1 10:12:41 2014 -0400
New routines to enable SyncReset Source and Set/Get Alignment debug mode.
fadcLib.{c,h}
- faSetAlignmentDebugMode:
If enable=1, enable alignment sequence when sync reset source is enabled
and disable when Trigger Source is enabled.
- faEnableSyncSrc:
Enable just the syncreset source (without trigger source). Optionally
set the alignment sequence to be sent to the CTP if
fadcAlignmentDebug=1
commit 0e714fc3335c53207511b7f0aaa9e4e21c96dcee
Author: Bryan Moffit <moffit at jlab.org>
Date: Tue Apr 29 14:35:08 2014 -0400
Update (possible final) fix to proc firmware.
commit 04a4b825337ea21caf2939571582f9bef661ca04
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Apr 25 14:12:42 2014 -0400
New firmware to test.
commit c3852a8cf14d0ab076ef6a19639983839441b446
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Apr 23 16:40:24 2014 -0400
Another debugging firmware update.
fadcLib.{c,h}
- Modified register bits for 90E debugging firmware.
commit a08bd7e4cfc70cec4c6bfc15e03295bcba9d5976
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Apr 21 15:02:49 2014 -0400
New routine to print out all ADC readbacks from all Modules/channels.
fadcLib.{c,h}
- new routine
void faGPrintAllChannelReadback()
commit 83b152fb8e40fb3dc41bbc5b876eece1df9a15f4
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Apr 21 14:06:21 2014 -0400
Another update to 90c debug firmware
commit 6f5f342d95fa224cca56f20a961696071172acf8
Author: Bryan Moffit <moffit at jlab.org>
Date: Mon Apr 21 11:15:11 2014 -0400
Updated Debugging firmware 90c and 90d.
fadcLib.{c,h}
- Add routine to cycle through each channel and print out the ADC
value.
FADC250_V2_TOP_ver90C-test.mcs
FADC250_V2_TOP_ver90D-test.mcs
- Added/Updated firmware files to check different points of signal
processing
fadcLib.{c,h}
commit 2217acba9f337617b5a1421f09bc5bf12dd87eab
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Apr 16 10:05:25 2014 -0400
Some debug firmware to determine cause of channel flatline problem.
fadcLib.{c,h}
- New routines to setup and readback the values from the ADC channels
int faPrintReadbackStatus(int id)
int faSetReadbackConfig(int id, int chan)
commit 5b234ba8c7211eda04f7102f9945cb7ba9f956aa
Author: Bryan Moffit <moffit at jlab.org>
Date: Wed Apr 16 09:23:54 2014 -0400
Added more descriptive errors if an errors occur during faReadBlock
fadcLib.{c,h}
- Added defined errors:
+#define FA_BLOCKERROR_NO_ERROR 0
+#define FA_BLOCKERROR_TERM_ON_WORDCOUNT 1
+#define FA_BLOCKERROR_UNKNOWN_BUS_ERROR 2
+#define FA_BLOCKERROR_ZERO_WORD_COUNT 3
+#define FA_BLOCKERROR_DMADONE_ERROR 4
+#define FA_BLOCKERROR_NTYPES 5
- New routine to return and optionally printout errors:
int faGetBlockError(int pflag)
- Typo in routine name
faEnableInternalPlaybackTrigger
-----------------------------------------------------------------------
Summary of changes:
v2.0/Makefile | 2 +-
v2.0/fadcLib.c | 313 +-
v2.0/fadcLib.h | 27 +-
v2.0/firmware/.currentfw_ctrl | 2 +-
v2.0/firmware/.currentfw_proc | 2 +-
v2.0/firmware/CTRL_FPGA_V2_TOP_0x0216.mcs |211189 ---------------
v2.0/firmware/CTRL_FPGA_V2_TOP_0x0219.mcs |211189 ---------------
v2.0/firmware/CTRL_FPGA_V2_TOP_0x021A.mcs |211189 ---------------
..._TOP_0x0214.mcs => CTRL_FPGA_V2_TOP_0x021B.mcs} |201850 ++++++++--------
v2.0/firmware/FADC250_V2_TOP_ver90A.mcs |227593 ----------------
v2.0/firmware/FADC250_V2_TOP_ver90B.mcs |227593 ----------------
...V2_TOP_ver908.mcs => FADC250_V2_TOP_ver90C.mcs} |273356 ++++++++++----------
12 files changed, 237901 insertions(+), 1326404 deletions(-)
delete mode 100644 v2.0/firmware/CTRL_FPGA_V2_TOP_0x0216.mcs
delete mode 100644 v2.0/firmware/CTRL_FPGA_V2_TOP_0x0219.mcs
delete mode 100644 v2.0/firmware/CTRL_FPGA_V2_TOP_0x021A.mcs
rename v2.0/firmware/{CTRL_FPGA_V2_TOP_0x0214.mcs => CTRL_FPGA_V2_TOP_0x021B.mcs} (74%)
delete mode 100644 v2.0/firmware/FADC250_V2_TOP_ver90A.mcs
delete mode 100644 v2.0/firmware/FADC250_V2_TOP_ver90B.mcs
rename v2.0/firmware/{FADC250_V2_TOP_ver908.mcs => FADC250_V2_TOP_ver90C.mcs} (70%)
hooks/post-receive
--
driver/fadc
More information about the Daq-drivers
mailing list