fit-file-parser 2.2.5 → 2.3.0

package/dist/binary.js

@@ -187,8 +187,23 @@ function convertTo(data, unitsList, unitName) {
     const unit = options[unitName];
     return unit ? data * unit.multiplier + unit.offset : data;
 }
-function applyOptions(data, field, options) {
+function applyOptions(data, field, options, fields) {
     switch (field) {
+        case 'device_type': {
+            const isLocal = fields.source_type === 'local' || fields.source_type === 5;
+            const isBLE = fields.source_type === 'bluetooth_low_energy' || fields.source_type === 3 || fields.source_type === 'bluetooth' || fields.source_type === 2;
+            const isANT = fields.source_type === 'antplus' || fields.source_type === 1 || fields.source_type === 'ant' || fields.source_type === 0;
+            if (isLocal) {
+                return FIT.types.local_device_type[data] || data;
+            }
+            if (isBLE) {
+                return FIT.types.ble_device_type[data] || data;
+            }
+            if (isANT) {
+                return FIT.types.antplus_device_type[data] || data;
+            }
+            return data;
+        }
         case 'speed':
         case 'enhanced_speed':
         case 'vertical_speed':
@@ -332,31 +347,41 @@ export function readRecord(blob, messageTypes, developerFields, startIndex, opti
     let readDataFromIndex = startIndex + 1;
     const fields = {};
     const message = getFitMessage(messageType.globalMessageNumber);
+    const rawFields = [];
     for (let i = 0; i < messageType.fieldDefs.length; i++) {
         const fDef = messageType.fieldDefs[i];
         const data = readData(blob, fDef, readDataFromIndex, options);
         if (!isInvalidValue(data, fDef.type)) {
-            if (fDef.isDeveloperField) {
-                const field = fDef.name;
-                const { type } = fDef;
-                const { scale } = fDef;
-                const { offset } = fDef;
-                fields[fDef.name] = applyOptions(formatByType(data, type, scale, offset), field, options);
-            }
-            else {
-                const { field, type, scale, offset } = message.getAttributes(fDef.fDefNo);
-                if (field !== 'unknown' && field !== '' && field !== undefined) {
-                    fields[field] = applyOptions(formatByType(data, type, scale, offset), field, options);
-                }
-            }
-            if (message.name === 'record' && options.elapsedRecordField) {
-                fields.elapsed_time = (fields.timestamp - (startDate || 0)) / 1000;
-                fields.timer_time = fields.elapsed_time - pausedTime;
-            }
+            rawFields.push({ fDef, data });
         }
         readDataFromIndex += fDef.size;
         messageSize += fDef.size;
     }
+    for (const { fDef, data } of rawFields) {
+        const { field } = fDef.isDeveloperField ? { field: fDef.name } : message.getAttributes(fDef.fDefNo);
+        if (field !== 'unknown' && field !== '' && field !== undefined) {
+            fields[field] = data;
+        }
+    }
+    for (const { fDef, data } of rawFields) {
+        if (fDef.isDeveloperField) {
+            const field = fDef.name;
+            const { type } = fDef;
+            const { scale } = fDef;
+            const { offset } = fDef;
+            fields[fDef.name] = applyOptions(formatByType(data, type, scale, offset), field, options, fields);
+        }
+        else {
+            const { field, type, scale, offset } = message.getAttributes(fDef.fDefNo);
+            if (field !== 'unknown' && field !== '' && field !== undefined) {
+                fields[field] = applyOptions(formatByType(data, type, scale, offset), field, options, fields);
+            }
+        }
+        if (message.name === 'record' && options.elapsedRecordField) {
+            fields.elapsed_time = (fields.timestamp - (startDate || 0)) / 1000;
+            fields.timer_time = fields.elapsed_time - pausedTime;
+        }
+    }
     if (message.name === 'field_description') {
         developerFields[fields.developer_data_index]
             = developerFields[fields.developer_data_index] || [];

package/dist/cjs/binary.js

@@ -193,8 +193,23 @@ function convertTo(data, unitsList, unitName) {
     const unit = options[unitName];
     return unit ? data * unit.multiplier + unit.offset : data;
 }
-function applyOptions(data, field, options) {
+function applyOptions(data, field, options, fields) {
     switch (field) {
+        case 'device_type': {
+            const isLocal = fields.source_type === 'local' || fields.source_type === 5;
+            const isBLE = fields.source_type === 'bluetooth_low_energy' || fields.source_type === 3 || fields.source_type === 'bluetooth' || fields.source_type === 2;
+            const isANT = fields.source_type === 'antplus' || fields.source_type === 1 || fields.source_type === 'ant' || fields.source_type === 0;
+            if (isLocal) {
+                return fit_js_1.FIT.types.local_device_type[data] || data;
+            }
+            if (isBLE) {
+                return fit_js_1.FIT.types.ble_device_type[data] || data;
+            }
+            if (isANT) {
+                return fit_js_1.FIT.types.antplus_device_type[data] || data;
+            }
+            return data;
+        }
         case 'speed':
         case 'enhanced_speed':
         case 'vertical_speed':
@@ -338,31 +353,41 @@ function readRecord(blob, messageTypes, developerFields, startIndex, options, st
     let readDataFromIndex = startIndex + 1;
     const fields = {};
     const message = (0, messages_js_1.getFitMessage)(messageType.globalMessageNumber);
+    const rawFields = [];
     for (let i = 0; i < messageType.fieldDefs.length; i++) {
         const fDef = messageType.fieldDefs[i];
         const data = readData(blob, fDef, readDataFromIndex, options);
         if (!isInvalidValue(data, fDef.type)) {
-            if (fDef.isDeveloperField) {
-                const field = fDef.name;
-                const { type } = fDef;
-                const { scale } = fDef;
-                const { offset } = fDef;
-                fields[fDef.name] = applyOptions(formatByType(data, type, scale, offset), field, options);
-            }
-            else {
-                const { field, type, scale, offset } = message.getAttributes(fDef.fDefNo);
-                if (field !== 'unknown' && field !== '' && field !== undefined) {
-                    fields[field] = applyOptions(formatByType(data, type, scale, offset), field, options);
-                }
-            }
-            if (message.name === 'record' && options.elapsedRecordField) {
-                fields.elapsed_time = (fields.timestamp - (startDate || 0)) / 1000;
-                fields.timer_time = fields.elapsed_time - pausedTime;
-            }
+            rawFields.push({ fDef, data });
         }
         readDataFromIndex += fDef.size;
         messageSize += fDef.size;
     }
+    for (const { fDef, data } of rawFields) {
+        const { field } = fDef.isDeveloperField ? { field: fDef.name } : message.getAttributes(fDef.fDefNo);
+        if (field !== 'unknown' && field !== '' && field !== undefined) {
+            fields[field] = data;
+        }
+    }
+    for (const { fDef, data } of rawFields) {
+        if (fDef.isDeveloperField) {
+            const field = fDef.name;
+            const { type } = fDef;
+            const { scale } = fDef;
+            const { offset } = fDef;
+            fields[fDef.name] = applyOptions(formatByType(data, type, scale, offset), field, options, fields);
+        }
+        else {
+            const { field, type, scale, offset } = message.getAttributes(fDef.fDefNo);
+            if (field !== 'unknown' && field !== '' && field !== undefined) {
+                fields[field] = applyOptions(formatByType(data, type, scale, offset), field, options, fields);
+            }
+        }
+        if (message.name === 'record' && options.elapsedRecordField) {
+            fields.elapsed_time = (fields.timestamp - (startDate || 0)) / 1000;
+            fields.timer_time = fields.elapsed_time - pausedTime;
+        }
+    }
     if (message.name === 'field_description') {
         developerFields[fields.developer_data_index]
             = developerFields[fields.developer_data_index] || [];

package/dist/cjs/fit-parser.js

@@ -103,6 +103,7 @@ class FitParser {
         const tank_summaries = [];
         const jumps = [];
         const time_in_zone = [];
+        const activity_metrics = [];
         let loopIndex = headerLength;
         const messageTypes = [];
         const developerFields = [];
@@ -204,6 +205,9 @@ class FitParser {
                 case 'time_in_zone':
                     time_in_zone.push(message);
                     break;
+                case 'activity_metrics':
+                    activity_metrics.push(message);
+                    break;
                 default:
                     if (messageType !== '') {
                         fitObj[messageType] = message;
@@ -225,6 +229,7 @@ class FitParser {
         fitObj.tank_summaries = tank_summaries;
         fitObj.jumps = jumps;
         fitObj.time_in_zone = time_in_zone;
+        fitObj.activity_metrics = activity_metrics;
         if (isCascadeNeeded) {
             laps = (0, helper_js_1.mapDataIntoLap)(laps, 'records', records);
             laps = (0, helper_js_1.mapDataIntoLap)(laps, 'lengths', lengths);

package/dist/cjs/fit.js

@@ -3106,7 +3106,7 @@ exports.FIT = {
             },
             1: {
                 field: 'device_type',
-                type: 'antplus_device_type',
+                type: 'uint8',
                 scale: null,
                 offset: 0,
                 units: '',
@@ -4190,6 +4190,93 @@ exports.FIT = {
             },
             0: { field: 'enabled', type: 'byte', scale: null, offset: 0, units: '' },
         },
+        140: {
+            name: 'activity_metrics',
+            1: {
+                field: 'new_max_heart_rate',
+                type: 'uint8',
+                scale: null,
+                offset: 0,
+                units: 'bpm',
+            },
+            4: {
+                field: 'aerobic_training_effect',
+                type: 'uint8',
+                scale: 10,
+                offset: 0,
+                units: '',
+            },
+            7: {
+                field: 'vo2_max',
+                type: 'uint32',
+                scale: 65536 / 3.5,
+                offset: 0,
+                units: 'ml/kg/min',
+            },
+            9: {
+                field: 'recovery_time',
+                type: 'uint16',
+                scale: null,
+                offset: 0,
+                units: 'min',
+            },
+            11: {
+                field: 'sport',
+                type: 'sport',
+                scale: null,
+                offset: 0,
+                units: '',
+            },
+            20: {
+                field: 'anaerobic_training_effect',
+                type: 'uint8',
+                scale: 10,
+                offset: 0,
+                units: '',
+            },
+            29: {
+                field: 'first_vo2_max',
+                type: 'uint32',
+                scale: 65536 / 3.5,
+                offset: 0,
+                units: 'ml/kg/min',
+            },
+            41: {
+                field: 'primary_benefit',
+                type: 'uint8',
+                scale: null,
+                offset: 0,
+                units: '',
+            },
+            60: {
+                field: 'total_ascent',
+                type: 'uint16',
+                scale: null,
+                offset: 0,
+                units: 'm',
+            },
+            61: {
+                field: 'total_descent',
+                type: 'uint16',
+                scale: null,
+                offset: 0,
+                units: 'm',
+            },
+            62: {
+                field: 'avg_power',
+                type: 'uint16',
+                scale: null,
+                offset: 0,
+                units: 'watts',
+            },
+            63: {
+                field: 'avg_heart_rate',
+                type: 'uint8',
+                scale: null,
+                offset: 0,
+                units: 'bpm',
+            },
+        },
         206: {
             name: 'field_description',
             0: {
@@ -4705,11 +4792,11 @@ exports.FIT = {
                 units: 's',
             },
             5: {
-                field: 'hr_zone_high_boundary_deprecated',
-                type: 'uint8_array',
-                scale: null,
+                field: 'time_in_power_zone',
+                type: 'uint32_array',
+                scale: 1000,
                 offset: 0,
-                units: '',
+                units: 's',
             },
             6: {
                 field: 'hr_zone_high_boundary',
@@ -4733,11 +4820,11 @@ exports.FIT = {
                 units: 'watts',
             },
             9: {
-                field: 'hr_calc_type',
-                type: 'hr_zone_calc',
+                field: 'power_zone_high_boundary',
+                type: 'uint16_array',
                 scale: null,
                 offset: 0,
-                units: '',
+                units: 'watts',
             },
             10: {
                 field: 'max_heart_rate_deprecated',
@@ -4855,6 +4942,7 @@ exports.FIT = {
             129: 'weather_alert',
             131: 'cadence_zone',
             132: 'hr',
+            140: 'activity_metrics',
             142: 'segment_lap',
             145: 'memo_glob',
             148: 'segment_id',
@@ -5978,7 +6066,6 @@ exports.FIT = {
             65534: 'connect',
         },
         antplus_device_type: {
-            0: 0,
             1: 'antfs',
             11: 'bike_power',
             12: 'environment_sensor_legacy',
@@ -5992,10 +6079,12 @@ exports.FIT = {
             26: 'racquet',
             27: 'control_hub',
             31: 'muscle_oxygen',
+            34: 'shifting',
             35: 'bike_light_main',
             36: 'bike_light_shared',
             38: 'exd',
             40: 'bike_radar',
+            46: 'bike_aero',
             119: 'weight_scale',
             120: 'heart_rate',
             121: 'bike_speed_cadence',
@@ -6003,6 +6092,26 @@ exports.FIT = {
             123: 'bike_speed',
             124: 'stride_speed_distance',
         },
+        local_device_type: {
+            0: 'gps',
+            1: 'glonass',
+            2: 'gps_glonass',
+            3: 'accelerometer',
+            4: 'barometer',
+            5: 'temperature',
+            10: 'whr',
+            12: 'sensor_hub',
+        },
+        ble_device_type: {
+            0: 'connected_gps',
+            1: 'heart_rate',
+            2: 'bike_power',
+            3: 'bike_speed_cadence',
+            4: 'bike_speed',
+            5: 'bike_cadence',
+            6: 'footpod',
+            7: 'bike_trainer',
+        },
         ant_network: {
             0: 'public',
             1: 'antplus',

package/dist/cjs/fit_types.d.ts

@@ -16,7 +16,7 @@ export interface MessageIndex {
     selected: boolean;
 }
 export type File = 'device' | 'settings' | 'sport' | 'activity' | 'workout' | 'course' | 'schedules' | 'weight' | 'totals' | 'goals' | 'blood_pressure' | 'monitoring_a' | 'activity_summary' | 'monitoring_daily' | 'monitoring_b' | 'segment' | 'segment_list' | 'exd_configuration' | 'mfg_range_min' | 'mfg_range_max';
-export type MesgNum = 'file_id' | 'capabilities' | 'device_settings' | 'user_profile' | 'hrm_profile' | 'sdm_profile' | 'bike_profile' | 'zones_target' | 'hr_zone' | 'power_zone' | 'met_zone' | 'sport' | 'goal' | 'session' | 'lap' | 'record' | 'event' | 'device_info' | 'workout' | 'workout_step' | 'schedule' | 'weight_scale' | 'course' | 'course_point' | 'totals' | 'activity' | 'software' | 'file_capabilities' | 'mesg_capabilities' | 'field_capabilities' | 'file_creator' | 'blood_pressure' | 'speed_zone' | 'monitoring' | 'training_file' | 'hrv' | 'ant_rx' | 'ant_tx' | 'ant_channel_id' | 'length' | 'monitoring_info' | 'pad' | 'slave_device' | 'connectivity' | 'weather_conditions' | 'weather_alert' | 'cadence_zone' | 'hr' | 'segment_lap' | 'memo_glob' | 'segment_id' | 'segment_leaderboard_entry' | 'segment_point' | 'segment_file' | 'workout_session' | 'watchface_settings' | 'gps_metadata' | 'camera_event' | 'timestamp_correlation' | 'gyroscope_data' | 'accelerometer_data' | 'three_d_sensor_calibration' | 'video_frame' | 'obdii_data' | 'nmea_sentence' | 'aviation_attitude' | 'video' | 'video_title' | 'video_description' | 'video_clip' | 'exd_screen_configuration' | 'exd_data_field_configuration' | 'exd_data_concept_configuration' | 'field_description' | 'developer_data_id' | 'magnetometer_data' | 'barometer_data' | 'one_d_sensor_calibration' | 'time_in_zone' | 'set' | 'stress_level' | 'dive_settings' | 'dive_gas' | 'dive_alarm' | 'exercise_title' | 'dive_summary' | 'jump' | 'climb_pro' | 'tank_update' | 'tank_summary' | 'o_hr_settings' | 'mfg_range_min' | 'mfg_range_max' | 'definition';
+export type MesgNum = 'file_id' | 'capabilities' | 'device_settings' | 'user_profile' | 'hrm_profile' | 'sdm_profile' | 'bike_profile' | 'zones_target' | 'hr_zone' | 'power_zone' | 'met_zone' | 'sport' | 'goal' | 'session' | 'lap' | 'record' | 'event' | 'device_info' | 'workout' | 'workout_step' | 'schedule' | 'weight_scale' | 'course' | 'course_point' | 'totals' | 'activity' | 'software' | 'file_capabilities' | 'mesg_capabilities' | 'field_capabilities' | 'file_creator' | 'blood_pressure' | 'speed_zone' | 'monitoring' | 'training_file' | 'hrv' | 'ant_rx' | 'ant_tx' | 'ant_channel_id' | 'length' | 'monitoring_info' | 'pad' | 'slave_device' | 'connectivity' | 'weather_conditions' | 'weather_alert' | 'cadence_zone' | 'hr' | 'activity_metrics' | 'segment_lap' | 'memo_glob' | 'segment_id' | 'segment_leaderboard_entry' | 'segment_point' | 'segment_file' | 'workout_session' | 'watchface_settings' | 'gps_metadata' | 'camera_event' | 'timestamp_correlation' | 'gyroscope_data' | 'accelerometer_data' | 'three_d_sensor_calibration' | 'video_frame' | 'obdii_data' | 'nmea_sentence' | 'aviation_attitude' | 'video' | 'video_title' | 'video_description' | 'video_clip' | 'exd_screen_configuration' | 'exd_data_field_configuration' | 'exd_data_concept_configuration' | 'field_description' | 'developer_data_id' | 'magnetometer_data' | 'barometer_data' | 'one_d_sensor_calibration' | 'time_in_zone' | 'set' | 'stress_level' | 'dive_settings' | 'dive_gas' | 'dive_alarm' | 'exercise_title' | 'dive_summary' | 'jump' | 'climb_pro' | 'tank_update' | 'tank_summary' | 'o_hr_settings' | 'mfg_range_min' | 'mfg_range_max' | 'definition';
 export type Checksum = 'clear' | 'ok';
 export type FileFlags = '0' | 'read' | 'write' | 'erase';
 export type MesgCount = 'num_per_file' | 'max_per_file' | 'max_per_file_type';
@@ -72,7 +72,9 @@ export type Schedule = 'workout' | 'course';
 export type CoursePoint = 'generic' | 'summit' | 'valley' | 'water' | 'food' | 'danger' | 'left' | 'right' | 'straight' | 'first_aid' | 'fourth_category' | 'third_category' | 'second_category' | 'first_category' | 'hors_category' | 'sprint' | 'left_fork' | 'right_fork' | 'middle_fork' | 'slight_left' | 'sharp_left' | 'slight_right' | 'sharp_right' | 'u_turn' | 'segment_start' | 'segment_end';
 export type Manufacturer = '0' | 'garmin' | 'garmin_fr405_antfs' | 'zephyr' | 'dayton' | 'idt' | 'srm' | 'quarq' | 'ibike' | 'saris' | 'spark_hk' | 'tanita' | 'echowell' | 'dynastream_oem' | 'nautilus' | 'dynastream' | 'timex' | 'metrigear' | 'xelic' | 'beurer' | 'cardiosport' | 'a_and_d' | 'hmm' | 'suunto' | 'thita_elektronik' | 'gpulse' | 'clean_mobile' | 'pedal_brain' | 'peaksware' | 'saxonar' | 'lemond_fitness' | 'dexcom' | 'wahoo_fitness' | 'octane_fitness' | 'archinoetics' | 'the_hurt_box' | 'citizen_systems' | 'magellan' | 'osynce' | 'holux' | 'concept2' | 'one_giant_leap' | 'ace_sensor' | 'brim_brothers' | 'xplova' | 'perception_digital' | 'bf1systems' | 'pioneer' | 'spantec' | 'metalogics' | '4iiiis' | 'seiko_epson' | 'seiko_epson_oem' | 'ifor_powell' | 'maxwell_guider' | 'star_trac' | 'breakaway' | 'alatech_technology_ltd' | 'mio_technology_europe' | 'rotor' | 'geonaute' | 'id_bike' | 'specialized' | 'wtek' | 'physical_enterprises' | 'north_pole_engineering' | 'bkool' | 'cateye' | 'stages_cycling' | 'sigmasport' | 'tomtom' | 'peripedal' | 'wattbike' | 'moxy' | 'ciclosport' | 'powerbahn' | 'acorn_projects_aps' | 'lifebeam' | 'bontrager' | 'wellgo' | 'scosche' | 'magura' | 'woodway' | 'elite' | 'nielsen_kellerman' | 'dk_city' | 'tacx' | 'direction_technology' | 'magtonic' | '1partcarbon' | 'inside_ride_technologies' | 'sound_of_motion' | 'stryd' | 'icg' | 'mipulse' | 'bsx_athletics' | 'look' | 'campagnolo_srl' | 'body_bike_smart' | 'praxisworks' | 'limits_technology' | 'topaction_technology' | 'cosinuss' | 'fitcare' | 'magene' | 'giant_manufacturing_co' | 'tigrasport' | 'salutron' | 'technogym' | 'bryton_sensors' | 'latitude_limited' | 'soaring_technology' | 'igpsport' | 'thinkrider' | 'gopher_sport' | 'waterrower' | 'orangetheory' | 'inpeak' | 'kinetic' | 'johnson_health_tech' | 'polar_electro' | 'seesense' | 'nci_technology' | 'development' | 'healthandlife' | 'lezyne' | 'scribe_labs' | 'zwift' | 'watteam' | 'recon' | 'favero_electronics' | 'dynovelo' | 'strava' | 'precor' | 'bryton' | 'sram' | 'navman' | 'cobi' | 'spivi' | 'mio_magellan' | 'evesports' | 'sensitivus_gauge' | 'podoon' | 'life_time_fitness' | 'falco_e_motors' | 'minoura' | 'cycliq' | 'luxottica' | 'trainer_road' | 'the_sufferfest' | 'fullspeedahead' | 'virtualtraining' | 'feedbacksports' | 'omata' | 'vdo' | 'magneticdays' | 'hammerhead' | 'kinetic_by_kurt' | 'shapelog' | 'dabuziduo' | 'jetblack' | 'coros' | 'virtugo' | 'velosense' | 'actigraphcorp';
 export type GarminProduct = 'hrm_bike' | 'hrm1' | 'axh01' | 'axb01' | 'axb02' | 'hrm2ss' | 'dsi_alf02' | 'hrm3ss' | 'hrm_run_single_byte_product_id' | 'bsm' | 'bcm' | 'axs01' | 'hrm_tri_single_byte_product_id' | 'fr225_single_byte_product_id' | 'fr301_china' | 'fr301_japan' | 'fr301_korea' | 'fr301_taiwan' | 'fr405' | 'fr50' | 'fr405_japan' | 'fr60' | 'dsi_alf01' | 'fr310xt' | 'edge500' | 'fr110' | 'edge800' | 'edge500_taiwan' | 'edge500_japan' | 'chirp' | 'fr110_japan' | 'edge200' | 'fr910xt' | 'edge800_taiwan' | 'edge800_japan' | 'alf04' | 'fr610' | 'fr210_japan' | 'vector_ss' | 'vector_cp' | 'edge800_china' | 'edge500_china' | 'fr610_japan' | 'edge500_korea' | 'fr70' | 'fr310xt_4t' | 'amx' | 'fr10' | 'edge800_korea' | 'swim' | 'fr910xt_china' | 'fenix' | 'edge200_taiwan' | 'edge510' | 'edge810' | 'tempe' | 'fr910xt_japan' | 'fr620' | 'fr220' | 'fr910xt_korea' | 'fr10_japan' | 'edge810_japan' | 'virb_elite' | 'edge_touring' | 'edge510_japan' | 'hrm_tri' | 'hrm_run' | 'fr920xt' | 'edge510_asia' | 'edge810_china' | 'edge810_taiwan' | 'edge1000' | 'vivo_fit' | 'virb_remote' | 'vivo_ki' | 'fr15' | 'vivo_active' | 'edge510_korea' | 'fr620_japan' | 'fr620_china' | 'fr220_japan' | 'fr220_china' | 'approach_s6' | 'vivo_smart' | 'fenix2' | 'epix' | 'fenix3' | 'edge1000_taiwan' | 'edge1000_japan' | 'fr15_japan' | 'edge520' | 'edge1000_china' | 'fr620_russia' | 'fr220_russia' | 'vector_s' | 'edge1000_korea' | 'fr920xt_taiwan' | 'fr920xt_china' | 'fr920xt_japan' | 'virbx' | 'vivo_smart_apac' | 'etrex_touch' | 'edge25' | 'fr25' | 'vivo_fit2' | 'fr225' | 'fr630' | 'fr230' | 'fr735xt' | 'vivo_active_apac' | 'vector_2' | 'vector_2s' | 'virbxe' | 'fr620_taiwan' | 'fr220_taiwan' | 'truswing' | 'fenix3_china' | 'fenix3_twn' | 'varia_headlight' | 'varia_taillight_old' | 'edge_explore_1000' | 'fr225_asia' | 'varia_radar_taillight' | 'varia_radar_display' | 'edge20' | 'd2_bravo' | 'approach_s20' | 'varia_remote' | 'hrm4_run' | 'vivo_active_hr' | 'vivo_smart_hr' | 'vivo_move' | 'varia_vision' | 'vivo_fit3' | 'fenix3_hr' | 'virb_ultra_30' | 'index_smart_scale' | 'fr235' | 'fenix3_chronos' | 'oregon7xx' | 'rino7xx' | 'nautix' | 'edge_820' | 'edge_explore_820' | 'fenix5s' | 'd2_bravo_titanium' | 'varia_ut800' | 'running_dynamics_pod' | 'fenix5x' | 'vivo_fit_jr' | 'fr935' | 'fenix5' | 'descent' | 'sdm4' | 'edge_remote' | 'training_center' | 'connectiq_simulator' | 'android_antplus_plugin' | 'connect';
-export type AntplusDeviceType = '0' | 'antfs' | 'bike_power' | 'environment_sensor_legacy' | 'multi_sport_speed_distance' | 'control' | 'fitness_equipment' | 'blood_pressure' | 'geocache_node' | 'light_electric_vehicle' | 'env_sensor' | 'racquet' | 'control_hub' | 'muscle_oxygen' | 'bike_light_main' | 'bike_light_shared' | 'exd' | 'bike_radar' | 'weight_scale' | 'heart_rate' | 'bike_speed_cadence' | 'bike_cadence' | 'bike_speed' | 'stride_speed_distance';
+export type AntplusDeviceType = 'antfs' | 'bike_power' | 'environment_sensor_legacy' | 'multi_sport_speed_distance' | 'control' | 'fitness_equipment' | 'blood_pressure' | 'geocache_node' | 'light_electric_vehicle' | 'env_sensor' | 'racquet' | 'control_hub' | 'muscle_oxygen' | 'shifting' | 'bike_light_main' | 'bike_light_shared' | 'exd' | 'bike_radar' | 'bike_aero' | 'weight_scale' | 'heart_rate' | 'bike_speed_cadence' | 'bike_cadence' | 'bike_speed' | 'stride_speed_distance';
+export type LocalDeviceType = 'gps' | 'glonass' | 'gps_glonass' | 'accelerometer' | 'barometer' | 'temperature' | 'whr' | 'sensor_hub';
+export type BleDeviceType = 'connected_gps' | 'heart_rate' | 'bike_power' | 'bike_speed_cadence' | 'bike_speed' | 'bike_cadence' | 'footpod' | 'bike_trainer';
 export type AntNetwork = 'public' | 'antplus' | 'antfs' | 'private';
 export type WorkoutCapabilities = '0' | 'interval' | 'custom' | 'fitness_equipment' | 'firstbeat' | 'new_leaf' | 'tcx' | 'speed' | 'heart_rate' | 'distance' | 'cadence' | 'power' | 'grade' | 'resistance' | 'protected';
 export type BatteryStatus = '0' | 'new' | 'good' | 'ok' | 'low' | 'critical' | 'charging' | 'unknown';
@@ -665,7 +667,7 @@ export interface ParsedEvent {
 }
 export interface ParsedDeviceInfo {
     device_index?: number;
-    device_type?: AntplusDeviceType;
+    device_type?: number;
     manufacturer?: Manufacturer;
     serial_number?: number;
     product?: number;
@@ -871,6 +873,20 @@ export interface ParsedOHrSettings {
     enabled?: number;
     timestamp: string;
 }
+export interface ParsedActivityMetrics {
+    new_max_heart_rate?: number;
+    aerobic_training_effect?: number;
+    vo2_max?: number;
+    recovery_time?: number;
+    sport?: Sport;
+    anaerobic_training_effect?: number;
+    first_vo2_max?: number;
+    primary_benefit?: number;
+    total_ascent?: number;
+    total_descent?: number;
+    avg_power?: number;
+    avg_heart_rate?: number;
+}
 export interface ParsedFieldDescription {
     developer_data_index?: number;
     field_definition_number?: number;
@@ -894,11 +910,9 @@ export interface ParsedTimeInZone {
     time_in_hr_zone?: number[];
     time_in_speed_zone?: number[];
     time_in_power_zone?: number[];
-    hr_zone_high_boundary_deprecated?: number[];
     hr_zone_high_boundary?: number[];
     speed_zone_high_boundary?: number[];
     power_zone_high_boundary?: number[];
-    hr_calc_type?: HrZoneCalc;
     max_heart_rate_deprecated?: number;
     max_heart_rate?: number;
     resting_heart_rate?: number;
@@ -1025,4 +1039,5 @@ export interface ParsedFit {
     tank_summaries?: ParsedTankSummary[];
     jumps?: ParsedJump[];
     time_in_zone?: ParsedTimeInZone[];
+    activity_metrics?: ParsedActivityMetrics[];
 }

package/dist/cjs/type_generator.js

@@ -210,6 +210,7 @@ function generateFitType() {
         tank_summaries: 'parsed_tank_summary',
         jumps: 'parsed_jump',
         time_in_zone: 'parsed_time_in_zone',
+        activity_metrics: 'parsed_activity_metrics',
     };
     const referenceProperties = {
         file_creator: 'parsed_file_creator',

package/dist/fit-parser.js

@@ -101,6 +101,7 @@ export default class FitParser {
         const tank_summaries = [];
         const jumps = [];
         const time_in_zone = [];
+        const activity_metrics = [];
         let loopIndex = headerLength;
         const messageTypes = [];
         const developerFields = [];
@@ -202,6 +203,9 @@ export default class FitParser {
                 case 'time_in_zone':
                     time_in_zone.push(message);
                     break;
+                case 'activity_metrics':
+                    activity_metrics.push(message);
+                    break;
                 default:
                     if (messageType !== '') {
                         fitObj[messageType] = message;
@@ -223,6 +227,7 @@ export default class FitParser {
         fitObj.tank_summaries = tank_summaries;
         fitObj.jumps = jumps;
         fitObj.time_in_zone = time_in_zone;
+        fitObj.activity_metrics = activity_metrics;
         if (isCascadeNeeded) {
             laps = mapDataIntoLap(laps, 'records', records);
             laps = mapDataIntoLap(laps, 'lengths', lengths);