[DAQ-drivers] driver/fa125 branch, devel, updated. v1.1.1-2-9-g9913be0

[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/fa125".

The branch, devel has been updated
       via  9913be0666cf8c135d55ac5c7753bc2634e572c9 (commit)
       via  14dc820aaa838c11de5b66628786c157c96f075b (commit)
       via  c09946ee09bbb36efe37ef5e01d2802fcb6ed104 (commit)
       via  2e0a137b3f48ed1499a9d23a0ba1494b4bd6cf5c (commit)
       via  72b27ad7c77adf3a092c06859f085fb50a0a6f85 (commit)
       via  f439bda3363a211429f2636eae7661f8a602b329 (commit)
       via  03a377c46d8b2c5b5a9cba6cb4295945aaf88885 (commit)
      from  33aee3cf17465b8b4a4cfa365e27b6b3a096ec13 (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 9913be0666cf8c135d55ac5c7753bc2634e572c9
Merge: 03a377c 14dc820
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Aug 8 16:05:57 2014 -0400

    Merge branch 'feature-1.2.1' into devel

commit 14dc820aaa838c11de5b66628786c157c96f075b
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Aug 8 16:02:27 2014 -0400

    Change faSetPPG arguments to allow to write to each FE FPGA.
    Add a counters reset routine and fa125Disable.
    
    fa125Lib.{c,h}
     - Remove routine fa125SetTestTrigger
     - Add fa125Disable (opposite of fa125Enable)
     - Add fe_chip paramter to fa125SetPPG and allow for up to 6*32 samples
       to be written (6 channels * 32 samples) to each FE FPGA.
     - Add fa125ResetCounters to reset all counters

commit c09946ee09bbb36efe37ef5e01d2802fcb6ed104
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed Aug 6 13:21:31 2014 -0400

    Add adjustment to pulser width.  Setting up PPG.
    
    fadc125Lib.{c,h}
     - Adjust fe.pulser_trig_delay to include width bits
     - Add new register test_waveform at 0xN094 for PPG programming.
     - fa125SetPulserTriggerDelay
       Make sure not to overwrite already configured width
     - fa125SetPulserWidth
       Set width of outgoing pulse to pre-amps
     - fa125SoftPulser
       Adjust definitions of 'output' parameter
     - fa125SetPPG
       Set the programmed samples to be inserted on reception of a trig2

commit 2e0a137b3f48ed1499a9d23a0ba1494b4bd6cf5c
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Jul 28 14:30:51 2014 -0400

    Add in routines for configuring/sending a pulse to drift chamber
    discriminators and enabling/disable programmable pulse generator.
    
    fa125Lib.{c,h}
     - fa125SetPulserTriggerDelay(int id, int delay);
     - fa125SoftPulser(int id, int output);
     - fa125PPGEnable(int id);
     - fa125PPGDisable(int id);

commit 72b27ad7c77adf3a092c06859f085fb50a0a6f85
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Jul 28 14:12:26 2014 -0400

    Four new routines for disabling/enabling specific or groups of channels.
    
    fa125Lib.{c,h}
     - fa125SetChannelDisable(int id, int channel)
    	Disable a specific channel
     - fa125SetChannelDisableMask(int id, unsigned int cmask0, unsigned int cmask1, unsigned int cmask2)
    	Disable groups of channels determined by provided channel masks (24 bit for each)
     - fa125SetChannelEnable(int id, int channel)
    	Enable a specific channel
     - fa125SetChannelEnableMask(int id, unsigned int cmask0, unsigned int cmask1, unsigned int cmask2)
    	Enable groups of channels determined by provided channel masks (24 bit for each)

commit f439bda3363a211429f2636eae7661f8a602b329
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Jul 28 10:34:09 2014 -0400

    Supported firmware version 1.2.1
    
    fa125Lib.h
     - Added new registers and bit definitions.
       0xd02c pulser_control
       0xd030 pulser_trig_delay
       0xn090 channel disable

commit 03a377c46d8b2c5b5a9cba6cb4295945aaf88885
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Jul 28 10:08:48 2014 -0400

    Some cleanup in routines.
    
    fa125Lib.{c,h}
      - fa125Init:
        Remove byte swapping calls.
      - fa125CheckAddresses:
        Add check in prog.trigsrc
      - fa125SetClockSource
        Separate using input clksrc from what is actually written to the register
      - fa125GetTriggerSource
        New routine to get the trigger source.

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

Summary of changes:
 fa125Lib.c                                      |  555 +-
 fa125Lib.h                                      |   48 +-
 firmware/{fa125_v1_100.mcs => fa125_v1_102.mcs} |129254 +++++++++++-----------
 test/Makefile                                   |    4 +-
 test/{fa125ReadoutTest.c => fa125PPGTest.c}     |  134 +-
 test/fa125PulserTest.c                          |  250 +
 6 files changed, 65461 insertions(+), 64784 deletions(-)
 copy firmware/{fa125_v1_100.mcs => fa125_v1_102.mcs} (76%)
 copy test/{fa125ReadoutTest.c => fa125PPGTest.c} (84%)
 create mode 100644 test/fa125PulserTest.c


hooks/post-receive
-- 
driver/fa125