[DAQ-drivers] driver/ctp branch, devel, updated. 0004-30-ga21a1b4

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

The branch, devel has been updated
       via  a21a1b43bb86df41f7484f0c13e0cbd1648232f3 (commit)
       via  98466ecaa18f776f79f8cae33e8e16ff2a5ea222 (commit)
       via  45a3774d37e36b161c7389c3e2b5b54baaf08f68 (commit)
       via  2a3539c7f3c632e0eb724ad786ad31993c444261 (commit)
      from  e12a56ef164bfe2423bb7b68499410e93a5dceff (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 a21a1b43bb86df41f7484f0c13e0cbd1648232f3
Merge: e12a56e 98466ec
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Oct 9 15:25:29 2014 -0400

    Merge branch 'feature-TOF_v1200' into devel

commit 98466ecaa18f776f79f8cae33e8e16ff2a5ea222
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Oct 9 14:58:48 2014 -0400

    Add in a few routines that were used in FCAT test stand for debugging.
    Update firmware to release version.

commit 45a3774d37e36b161c7389c3e2b5b54baaf08f68
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Sep 19 13:34:57 2014 -0400

    Add routine prototypes to header file for TOF routines.

commit 2a3539c7f3c632e0eb724ad786ad31993c444261
Author: Bryan Moffit <moffit at jlab.org>
Date:   Fri Sep 19 13:32:30 2014 -0400

    Supported U24 Firmware 0x1200 (TOF)
    
    ctpLib.{c,h}
     - Add 0x1200 as supported U24 firmware
     - Add TOF routines:
     int ctpSetTOFCoincWidth(int windowwidth)
     int ctpGetTOFCoincWidth()
    
     - Add routine to get the FPGA temperatures:
     float ctpGetFPGATemperature(int fpga, int pflag)

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

Summary of changes:
 ctpLib.c                                           |  108 +
 ctpLib.h                                           |   17 +-
 ...00.mcs => TOF_ctpv2_fx100t_u24_top_ver1200.mcs} |226446 ++++++++++----------
 3 files changed, 113346 insertions(+), 113225 deletions(-)
 copy firmware/{Spectrometer_ctpv2_fx100t_u24_top_ver0E00.mcs => TOF_ctpv2_fx100t_u24_top_ver1200.mcs} (82%)


hooks/post-receive
-- 
driver/ctp