fit4ruby 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f8b521fc5fd62ec4a5dc424985816b3532d9c4
-  data.tar.gz: 11575588e41f8a325afb6987b2b0bfa351676e1e
+  metadata.gz: b4ee014802983dc12f9d4204e29e1c80d33be729
+  data.tar.gz: 7d52d887dea393412752a72974d189452ffea3e3
 SHA512:
-  metadata.gz: eee1354180d8870ebf322961e8aace3d01009fa6f06682c46dbb4df83ccf48f54093394f5a9e5201e86c1b5588bd6d6c556e978b308f05a2bd3ee06099f3af67
-  data.tar.gz: 68a30a48b9fb1832fb1c02bf305b0437f4640825278ef46f57b688cecd00002efbc850268082908ad6591fc9ed32cf46f6221713f110912a1a8c6d08bbbc9407
+  metadata.gz: 0d306e3ff6d58837943461a2508c6a81d05043b49eb186e352f273e11b341ffe6b0db92e500d764e327c37f38c5f3a5ec466a8bb8172599dd1df563a3b9a0075
+  data.tar.gz: cb7692535f35056b613c8f9e3a334d9690400ec2f614c8e5676af0919cb8132b1a280caa7efcd3c6265044008def7deed8a6e706e4718aad1be57a96b12700f3

data/lib/fit4ruby/Activity.rb

@@ -19,6 +19,7 @@ require 'fit4ruby/FileCreator'
 require 'fit4ruby/DeviceInfo'
 require 'fit4ruby/SensorSettings'
 require 'fit4ruby/DataSources'
+require 'fit4ruby/UserData'
 require 'fit4ruby/UserProfile'
 require 'fit4ruby/PhysiologicalMetrics'
 require 'fit4ruby/Session'
@@ -38,7 +39,7 @@ module Fit4Ruby
 
     attr_accessor :file_id, :field_descriptions, :developer_data_ids, :epo_data,
                   :file_creator, :device_infos, :sensor_settings, :data_sources,
-                  :user_profiles, :physiological_metrics,
+                  :user_data, :user_profiles, :physiological_metrics,
                   :sessions, :laps, :records, :hrv,
                   :heart_rate_zones, :events, :personal_records
 
@@ -58,6 +59,7 @@ module Fit4Ruby
       @device_infos = []
       @sensor_settings = []
       @data_sources = []
+      @user_data = []
       @user_profiles = []
       @physiological_metrics = []
       @events = []
@@ -318,7 +320,7 @@ module Fit4Ruby
     # @param field_values [Hash] A Hash that provides initial values for
     #        certain fields of the FitDataRecord.
     # @return [DeveloperDataId]
-    def new_field_description(field_values = {})
+    def new_developer_data_id(field_values = {})
       new_fit_data_record('developer_data_id', field_values)
     end
 
@@ -347,12 +349,20 @@ module Fit4Ruby
       new_fit_data_record('data_sources', field_values)
     end
 
+    # Add a new UserData to the Activity.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [UserData]
+    def new_user_data(field_values = {})
+      new_fit_data_record('user_data', field_values)
+    end
+
     # Add a new UserProfile to the Activity.
     # @param field_values [Hash] A Hash that provides initial values for
     #        certain fields of the FitDataRecord.
     # @return [UserProfile]
     def new_user_profile(field_values = {})
-      new_fit_data_record('old_user_profile', field_values)
+      new_fit_data_record('user_profile', field_values)
     end
 
     # Add a new PhysiologicalMetrics to the Activity.
@@ -461,7 +471,9 @@ module Fit4Ruby
         @sensor_settings << (record = SensorSettings.new(field_values))
       when 'data_sources'
         @data_sources << (record = DataSources.new(field_values))
-      when 'old_user_profile'
+      when 'user_data'
+        @user_data << (record = UserData.new(field_values))
+      when 'user_profile'
         @user_profiles << (record = UserProfile.new(field_values))
       when 'physiological_metrics'
         @physiological_metrics <<

data/lib/fit4ruby/DeveloperDataId.rb

