rowingdata 3.7.2__tar.gz → 3.8.0__tar.gz

{rowingdata-3.7.2/rowingdata.egg-info → rowingdata-3.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rowingdata
-Version: 3.7.2
+Version: 3.8.0
 Summary: The rowingdata library to create colorful plots from CrewNerd, Painsled and other rowing data tools
 Home-page: https://github.com/sanderroosendaal/rowingdata
 Author: Sander Roosendaal
@@ -536,7 +536,7 @@ Data Fields
 
 The available data fields are
 
-* 'Timestamp (sec)'
+* 'TimeStamp (sec)'
 * ' Horizontal (meters)'
 * ' Cadence (stokes/min'
 * ' HRCur (bpm)'
@@ -546,31 +546,41 @@ The available data fields are
 * ' StrokeDistance (meters)'
 * ' DriveTime (ms)'
 * ' StrokeRecoveryTime (ms)'
-* ' AverageDriveForce (lbs)'
-* ' PeakDriveForce (lbs)'
+* ' AverageDriveForce (N)' (preferred; SI units)
+* ' PeakDriveForce (N)' (preferred; SI units)
+* ' AverageDriveForce (lbs)' (legacy; still supported)
+* ' PeakDriveForce (lbs)' (legacy; still supported)
 * 'cum_dist'
 
+Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
+``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
 
-=================
-CSV File Standard
-=================
+=======================
+rowingdata CSV Columns
+=======================
 
-The basic rowingdata class reads CSV files that adher to the standard
-described here. Any parser implementation should adher to the minimum
-standard as described here.
+This section describes the dataframe schema used by the ``rowingdata`` class.
+It is this package's own column layout, not a vendor-neutral standard. For a
+cross-vendor interchange format, see the Rowing Data Standard at
+https://github.com/MoveLab-Studio/rowing-data-standard, which rowingdata
+targets when exporting FIT.
 
-Please send to me any CSV file that adhers to the standard described here
+Any parser implementation feeding the ``rowingdata`` class should produce at
+least the columns described below.
+
+Please send to me any CSV file that follows the layout described here
 but does not parse well in the "rowingdata" module. I will update the module
-and add the file to standard testing. 
+and add the file to regression testing. 
 
 Field Names (Columns)
 ----------------------
 
 The standard field names are:
 
-* 'Timestamp (sec)'
+* 'TimeStamp (sec)'
 * ' Horizontal (meters)'
 * ' Cadence (stokes/min'
 * ' HRCur (bpm)'
@@ -580,12 +590,24 @@ The standard field names are:
 * ' StrokeDistance (meters)'
 * ' DriveTime (ms)'
 * ' StrokeRecoveryTime (ms)'
-* ' AverageDriveForce (lbs)'
-* ' PeakDriveForce (lbs)'
+* ' AverageDriveForce (N)' (preferred; SI units)
+* ' PeakDriveForce (N)' (preferred; SI units)
+* ' AverageDriveForce (lbs)' (legacy; still supported)
+* ' PeakDriveForce (lbs)' (legacy; still supported)
 * ' lapIdx'
 * ' ElapsedTime (sec)'
 
-The CSV file adhers to the US conventions, with fields
+Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
+``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+
+Planned for dual oarlock (port/starboard symmetry): ``catch_port``, ``catch_starboard``,
+``finish_port``, ``finish_starboard``, ``slip_port``, ``slip_starboard``, ``wash_port``,
+``wash_starboard``, ``peakforceangle_port``, ``peakforceangle_starboard``,
+``effectiveLength_port``, ``effectiveLength_starboard``. See *Dual oarlock
+(port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
+export for these per-side columns.
+
+The CSV file adheres to the US conventions, with fields
 separated by a comma (',')
 and using the dot '.' as the decimal symbol. 
 
@@ -738,21 +760,28 @@ Field name: ' DriveLength (meters)'
 
 Unit: meter
 
-The distance traveled by the handle along the longitudal
+The distance traveled by the handle along the longitudinal
 axis of the boat or erg.
 
 For OTW rowing, where the oar or scull rotates around the pin, this
 is not equal to the length trajectory traveled by the hands. It
-is the projection of that trajectory on the longitudal axis. 
+is the projection of that trajectory on the longitudinal axis.
+
+Typical range: 1.2–1.5 m for rowing. This is a *stroke output* metric:
+how far the handle actually moved during the drive phase.
 
-Stroke Distance 
-------------------------
+Stroke Distance
+---------------
 
 Field name: ' StrokeDistance (meters)'
 
 Unit: meter
 
-The distance traveled during the stroke cycle. 
+The distance traveled during the stroke cycle. This is the distance
+the boat or erg travels during one complete stroke (catch to catch),
+i.e. the boat's displacement, not the handle travel. Distinct from
+Drive Length (handle distance) and from Effective Length (rigging).
+Typical range: 7–12 m for OTW rowing. 
 
 Drive Time
 -------------
@@ -779,14 +808,12 @@ The duration of the recovery part. See Drive Time for the definition. Drive Time
 Average Drive Force
 --------------------
 
-Field name: ' AverageDriveForce (lbs)' / ' AverageDriveForce (N)'
-
-Unit: lbs - or N, see below
+Field name: ' AverageDriveForce (N)' (preferred) or ' AverageDriveForce (lbs)' (legacy)
 
-Currently implemented is only the field name and value in lbs. In the future,
-we will implement ' AverageDriveForce (N)' so we can report in SI units.
+Unit: newtons (N), or pounds (lb) for older files and tools
 
-This should be the part of the handle force that does actual work.
+Use **Newtons** for new data and integrations. **Pounds** remain supported for
+backward compatibility. This should be the part of the handle force that does actual work.
 
 For dynamic ergs and OTW rowing this is not sufficient to describe the
 complete stroke dynamics, so additional fields can be defined, for example
@@ -809,11 +836,48 @@ as opposed to an average over time or oar angles.
 Peak Drive Force
 ------------------
 
-Field name: ' PeakDriveForce (lbs)' or ' PeakDriveForce (N)'
+Field name: ' PeakDriveForce (N)' (preferred) or ' PeakDriveForce (lbs)' (legacy)
 
-Unit: lbs (currently) or N (supported in the future)
+Unit: newtons (N), or pounds (lb) for older files and tools
 
-See discusison about measuring forces under Average Drive Force.
+See discussion about measuring forces under Average Drive Force.
+
+Oarlock scalars (OTW rigging)
+-----------------------------
+
+Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
+'wash', 'peakforceangle', 'effectiveLength'
+
+Units: degrees for angles; meter for effectiveLength (scale may vary by
+source: NK Logbook uses these columns).
+
+These fields come from NK Logbook (Oarlock) and similar OTW
+measurement systems. They describe rigging geometry and blade angles:
+
+* **catch**, **finish** – oar angles at catch and finish (degrees),
+  using the rowing convention where **0° = oar perpendicular to the boat's
+  longitudinal axis**. Negative values indicate the catch direction (oar blade
+  toward bow, handle toward stern); positive values indicate the finish direction
+  (oar blade toward stern, handle toward bow). NK uses catchAngle, finishAngle.
+* **slip** – blade slip angle.
+* **wash** – wash/backwash angle.
+* **peakforceangle** – oar angle at peak force (same 0° = perpendicular convention).
+* **effectiveLength** – effective lever length (rigging geometry). *Not*
+  the same as Drive Length: Effective Length is the horizontal component
+  from pin to handle (a rigging/setup measure, often in cm), whereas
+  Drive Length is the *actual distance the handle traveled* during the
+  stroke (typically 1.2–1.5 m). Both may appear in the same dataset;
+  they serve different purposes.
+
+Dual oarlock (port/starboard)
+..............................
+
+When a rower uses two smart oarlocks, oarlock metrics can be reported per side:
+port (left) and starboard (right). Each metric may appear as a per-side column
+(e.g. ``catch_port``, ``catch_starboard``); the unsuffixed summary column
+(``catch``) is the average of the two sides when both exist, and the value of
+whichever side is present otherwise. **Note:** rowingdata does not yet
+implement parsing or FIT export for these per-side columns.
 
 Lap Identifier
 -------------------
@@ -903,6 +967,26 @@ Boat bearing.
 Release Notes:
 ================
 
+Unreleased
+----------
+
+- **Breaking change to exported FIT file contents.** FIT export now follows the
+  Rowing Data Standard (https://github.com/MoveLab-Studio/rowing-data-standard,
+  Draft v0.1). The ``exporttofit`` API is unchanged, but the bytes it writes are
+  not: the developer application ID is now the standard UUID, ``DriveLength``
+  and ``EffectiveLength`` are encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 255, stroke rate moves to field ID 93, and
+  stroke work to field ID 19. Consumers that hardcoded the previous rowingdata
+  application ID or the old metre-based scales must be updated. ``FITParser``
+  still reads files written by rowingdata 3.7.3 and earlier.
+- In-stroke curve fields are emitted under a separate, private application ID,
+  because those field IDs are not allocated in the standard's registry and so
+  carry no interoperable meaning.
+- Removed ``docs/FIT_STANDARD.md`` and ``docs/FIT_STANDARD.pdf``. The standard is
+  maintained by a committee at
+  https://github.com/MoveLab-Studio/rowing-data-standard, which is the single
+  source of truth; this repository no longer ships a copy.
+
 0.97.x
 ------
 

{rowingdata-3.7.2 → rowingdata-3.8.0}/README.rst

@@ -504,7 +504,7 @@ Data Fields
 
 The available data fields are
 
-* 'Timestamp (sec)'
+* 'TimeStamp (sec)'
 * ' Horizontal (meters)'
 * ' Cadence (stokes/min'
 * ' HRCur (bpm)'
@@ -514,31 +514,41 @@ The available data fields are
 * ' StrokeDistance (meters)'
 * ' DriveTime (ms)'
 * ' StrokeRecoveryTime (ms)'
-* ' AverageDriveForce (lbs)'
-* ' PeakDriveForce (lbs)'
+* ' AverageDriveForce (N)' (preferred; SI units)
+* ' PeakDriveForce (N)' (preferred; SI units)
+* ' AverageDriveForce (lbs)' (legacy; still supported)
+* ' PeakDriveForce (lbs)' (legacy; still supported)
 * 'cum_dist'
 
+Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
+``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
 
-=================
-CSV File Standard
-=================
+=======================
+rowingdata CSV Columns
+=======================
 
-The basic rowingdata class reads CSV files that adher to the standard
-described here. Any parser implementation should adher to the minimum
-standard as described here.
+This section describes the dataframe schema used by the ``rowingdata`` class.
+It is this package's own column layout, not a vendor-neutral standard. For a
+cross-vendor interchange format, see the Rowing Data Standard at
+https://github.com/MoveLab-Studio/rowing-data-standard, which rowingdata
+targets when exporting FIT.
 
-Please send to me any CSV file that adhers to the standard described here
+Any parser implementation feeding the ``rowingdata`` class should produce at
+least the columns described below.
+
+Please send to me any CSV file that follows the layout described here
 but does not parse well in the "rowingdata" module. I will update the module
-and add the file to standard testing. 
+and add the file to regression testing. 
 
 Field Names (Columns)
 ----------------------
 
 The standard field names are:
 
-* 'Timestamp (sec)'
+* 'TimeStamp (sec)'
 * ' Horizontal (meters)'
 * ' Cadence (stokes/min'
 * ' HRCur (bpm)'
@@ -548,12 +558,24 @@ The standard field names are:
 * ' StrokeDistance (meters)'
 * ' DriveTime (ms)'
 * ' StrokeRecoveryTime (ms)'
-* ' AverageDriveForce (lbs)'
-* ' PeakDriveForce (lbs)'
+* ' AverageDriveForce (N)' (preferred; SI units)
+* ' PeakDriveForce (N)' (preferred; SI units)
+* ' AverageDriveForce (lbs)' (legacy; still supported)
+* ' PeakDriveForce (lbs)' (legacy; still supported)
 * ' lapIdx'
 * ' ElapsedTime (sec)'
 
-The CSV file adhers to the US conventions, with fields
+Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
+``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+
+Planned for dual oarlock (port/starboard symmetry): ``catch_port``, ``catch_starboard``,
+``finish_port``, ``finish_starboard``, ``slip_port``, ``slip_starboard``, ``wash_port``,
+``wash_starboard``, ``peakforceangle_port``, ``peakforceangle_starboard``,
+``effectiveLength_port``, ``effectiveLength_starboard``. See *Dual oarlock
+(port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
+export for these per-side columns.
+
+The CSV file adheres to the US conventions, with fields
 separated by a comma (',')
 and using the dot '.' as the decimal symbol. 
 
@@ -706,21 +728,28 @@ Field name: ' DriveLength (meters)'
 
 Unit: meter
 
-The distance traveled by the handle along the longitudal
+The distance traveled by the handle along the longitudinal
 axis of the boat or erg.
 
 For OTW rowing, where the oar or scull rotates around the pin, this
 is not equal to the length trajectory traveled by the hands. It
-is the projection of that trajectory on the longitudal axis. 
+is the projection of that trajectory on the longitudinal axis.
+
+Typical range: 1.2–1.5 m for rowing. This is a *stroke output* metric:
+how far the handle actually moved during the drive phase.
 
-Stroke Distance 
-------------------------
+Stroke Distance
+---------------
 
 Field name: ' StrokeDistance (meters)'
 
 Unit: meter
 
-The distance traveled during the stroke cycle. 
+The distance traveled during the stroke cycle. This is the distance
+the boat or erg travels during one complete stroke (catch to catch),
+i.e. the boat's displacement, not the handle travel. Distinct from
+Drive Length (handle distance) and from Effective Length (rigging).
+Typical range: 7–12 m for OTW rowing. 
 
 Drive Time
 -------------
@@ -747,14 +776,12 @@ The duration of the recovery part. See Drive Time for the definition. Drive Time
 Average Drive Force
 --------------------
 
-Field name: ' AverageDriveForce (lbs)' / ' AverageDriveForce (N)'
-
-Unit: lbs - or N, see below
+Field name: ' AverageDriveForce (N)' (preferred) or ' AverageDriveForce (lbs)' (legacy)
 
-Currently implemented is only the field name and value in lbs. In the future,
-we will implement ' AverageDriveForce (N)' so we can report in SI units.
+Unit: newtons (N), or pounds (lb) for older files and tools
 
-This should be the part of the handle force that does actual work.
+Use **Newtons** for new data and integrations. **Pounds** remain supported for
+backward compatibility. This should be the part of the handle force that does actual work.
 
 For dynamic ergs and OTW rowing this is not sufficient to describe the
 complete stroke dynamics, so additional fields can be defined, for example
@@ -777,11 +804,48 @@ as opposed to an average over time or oar angles.
 Peak Drive Force
 ------------------
 
-Field name: ' PeakDriveForce (lbs)' or ' PeakDriveForce (N)'
+Field name: ' PeakDriveForce (N)' (preferred) or ' PeakDriveForce (lbs)' (legacy)
 
-Unit: lbs (currently) or N (supported in the future)
+Unit: newtons (N), or pounds (lb) for older files and tools
 
-See discusison about measuring forces under Average Drive Force.
+See discussion about measuring forces under Average Drive Force.
+
+Oarlock scalars (OTW rigging)
+-----------------------------
+
+Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
+'wash', 'peakforceangle', 'effectiveLength'
+
+Units: degrees for angles; meter for effectiveLength (scale may vary by
+source: NK Logbook uses these columns).
+
+These fields come from NK Logbook (Oarlock) and similar OTW
+measurement systems. They describe rigging geometry and blade angles:
+
+* **catch**, **finish** – oar angles at catch and finish (degrees),
+  using the rowing convention where **0° = oar perpendicular to the boat's
+  longitudinal axis**. Negative values indicate the catch direction (oar blade
+  toward bow, handle toward stern); positive values indicate the finish direction
+  (oar blade toward stern, handle toward bow). NK uses catchAngle, finishAngle.
+* **slip** – blade slip angle.
+* **wash** – wash/backwash angle.
+* **peakforceangle** – oar angle at peak force (same 0° = perpendicular convention).
+* **effectiveLength** – effective lever length (rigging geometry). *Not*
+  the same as Drive Length: Effective Length is the horizontal component
+  from pin to handle (a rigging/setup measure, often in cm), whereas
+  Drive Length is the *actual distance the handle traveled* during the
+  stroke (typically 1.2–1.5 m). Both may appear in the same dataset;
+  they serve different purposes.
+
+Dual oarlock (port/starboard)
+..............................
+
+When a rower uses two smart oarlocks, oarlock metrics can be reported per side:
+port (left) and starboard (right). Each metric may appear as a per-side column
+(e.g. ``catch_port``, ``catch_starboard``); the unsuffixed summary column
+(``catch``) is the average of the two sides when both exist, and the value of
+whichever side is present otherwise. **Note:** rowingdata does not yet
+implement parsing or FIT export for these per-side columns.
 
 Lap Identifier
 -------------------
@@ -871,6 +935,26 @@ Boat bearing.
 Release Notes:
 ================
 
+Unreleased
+----------
+
+- **Breaking change to exported FIT file contents.** FIT export now follows the
+  Rowing Data Standard (https://github.com/MoveLab-Studio/rowing-data-standard,
+  Draft v0.1). The ``exporttofit`` API is unchanged, but the bytes it writes are
+  not: the developer application ID is now the standard UUID, ``DriveLength``
+  and ``EffectiveLength`` are encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 255, stroke rate moves to field ID 93, and
+  stroke work to field ID 19. Consumers that hardcoded the previous rowingdata
+  application ID or the old metre-based scales must be updated. ``FITParser``
+  still reads files written by rowingdata 3.7.3 and earlier.
+- In-stroke curve fields are emitted under a separate, private application ID,
+  because those field IDs are not allocated in the standard's registry and so
+  carry no interoperable meaning.
+- Removed ``docs/FIT_STANDARD.md`` and ``docs/FIT_STANDARD.pdf``. The standard is
+  maintained by a committee at
+  https://github.com/MoveLab-Studio/rowing-data-standard, which is the single
+  source of truth; this repository no longer ships a copy.
+
 0.97.x
 ------
 

rowingdata-3.8.0/rowingdata/data/fit_export_spec.json

@@ -0,0 +1,88 @@
+{
+  "version": 2,
+  "_comment": "Authoritative FIT developer field definitions for rowingdata fitwrite. Field IDs, scales and units must match the Rowing Data Standard registry at https://github.com/MoveLab-Studio/rowing-data-standard (registry/field-ids.md); that repository is the source of truth, this file is only rowingdata's machine-readable copy of the subset it emits. v2: mm precision for DriveLength/PeakForcePositionAbs (scale 1000); StrokeRate dev field (93); instroke curve Y-scale registry.",
+  "instroke_dynamic": {
+    "summary_start": 20,
+    "summary_id_padding": "ceil_to_10",
+    "curve_start": 60
+  },
+  "instroke_curve_types": {
+    "HandleForceCurve": {
+      "y_scale": 10,
+      "y_units": "N",
+      "default_abscissa": "HANDLE_DISTANCE_UNIFORM_M"
+    },
+    "BoatAcceleratorCurve": {
+      "y_scale": 100,
+      "y_units": "m/s^2",
+      "default_abscissa": "TIME_UNIFORM_MS"
+    },
+    "OarAngleVelocityCurve": {
+      "y_scale": 10,
+      "y_units": "deg/s",
+      "default_abscissa": "TIME_UNIFORM_MS"
+    },
+    "SeatCurve": {
+      "y_scale": 255,
+      "y_units": "m",
+      "default_abscissa": "HANDLE_DISTANCE_UNIFORM_M"
+    }
+  },
+  "abscissa_enum": {
+    "UNKNOWN": 0,
+    "TIME_UNIFORM_MS": 1,
+    "HANDLE_DISTANCE_UNIFORM_M": 2,
+    "OAR_ANGLE_UNIFORM_DEG": 3,
+    "NORMALIZED_DRIVE_0_1": 4
+  },
+  "instroke_axis_field_ids": [90, 91, 92],
+  "always_emit_field_ids": [9, 90, 91, 92],
+  "instroke_column_map": {
+    "curve_data": "HandleForceCurve",
+    "boat accelerator curve": "BoatAcceleratorCurve",
+    "oar angle velocity curve": "OarAngleVelocityCurve",
+    "seat curve": "SeatCurve"
+  },
+  "developer_fields": [
+    {"field_id": 0, "group": "rowing", "fit_name": "DriveLength", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": [" DriveLength (meters)"]},
+    {"field_id": 1, "group": "rowing", "fit_name": "StrokeDriveTime", "base_type": "UINT16", "size": 2, "scale": 1, "units": "ms", "df_columns": [" DriveTime (ms)"]},
+    {"field_id": 2, "group": "rowing", "fit_name": "DragFactor", "base_type": "UINT16", "size": 2, "scale": 1, "units": "", "df_columns": [" DragFactor"]},
+    {"field_id": 3, "group": "rowing", "fit_name": "StrokeRecoveryTime", "base_type": "UINT16", "size": 2, "scale": 1, "units": "ms", "df_columns": [" StrokeRecoveryTime (ms)"]},
+    {"field_id": 4, "group": "rowing", "fit_name": "AverageDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" AverageDriveForce (lbs)"]},
+    {"field_id": 5, "group": "rowing", "fit_name": "PeakDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" PeakDriveForce (lbs)"]},
+    {"field_id": 6, "group": "rowing", "fit_name": "AverageDriveForceN", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" AverageDriveForce (N)"]},
+    {"field_id": 7, "group": "rowing", "fit_name": "PeakDriveForceN", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" PeakDriveForce (N)"]},
+    {"field_id": 8, "group": "rowing", "fit_name": "AverageBoatSpeed", "base_type": "UINT16", "size": 2, "scale": 255, "units": "m/s", "df_columns": [" AverageBoatSpeed (m/s)"]},
+    {"field_id": 9, "group": "rowing", "fit_name": "WorkoutState", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": [" WorkoutState"]},
+    {"field_id": 10, "group": "metadata", "fit_name": "RecordingStrategy", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": [], "message_type": "session"},
+    {"field_id": 19, "group": "rowing", "fit_name": "StrokeWork", "base_type": "UINT16", "size": 2, "scale": 1, "units": "J", "df_columns": [" WorkPerStroke (joules)", "driveenergy"]},
+    {"field_id": 93, "group": "rowing", "fit_name": "StrokeRate", "base_type": "UINT16", "size": 2, "scale": 100, "units": "spm", "df_columns": [" Cadence (stokes/min)"]},
+
+    {"field_id": 11, "group": "oarlock", "fit_name": "Catch", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch", " catch", "catchAngle"]},
+    {"field_id": 12, "group": "oarlock", "fit_name": "Finish", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["finish", " finish", "finishAngle"]},
+    {"field_id": 13, "group": "oarlock", "fit_name": "Slip", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["slip", " slip"]},
+    {"field_id": 14, "group": "oarlock", "fit_name": "Wash", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["wash", " wash"]},
+    {"field_id": 15, "group": "oarlock", "fit_name": "PeakForceAngle", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle", " peakforceangle"]},
+    {"field_id": 16, "group": "oarlock", "fit_name": "EffectiveLength", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength", " effectiveLength", "effective length"]},
+
+    {"field_id": 200, "group": "oarlock_dual", "dual_pair": "catch", "side": "port", "fit_name": "CatchPort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch_port", "catchAngle_port"]},
+    {"field_id": 201, "group": "oarlock_dual", "dual_pair": "catch", "side": "starboard", "fit_name": "CatchStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch_starboard", "catchAngle_starboard"]},
+    {"field_id": 202, "group": "oarlock_dual", "dual_pair": "finish", "side": "port", "fit_name": "FinishPort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["finish_port", "finishAngle_port"]},
+    {"field_id": 203, "group": "oarlock_dual", "dual_pair": "finish", "side": "starboard", "fit_name": "FinishStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["finish_starboard", "finishAngle_starboard"]},
+    {"field_id": 204, "group": "oarlock_dual", "dual_pair": "slip", "side": "port", "fit_name": "SlipPort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["slip_port"]},
+    {"field_id": 205, "group": "oarlock_dual", "dual_pair": "slip", "side": "starboard", "fit_name": "SlipStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["slip_starboard"]},
+    {"field_id": 206, "group": "oarlock_dual", "dual_pair": "wash", "side": "port", "fit_name": "WashPort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["wash_port"]},
+    {"field_id": 207, "group": "oarlock_dual", "dual_pair": "wash", "side": "starboard", "fit_name": "WashStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["wash_starboard"]},
+    {"field_id": 208, "group": "oarlock_dual", "dual_pair": "peakforceangle", "side": "port", "fit_name": "PeakForceAnglePort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle_port"]},
+    {"field_id": 209, "group": "oarlock_dual", "dual_pair": "peakforceangle", "side": "starboard", "fit_name": "PeakForceAngleStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle_starboard"]},
+    {"field_id": 210, "group": "oarlock_dual", "dual_pair": "effectiveLength", "side": "port", "fit_name": "EffectiveLengthPort", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength_port"]},
+    {"field_id": 211, "group": "oarlock_dual", "dual_pair": "effectiveLength", "side": "starboard", "fit_name": "EffectiveLengthStarboard", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength_starboard"]},
+
+    {"field_id": 17, "group": "peak_position", "fit_name": "PeakForcePositionNorm", "base_type": "UINT16", "size": 2, "scale": 1, "units": "", "df_columns": ["rel_peak_force_pos", "PeakForcePositionNorm", "% of Stroke Complete When Peak Force Is Reached"], "transformer": "peak_norm", "clip_uint16_max": 10000},
+    {"field_id": 18, "group": "peak_position", "fit_name": "PeakForcePositionAbs", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["peak_force_pos", "PeakForcePositionAbs"], "transformer": "peak_abs"},
+
+    {"field_id": 90, "group": "instroke_axis", "fit_name": "InstrokeAbscissaType", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": []},
+    {"field_id": 91, "group": "instroke_axis", "fit_name": "InstrokeSampleInterval", "base_type": "UINT16", "size": 2, "scale": 1, "units": "", "df_columns": []},
+    {"field_id": 92, "group": "instroke_axis", "fit_name": "InstrokePointCount", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": []}
+  ]
+}