fit4ruby 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c5d5efa9834b239320385607392c18c215f60b
-  data.tar.gz: 1a57d3f6d6e0e70f56c584d445aaa69c92cbd306
+  metadata.gz: 22fe9d584ae711b90ca8e963b254d959dd2e005c
+  data.tar.gz: 0b90e47c9f390ec90a8d5258638903222cd577a1
 SHA512:
-  metadata.gz: a438a9c330043b253e8868490ffcd0dc972efa49064c9d5e3d8a16ae666590fea1d531d708658a8a5dbaf9015a084d4d668f909108efc0736910ef4239477ece
-  data.tar.gz: 9636b7c9378345f4e62b5eb171b123e7fc1a0ec5c79e939164c5a20ab844e8befca0abee12a9d1875eca193d63ed1cbdb7f28b7f5495d1ef6c421d7de358df0e
+  metadata.gz: 075fdc211b229dab82d43e32738edc57f6926a8eeee5f7128ea3863cd37b819ff4c064a296e3536aac6698c91a1641d716d7a243fdb60eebefd1ff002c8be92c
+  data.tar.gz: 1e9ad8de227dfcf75e5ca60614583a249eac8be43d3876bc85dd23e93fdea441983c75448d28c8216ddd56d6b70045e41b0042ee2da826d0c2575864880140bb

data/fit4ruby.gemspec

@@ -7,12 +7,12 @@ GEM_SPEC = Gem::Specification.new do |spec|
   spec.name         = 'fit4ruby'
   spec.version      = Fit4Ruby::VERSION
   spec.license      = 'GNU GPL version 2'
-  spec.summary      = 'Library to read GARMIN FIT files.'
+  spec.summary      = 'Library to read and write GARMIN FIT files.'
   spec.description  = <<EOT
 This library can read and write FIT files and convert them into a Ruby data
 structure for easy processing. This library was written for Garmin devices
-like the FR620, Fenix 3 and Fenix 3 HR. Fit files from other devices may work
-as well but have not been tested.
+like the FR620, Fenix 3, Fenix 3 HR, Fenix 5 (s and X). Fit files from other
+devices may work as well but have not been tested.
 EOT
   spec.authors      = [ 'Chris Schlaeger' ]
   spec.email        = 'chris@linux.com'

data/lib/fit4ruby/Activity.rb

@@ -12,6 +12,8 @@
 
 require 'fit4ruby/FitDataRecord'
 require 'fit4ruby/FileId'
+require 'fit4ruby/FieldDescription'
+require 'fit4ruby/DeveloperDataId'
 require 'fit4ruby/EPO_Data'
 require 'fit4ruby/FileCreator'
 require 'fit4ruby/DeviceInfo'
@@ -34,7 +36,7 @@ module Fit4Ruby
   # equivalents of the message record structures used in the FIT file.
   class Activity < FitDataRecord
 
-    attr_accessor :file_id, :epo_data,
+    attr_accessor :file_id, :field_descriptions, :developer_data_ids, :epo_data,
                   :file_creator, :device_infos, :sensor_settings, :data_sources,
                   :user_profiles, :physiological_metrics,
                   :sessions, :laps, :records, :hrv,
@@ -49,6 +51,8 @@ module Fit4Ruby
       @num_sessions = 0
 
       @file_id = FileId.new
+      @field_descriptions = []
+      @developer_data_ids = []
       @epo_data = nil
       @file_creator = FileCreator.new
       @device_infos = []
@@ -282,7 +286,9 @@ module Fit4Ruby
       @file_id.write(io, id_mapper)
       @file_creator.write(io, id_mapper)
 
