PolideaInternal · dpwiese · Sep 17, 2018 · Sep 17, 2018 · Sep 17, 2018 · Sep 17, 2018
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,38 @@
+# Change Log
+
+<a name="1.5.4"></a>
+## [1.5.4](https://github.com/jimmykane/fit-parser/compare/v1.0.0...v1.5.3) (2019-03-01)
+* **Features**: HRV, Developer fields, devices and much more
+* **Miscellaneous**: Fix most of the issues parsing fit files
+
+<a name="1.0.1"></a>
+## [1.0.1](https://github.com/pierremtb/easy-fit/compare/v1.0.0...v1.0.1) (2018-09-18)
+
+
+### 😭 Unclassified (not [following convention](https://github.com/sportheroes/bk-conventional-changelog#types-of-commits))
+
+* **Miscellaneous**: fix: Applied to src/fit offset adjustments from commit 9ed802 ([70b3eb6](https://github.com/pierremtb/easy-fit/commit/70b3eb6) - [JoeTheFkingFrypan](https://github.com/JoeTheFkingFrypan))
+
+
+
+<a name="1.0.0"></a>
+# [1.0.0](https://github.com/pierremtb/easy-fit/compare/0.0.7...1.0.0) (2018-09-17)
+
+
+### 😭 Unclassified (not [following convention](https://github.com/sportheroes/bk-conventional-changelog#types-of-commits))
+
+* **Miscellaneous**: Fix readme typo ([2282c06](https://github.com/pierremtb/easy-fit/commit/2282c06)))
+* **Miscellaneous**: chore: preparing to release fork internally ([3eef5f7](https://github.com/pierremtb/easy-fit/commit/3eef5f7) - [JoeTheFkingFrypan](https://github.com/JoeTheFkingFrypan))
+* **Miscellaneous**: fix: Typo leading to uint16 to never be invalidated ([9ed802c](https://github.com/pierremtb/easy-fit/commit/9ed802c) - [JoeTheFkingFrypan](https://github.com/JoeTheFkingFrypan))
+* **Miscellaneous**: Merge remote-tracking branch 'jenglert/master' ([819d78e](https://github.com/pierremtb/easy-fit/commit/819d78e)))
+* **Miscellaneous**: fix missing buffer dependency and compile dst ([a4b237a](https://github.com/pierremtb/easy-fit/commit/a4b237a)))
+* **Miscellaneous**: Merge remote-tracking branch 'FrostDigital/master' ([6fa9258](https://github.com/pierremtb/easy-fit/commit/6fa9258)))
+* **Miscellaneous**: Makes parsing of fit files with developer defined fields possible (#1) ([9aea666](https://github.com/pierremtb/easy-fit/commit/9aea666))), closes [#1](https://github.com/pierremtb/easy-fit/issues/1)
+* **Miscellaneous**: fix: Adjusted offset for all altitude-related fields ([1ff0fa4](https://github.com/pierremtb/easy-fit/commit/1ff0fa4) - [JoeTheFkingFrypan](https://github.com/JoeTheFkingFrypan))
+* **Miscellaneous**: chore(devices): add forerunner 735 xt ([aacaa04](https://github.com/pierremtb/easy-fit/commit/aacaa04)))
+* **Miscellaneous**: Compile src ([ee4aa00](https://github.com/pierremtb/easy-fit/commit/ee4aa00)))
+* **Miscellaneous**: Add support for other lap types ([dcf42a1](https://github.com/pierremtb/easy-fit/commit/dcf42a1)))
+* **Miscellaneous**: Compile src ([50b9b21](https://github.com/pierremtb/easy-fit/commit/50b9b21)))
+* **Miscellaneous**: Merge remote-tracking branch 'pierremtb/master' ([f7f5ff0](https://github.com/pierremtb/easy-fit/commit/f7f5ff0)))
+* **Miscellaneous**: Add support for more manufacturers ([2d122d2](https://github.com/pierremtb/easy-fit/commit/2d122d2)))
+* **Miscellaneous**: Really compiled last changes on binary.js this time, small details on package.json file -> bumped to 0.0.8 ([e5dc98f](https://github.com/pierremtb/easy-fit/commit/e5dc98f)))
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
-# easy-fit
+# fit-file-parser
 
 > Parse your .FIT files easily, directly from JS.
-> Written in ES6.
+> Written in ES6. (Hope to change)
 
 
 ## Install
 
 ```
-$ npm install easy-fit --save
+$ npm install fit-file-parser --save
 ```
 
 ## How to use
@@ -16,14 +16,14 @@ See in [examples](./examples) folder:
 
 ```javascript
 // Require the module
-var EasyFit = require('./../dist/easy-fit.js').default;
+var FitParser = require('./../dist/fit-file-parser.js').default;
 
 // Read a .FIT file
 var fs = require('fs');
 fs.readFile('./example.fit', function (err, content) {
 
-  // Create a EasyFit instance (options argument is optional)
-  var easyFit = new EasyFit({
+  // Create a FitParser instance (options argument is optional)
+  var fitParser = new FitParser({
     force: true,
     speedUnit: 'km/h',
     lengthUnit: 'km',
@@ -33,7 +33,7 @@ fs.readFile('./example.fit', function (err, content) {
   });
 
   // Parse your file
-  easyFit.parse(content, function (error, data) {
+  fitParser.parse(content, function (error, data) {
 
     // Handle result of parse method
     if (error) {
@@ -48,7 +48,7 @@ fs.readFile('./example.fit', function (err, content) {
 ```
 
 ## API Documentation
-### new EasyFit(Object _options_)
+### new FitParser(Object _options_)
 Needed to create a new instance. _options_ is optional, and is used to customize the returned object.
 
 Allowed properties :
@@ -72,13 +72,14 @@ Allowed properties :
   - `true`: Continues even if they are errors (**default for now**)
   - `false`: Stops if an error occurs
 - `elapsedRecordField`: Boolean
-  - `true`: Includes a `elapsed_time` field inside each `record` field, containing the elapsed time in seconds since the first record (**default**)
-  - `false`
+  - `true`: Includes `elapsed_time`, containing the elapsed time in seconds since the first record, and `timer_time`, containing the time shown on the device, inside each `record` field
+  - `false` (**default**)
 
-### easyFit.parse(Buffer _file_, Function _callback_)
+### fitParser.parse(Buffer _file_, Function _callback_)
 _callback_ receives two arguments, the first as a error String, and the second as Object, result of parsing.
 
 ## Contributors
+All started thanks to [Pierre Jacquier](https://github.com/pierremtb)
 
 Big thanks to [Mikael Lofjärd](https://github.com/mlofjard) for [his early prototype](https://github.com/mlofjard/jsonfit).
 See [CONTRIBUTORS](./CONTRIBUTORS.md).
@@ -87,4 +88,4 @@ See [CONTRIBUTORS](./CONTRIBUTORS.md).
 
 MIT license; see [LICENSE](./LICENSE).
 
-(c) 2016 by Pierre Jacquier
+(c) 2019 Dimitrios Kanellopoulos
diff --git a/dist/binary.js b/dist/binary.js
@@ -12,7 +12,7 @@ var _fit = require('./fit');
 
 var _messages = require('./messages');
 
-var _buffer = require('buffer');
+var _buffer = require('buffer/');
 
 function addEndian(littleEndian, bytes) {
     var result = 0;
@@ -24,7 +24,7 @@ function addEndian(littleEndian, bytes) {
     return result;
 }
 
-function readData(blob, fDef, startIndex) {
+function readData(blob, fDef, startIndex, options) {
     if (fDef.endianAbility === true) {
         var temp = [];
         for (var i = 0; i < fDef.size; i++) {
@@ -34,38 +34,52 @@ function readData(blob, fDef, startIndex) {
         var buffer = new Uint8Array(temp).buffer;
         var dataView = new DataView(buffer);
 
-        switch (fDef.type) {
-            case 'sint16':
-                return dataView.getInt16(0, fDef.littleEndian);
-            case 'uint16':
-                return dataView.getUint16(0, fDef.littleEndian);
-            case 'sint32':
-                return dataView.getInt32(0, fDef.littleEndian);
-            case 'uint32':
-                return dataView.getUint32(0, fDef.littleEndian);
-            case 'float32':
-                return dataView.getFloat32(0, fDef.littleEndian);
-            case 'float64':
-                return dataView.getFloat64(0, fDef.littleEndian);
+        try {
+            switch (fDef.type) {
+                case 'sint16':
+                    return dataView.getInt16(0, fDef.littleEndian);
+                case 'uint16':
+                case 'uint16z':
+                    return dataView.getUint16(0, fDef.littleEndian);
+                case 'sint32':
+                    return dataView.getInt32(0, fDef.littleEndian);
+                case 'uint32':
+                case 'uint32z':
+                    return dataView.getUint32(0, fDef.littleEndian);
+                case 'float32':
+                    return dataView.getFloat32(0, fDef.littleEndian);
+                case 'float64':
+                    return dataView.getFloat64(0, fDef.littleEndian);
+                case 'uint16_array':
+                    var array = [];
+                    for (var _i = 0; _i < fDef.size; _i += 2) {
+                        array.push(dataView.getUint16(_i, fDef.littleEndian));
+                    }
+                    return array;
+            }
+        } catch (e) {
+            if (!options.force) {
+                throw e;
+            }
         }
 
         return addEndian(fDef.littleEndian, temp);
     }
 
     if (fDef.type === 'string') {
         var _temp = [];
-        for (var _i = 0; _i < fDef.size; _i++) {
-            if (blob[startIndex + _i]) {
-                _temp.push(blob[startIndex + _i]);
+        for (var _i2 = 0; _i2 < fDef.size; _i2++) {
+            if (blob[startIndex + _i2]) {
+                _temp.push(blob[startIndex + _i2]);
             }
         }
         return new _buffer.Buffer(_temp).toString('utf-8');
     }
 
     if (fDef.type === 'byte_array') {
         var _temp2 = [];
-        for (var _i2 = 0; _i2 < fDef.size; _i2++) {
-            _temp2.push(blob[startIndex + _i2]);
+        for (var _i3 = 0; _i3 < fDef.size; _i3++) {
+            _temp2.push(blob[startIndex + _i3]);
         }
         return _temp2;
     }
@@ -76,18 +90,43 @@ function readData(blob, fDef, startIndex) {
 function formatByType(data, type, scale, offset) {
     switch (type) {
         case 'date_time':
+        case 'local_date_time':
             return new Date(data * 1000 + 631065600000);
         case 'sint32':
-        case 'sint16':
             return data * _fit.FIT.scConst;
+        case 'sint16':
         case 'uint32':
         case 'uint16':
             return scale ? data / scale + offset : data;
+        case 'uint16_array':
+            return data.map(function (dataItem) {
+                return scale ? dataItem / scale + offset : dataItem;
+            });
         default:
-            if (_fit.FIT.types[type]) {
+            if (!_fit.FIT.types[type]) {
+                return data;
+            }
+            // Quick check for a mask
+            var values = [];
+            for (var key in _fit.FIT.types[type]) {
+                if (_fit.FIT.types[type].hasOwnProperty(key)) {
+                    values.push(_fit.FIT.types[type][key]);
+                }
+            }
+            if (values.indexOf('mask') === -1) {
                 return _fit.FIT.types[type][data];
             }
-            return data;
+            var dataItem = {};
+            for (var key in _fit.FIT.types[type]) {
+                if (_fit.FIT.types[type].hasOwnProperty(key)) {
+                    if (_fit.FIT.types[type][key] === 'mask') {
+                        dataItem.value = data & key;
+                    } else {
+                        dataItem[_fit.FIT.types[type][key]] = !!((data & key) >> 7); // Not sure if we need the >> 7 and casting to boolean but from all the masked props of fields so far this seems to be the case
+                    }
+                }
+            }
+            return dataItem;
     }
 }
 
@@ -182,7 +221,7 @@ function applyOptions(data, field, options) {
     }
 }
 
-function readRecord(blob, messageTypes, developerFields, startIndex, options, startDate) {
+function readRecord(blob, messageTypes, developerFields, startIndex, options, startDate, pausedTime) {
     var recordHeader = blob[startIndex];
     var localMessageType = recordHeader & 15;
 
@@ -226,30 +265,41 @@ function readRecord(blob, messageTypes, developerFields, startIndex, options, st
             mTypeDef.fieldDefs.push(fDef);
         }
 
-        for (var _i3 = 0; _i3 < numberOfDeveloperDataFields; _i3++) {
-            var _fDefIndex = startIndex + 6 + numberOfFields * 3 + 1 + _i3 * 3;
-
-            var fieldNum = blob[_fDefIndex];
-            var size = blob[_fDefIndex + 1];
-            var devDataIndex = blob[_fDefIndex + 2];
-
-            var devDef = developerFields[devDataIndex][fieldNum];
-
-            var _baseType = devDef.fit_base_type_id;
-
-            var _fDef = {
-                type: _fit.FIT.types.fit_base_type[_baseType],
-                fDefNo: fieldNum,
-                size: size,
-                endianAbility: (_baseType & 128) === 128,
-                littleEndian: lEnd,
-                baseTypeNo: _baseType & 15,
-                name: devDef.field_name,
-                dataType: (0, _messages.getFitMessageBaseType)(_baseType & 15),
-                isDeveloperField: true
-            };
-
-            mTypeDef.fieldDefs.push(_fDef);
+        for (var _i4 = 0; _i4 < numberOfDeveloperDataFields; _i4++) {
+            // If we fail to parse then try catch
+            try {
+                var _fDefIndex = startIndex + 6 + numberOfFields * 3 + 1 + _i4 * 3;
+
+                var fieldNum = blob[_fDefIndex];
+                var size = blob[_fDefIndex + 1];
+                var devDataIndex = blob[_fDefIndex + 2];
+
+                var devDef = developerFields[devDataIndex][fieldNum];
+
+                var _baseType = devDef.fit_base_type_id;
+
+                var _fDef = {
+                    type: _fit.FIT.types.fit_base_type[_baseType],
+                    fDefNo: fieldNum,
+                    size: size,
+                    endianAbility: (_baseType & 128) === 128,
+                    littleEndian: lEnd,
+                    baseTypeNo: _baseType & 15,
+                    name: devDef.field_name,
+                    dataType: (0, _messages.getFitMessageBaseType)(_baseType & 15),
+                    scale: devDef.scale || 1,
+                    offset: devDef.offset || 0,
+                    developerDataIndex: devDataIndex,
+                    isDeveloperField: true
+                };
+
+                mTypeDef.fieldDefs.push(_fDef);
+            } catch (e) {
+                if (options.force) {
+                    continue;
+                }
+                throw e;
+            }
         }
 
         messageTypes[localMessageType] = mTypeDef;
@@ -273,28 +323,34 @@ function readRecord(blob, messageTypes, developerFields, startIndex, options, st
     var fields = {};
     var message = (0, _messages.getFitMessage)(messageType.globalMessageNumber);
 
-    for (var _i4 = 0; _i4 < messageType.fieldDefs.length; _i4++) {
-        var _fDef2 = messageType.fieldDefs[_i4];
-        var data = readData(blob, _fDef2, readDataFromIndex);
+    for (var _i5 = 0; _i5 < messageType.fieldDefs.length; _i5++) {
+        var _fDef2 = messageType.fieldDefs[_i5];
+        var data = readData(blob, _fDef2, readDataFromIndex, options);
 
         if (!isInvalidValue(data, _fDef2.type)) {
             if (_fDef2.isDeveloperField) {
-                // Skip format of data if developer field
-                fields[_fDef2.name] = data;
+
+                var field = _fDef2.name;
+                var type = _fDef2.type;
+                var scale = _fDef2.scale;
+                var offset = _fDef2.offset;
+
+                fields[_fDef2.name] = applyOptions(formatByType(data, type, scale, offset), field, options);
             } else {
                 var _message$getAttribute2 = message.getAttributes(_fDef2.fDefNo),
-                    field = _message$getAttribute2.field,
-                    type = _message$getAttribute2.type,
-                    scale = _message$getAttribute2.scale,
-                    offset = _message$getAttribute2.offset;
+                    _field = _message$getAttribute2.field,
+                    _type = _message$getAttribute2.type,
+                    _scale = _message$getAttribute2.scale,
+                    _offset = _message$getAttribute2.offset;
 
-                if (field !== 'unknown' && field !== '' && field !== undefined) {
-                    fields[field] = applyOptions(formatByType(data, type, scale, offset), field, options);
+                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) / 1000;
+                fields.timer_time = fields.elapsed_time - pausedTime;
             }
         }