@@ -25,9 +25,6 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
-    def create_global_definition
-    end
-
   end
 
 end

data/lib/fit4ruby/FieldDescription.rb

@@ -3,7 +3,7 @@
 #
 # = FieldDescription.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2017 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -11,6 +11,8 @@
 #
 
 require 'fit4ruby/FitDataRecord'
+require 'fit4ruby/FitDefinitionFieldBase'
+require 'fit4ruby/FitTypeDefs'
 
 module Fit4Ruby
 
@@ -25,7 +27,31 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
-    def create_global_definition
+    def create_global_definition(fit_entity)
+      messages = fit_entity.developer_fit_messages
+      unless (gfm = GlobalFitMessages[@native_mesg_num])
+        Log.error "Developer field description references unknown global " +
+          "message number #{@native_mesg_num}"
+      end
+
+      if @developer_data_index >=
+           fit_entity.top_level_record.developer_data_ids.size
+         Log.error "Developer data index #{@developer_data_index} is too large"
+      end
+
+      msg = messages[@native_mesg_num] ||
+        messages.message(@native_mesg_num, gfm.name)
+      unless (@fit_base_type_id & 0x7F) < FIT_TYPE_DEFS.size
+        Log.error "fit_base_type_id #{@fit_base_type_id} is too large"
+      end
+      options = {}
+      options[:scale] = @scale if @scale
+      options[:offset] = @offset if @offset
+      options[:array] = @array if @array
+      options[:unit] = @units
+      msg.field(@field_definition_number,
+                FIT_TYPE_DEFS[@fit_base_type_id & 0x7F][1],
+                "_#{@developer_data_index}_#{@field_name}", options)
     end
 
   end

data/lib/fit4ruby/FitDataRecord.rb

@@ -19,7 +19,8 @@ module Fit4Ruby
 
     include Converters
 