-      (@device_infos + @sensor_settings + @data_sources + @user_profiles +
+      (@field_descriptions + @developer_data_ids +
+       @device_infos + @sensor_settings +
+       @data_sources + @user_profiles +
        @physiological_metrics + @events +
        @sessions + @laps + @records + @heart_rate_zones +
        @personal_records).sort.each do |s|
@@ -300,6 +306,22 @@ module Fit4Ruby
       new_fit_data_record('file_id', field_values)
     end
 
+    # Add a new FieldDescription to the Activity.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [FieldDescription]
+    def new_field_description(field_values = {})
+      new_fit_data_record('field_description', field_values)
+    end
+
+    # Add a new DeveloperDataId to the Activity.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [DeveloperDataId]
+    def new_field_description(field_values = {})
+      new_fit_data_record('developer_data_id', field_values)
+    end
+
     # Add a new FileCreator to the Activity. It will replace any previously
     # added FileCreator object.
     # @param field_values [Hash] A Hash that provides initial values for
@@ -403,6 +425,8 @@ module Fit4Ruby
     def ==(a)
       super(a) && @file_id == a.file_id &&
         @file_creator == a.file_creator &&
+        @field_descriptions == a.field_descriptions &&
+        @developer_data_ids == a.developer_data_ids &&
         @device_infos == a.device_infos &&
         @sensor_settings == a.sensor_settings &&
         @data_sources == a.data_sources &&
@@ -423,6 +447,10 @@ module Fit4Ruby
       case record_type
       when 'file_id'
         @file_id = (record = FileId.new(field_values))
+      when 'field_description'
+        @field_descriptions << (record = FieldDescription.new(field_values))
+      when 'developer_data_id'
+        @developer_data_ids << (record = DeveloperDataId.new(field_values))
       when 'epo_data'
         @epo_data = (record = EPO_Data.new(field_values))
       when 'file_creator'

data/lib/fit4ruby/DeveloperDataId.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DeveloperDataId.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2017 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 DeveloperDataId FIT message.
+  class DeveloperDataId < FitDataRecord
+
+    # Create a new DeveloperDataId object.
+    # @param field_values [Hash] Hash that provides initial values for certain
+    #        fields.
+    def initialize(field_values = {})
+      super('developer_data_id')
+      set_field_values(field_values)
+    end
+
+    def create_global_definition
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/FieldDescription.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FieldDescription.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2017 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 FieldDescription FIT message.
+  class FieldDescription < FitDataRecord
+
+    # Create a new FieldDescription object.
+    # @param field_values [Hash] Hash that provides initial values for certain
+    #        fields.
+    def initialize(field_values = {})
+      super('field_description')
+      set_field_values(field_values)
+    end
+
+    def create_global_definition
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/FitDataRecord.rb

@@ -131,7 +131,7 @@ module Fit4Ruby
       # Create a BinData::Struct object to store the data record.
       fields = []
       global_fit_message.fields_by_number.each do |field_number, field|
-        bin_data_type = FitDefinitionField.fit_type_to_bin_data(field.type)
+        bin_data_type = FitDefinitionFieldBase.fit_type_to_bin_data(field.type)
         fields << [ bin_data_type, field.name ]
       end
       bd = BinData::Struct.new(:endian => :little, :fields => fields)
@@ -146,7 +146,7 @@ module Fit4Ruby
         else
           # If we don't have a corresponding variable or the variable is nil
           # we write the 'undefined' value instead.
-          value = FitDefinitionField.undefined_value(field.type)
+          value = FitDefinitionFieldBase.undefined_value(field.type)
         end
         bd[field.name] = value
       end

data/lib/fit4ruby/FitDefinition.rb

@@ -12,6 +12,7 @@
 
 require 'bindata'
 require 'fit4ruby/FitDefinitionField'
+require 'fit4ruby/FitDeveloperDataFieldDefinition'
 
 module Fit4Ruby
 
@@ -24,6 +25,8 @@ module Fit4Ruby
   # required.
   class FitDefinition < BinData::Record
 
+    @@has_developer_data = false
+
     hide :reserved
 
     uint8 :reserved, :initial_value => 0
@@ -33,7 +36,14 @@ module Fit4Ruby
       uint16be :default
     end
     uint8 :field_count
-    array :fields, :type => FitDefinitionField, :initial_length => :field_count
+    array :data_fields, :type => FitDefinitionField,
+      :initial_length => :field_count
+
+    uint8 :developer_fields_count, :onlyif => :has_developer_data?
+    array :developer_fields,
+      :type => FitDeveloperDataFieldDefinition,
+      :initial_length => :developer_fields_count,
+      :onlyif => :has_developer_data?
 
     def endian
       architecture.snapshot == 0 ? :little : :big
@@ -43,7 +53,22 @@ module Fit4Ruby
       if architecture.snapshot > 1
         Log.fatal "Illegal architecture value #{architecture.snapshot}"
       end
-      fields.each { |f| f.check }
+      data_fields.each { |f| f.check }
+    end
+
+    def FitDefinition::read(io, entity, developer_data_flag)
+      @@has_developer_data = developer_data_flag != 0
+      super(io)
+    end
+
+    def FitDefinitionField::write(io)
+      # We don't support writing developer data fields yet.
+      @@has_developer_data = false
+      super(io)
+    end
+
+    def has_developer_data?
+      @@has_developer_data
     end
 
     def setup(fit_message_definition)
@@ -52,13 +77,12 @@ module Fit4Ruby
         fdf.field_definition_number = number
         fdf.set_type(f.type)
 
-        fields << fdf
+        data_fields << fdf
       end
-      self.field_count = fields.length
+      self.field_count = data_fields.length
     end
 
   end
 
-
 end
 

data/lib/fit4ruby/FitDefinitionField.rb

@@ -12,6 +12,7 @@
 
 require 'bindata'
 require 'time'
+require 'fit4ruby/FitDefinitionFieldBase'
 require 'fit4ruby/Log'
 require 'fit4ruby/GlobalFitMessage'
 
@@ -24,23 +25,7 @@ module Fit4Ruby
   # the exact size of the binary records.
   class FitDefinitionField < BinData::Record
 
-    @@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 ]
-    ]
+    include FitDefinitionFieldBase
 
     hide :reserved
 
