[DAQ-drivers] driver/ctp branch, devel, updated. 0004-26-ge12a56e

[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  e12a56ef164bfe2423bb7b68499410e93a5dceff (commit)
       via  c1f23d7065b2b3df748fd64ba36917b7bba0ecd7 (commit)
       via  ca3db330e5fe69b9b88a3bf5c12a653e6975f7ef (commit)
       via  9c376c6d75fbffa436b00bac452b779efdac9926 (commit)
       via  b49edde7cfaca09d3a5ce29c9a85daab265e75e4 (commit)
       via  62e16ff6d54d002a1d8b607b398729bd51f6af88 (commit)
       via  000f2cc941d8d62d53a34484bd4368eaab6ed5d1 (commit)
       via  468b9b55e4bd4ca38c7162032da16621a31d6dbb (commit)
       via  1f50a9c5c1220cbf5bed4e95faf2f8562c796997 (commit)
       via  6a43e2121a3b38e6376bf42f9098bf5c725c24cd (commit)
       via  401f734462bef55e92335b6b65d81e2bbda655a1 (commit)
       via  1e05ac15361d77ee94777841880e6299d2694def (commit)
      from  b98a7148cff4dc96cbe4d1f70df5c6b2ee43e8ef (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 e12a56ef164bfe2423bb7b68499410e93a5dceff
Merge: b98a714 c1f23d7
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Oct 6 10:00:14 2014 -0400

    Merge branch 'feature-spectrometer' into devel

commit c1f23d7065b2b3df748fd64ba36917b7bba0ecd7
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Oct 6 09:58:11 2014 -0400

    Introduce MCS file for spectrometer U24 firmware.
    Add in a few routines to ease debugging.
    
    ctpLib.{c,h}
     - new routines:
       unsigned int ctpGetChannelUpMask(int fType);
       unsigned int ctpGetLaneUpMask(int lane, int fType);

commit ca3db330e5fe69b9b88a3bf5c12a653e6975f7ef
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Sep 29 10:20:51 2014 -0400

    ctpLib.{c,h}
     - ctpGetSpectrometerMode(..)
       Set correct bit shift to obtain the mode.

commit 9c376c6d75fbffa436b00bac452b779efdac9926
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon Sep 29 10:17:57 2014 -0400

    Increase the number of available modes for Spectrometer firmware.
    
    ctpLib.{c,h}
     - ctpStatus(..)
       Display name of current mode
     - ctpSetSpectrometerMode(..)
       Add additional mode, and display current mode.
     - ctpGetSpectrometerMode(..)
       Display current mode.

commit b49edde7cfaca09d3a5ce29c9a85daab265e75e4
Merge: 62e16ff b98a714
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed Jul 9 09:42:39 2014 -0400

    Merge branch 'devel' into feature-spectrometer

commit 62e16ff6d54d002a1d8b607b398729bd51f6af88
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Jul 8 17:45:09 2014 -0400

    Add FPGA ID to 0x0a01 MCS file.

commit 000f2cc941d8d62d53a34484bd4368eaab6ed5d1
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Jul 8 10:18:44 2014 -0400

    A few more routines to support BCAL firmware.
    
    ctpLib.{c,h}
     - Add routines:
     int ctpSetBCALScalerInhibitWindow(int width)
     int ctpGetBCALScalerInhibitWindow(int width)
     - ctpSetBCALScalerThresholds
     Do the correct mask and bit shifting when showing hit channel (r)
     - ctpSetBCALWindowWidth
     Don't overwrite previous unrelated settings in fpga24.config3 when
     writing a new width

commit 468b9b55e4bd4ca38c7162032da16621a31d6dbb
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue May 20 12:58:48 2014 -0400

    Moved latch and clear of scaler data to another register.
    
    ctpLib.{c,h}
     - Moved the latch and clear of the scaler data from U24 config4 to scaler_ctrl

commit 1f50a9c5c1220cbf5bed4e95faf2f8562c796997
Merge: 6a43e21 70619d9
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue May 20 12:37:21 2014 -0400

    Merge branch 'devel' into feature-spectrometer

commit 6a43e2121a3b38e6376bf42f9098bf5c725c24cd
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue May 20 10:26:59 2014 -0400

    Bits for latching and clearing PS scalers moved to U24: config4
    
    ctpLib.{c,h}
     - ctpReadSpectrometerData:
       Latch and Clear of data moved to config4 to keep us from needing
       to read config3 first to keep window settings and mode.

commit 401f734462bef55e92335b6b65d81e2bbda655a1
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon May 19 16:07:17 2014 -0400

    Appropriate implementation of latching/clearing to get Spectrometer data.
    
    ctpLib.{c,h}
     - ctpStatus:
       Add Spectrometer paramters
     - ctpSetSpectrometerMode
       Remove "default" register bits.
     - ctpReadSpectrometerData
       Add latch and clear arguments to allow user to latch and clear data registers
     - ctpPrintSpectrometerData
       Add latch and clear arguments

commit 1e05ac15361d77ee94777841880e6299d2694def
Author: Bryan Moffit <moffit at jlab.org>
Date:   Mon May 19 15:02:04 2014 -0400

    Supports U24 Firmware Version 0xE00 (Hall-D Spectrometer)
    
    ctpLib.{c,h}
     - Updated memory map for U24 for more registers
     - New masks and bits defined for config3
     - New routines:
     int  ctpSetSpectrometerMode(int mode, int width);
     int  ctpGetSpectrometerMode();
     int  ctpGetSpectrometerWidth();
     int  ctpReadSpectrometerData(volatile unsigned int *data);
     int  ctpPrintSpectrometerData();

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

Summary of changes:
 ctpLib.c                                           |  385 +-
 ctpLib.h                                           |   30 +-
 ... Spectrometer_ctpv2_fx100t_u24_top_ver0E00.mcs} |212688 ++++++++++----------
 3 files changed, 106753 insertions(+), 106350 deletions(-)
 copy firmware/{TAG_ctpv2_fx100t_u24_top_ver0A01.mcs => Spectrometer_ctpv2_fx100t_u24_top_ver0E00.mcs} (83%)


hooks/post-receive
-- 
driver/ctp