-    RecordOrder = [ 'old_user_profile', 'device_info', 'data_sources', 'event',
+    RecordOrder = [ 'user_data', 'user_profile',
+                    'device_info', 'data_sources', 'event',
                     'record', 'lap', 'session', 'heart_rate_zones',
                     'personal_records' ]
 

data/lib/fit4ruby/FitDefinition.rb

@@ -54,10 +54,12 @@ module Fit4Ruby
         Log.fatal "Illegal architecture value #{architecture.snapshot}"
       end
       data_fields.each { |f| f.check }
+      developer_fields.each { |f| f.check }
     end
 
-    def FitDefinition::read(io, entity, developer_data_flag)
+    def FitDefinition::read(io, entity, developer_data_flag, fit_entity)
       @@has_developer_data = developer_data_flag != 0
+      @@fit_entity = fit_entity
       super(io)
     end
 
@@ -71,6 +73,10 @@ module Fit4Ruby
       @@has_developer_data
     end
 
+    def fit_entity
+      @@fit_entity
+    end
+
     def setup(fit_message_definition)
       fit_message_definition.fields_by_number.each do |number, f|
         fdf = FitDefinitionField.new

data/lib/fit4ruby/FitDefinitionField.rb

@@ -3,7 +3,7 @@
 #
 # = FitDefinitionField.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -15,6 +15,7 @@ require 'time'
 require 'fit4ruby/FitDefinitionFieldBase'
 require 'fit4ruby/Log'
 require 'fit4ruby/GlobalFitMessage'
+require 'fit4ruby/FitTypeDefs'
 
 module Fit4Ruby
 
@@ -45,7 +46,7 @@ module Fit4Ruby
                                              "choice_#{field_number}"
          @type = field.respond_to?('type') ? field.type : nil
 
-         if @type && (td = @@TypeDefs[checked_base_type_number]) &&
+         if @type && (td = FIT_TYPE_DEFS[checked_base_type_number]) &&
             td[0] != @type
            Log.warn "#{@global_message_number}:#{@name} must be of type " +
            "#{@type}, not #{td[0]}"

data/lib/fit4ruby/FitDefinitionFieldBase.rb

@@ -10,52 +10,33 @@
 # published by the Free Software Foundation.
 #
 
+require 'fit4ruby/FitTypeDefs'
+
 module Fit4Ruby
 
   module FitDefinitionFieldBase
 
-    @@TypeDefs = [
-      # FIT Type, BinData type, undefined value, bytes
-      [ 'enum', 'uint8', 0xFF, 1 ],
-      [ 'sint8', 'int8', 0x7F, 1 ],
-      [ 'uint8', 'uint8', 0xFF, 1 ],
-      [ 'sint16', 'int16', 0x7FFF, 2 ],
-      [ 'uint16', 'uint16', 0xFFFF, 2 ],
-      [ 'sint32', 'int32', 0x7FFFFFFF, 4 ],
-      [ 'uint32', 'uint32', 0xFFFFFFFF, 4 ],
-      [ 'string', 'string', '', 0 ],
-      [ 'float32', 'float', 0xFFFFFFFF, 4 ],
-      [ 'float63', 'double', 0xFFFFFFFF, 4 ],
-      [ 'uint8z', 'uint8', 0, 1 ],
-      [ 'uint16z', 'uint16', 0, 2 ],
-      [ 'uint32z', 'uint32', 0, 4 ],
-      [ 'byte', 'uint8', 0xFF, 1 ],
-      [ 'sint64', 'int64', 0x7FFFFFFFFFFFFFFF, 8 ],
-      [ 'uint64', 'uint64', 0xFFFFFFFFFFFFFFFF, 8 ],
-      [ 'uint64z', 'uint64', 0, 8 ]
-    ]
-
     def FitDefinitionFieldBase::fit_type_to_bin_data(fit_type)
-      entry = @@TypeDefs.find { |e| e[0] == fit_type }
+      entry = FIT_TYPE_DEFS.find { |e| e[0] == fit_type }
       raise "Unknown fit type #{fit_type}" unless entry
       entry[1]
     end
 
     def FitDefinitionFieldBase::undefined_value(fit_type)
-      entry = @@TypeDefs.find { |e| e[0] == fit_type }
+      entry = FIT_TYPE_DEFS.find { |e| e[0] == fit_type }
       raise "Unknown fit type #{fit_type}" unless entry
       entry[2]
     end
 
     def set_type(fit_type)
-      idx = @@TypeDefs.index { |x| x[0] == fit_type }
+      idx = FIT_TYPE_DEFS.index { |x| x[0] == fit_type }
       raise "Unknown type #{fit_type}" unless idx
       self.base_type_number = idx
-      self.byte_count = @@TypeDefs[idx][3]
+      self.byte_count = FIT_TYPE_DEFS[idx][3]
     end
 
     def type(fit_type = false)
-      @@TypeDefs[checked_base_type_number][fit_type ? 0 : 1]
+      FIT_TYPE_DEFS[checked_base_type_number][fit_type ? 0 : 1]
     end
 
     def is_array?
@@ -76,17 +57,17 @@ module Fit4Ruby
     end
 
     def base_type_bytes
-      @@TypeDefs[checked_base_type_number][3]
+      FIT_TYPE_DEFS[checked_base_type_number][3]
     end
 
     def undefined_value
-      @@TypeDefs[checked_base_type_number][2]
+      FIT_TYPE_DEFS[checked_base_type_number][2]
     end
 
     private
 
     def checked_base_type_number
-      if @@TypeDefs.length <= base_type_number.snapshot
+      if FIT_TYPE_DEFS.length <= base_type_number.snapshot
         Log.error "Unknown FIT Base type #{base_type_number.snapshot} in " +
           "Global FIT Message #{name}"
         return 0
@@ -95,7 +76,7 @@ module Fit4Ruby
     end
 
     def check_fit_base_type
-      if @@TypeDefs.length <= base_type_number.snapshot
+      if FIT_TYPE_DEFS.length <= base_type_number.snapshot
       end
     end
 

data/lib/fit4ruby/FitDeveloperDataFieldDefinition.rb

@@ -3,7 +3,7 @@
 #
 # = FitDeveloperDataFieldDefinition.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2017 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -12,6 +12,7 @@
 
 require 'bindata'
 require 'fit4ruby/FitDefinitionFieldBase'
+require 'fit4ruby/FitTypeDefs'
 
 module Fit4Ruby
 
@@ -28,13 +29,44 @@ module Fit4Ruby
         "#{field_number.snapshot}"
     end
 
-    def bindata_type
-      fit_definition = parent.parent
-      if (entry = @@TypeDefs.find { |e| e[3] == size_in_bytes.snapshot })
-        entry[1]
-      else
-        'uint8'
+    def type
+      FIT_TYPE_DEFS[checked_base_type_number][1]
+    end
+
+    def base_type_bytes
+      FIT_TYPE_DEFS[checked_base_type_number][3]
+    end
+
+    def byte_count
+      size_in_bytes
+    end
+
+    private
+
+    def find_field_definition
+      tlr = parent.parent.fit_entity.top_level_record
+      field = tlr.field_descriptions.find do |fd|
+        fd.field_definition_number == field_number.snapshot &&
+          fd.developer_data_index == developer_data_index.snapshot
       end
+      unless field
+        Log.error "Unknown developer field #{field_number.snapshot} " +
+          "for developer #{developer_data_index.snapshot}"
+      end
+
+      field
+    end
+
+    def checked_base_type_number
+      field = find_field_definition
+      base_type_number = field.fit_base_type_id & 0x7F
+      if FIT_TYPE_DEFS.length <= base_type_number
+        Log.error "Unknown FIT Base type #{base_type_number} in " +
+          "Global FIT Message #{name}"
+        return 0
+      end
+
+      base_type_number
     end
 
   end

data/lib/fit4ruby/FitFile.rb

@@ -55,7 +55,7 @@ module Fit4Ruby
           # incremented each time the corresponding record type is found.
           record_counters = Hash.new { 0 }
           while io.pos < offset + header.end_pos
-            record = FitRecord.new(definitions)
+            record = FitRecord.new(definitions, entity)
             record.read(io, entity, filter, record_counters)
             records << record if filter
           end

data/lib/fit4ruby/FitFileEntity.rb

@@ -3,7 +3,7 @@
 #
 # = FitMessageRecord.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2015 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2015, 2016, 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -12,6 +12,7 @@
 
 require 'fit4ruby/Activity'
 require 'fit4ruby/Monitoring_B'
+require 'fit4ruby/GlobalFitMessage'
 
 module Fit4Ruby
 
@@ -25,11 +26,12 @@ module Fit4Ruby
   # objec we need to use to store it for later consumption.
   class FitFileEntity
 
-    attr_reader :top_level_record
+    attr_reader :top_level_record, :developer_fit_messages
 
     # Create a FitFileEntity.
     def initialize
       @top_level_record = nil
+      @developer_fit_messages = GlobalFitMessageList.new
     end
 
     # Set what kind of FIT file we are dealing with.

data/lib/fit4ruby/FitMessageRecord.rb

@@ -41,9 +41,16 @@ module Fit4Ruby
       @message_record = produce(definition)
     end
 
-    def read(io, entity, filter = nil, fields_dump = nil)
+    def read(io, entity, filter = nil, fields_dump = nil, fit_entity)
       @message_record.read(io)
 
+      # Check if we have a developer defined message for this global message
+      # number.
+      if fit_entity.top_level_record
+        developer_fields = fit_entity.top_level_record.field_descriptions
+        @dfm = developer_fields[@global_message_number]
+      end
+
       if @name == 'file_id'
         unless (entity_type = @message_record['type'].snapshot)
           Log.fatal "Corrupted FIT file: file_id record has no type definition"
@@ -63,6 +70,7 @@ module Fit4Ruby
           f1alt ? 1 : -1
       end
 
+      #(sorted_fields + @definition.developer_fields).each do |field|
       sorted_fields.each do |field|
         value = @message_record[field.name].snapshot
         # Strings are null byte terminated. There may be more bytes in the
@@ -89,16 +97,10 @@ module Fit4Ruby
             (field_def ? field_def : field).to_s(value))
         end
       end
