[DAQ-drivers] driver/f1tdc branch, v2.v3-devel, updated. 8b3652ba0a0549a608f0ceab0f724553c88ae4f7
Bryan Moffit
moffit at jlab.org
Thu Jun 26 14:35:28 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/f1tdc".
The branch, v2.v3-devel has been updated
via 8b3652ba0a0549a608f0ceab0f724553c88ae4f7 (commit)
via 0bc93cfd86ae2cf2a8f7721772966e7b3b673f3e (commit)
via b22af139d2bab61903f0b6d89c085b251107e590 (commit)
via 58d080acb04193e5bcdb2863c093c07f98d5754b (commit)
via 849850282e649e19959d43f7ee7e260e06b3d01f (commit)
via d9fc51b5647d6b5a8972e5a43c5fa3c3da706df3 (commit)
from b3153d253e7fdf1953342312bff7d3efec889abc (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 8b3652ba0a0549a608f0ceab0f724553c88ae4f7
Merge: b22af13 0bc93cf
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jun 26 14:35:23 2014 -0400
Merge branch 'feature-v2.10-v3.17' into v2.v3-devel
commit 0bc93cfd86ae2cf2a8f7721772966e7b3b673f3e
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jun 26 14:32:49 2014 -0400
Supported Firmware Versions: V2:0x10 V3:0x17
f1tdcLib.{c,h}
- Updated to support forcing of all chip headers into the data stream
- int f1SetForceChipHeaders(int id, int enable)
void f1GSetForceChipHeaders(int enable)
- f1SetConfig
- Updated to be sure that chips that are not on the module are enabled.
commit b22af139d2bab61903f0b6d89c085b251107e590
Merge: 8498502 58d080a
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jun 26 13:49:33 2014 -0400
Merge branch 'doc' into v2.v3-devel
commit 58d080acb04193e5bcdb2863c093c07f98d5754b
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Jun 26 13:48:51 2014 -0400
Finished converting comments into doxygen format.
commit 849850282e649e19959d43f7ee7e260e06b3d01f
Author: Bryan Moffit <moffit at jlab.org>
Date: Fri Apr 4 13:15:06 2014 -0400
Added Enable/Disable channel (and mask) routines. Firmware output bug fix.
f1tdcLib.{c,h}
- f1Init: BUG: too many arguments in a printf
- New structure and routine (f1Input2Channel) to convert input
channels into f1 chip-channel.
- Static method: f1SetChannel to enable/disable an single input channel
- Static method: f1SetChannelMask to enable/disable a mask of channels
- f1DisableChannel
f1EnableChannel
f1DisableChannelMask
f1EnableChannelMask
- New/old routines now use the static methods above.
commit d9fc51b5647d6b5a8972e5a43c5fa3c3da706df3
Author: Bryan Moffit <moffit at jlab.org>
Date: Thu Mar 27 16:27:06 2014 -0400
f1tdcLib.c
- f1DisableChannel: Changed the variable names around (reg<->rval) because
they make better sense this way.
- f1DisableChannelMask: Re-written to read all chip registers, then modify
their contents, then write them all back again. Should be slightly
more efficient this way.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
f1FirmwareTools.c | 3 +-
f1tdcLib.c | 1311 ++++++++++++++++++++---
f1tdcLib.h | 9 +-
firmware/.currentfw_v2 | 2 +-
firmware/.currentfw_v3 | 2 +-
firmware/{f1tdc_v3_1_15.rbf => f1tdc_v2_10.rbf} | Bin 2495719 -> 2495719 bytes
firmware/f1tdc_v2_1_0e.rbf | Bin 2495719 -> 0 bytes
firmware/f1tdc_v3_12.rbf | Bin 2495719 -> 0 bytes
firmware/{f1tdc_v2_d.rbf => f1tdc_v3_17.rbf} | Bin 2495719 -> 2495719 bytes
10 files changed, 1173 insertions(+), 160 deletions(-)
rename firmware/{f1tdc_v3_1_15.rbf => f1tdc_v2_10.rbf} (50%)
delete mode 100644 firmware/f1tdc_v2_1_0e.rbf
delete mode 100644 firmware/f1tdc_v3_12.rbf
rename firmware/{f1tdc_v2_d.rbf => f1tdc_v3_17.rbf} (56%)
hooks/post-receive
--
driver/f1tdc
More information about the Daq-drivers
mailing list