@@ -50,18 +35,6 @@ module Fit4Ruby
     bit2 :reserved
     bit5 :base_type_number
 
-    def self.fit_type_to_bin_data(fit_type)
-      entry = @@TypeDefs.find { |e| e[0] == fit_type }
-      raise "Unknown fit type #{fit_type}" unless entry
-      entry[1]
-    end
-
-    def self.undefined_value(fit_type)
-      entry = @@TypeDefs.find { |e| e[0] == fit_type }
-      raise "Unknown fit type #{fit_type}" unless entry
-      entry[2]
-    end
-
     def init
       @global_message_number = parent.parent.global_message_number.snapshot
       @global_message_definition = GlobalFitMessages[@global_message_number]
@@ -72,7 +45,8 @@ module Fit4Ruby
                                              "choice_#{field_number}"
          @type = field.respond_to?('type') ? field.type : nil
 
-         if @type && (td = @@TypeDefs[base_type_number]) && td[0] != @type
+         if @type && (td = @@TypeDefs[checked_base_type_number]) &&
+            td[0] != @type
            Log.warn "#{@global_message_number}:#{@name} must be of type " +
            "#{@type}, not #{td[0]}"
          end
@@ -129,51 +103,6 @@ module Fit4Ruby
       end
     end
 
-    def set_type(fit_type)
-      idx = @@TypeDefs.index { |x| x[0] == fit_type }
-      raise "Unknown type #{fit_type}" unless idx
-      self.base_type_number = idx
-      self.byte_count = @@TypeDefs[idx][3]
-    end
-
-    def type(fit_type = false)
-      check_fit_base_type
-      @@TypeDefs[base_type_number.snapshot][fit_type ? 0 : 1]
-    end
-
-    def is_array?
-      if total_bytes > base_type_bytes
-        if total_bytes % base_type_bytes != 0
-          Log.fatal "Total bytes (#{total_bytes}) must be multiple of " +
-                    "base type bytes (#{base_type_bytes})."
-        end
-        return true
-      end
-      false
-    end
-
-    def total_bytes
-      self.byte_count.snapshot
-    end
-
-    def base_type_bytes
-      check_fit_base_type
-      @@TypeDefs[base_type_number.snapshot][3]
-    end
-
-    def undefined_value
-      check_fit_base_type
-      @@TypeDefs[base_type_number.snapshot][2]
-    end
-
-    private
-
-    def check_fit_base_type
-      if @@TypeDefs.length <= base_type_number.snapshot
-        Log.fatal "Unknown FIT Base type #{base_type_number.snapshot}"
-      end
-    end
-
   end
 
 end