-      #@definition.developer_fields.each do |field|
-      #  $stderr.puts "  ++ New Developer Field " +
-      #    "#{field.field_number.snapshot}  " +
-      #    "Bytes: #{field.size_in_bytes.snapshot}  " +
-      #    "Developer ID: #{field.developer_data_index.snapshot}"
-      #end
-
-      #if @name == 'field_description'
-      #  obj.create_global_definition
-      #end
+
+      if @name == 'field_description'
+        obj.create_global_definition(fit_entity)
+      end
     end
 
     private
@@ -141,26 +143,24 @@ module Fit4Ruby
 
     def produce(definition)
       fields = []
-      definition.data_fields.each do |field|
+      (definition.data_fields.to_a +
+       definition.developer_fields.to_a).each do |field|
         field_def = [ field.type, field.name ]
+
+        # Some field types need special handling.
         if field.type == 'string'
-          # Strings need special handling. We need to also include the length
-          # of the String.
+          # We need to also include the length of the String.
           field_def << { :read_length => field.total_bytes }
         elsif field.is_array?
+          # For Arrays we have to break them into separte fields.
           field_def = [ :array, field.name,
                         { :type => field.type.intern,
-                          :initial_length => field.total_bytes /
-                                             field.base_type_bytes } ]
+                          :initial_length =>
+                            field.total_bytes / field.base_type_bytes } ]
         end
         fields << field_def
       end
 
