rowingdata 3.8.2__tar.gz → 3.8.3__tar.gz

{rowingdata-3.8.2/rowingdata.egg-info → rowingdata-3.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rowingdata
-Version: 3.8.2
+Version: 3.8.3
 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
@@ -555,7 +555,7 @@ The available data fields are
 * 'cum_dist'
 
 Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
@@ -567,7 +567,7 @@ rowingdata CSV Columns
 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
+https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which rowingdata
 targets when exporting FIT.
 
 Any parser implementation feeding the ``rowingdata`` class should produce at
@@ -600,12 +600,12 @@ The standard field names are:
 * ' ElapsedTime (sec)'
 
 Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 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
+``effectiveArc_port``, ``effectiveArc_starboard``. See *Dual oarlock
 (port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
 export for these per-side columns.
 
@@ -848,10 +848,9 @@ Oarlock scalars (OTW rigging)
 -----------------------------
 
 Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
-'wash', 'peakforceangle', 'effectiveLength'
+'wash', 'peakforceangle', 'effectiveArc'
 
-Units: degrees for angles; meter for effectiveLength (scale may vary by
-source: NK Logbook uses these columns).
+Units: degrees for angles and for effectiveArc.
 
 These fields come from NK Logbook (Oarlock) and similar OTW
 measurement systems. They describe rigging geometry and blade angles:
@@ -864,12 +863,11 @@ measurement systems. They describe rigging geometry and blade angles:
 * **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.
+* **effectiveArc** – the part of the stroke arc that is effective: catch to
+  finish, less slip and wash (degrees). The Rowing Data Standard replaced the
+  earlier effective *length* (a lever length in mm) with this arc. Files written
+  against earlier drafts carry ``EffectiveLength``; it is read into the
+  ``effectiveLength`` column (metres) and is not converted into an arc.
 
 Dual oarlock (port/starboard)
 ..............................
@@ -973,12 +971,16 @@ 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
+  Rowing Data Standard (https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard,
+  current ``main``). The ``exporttofit`` API is unchanged, but the bytes it
+  writes are not: the developer application ID is now the standard UUID,
+  ``DriveLength`` is encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 100, ``EffectiveLength`` is replaced by
+  ``EffectiveArc`` in degrees (IDs 16, 210, 211; the ``effectiveLength*``
+  columns are no longer exported, use ``effectiveArc*``), the force fields are
+  named ``AverageDriveForce`` and ``PeakDriveForce``, stroke rate is written as
+  native ``cadence256``, stroke work uses field ID 19, and no value is written
+  as the FIT invalid value (255 / 65535 / 32767): measurements clip one below it. 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,
@@ -986,7 +988,7 @@ Unreleased
   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
+  https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which is the single
   source of truth; this repository no longer ships a copy.
 
 0.97.x

{rowingdata-3.8.2 → rowingdata-3.8.3}/README.rst

@@ -521,7 +521,7 @@ The available data fields are
 * 'cum_dist'
 
 Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
@@ -533,7 +533,7 @@ rowingdata CSV Columns
 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
+https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which rowingdata
 targets when exporting FIT.
 
 Any parser implementation feeding the ``rowingdata`` class should produce at
@@ -566,12 +566,12 @@ The standard field names are:
 * ' ElapsedTime (sec)'
 
 Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 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
+``effectiveArc_port``, ``effectiveArc_starboard``. See *Dual oarlock
 (port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
 export for these per-side columns.
 
@@ -814,10 +814,9 @@ Oarlock scalars (OTW rigging)
 -----------------------------
 
 Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
-'wash', 'peakforceangle', 'effectiveLength'
+'wash', 'peakforceangle', 'effectiveArc'
 
-Units: degrees for angles; meter for effectiveLength (scale may vary by
-source: NK Logbook uses these columns).
+Units: degrees for angles and for effectiveArc.
 
 These fields come from NK Logbook (Oarlock) and similar OTW
 measurement systems. They describe rigging geometry and blade angles:
@@ -830,12 +829,11 @@ measurement systems. They describe rigging geometry and blade angles:
 * **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.
+* **effectiveArc** – the part of the stroke arc that is effective: catch to
+  finish, less slip and wash (degrees). The Rowing Data Standard replaced the
+  earlier effective *length* (a lever length in mm) with this arc. Files written
+  against earlier drafts carry ``EffectiveLength``; it is read into the
+  ``effectiveLength`` column (metres) and is not converted into an arc.
 
 Dual oarlock (port/starboard)
 ..............................
@@ -939,12 +937,16 @@ 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
+  Rowing Data Standard (https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard,
+  current ``main``). The ``exporttofit`` API is unchanged, but the bytes it
+  writes are not: the developer application ID is now the standard UUID,
+  ``DriveLength`` is encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 100, ``EffectiveLength`` is replaced by
+  ``EffectiveArc`` in degrees (IDs 16, 210, 211; the ``effectiveLength*``
+  columns are no longer exported, use ``effectiveArc*``), the force fields are
+  named ``AverageDriveForce`` and ``PeakDriveForce``, stroke rate is written as
+  native ``cadence256``, stroke work uses field ID 19, and no value is written
+  as the FIT invalid value (255 / 65535 / 32767): measurements clip one below it. 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,
@@ -952,7 +954,7 @@ Unreleased
   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
+  https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which is the single
   source of truth; this repository no longer ships a copy.
 
 0.97.x

{rowingdata-3.8.2 → rowingdata-3.8.3}/rowingdata/data/fit_export_spec.json

@@ -1,8 +1,8 @@
 {
-  "version": 3,
+  "version": 4,
   "protocol_version": 1,
   "handle_force_curve_field_id": 60,
-  "_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. v3: standard draft 0.1: WorkoutState holds FIT intensity values; StrokeState (96); SlipThreshold/WashThreshold (94/95); HandleForceCurve fixed at 60; fields 4, 5 and 93 are not in the standard and are read-only (group legacy).",
+  "_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/Rowing-Industry-Trade-Association/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. v4: main of 2026-10-31: AverageBoatSpeed scale 100; EffectiveLength -> EffectiveArc (deg, scale 10; 16, 210, 211); force fields named without the N suffix. v3: standard draft 0.1: WorkoutState holds FIT intensity values; StrokeState (96); SlipThreshold/WashThreshold (94/95); HandleForceCurve fixed at 60; fields 4, 5 and 93 are not in the standard and are read-only (group legacy).",
   "instroke_dynamic": {
     "summary_start": 20,
     "summary_id_padding": "ceil_to_10",
@@ -52,9 +52,9 @@
     {"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": "legacy", "fit_name": "AverageDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" AverageDriveForce (lbs)"]},
     {"field_id": 5, "group": "legacy", "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": 6, "group": "rowing", "fit_name": "AverageDriveForce", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" AverageDriveForce (N)"]},
+    {"field_id": 7, "group": "rowing", "fit_name": "PeakDriveForce", "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": 100, "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": 94, "group": "metadata", "fit_name": "SlipThreshold", "base_type": "UINT16", "size": 2, "scale": 1, "units": "N", "df_columns": [], "message_type": "session"},
@@ -68,7 +68,7 @@
     {"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": 16, "group": "oarlock", "fit_name": "EffectiveArc", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc", " effectiveArc", "effective arc"]},
 
     {"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"]},
@@ -80,8 +80,8 @@
     {"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": 210, "group": "oarlock_dual", "dual_pair": "effectiveArc", "side": "port", "fit_name": "EffectiveArcPort", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc_port"]},
+    {"field_id": 211, "group": "oarlock_dual", "dual_pair": "effectiveArc", "side": "starboard", "fit_name": "EffectiveArcStarboard", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc_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"},

{rowingdata-3.8.2 → rowingdata-3.8.3}/rowingdata/fitwrite.py

@@ -79,6 +79,12 @@ INTENSITY_RECOVERY = 4
 INTENSITY_INTERVAL = 5
 INTENSITY_OTHER = 6
 
+# Largest value that is not the FIT invalid value of the base type (standard §6.5):
+# 255 / 65535 / 32767 mean "no data" and are never written as a measurement.
+UINT8_MAX_VALID = 254
+UINT16_MAX_VALID = 65534
+SINT16_MAX_VALID = 32766
+
 # Developer fields that must be emitted even when value is 0 (semantic zero / unknown).
 ALWAYS_EMIT_DEV_FIELD_IDS = frozenset(_FIT_EXPORT_RAW['always_emit_field_ids'])
 
@@ -248,7 +254,7 @@ def _series_to_peak_force_position_abs_m(values):
     """Map peak_force_pos (often RP3 cm) to millimeters for PeakForcePositionAbs (scale 1, units mm)."""
     v = pd.to_numeric(values, errors='coerce').values
     out = np.zeros(len(v), dtype=np.float64)
-    max_mm = 65535.0
+    max_mm = float(UINT16_MAX_VALID)
     for i, x in enumerate(v):
         if not np.isfinite(x) or x <= 0:
             continue
@@ -260,26 +266,18 @@ def _series_to_peak_force_position_abs_m(values):
     return out
 
 
-def _length_values_to_mm(arr):
-    """Convert oarlock effective-length column values to millimeters."""
-    arr = np.asarray(arr, dtype=np.float64)
-    if np.nanmax(arr) <= 5.0:
-        return arr * 1000.0
-    return arr * 10.0
-
-
 def _values_for_fit_field(arr, units, scale, base_type):
     """Map physical DataFrame values to FIT developer-field magnitudes before clipping."""
     arr = np.nan_to_num(arr, nan=0.0, posinf=0.0, neginf=0.0)
     if units == 'mm':
         arr = arr * 1000.0
     if base_type == BaseType.UINT8:
-        arr = np.clip(arr, 0, 255)
+        arr = np.clip(arr, 0, UINT8_MAX_VALID)
     elif base_type == BaseType.UINT16:
-        max_display = 65535.0 / scale if scale else 65535.0
+        max_display = UINT16_MAX_VALID / scale if scale else float(UINT16_MAX_VALID)
         arr = np.clip(arr, 0, max_display)
     elif base_type == BaseType.SINT16:
-        max_display = 32767.0 / scale if scale else 32767.0
+        max_display = SINT16_MAX_VALID / scale if scale else float(SINT16_MAX_VALID)
         min_display = -32768.0 / scale if scale else -32768.0
         arr = np.clip(arr, min_display, max_display)
     return arr
@@ -301,7 +299,7 @@ def _split_cadence_arrays(df, nr_rows):
                 np.zeros(nr_rows, dtype=np.float64))
     raw = np.where(raw > 0, raw, 0.0)
     cadence_int = np.floor(raw + 0.5).astype(int)
-    cadence256 = np.clip(raw, 0.0, 65535.0 / 256.0)
+    cadence256 = np.clip(raw, 0.0, UINT16_MAX_VALID / 256.0)
     return cadence_int, cadence256, raw
 
 
@@ -358,11 +356,11 @@ def _compute_instroke_axis_arrays(df, n_points, instroke_abscissa_type, instroke
         )
         # Millimeters between uniform samples along handle travel
         interval = np.round(drive_m * 1000.0 / np.maximum(n_points - 1, 1))
-        interval = np.clip(interval, 0, 65535)
+        interval = np.clip(interval, 0, UINT16_MAX_VALID)
     elif atype == INSTROKE_ABSCISSA_TIME_UNIFORM_MS and ' DriveTime (ms)' in df.columns:
         drive_ms = np.nan_to_num(df[' DriveTime (ms)'].values, nan=0.0, posinf=0.0, neginf=0.0)
         interval = np.round(drive_ms / np.maximum(n_points - 1, 1))
-        interval = np.clip(interval, 0, 65535)
+        interval = np.clip(interval, 0, UINT16_MAX_VALID)
     else:
         interval = np.zeros(nr)
     pc = np.full(nr, float(min(int(n_points), 127)))
@@ -618,7 +616,7 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
         Handle force in N above/below which the blade counts as entered/exited (Session
         fields SlipThreshold 94 / WashThreshold 95, standard §5.4). Written when given
         and use_developer_fields is True; the standard recommends writing them whenever
-        Slip, Wash or EffectiveLength are written.
+        Slip, Wash or EffectiveArc are written.
 
     Returns
     -------
@@ -704,13 +702,13 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
 
     try:
         heart_rate = df[' HRCur (bpm)'].values.astype(int)
-        heart_rate = np.clip(heart_rate, 0, 255)  # uint8
+        heart_rate = np.clip(heart_rate, 0, UINT8_MAX_VALID)  # uint8
     except KeyError:
         heart_rate = np.zeros(nr_rows, dtype=int)
 
     try:
         power = df[' Power (watts)'].values.astype(int)
-        power = np.clip(power, 0, 65535)  # uint16
+        power = np.clip(power, 0, UINT16_MAX_VALID)  # uint16
     except KeyError:
         power = np.zeros(nr_rows, dtype=int)
 
@@ -795,21 +793,10 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
             col = next((c for c in possible_cols if c in df.columns), None)
             if col is not None:
                 arr = df[col].values
-                if units == 'mm' and 'EffectiveLength' in name:
-                    arr = _length_values_to_mm(arr)
-                    arr = _values_for_fit_field(arr, '', scale, base_type)
-                elif base_type == BaseType.SINT16:
-                    arr = _values_for_fit_field(arr, units, scale, base_type)
-                else:
-                    arr = _values_for_fit_field(arr, units, scale, base_type)
+                arr = _values_for_fit_field(arr, units, scale, base_type)
                 dev_arrays[field_id] = arr
                 dev_specs.append((field_id, col, name, base_type, size, scale, units))
         for _pair_key, port_fd, starboard_fd in OARLOCK_DUAL_PAIRS:
-            if _pair_key == 'effectiveLength':
-                # Draft defect: summary field 16 is mm while 210/211 are metres,
-                # and §5.3 calls 16 the average of the two. Unresolved upstream,
-                # so neither encoding is written.
-                continue
             cols_p = port_fd[1]
             cols_s = starboard_fd[1]
             col_p = next((c for c in cols_p if c in df.columns), None)
@@ -819,11 +806,7 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
             for fd, col in ((port_fd, col_p), (starboard_fd, col_s)):
                 field_id, possible_cols, name, base_type, size, scale, units = fd
                 arr = df[col].values
-                if units == 'mm' and 'EffectiveLength' in name:
-                    arr = _length_values_to_mm(arr)
-                    arr = _values_for_fit_field(arr, '', scale, base_type)
-                else:
-                    arr = _values_for_fit_field(arr, units, scale, base_type)
+                arr = _values_for_fit_field(arr, units, scale, base_type)
                 dev_arrays[field_id] = arr
                 dev_specs.append((field_id, col, name, base_type, size, scale, units))
         for fd in PEAK_POSITION_DEV_FIELDS:
@@ -839,7 +822,7 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
                 continue
             arr = np.nan_to_num(arr, nan=0.0, posinf=0.0, neginf=0.0)
             if base_type == BaseType.UINT16:
-                max_display = 65535.0 / scale if scale else 65535.0
+                max_display = UINT16_MAX_VALID / scale if scale else float(UINT16_MAX_VALID)
                 arr = np.clip(arr, 0, max_display)
                 if clip_max is not None:
                     arr = np.clip(arr, 0, float(clip_max))
@@ -875,9 +858,9 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
                 field_id = base_id
                 name = '%s_%s' % (canonical, metric)
                 arr = np.nan_to_num(arr, nan=0.0, posinf=0.0, neginf=0.0)
-                # UINT16: encoded = value * scale, must be <= 65535. Scale 1 => max display 65535
+                # UINT16: encoded = value * scale, must be <= 65534. Scale 1 => max display 65534
                 scale = 1
-                arr = np.clip(arr, 0, 65535.0 / max(scale, 1))
+                arr = np.clip(arr, 0, UINT16_MAX_VALID / max(scale, 1))
                 dev_arrays[field_id] = arr
                 dev_specs.append((field_id, col, name, BaseType.UINT16, 2, scale, ''))
                 instroke_private_field_ids.add(field_id)
@@ -935,9 +918,9 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
                     fid, name, bt, size, scale, units = axis_row
                     arr = np.nan_to_num(arr, nan=0.0, posinf=0.0, neginf=0.0)
                     if bt == BaseType.UINT8:
-                        arr = np.clip(arr, 0, 255)
+                        arr = np.clip(arr, 0, UINT8_MAX_VALID)
                     elif bt == BaseType.UINT16:
-                        arr = np.clip(arr, 0, 65535)
+                        arr = np.clip(arr, 0, UINT16_MAX_VALID)
                     dev_arrays[fid] = arr
                     dev_specs.append((fid, '_instroke_axis', name, bt, size, scale, units))
 
@@ -1124,7 +1107,7 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
                 if is_array_field and arr.ndim == 2:
                     row = arr[i]
                     vals = np.nan_to_num(row, nan=0.0, posinf=0.0, neginf=0.0)
-                    max_phys = 65535.0 / max(scale, 1)
+                    max_phys = UINT16_MAX_VALID / max(scale, 1)
                     vals = np.clip(vals, 0, max_phys)
                     has_data = np.any(vals != 0)
                     if has_data:
@@ -1144,7 +1127,7 @@ def write_fit(file_name, df, row_date="2016-01-01", notes="Exported by Rowingdat
                 else:
                     val = float(arr[i])
                     if base_type == BaseType.UINT8:
-                        val = int(np.clip(round(val), 0, 255))
+                        val = int(np.clip(round(val), 0, UINT8_MAX_VALID))
                     if val != 0 or field_id in ALWAYS_EMIT_DEV_FIELD_IDS:
                         dev = DeveloperField(
                             developer_data_index=_dev_index_for(field_id),

{rowingdata-3.8.2 → rowingdata-3.8.3}/rowingdata/fitwrite_spec.py

@@ -78,9 +78,9 @@ def load_fit_spec_raw():
 
 def _validate_spec(raw):
     version = raw.get('version', 0)
-    if version not in (1, 2, 3):
+    if version not in (1, 2, 3, 4):
         warnings.warn(
-            'fit_export_spec.json version %s may be unsupported (expected 1, 2 or 3)' % version,
+            'fit_export_spec.json version %s may be unsupported (expected 1, 2, 3 or 4)' % version,
             UserWarning,
             stacklevel=2,
         )

{rowingdata-3.8.2 → rowingdata-3.8.3}/rowingdata/otherparsers.py

@@ -44,6 +44,10 @@ def _standard_app_ids():
     return ROWINGDATA_APP_ID, INSTROKE_APP_ID
 
 
+# FIT invalid ("no data") value per base type (standard §6.5): read as missing.
+_FIT_INVALID_VALUES = {'UINT8': 255, 'UINT16': 65535, 'SINT16': 32767}
+
+
 def _load_developer_field_spec():
     """Reverse map of the export spec: lowercase FIT field name -> definition.
 
@@ -64,6 +68,22 @@ def _load_developer_field_spec():
             'column': columns[0],
             'units': entry.get('units') or '',
             'scale': entry.get('scale') or 1,
+            'invalid': _FIT_INVALID_VALUES.get(entry.get('base_type')),
+        }
+    # Names the standard has since renamed. Files written against earlier drafts
+    # still carry them, so they are read, but never written.
+    renamed = (
+        ('AverageDriveForceN', 'AverageDriveForce'),
+        ('PeakDriveForceN', 'PeakDriveForce'),
+    )
+    for old, new in renamed:
+        mapping[old.lower()] = dict(mapping[new.lower()])
+    # EffectiveLength (mm) became EffectiveArc (deg); the two are not convertible
+    # into each other, so an old file's length keeps its own column, in metres.
+    for suffix in ('', 'Port', 'Starboard'):
+        column = 'effectiveLength' + ('_' + suffix.lower() if suffix else '')
+        mapping['effectivelength' + suffix.lower()] = {
+            'column': column, 'units': 'mm', 'scale': 1, 'invalid': 65535,
         }
     return mapping
 
@@ -865,9 +885,8 @@ class FITParser(object):
         """Rename standard developer fields to rowingdata CSV columns.
 
         fitparse does not apply developer-field scales, so the raw integers are
-        divided here. The scale in the file wins when present; ``AverageBoatSpeed``
-        needs the spec fallback because scale 255 is the uint8 invalid value and
-        cannot survive in a field_description.
+        divided here. The scale in the file wins when present; the spec scale is
+        the fallback for files that do not carry one.
         """
         spec = _developer_field_spec()
         if not spec:  # pragma: no cover
@@ -887,6 +906,8 @@ class FITParser(object):
             file_scale = standard.get(key) if is_standard else legacy.get(key)
             scale = file_scale if file_scale else definition['scale']
             values = pd.to_numeric(self.df[source], errors='coerce')
+            if definition.get('invalid') is not None:
+                values = values.mask(values == definition['invalid'])
             if scale and scale != 1:
                 values = values / float(scale)
             # Pre-UUID files carried lengths in metres already.

{rowingdata-3.8.2 → rowingdata-3.8.3}/rowingdata/rowingdata.py

@@ -6,7 +6,7 @@ from __future__ import print_function
 from six.moves import range
 from six.moves import input
 
-__version__ = "3.8.2"
+__version__ = "3.8.3"
 
 from collections import Counter
 

{rowingdata-3.8.2 → rowingdata-3.8.3/rowingdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rowingdata
-Version: 3.8.2
+Version: 3.8.3
 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
@@ -555,7 +555,7 @@ The available data fields are
 * 'cum_dist'
 
 Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
@@ -567,7 +567,7 @@ rowingdata CSV Columns
 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
+https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which rowingdata
 targets when exporting FIT.
 
 Any parser implementation feeding the ``rowingdata`` class should produce at
@@ -600,12 +600,12 @@ The standard field names are:
 * ' ElapsedTime (sec)'
 
 Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 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
+``effectiveArc_port``, ``effectiveArc_starboard``. See *Dual oarlock
 (port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
 export for these per-side columns.
 
@@ -848,10 +848,9 @@ Oarlock scalars (OTW rigging)
 -----------------------------
 
 Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
-'wash', 'peakforceangle', 'effectiveLength'
+'wash', 'peakforceangle', 'effectiveArc'
 
-Units: degrees for angles; meter for effectiveLength (scale may vary by
-source: NK Logbook uses these columns).
+Units: degrees for angles and for effectiveArc.
 
 These fields come from NK Logbook (Oarlock) and similar OTW
 measurement systems. They describe rigging geometry and blade angles:
@@ -864,12 +863,11 @@ measurement systems. They describe rigging geometry and blade angles:
 * **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.
+* **effectiveArc** – the part of the stroke arc that is effective: catch to
+  finish, less slip and wash (degrees). The Rowing Data Standard replaced the
+  earlier effective *length* (a lever length in mm) with this arc. Files written
+  against earlier drafts carry ``EffectiveLength``; it is read into the
+  ``effectiveLength`` column (metres) and is not converted into an arc.
 
 Dual oarlock (port/starboard)
 ..............................
@@ -973,12 +971,16 @@ 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
+  Rowing Data Standard (https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard,
+  current ``main``). The ``exporttofit`` API is unchanged, but the bytes it
+  writes are not: the developer application ID is now the standard UUID,
+  ``DriveLength`` is encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 100, ``EffectiveLength`` is replaced by
+  ``EffectiveArc`` in degrees (IDs 16, 210, 211; the ``effectiveLength*``
+  columns are no longer exported, use ``effectiveArc*``), the force fields are
+  named ``AverageDriveForce`` and ``PeakDriveForce``, stroke rate is written as
+  native ``cadence256``, stroke work uses field ID 19, and no value is written
+  as the FIT invalid value (255 / 65535 / 32767): measurements clip one below it. 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,
@@ -986,7 +988,7 @@ Unreleased
   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
+  https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which is the single
   source of truth; this repository no longer ships a copy.
 
 0.97.x

{rowingdata-3.8.2 → rowingdata-3.8.3}/tests/test_fit_instroke_export.py

@@ -2,7 +2,7 @@
 """Thorough tests for FIT in-stroke curve export.
 
 In-stroke curve field IDs are unallocated in the Rowing Data Standard registry
-(https://github.com/MoveLab-Studio/rowing-data-standard), so they are emitted
+(https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard), so they are emitted
 under rowingdata's private application ID; see fitwrite.INSTROKE_APP_ID.
 """
 from __future__ import absolute_import