data/lib/fit4ruby/FitDefinitionFieldBase.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FitDefinitionFieldBase.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2014, 2017 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
+
+  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 }
+      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 }
+      raise "Unknown fit type #{fit_type}" unless entry
+      entry[2]
+    end
+
+    def set_type(fit_type)
+      idx = @@TypeDefs.index { |x| x[0] == fit_type }
+      raise "Unknown type #{fit_type}" unless idx
+      self.base_type_number = idx
+      self.byte_count = @@TypeDefs[idx][3]
+    end
+
+    def type(fit_type = false)
+      @@TypeDefs[checked_base_type_number][fit_type ? 0 : 1]
+    end
+
+    def is_array?
+      if total_bytes > base_type_bytes
+        if total_bytes % base_type_bytes != 0
+          Log.error "Total bytes (#{total_bytes}) must be multiple of " +
+                    "base type bytes (#{base_type_bytes}) of type " +
+                    "#{base_type_number.snapshot} in Global FIT " +
+                    "Message #{name}."
+        end
+        return true
+      end
+      false
+    end
+
+    def total_bytes
+      self.byte_count.snapshot
+    end
+
+    def base_type_bytes
+      @@TypeDefs[checked_base_type_number][3]
+    end
+
+    def undefined_value
+      @@TypeDefs[checked_base_type_number][2]
+    end
+
+    private
+
+    def checked_base_type_number
+      if @@TypeDefs.length <= base_type_number.snapshot
+        Log.error "Unknown FIT Base type #{base_type_number.snapshot} in " +
+          "Global FIT Message #{name}"
+        return 0
+      end
+      base_type_number.snapshot
+    end
+
+    def check_fit_base_type
+      if @@TypeDefs.length <= base_type_number.snapshot
+      end
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/FitDeveloperDataFieldDefinition.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FitDeveloperDataFieldDefinition.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2017 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 'bindata'
+require 'fit4ruby/FitDefinitionFieldBase'
+
+module Fit4Ruby
+
+  class FitDeveloperDataFieldDefinition < BinData::Record
+
+    include FitDefinitionFieldBase
+
+    uint8 :field_number
+    uint8 :size_in_bytes
+    uint8 :developer_data_index
+
+    def name
+      "developer_field_#{developer_data_index.snapshot}_" +
+        "#{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'
+      end
+    end
+
+  end
+
+end

data/lib/fit4ruby/FitMessageRecord.rb

@@ -53,8 +53,8 @@ module Fit4Ruby
       obj = entity.new_fit_data_record(@name)
 
       # It's important to ensure that alternative fields processed after the
-      # regular fields so that the decision field is already set.
-      sorted_fields = @definition.fields.sort do |f1, f2|
+      # regular fields so that the decision field has already been already set.
+      sorted_fields = @definition.data_fields.sort do |f1, f2|
         f1alt = is_alt_field?(f1)
         f2alt = is_alt_field?(f2)
         f1alt == f2alt ?
@@ -89,6 +89,16 @@ 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
     end
 
     private
@@ -131,7 +141,7 @@ module Fit4Ruby
 
     def produce(definition)
       fields = []
-      definition.fields.each do |field|
+      definition.data_fields.each do |field|
         field_def = [ field.type, field.name ]
         if field.type == 'string'
           # Strings need special handling. We need to also include the length
@@ -146,6 +156,11 @@ module Fit4Ruby
         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

@@ -36,40 +36,39 @@ module Fit4Ruby
     def read(io, entity, filter, record_counters)
       header = FitRecordHeader.read(io)
 
-      if !header.compressed?
-        # process normal headers
-        local_message_type = header.local_message_type.snapshot
-        if header.message_type.snapshot == 1
-          # process definition message
-          definition = FitDefinition.read(io)
-          @definitions[local_message_type] = FitMessageRecord.new(definition)
-        else
-          # process data message
-          definition = @definitions[local_message_type]
-          unless definition
-            Log.fatal "Undefined local message type: #{local_message_type}"
-          end
-          if filter
-            @number = @definitions[local_message_type].global_message_number
-            index = (record_counters[@number] += 1)
+      if header.compressed?
+        # process compressed timestamp header
+        time_offset = header.time_offset.snapshot
+      end
+
+      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)
+        @definitions[local_message_type] = FitMessageRecord.new(definition)
+      else
+        # process data message
+        definition = @definitions[local_message_type]
+        unless definition
+          Log.fatal "Undefined local message type: #{local_message_type}"
+        end
+        if filter
+          @number = @definitions[local_message_type].global_message_number
+          index = (record_counters[@number] += 1)
 
