[DAQ-drivers] driver/fadc branch, devel, updated. v1B-8-g4092b70

[Bryan Moffit]

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  4092b70b47c472af1cdd1a10128809ca9b97aa25 (commit)
       via  7d174cd5c2a25bba36e58edd8d58eb9cc47ec527 (commit)
       via  408c94bfbf025f481d6dbbb2468615161ca45d9f (commit)
       via  6efa05eed411fa567914502853cc3ed9a0b70984 (commit)
       via  6f3005c77fb7d4379352c994d838a34e910ab2b7 (commit)
       via  2d392a257aed38c3e74e5778e3070d8483aaa340 (commit)
       via  0a6a44bbd67d52c108afa30af58a615b19330a5f (commit)
       via  4cf490986cdc6da6889307e3ae3fb18b7249c008 (commit)
      from  6d838b304aa99e25abaab6ea67aedb279fc16f5e (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 4092b70b47c472af1cdd1a10128809ca9b97aa25
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu May 8 16:37:15 2014 -0400

    Updated 0x21C firmware.

commit 7d174cd5c2a25bba36e58edd8d58eb9cc47ec527
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu May 8 10:22:33 2014 -0400

    Updated faDataDecode for current data format.
    
    fadcLib.{c,h}
     - faDataDecode:
       - Added slot number in Event Header
       - Removed Window Sum (replaced with Undefined)
       - Removed Streaming Raw Data
       - Removed Pulse Amplitude
       - Removed Internal Trigger Word
       - Added Scaler Header and data words

commit 408c94bfbf025f481d6dbbb2468615161ca45d9f
Merge: 0a6a44b 6efa05e
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed May 7 10:16:26 2014 -0400

    Merge branch 'feature-v1C' into devel

commit 6efa05eed411fa567914502853cc3ed9a0b70984
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed May 7 10:14:58 2014 -0400

    Update faDataDecode.  Verify History Buffer feature.
    
    fadcLib.c
     - faGStatus: Small formatting change
     - faDataDecode: Update Block Header to current encoding

commit 6f3005c77fb7d4379352c994d838a34e910ab2b7
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed May 7 09:37:51 2014 -0400

    Remove routines used by previous debugging firmware.
    
    fadcLib.{c,h}
     - Remove these routines used by 0x90C debugging firmware:
     int  faPrintReadbackStatus(int id);
     int  faPrintAllChannelsReadback(int id);
     void faGPrintAllChannelReadback();
     int  faSetReadbackConfig(int id, int chan, int type);

commit 2d392a257aed38c3e74e5778e3070d8483aaa340
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed May 7 09:13:10 2014 -0400

    Supported Firmware 0x021C.
    Implementation of control and readout of sum history buffer.
    
    firmware/CTRL_FPGA_V2_TOP_0x021C.mcs
     - Updated control firmware
    
    fadcLib.{c,h}
     - Bumped supported firmware version to 0x1C
     - Updated register map to include sum_threshold and sum_data.
     - new routines to control sum history buffer
     int  faSetHistoryBufferThreshold(int id, int thres);
     void faGSetHistoryBufferThreshold(int thres);
     int  faGetHistoryBufferThreshold(int id);
     int  faArmHistoryBuffer(int id);
     void faGArmHistoryBuffer();
     int  faHistoryBufferDReady(int id);
     - New routine to readout history buffer
     int  faReadHistoryBuffer(int id, volatile unsigned int *data, int nwrds);

commit 0a6a44bbd67d52c108afa30af58a615b19330a5f
Merge: 6d838b3 4cf4909
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue May 6 16:34:12 2014 -0400

    Merge branch 'feature-GStatus' into devel

commit 4cf490986cdc6da6889307e3ae3fb18b7249c008
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue May 6 16:32:50 2014 -0400

    Updated faGStatus to provide a summary, rather than loop through faStatus.
    
    fadcLib.c
     faGStatus: This routine now provides a quick summary of all configured
       modules, instead of looping through each module with faStatus

-----------------------------------------------------------------------

Summary of changes:
 v2.0/fadcLib.c                                     |  636 +-
 v2.0/fadcLib.h                                     |   30 +-
 v2.0/firmware/.currentfw_ctrl                      |    2 +-
 ..._TOP_0x021B.mcs => CTRL_FPGA_V2_TOP_0x021C.mcs} |198168 ++++++++++----------
 v2.0/test/Makefile                                 |    8 +-
 v2.0/test/fadcReadoutTest.c                        |   28 +-
 .../{fadcReadoutTest.c => historyBufferTest.c}     |   99 +-
 7 files changed, 99611 insertions(+), 99360 deletions(-)
 rename v2.0/firmware/{CTRL_FPGA_V2_TOP_0x021B.mcs => CTRL_FPGA_V2_TOP_0x021C.mcs} (74%)
 copy v2.0/test/{fadcReadoutTest.c => historyBufferTest.c} (86%)


hooks/post-receive
-- 
driver/fadc