-      definition.developer_fields.each do |field|
-        field_def = [ field.bindata_type, field.name ]
-        fields << field_def
-      end
-
       BinData::Struct.new(:endian => definition.endian, :fields => fields)
     end
 

data/lib/fit4ruby/FitRecord.rb

@@ -28,8 +28,12 @@ module Fit4Ruby
 
     attr_reader :number
 
-    def initialize(definitions)
+    def initialize(definitions, fit_entity)
       @definitions = definitions
+      # It's a bit ugly that we have to pass the generated FitFileEntity to
+      # the parser classes. But we need to have access to the developer field
+      # definitions to parse them properly.
+      @fit_entity = fit_entity
       @name = @number = @fields = nil
     end
 
@@ -44,8 +48,8 @@ module Fit4Ruby
       local_message_type = header.local_message_type.snapshot
       if header.normal? && header.message_type.snapshot == 1
         # process definition message
-        definition = FitDefinition.read(io, entity,
-                                        header.developer_data_flag.snapshot)
+        definition = FitDefinition.read(
+          io, entity, header.developer_data_flag.snapshot, @fit_entity)
         @definitions[local_message_type] = FitMessageRecord.new(definition)
       else
         # process data message
@@ -68,7 +72,7 @@ module Fit4Ruby
             @fields = []
           end
         end
-        definition.read(io, entity, filter, @fields)
+        definition.read(io, entity, filter, @fields, @fit_entity)
       end
 
       self

data/lib/fit4ruby/FitTypeDefs.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FitTypeDefs.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+module Fit4Ruby
+
+  FIT_TYPE_DEFS = [
+    # FIT Type, BinData type, undefined value, bytes
+    [ 'enum', 'uint8', 0xFF, 1 ],
+    [ 'sint8', 'int8', 0x7F, 1 ],
+    [ 'uint8', 'uint8', 0xFF, 1 ],
+    [ 'sint16', 'int16', 0x7FFF, 2 ],
+    [ 'uint16', 'uint16', 0xFFFF, 2 ],
+    [ 'sint32', 'int32', 0x7FFFFFFF, 4 ],
+    [ 'uint32', 'uint32', 0xFFFFFFFF, 4 ],
+    [ 'string', 'string', '', 0 ],
+    [ 'float32', 'float', 0xFFFFFFFF, 4 ],
+    [ 'float63', 'double', 0xFFFFFFFF, 4 ],
+    [ 'uint8z', 'uint8', 0, 1 ],
+    [ 'uint16z', 'uint16', 0, 2 ],
+    [ 'uint32z', 'uint32', 0, 4 ],
+    [ 'byte', 'uint8', 0xFF, 1 ],
+    [ 'sint64', 'int64', 0x7FFFFFFFFFFFFFFF, 8 ],
+    [ 'uint64', 'uint64', 0xFFFFFFFFFFFFFFFF, 8 ],
+    [ 'uint64z', 'uint64', 0, 8 ]
+  ]
+
+end
+

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -114,7 +114,7 @@ module Fit4Ruby
     field 12, 'enum', 'hr_setting', :dict => 'display_heart'
     field 13, 'enum', 'speed_setting', :dict => 'display_measure'
     field 14, 'enum', 'dist_setting', :dict => 'display_measure'