-            # Check if we have a filter defined to collect raw dumps of the
-            # data in the message records. The dump is collected in @fields
-            # for later output.
-            if (filter.record_numbers.nil? ||
-                filter.record_numbers.include?(@number)) &&
-               (filter.record_indexes.nil? ||
-                filter.record_indexes.include?(index))
-              @name = definition.name
-              @fields = []
-            end
+          # Check if we have a filter defined to collect raw dumps of the
+          # data in the message records. The dump is collected in @fields
+          # for later output.
+          if (filter.record_numbers.nil? ||
+              filter.record_numbers.include?(@number)) &&
+             (filter.record_indexes.nil? ||
+              filter.record_indexes.include?(index))
+            @name = definition.name
+            @fields = []
           end
-          definition.read(io, entity, filter, @fields)
         end
-      else
-        # process compressed timestamp header
-        time_offset = header.time_offset
-        Log.fatal "Support for compressed headers not yet implemented"
+        definition.read(io, entity, filter, @fields)
       end
 
       self

data/lib/fit4ruby/FitRecordHeader.rb

@@ -3,7 +3,7 @@
 #
 # = FitRecordHeader.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2017 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
@@ -17,13 +17,13 @@ module Fit4Ruby
     bit1 :normal
 
     bit1 :message_type, :onlyif => :normal?
-    bit2 :reserved, :onlyif => :normal?
 
+    bit1 :developer_data_flag, :onlyif => :normal?
+    bit1 :reserved, :onlyif => :normal?
     choice :local_message_type, :selection => :normal do
       bit4 0
       bit2 1
     end
-
     bit5 :time_offset, :onlyif => :compressed?
 
     def normal?

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -283,6 +283,25 @@ module Fit4Ruby
     entry 2, 'paused'
     entry 3, 'unknown'
 
+    dict 'fit_base_type'
+    entry 0, 'enum'
+    entry 1, 'sint8'
+    entry 2, 'uint8'
+    entry 7, 'string'
+    entry 10, 'uint8z'
+    entry 13, 'byte'
+    entry 131, 'sint16'
+    entry 132, 'uint16'
+    entry 133, 'sint32'
+    entry 134, 'uint32'
+    entry 136, 'float32'
+    entry 137, 'float64'
+    entry 139, 'uint16z'
+    entry 140, 'uint32z'
+    entry 142, 'sint64'
+    entry 143, 'uint64'
+    entry 144, 'uint64z'
+
     dict 'garmin_product'
     entry 8, 'hrm_run_single_byte_product_id'
     entry 1551, 'fenix'

data/lib/fit4ruby/GlobalFitMessage.rb

@@ -86,7 +86,7 @@ module Fit4Ruby
       end
 
       def fit_to_native(value)
-        return nil if value == FitDefinitionField.undefined_value(@type)
+        return nil if value == FitDefinitionFieldBase.undefined_value(@type)
 
         if @opts.include?(:dict) && (dict = GlobalFitDictionaries[@opts[:dict]])
           return dict.name(value) || "Undocumented value #{value}"
@@ -106,12 +106,12 @@ module Fit4Ruby
       end
 
       def native_to_fit(value)
-        return FitDefinitionField.undefined_value(@type) if value.nil?
+        return FitDefinitionFieldBase.undefined_value(@type) if value.nil?
 
         if @opts.include?(:dict) && (dict = GlobalFitDictionaries[@opts[:dict]])
           unless (dv = dict.value_by_name(value))
             Log.error "Unknown value '#{value}' assigned to field #{@name}"
