[DAQ-drivers] driver/fa125 branch, devel, updated. e6c99fefc6b62629cd7879da81c45d52048a48ef

Bryan Moffit moffit at jlab.org
Tue Apr 22 13:32:54 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/fa125".

The branch, devel has been updated
       via  e6c99fefc6b62629cd7879da81c45d52048a48ef (commit)
       via  51987ccdaa4aea3d6674812219521200c97ed681 (commit)
       via  2d4595a6f73bdfbc6ddaa3f72e7ff30366c3553c (commit)
       via  6c2b159ae93f5632d07a8a744b7928dc36f9da0e (commit)
       via  53cbb192bce14aed005cf4631e9aca971dc2b037 (commit)
       via  4066e2a87794754ca0e9d5a88d4aede52e21bbca (commit)
       via  a3787fe165a7adba8381f5eaac9eeb28489add68 (commit)
      from  687b94a9e9009334b5fce9edce5d8b26a5e7f71e (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 e6c99fefc6b62629cd7879da81c45d52048a48ef
Merge: 687b94a 51987cc
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Apr 22 13:32:28 2014 -0400

    Merge branch 'feature_v1.1.0' into devel

commit 51987ccdaa4aea3d6674812219521200c97ed681
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Apr 22 13:31:45 2014 -0400

    Bump supported firmware up to 10101

commit 2d4595a6f73bdfbc6ddaa3f72e7ff30366c3553c
Author: Bryan Moffit <moffit at jlab.org>
Date:   Tue Apr 22 13:26:11 2014 -0400

    Update current firmware version to v1.102.  Additional sync source enable hit.
    
    fa125Lib.c
     - Hit bit 2, in FE test registers to enable syncreset source

commit 6c2b159ae93f5632d07a8a744b7928dc36f9da0e
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Apr 3 15:39:43 2014 -0400

    Just a few tweaks and fixes
    
    fa125Lib.{c,h}
     - fa125CheckAddresses: Routine to help check the register alignment
     - fa125Status: BUG: wasn't reading out ptw,pl,nsb,nsa before printout
     - fa125DecodeData: Add sample number to printout of raw window mode
     - Remove several FIXMEs and items just not used anymore

commit 53cbb192bce14aed005cf4631e9aca971dc2b037
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Apr 3 13:26:40 2014 -0400

    Add new firmware MCS file for v1.1.0
    
    .currentfw
    fa125_v1_100.mcs

commit 4066e2a87794754ca0e9d5a88d4aede52e21bbca
Author: Bryan Moffit <moffit at jlab.org>
Date:   Thu Apr 3 13:03:17 2014 -0400

    Processing modes, thresholds and status
    
    fa125Lib.{c,h}
     - fa125Status: Cleanup using structures instead of individual variables
                    Add in some details on processing mode
     - fa125SetProcMode: new routine for setting processing mode and
        window parameters
     - fa125SetThreshold
       fa125SetCommonThreshold
       fa125GSetCommonGThreshold
         New routines for setting thresholds in channels
     - fa125PrintThreshold: Prints thresholds to standard out

commit a3787fe165a7adba8381f5eaac9eeb28489add68
Author: Bryan Moffit <moffit at jlab.org>
Date:   Wed Apr 2 16:40:58 2014 -0400

    Start of Supported Firmware Version 1.1.0
    
    fa125Lib.{c,h}
     - Bump supported version to 0x00010100
     - Updated memory map for FE
       ptw, pl, ptw_last_adr, ptw_max_buf, nsb, nsa, tet[6], config1, trig_count
     - fa125Init: Configure SyncReset Source
     - fa125SetSyncResetSource: New routine to set SyncReset source
     - fa125Status: Decoding of SyncReset source
     - Change register/bit definitions for syncreset source from main to proc

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

Summary of changes:
 fa125Lib.c                                    |  557 +-
 fa125Lib.h                                    |   91 +-
 firmware/.currentfw                           |    2 +-
 firmware/{test_fcat9.mcs => fa125_v1_100.mcs} |74310 ++++++------
 firmware/{test_fcat2.mcs => fa125_v1_101.mcs} |131353 ++++++++++----------
 firmware/test_fcat8.mcs                       |159560 -------------------------
 test/fa125FirmwareTest.c                      |    6 +-
 test/fa125ReadoutTest_write.c                 |   24 +-
 8 files changed, 103321 insertions(+), 262582 deletions(-)
 rename firmware/{test_fcat9.mcs => fa125_v1_100.mcs} (83%)
 rename firmware/{test_fcat2.mcs => fa125_v1_101.mcs} (74%)
 delete mode 100644 firmware/test_fcat8.mcs


hooks/post-receive
-- 
driver/fa125


More information about the Daq-drivers mailing list