-    field 17, 'enum', 'activity_class'
+    field 17, 'enum', 'activity_class', :scale => 10
     field 18, 'enum', 'position_setting', :dict => 'display_position'
     field 21, 'enum', 'temperature_setting', :dict => 'display_measure'
     field 24, 'uint8', 'birth_year'
@@ -251,8 +251,8 @@ module Fit4Ruby
     field 35, 'uint16', 'training_stress_score', :scale => 10, :unit => 'tss'
     field 36, 'uint16', 'intensity_factor', :scale => 1000, :unit => 'if'
     field 37, 'uint16', 'left_right_balance', :dict => 'left_right_balance_100'
-    field 38, 'sint32', 'undocumented_field_38'
-    field 39, 'sint32', 'undocumented_field_39'
+    field 38, 'sint32', 'lap1_lat', :type => 'coordinate' # guessed
+    field 39, 'sint32', 'lap1_long', :type => 'coordinate' # guessed
     field 41, 'uint32', 'avg_stroke_count', :scale => 10, :unit => 'strokes/lap'
     field 42, 'uint16', 'avg_stroke_distance', :scale => 100, :unit => 'm'
     field 43, 'enum', 'swim_stroke', :dict => 'swim_stroke'
@@ -433,6 +433,8 @@ module Fit4Ruby
     field 46, 'uint8', 'right_pedal_smoothness', :scale => 2, :unit => '%'
     field 47, 'uint8', 'combined_pedal_smoothness', :scale => 2, :unit => '%'
     field 53, 'uint8', 'fractional_cadence', :scale => 128
+    field 54, 'uint16', 'total_hemoglobin_conc', :scale => 100, :unit => 'g/dL'
+    field 57, 'uint16', 'saturated_hemoglobin_percent', :scale => 10, :unit => '%'
     field 61, 'uint16', 'undefined_value_61'
     field 63, 'uint16', 'undefined_value_63'
     field 64, 'uint16', 'undefined_value_64'
@@ -629,7 +631,7 @@ module Fit4Ruby
     field 0, 'uint16', 'time', :array => true, :scale => 1000, :unit => 's'
 
     # Not part of the official ANT SDK doc
-    message 79, 'old_user_profile'
+    message 79, 'user_data'
     field 0, 'uint16', 'metmax', :scale => 1000, :unit => 'MET' # VO2max / 3.5
     field 1, 'uint8', 'age', :unit => 'years'
     field 2, 'uint8', 'height', :scale => 100, :unit => 'm'
@@ -807,6 +809,7 @@ module Fit4Ruby
     field 57, 'uint16', 'undocumented_field_57'
     field 58, 'enum', 'undocumented_field_58'
     field 59, 'uint8', 'undocumented_field_59'
+    field 62, 'uint8', 'undocumented_field_62'
     field 254, 'uint16', 'message_index'
 
     message 206, 'field_description'
@@ -844,12 +847,12 @@ module Fit4Ruby
     field 1, 'uint16', 'lap_index'
     field 2, 'uint32', 'time_in_hr_zone', :array => true, :scale => 1000, :unit => 's'
     field 5, 'uint32', 'undocumented_field_5'
-    field 6, 'uint8', 'heart_rate_zones', :array => true
+    field 6, 'uint8', 'heart_rate_zones', :array => true, :unit => 'bpm'
     field 9, 'uint16', 'undocumented_field_9'
     field 10, 'enum', 'undocumented_field_10'