-            return FitDefinitionField.undefined_value(@type)
+            return FitDefinitionFieldBase.undefined_value(@type)
           else
             return dv
           end

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -63,6 +63,7 @@ module Fit4Ruby
     field 53, 'enum', 'undocumented_field_53'
     field 54, 'enum', 'undocumented_field_54'
     field 56, 'enum', 'mounting_side'
+    field 55, 'enum', 'undocumented_field_55'
     field 58, 'uint16', 'autosync_min_steps'
     field 59, 'uint16', 'autosync_min_time'
     field 62, 'enum', 'undocumented_field_62'
@@ -98,6 +99,7 @@ module Fit4Ruby
     field 127, 'enum', 'undocumented_field_127'
     field 128, 'enum', 'undocumented_field_128'
     field 133, 'enum', 'undocumented_field_133'
+    field 138, 'enum', 'undocumented_field_138'
 
     message 3, 'user_profile'
     field 0, 'string', 'friendly_name'
@@ -115,7 +117,7 @@ module Fit4Ruby
     field 17, 'enum', 'activity_class'
     field 18, 'enum', 'position_setting', :dict => 'display_position'
     field 21, 'enum', 'temperature_setting', :dict => 'display_measure'
-    field 24, 'uint8', 'undocumented_field_24'
+    field 24, 'uint8', 'birth_year'
     field 28, 'uint32', 'wake_time', :type => 'duration'
     field 29, 'uint32', 'sleep_time', :type => 'duration'
     field 30, 'enum', 'height_setting', :dict => 'display_measure'
@@ -199,6 +201,7 @@ module Fit4Ruby
     field 54, 'uint32', 'undocumented_field_54'
     field 55, 'enum', 'undocumented_field_55'
     field 57, 'enum', 'undocumented_field_57'
+    field 60, 'enum', 'undocumented_field_60'
     field 254, 'uint16', 'message_index'
 
     message 18, 'session'
@@ -302,6 +305,12 @@ module Fit4Ruby
     field 134, 'uint16', 'avg_stride_length', :scale => 10000, :unit => 'm' # guessed
     field 137, 'uint8', 'g_effect', :scale => 10
     field 138, 'uint8', 'undocumented_field_138'
+    field 151, 'uint16', 'undocumented_field_151'
+    field 152, 'uint32', 'undocumented_field_152'
+    field 157, 'uint16', 'undocumented_field_157'
+    field 158, 'uint16', 'undocumented_field_158'
+    field 153, 'enum', 'undocumented_field_153'
+    field 154, 'enum', 'undocumented_field_154'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -390,6 +399,8 @@ module Fit4Ruby
     field 118, 'uint16', 'vertical_ratio', :scale => 100, :unit => '%' # guessed
     field 119, 'uint16', 'avg_gct_balance', :scale => 100, :unit => '%' # guessed
     field 120, 'uint16', 'avg_stride_length', :scale => 10000, :unit => 'm' # guessed
+    field 125, 'uint16', 'undocumented_field_125'
+    field 126, 'uint16', 'undocumented_field_126'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -475,8 +486,8 @@ module Fit4Ruby
     # Possibly which device is used as metering source.
     # Not documented in FIT SDK, so the field names are all guesses right now.
     message 22, 'data_sources'
-    field 0, 'uint8', 'distance'
-    field 1, 'uint8', 'speed'
+    field 0, 'uint8', 'speed'
+    field 1, 'uint8', 'distance'
     field 2, 'uint8', 'cadence'
     field 3, 'uint8', 'elevation'
     field 4, 'uint8', 'heart_rate'
@@ -515,6 +526,7 @@ module Fit4Ruby
     field 25, 'enum', 'source_type', :dict => 'source_type'
     field 29, 'uint8', 'undocumented_field_29'
     field 30, 'uint8', 'undocumented_field_30'
+    field 31, 'uint32', 'undocumented_field_31'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # This message was first seen on the Fenix3HR with firmware 3.0.
@@ -787,8 +799,32 @@ module Fit4Ruby
     field 56, 'uint16', 'undocumented_field_56'
     field 57, 'uint16', 'undocumented_field_57'
     field 58, 'enum', 'undocumented_field_58'
+    field 59, 'uint8', 'undocumented_field_59'
     field 254, 'uint16', 'message_index'
 
+    message 206, 'field_description'
+    field 0, 'uint8', 'developer_data_index'
+    field 1, 'uint8', 'field_definition_number'
+    field 2, 'uint8', 'fit_base_type_id'
+    field 3, 'string', 'field_name', :array => true
+    field 4, 'uint8', 'array'
+    field 5, 'string', 'components'
+    field 6, 'uint8', 'scale'
+    field 7, 'sint8', 'offset'
+    field 8, 'string', 'units', :array => true
+    field 9, 'string', 'bits'
+    field 10, 'string', 'accumulate'
+    field 13, 'uint16', 'fit_base_unit_id'
+    field 14, 'uint16', 'native_mesg_num'
+    field 15, 'uint8', 'native_field_num'
+
+    message 207, 'developer_data_id'
+    field 0, 'byte', 'developer_id', :array => true
+    field 1, 'byte', 'application_id', :array => true
+    field 2, 'uint16', 'manufacturer_id'
+    field 3, 'uint8', 'developer_data_index'
+    field 4, 'uint32', 'application_version'
+
     # Not part of the official ANT SDK doc.
     message 211, 'undocumented_211'
     field 0, 'uint8', 'undocumented_field_0'
@@ -811,6 +847,21 @@ module Fit4Ruby
     field 15, 'uint16', 'undocumented_field_15'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    # Not part of the official ANT SDK doc.
+    message 227, 'stress'
+    field 0, 'sint16', 'undocumented_0'
+    field 1, 'uint32', 'undocumented_1'
+    field 2, 'sint8', 'level'
+
+    message 1024, 'undocumented_1024'
+    field 0, 'enum', 'undocumented_field_0'
+    field 2, 'enum', 'undocumented_field_2'
+    field 15, 'uint16', 'undocumented_field_15'
+    field 40, 'enum', 'undocumented_field_40'
+    field 44, 'enum', 'undocumented_field_44'
+    field 247, 'enum', 'undocumented_field_247'
+    field 255, 'enum', 'undocumented_field_255'
+
     # Not part of the official ANT SDK doc.
     message 233, 'undocumented_233'
     field 2, 'byte', 'undocumented_field_2'

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -69,8 +69,8 @@ dependencies:
 description: |
   This library can read and write FIT files and convert them into a Ruby data
   structure for easy processing. This library was written for Garmin devices
-  like the FR620, Fenix 3 and Fenix 3 HR. Fit files from other devices may work
-  as well but have not been tested.
+  like the FR620, Fenix 3, Fenix 3 HR, Fenix 5 (s and X). Fit files from other
+  devices may work as well but have not been tested.
 email: chris@linux.com
 executables: []
 extensions: []
@@ -86,16 +86,20 @@ files:
 - lib/fit4ruby/Activity.rb
 - lib/fit4ruby/Converters.rb
 - lib/fit4ruby/DataSources.rb
+- lib/fit4ruby/DeveloperDataId.rb
 - lib/fit4ruby/DeviceInfo.rb
 - lib/fit4ruby/DumpedField.rb
 - lib/fit4ruby/EPO_Data.rb
 - lib/fit4ruby/Event.rb
+- lib/fit4ruby/FieldDescription.rb
 - lib/fit4ruby/FileCreator.rb
 - lib/fit4ruby/FileId.rb
 - lib/fit4ruby/FileNameCoder.rb
 - lib/fit4ruby/FitDataRecord.rb
 - lib/fit4ruby/FitDefinition.rb
 - lib/fit4ruby/FitDefinitionField.rb
+- lib/fit4ruby/FitDefinitionFieldBase.rb
+- lib/fit4ruby/FitDeveloperDataFieldDefinition.rb
 - lib/fit4ruby/FitFile.rb
 - lib/fit4ruby/FitFileEntity.rb
 - lib/fit4ruby/FitFilter.rb
@@ -155,7 +159,7 @@ rubyforge_project:
 rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
-summary: Library to read GARMIN FIT files.
+summary: Library to read and write GARMIN FIT files.
 test_files:
 - spec/FileNameCoder_spec.rb
 - spec/FitFile_spec.rb