-    field 11, 'uint8', 'max_heart_rate'
-    field 12, 'uint8', 'resting_heart_rate'
-    field 13, 'uint8', 'undocumented_field_13'
+    field 11, 'uint8', 'max_heart_rate', :unit => 'bpm'
+    field 12, 'uint8', 'resting_heart_rate', :unit => 'bpm'
+    field 13, 'uint8', 'lactate_threshold_heart_rate', :unit => 'bpm'
     field 14, 'enum', 'undocumented_field_14'
     field 15, 'uint16', 'undocumented_field_15'
     field 253, 'uint32', 'timestamp', :type => 'date_time'

data/lib/fit4ruby/Monitoring_B.rb

@@ -25,8 +25,8 @@ module Fit4Ruby
   # record structures used in the FIT file.
   class Monitoring_B < FitDataRecord
 
-    attr_accessor :file_id, :device_infos, :software, :monitoring_infos,
-                  :monitorings
+    attr_accessor :file_id, :field_descriptions, :device_infos, :software,
+      :monitoring_infos, :monitorings
 
     # Create a new Monitoring_B object.
     # @param field_values [Hash] A Hash that provides initial values for
@@ -36,6 +36,7 @@ module Fit4Ruby
       @num_sessions = 0
 
       @file_id = FileId.new
+      @field_descriptions = []
       @device_infos = []
       @softwares = nil
       @monitoring_infos = []

data/lib/fit4ruby/PhysiologicalMetrics.rb

@@ -14,7 +14,7 @@ require 'fit4ruby/FitDataRecord'
 
 module Fit4Ruby
 
-  # This class corresponds to the old_user_profile FIT message.
+  # This class corresponds to the physiological_metrics FIT message.
   class PhysiologicalMetrics < FitDataRecord
 
     # Create a new PhysiologicalMetrics object.

data/lib/fit4ruby/UserData.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = UserData.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2018 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  # This class corresponds to the old_user_profile FIT message.
+  class UserData < FitDataRecord
+
+    # Create a new UserData object.
+    # @param field_values [Hash] Hash that provides initial values for certain
+    #        fields.
+    def initialize(field_values = {})
+      super('user_data')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/UserProfile.rb

@@ -21,7 +21,7 @@ module Fit4Ruby
     # @param field_values [Hash] Hash that provides initial values for certain
     #        fields.
     def initialize(field_values = {})
-      super('old_user_profile')
+      super('user_profile')
       set_field_values(field_values)
     end
 

data/lib/fit4ruby/version.rb

@@ -1,4 +1,4 @@
 module Fit4Ruby
   # The version number of the library.
-  VERSION = '2.0.0'
+  VERSION = '3.0.0'
 end

data/spec/FitFile_spec.rb

@@ -20,9 +20,9 @@ describe Fit4Ruby do
     ts = Time.now
     a = Fit4Ruby::Activity.new
     a.total_timer_time = 30 * 60.0
-    a.new_user_profile({ :age => 33, :height => 1.78, :weight => 73.0,
-                         :gender => 'male', :activity_class => 4.0,
-                         :max_hr => 178 })
+    a.new_user_data({ :age => 33, :height => 1.78, :weight => 73.0,
+                      :gender => 'male', :activity_class => 4.0,
+                      :max_hr => 178 })
 
     a.new_event({ :event => 'timer', :event_type => 'start_time' })
     a.new_device_info({ :timestamp => ts,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -108,6 +108,7 @@ files:
 - lib/fit4ruby/FitMessageRecord.rb
 - lib/fit4ruby/FitRecord.rb
 - lib/fit4ruby/FitRecordHeader.rb
+- lib/fit4ruby/FitTypeDefs.rb
 - lib/fit4ruby/GeoMath.rb
 - lib/fit4ruby/GlobalFitDictList.rb
 - lib/fit4ruby/GlobalFitDictionaries.rb
@@ -127,6 +128,7 @@ files:
 - lib/fit4ruby/SensorSettings.rb
 - lib/fit4ruby/Session.rb
 - lib/fit4ruby/Software.rb
+- lib/fit4ruby/UserData.rb
 - lib/fit4ruby/UserProfile.rb
 - lib/fit4ruby/version.rb
 - spec/FileNameCoder_spec.rb