fit4ruby 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d789b2e373decc4dfff48739b65a320c66da88fd
-  data.tar.gz: 1a40f4aac55b45f66cb082b6ffef4ca6e3c3ed9e
+  metadata.gz: 247b4e5fd81ffc3c5e12bc1d3235196126fdb8cc
+  data.tar.gz: b493e5b073e63d977ed28edc3600dac73519d0b6
 SHA512:
-  metadata.gz: 2ec0e96be6dd2d0cf44b03a5ac41197a693d4a4b8861063a55f7d37e98252656f380d8cb57bb4d77476d7f805fdab1668c598f5ec81208e7225102e151b12e8a
-  data.tar.gz: d92c14c4af7c98c043d3a675bb8eefa741fe30b18a05d4606358cd69a49c05b4564355b1c213dac9c9196d1b1c2f0bf5122bca7808652db310fccf1c59fe92f1
+  metadata.gz: 88b2fe75bdf8a1bfb4a6f3d4892db4253f942a3a251118fc054f4671f9f3927960552fe9005334da6f884e95990babae029071edbf287740efaff2450748824b
+  data.tar.gz: f8aa4152a1d37f682d0ca526045d10a19628ba79bad41eebbf3b3e3e963fcb971fc82d38fef8756b2bfa50eaefd3eea80388c849cb1bc0bf34aa79d64754e7eb

data/lib/fit4ruby/Activity.rb

@@ -264,7 +264,7 @@ module Fit4Ruby
       # Then check the user_data entries for a metmax entry. METmax * 3.5
       # is same value as VO2max.
       @user_data.each do |u|
-        return ((u.metmax * 1000.0) * 3.5) / 1024.0 if u.metmax
+        return u.metmax * 3.5 if u.metmax
       end
 
       nil

data/lib/fit4ruby/FieldDescription.rb

@@ -3,7 +3,7 @@
 #
 # = FieldDescription.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2017, 2018, 2019 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
@@ -32,17 +32,20 @@ module Fit4Ruby
       unless (gfm = GlobalFitMessages[@native_mesg_num])
         Log.error "Developer field description references unknown global " +
           "message number #{@native_mesg_num}"
+        return
       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"
+         return
       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"
+        return
       end
       options = {}
       options[:scale] = @scale if @scale
@@ -58,4 +61,3 @@ module Fit4Ruby
 
 end
 
-

data/lib/fit4ruby/FitDeveloperDataFieldDefinition.rb

@@ -3,7 +3,7 @@
 #
 # = FitDeveloperDataFieldDefinition.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2017, 2018 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2017, 2018, 2019 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
@@ -41,22 +41,56 @@ module Fit4Ruby
       size_in_bytes
     end
 
-    private
+    def undefined_value
+      FIT_TYPE_DEFS[checked_base_type_number][2]
+    end
 
     def find_field_definition
+      return @field_definition if @field_definition
+
       tlr = parent.parent.fit_entity.top_level_record
-      field = tlr.field_descriptions.find do |fd|
+      @field_definition = tlr.field_descriptions.find do |fd|
         fd.field_definition_number == field_number.snapshot &&
           fd.developer_data_index == developer_data_index.snapshot
       end
-      unless field
+      unless @field_definition
         Log.error "Unknown developer field #{field_number.snapshot} " +
           "for developer #{developer_data_index.snapshot}"
+        return nil
       end
 
-      field
+      @field_definition
+    end
+
+    def to_s(value)
+      return '' if value.nil?
+
+      if (field_definition = find_field_definition)
+        "#{value} #{find_field_definition.units}"
+      else
+        if value.kind_of?(Array)
+          s = '[ '
+          value.each do |v|
+            v /= @field_def.scale.to_f if @field_def.scale
+            v -= @fielid_def.offset if @field_def.offset
+            s << to_s(v) + ' '
+          end
+          s + ']'
+
+          return s
+        else
+          field_number = field_definition_number.snapshot
+
+          value /= @field_def.scale.to_f if @field_def.scale
+          value -= @fielid_def.offset if @field_def.offset
+
+          return value.to_s
+        end
+      end
     end
 
+    private
+
     def checked_base_type_number
       field = find_field_definition
       base_type_number = field.fit_base_type_id & 0x7F

data/lib/fit4ruby/FitFileEntity.rb

@@ -13,6 +13,7 @@
 require 'fit4ruby/Activity'
 require 'fit4ruby/Monitoring_B'
 require 'fit4ruby/GlobalFitMessage'
+require 'fit4ruby/Metrics'
 
 module Fit4Ruby
 
@@ -49,6 +50,9 @@ module Fit4Ruby
       when 32, 'monitoring_b'
         @top_level_record = Monitoring_B.new
         @type = 'monitoring_b'
+      when 44, 'metrics'
+        @top_level_record = Metrics.new
+        @type = 'metrics'
       else
         Log.error "Unsupported FIT file type #{type}"
         return nil

data/lib/fit4ruby/FitMessageRecord.rb

@@ -3,7 +3,7 @@
 #
 # = FitMessageRecord.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2018, 2019 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
@@ -98,6 +98,39 @@ module Fit4Ruby
         end
       end
 
+      @definition.developer_fields.each do |field|
+        # Find the corresponding field description for the given developer and
+        # field number.
+        field_number = field.field_number.snapshot
+
+        unless (field_description = field.find_field_definition)
+          Log.error "There is no field definition for developer " +
+            "#{field.developer_data_index} field #{field_number}"
+          next
+        end
+
+        field_name = field_description.field_name
+        units = field_description.units
+        type = field.type
+        native_message_number = field_description.native_mesg_num
+        native_field_number = field_description.native_field_num
+
+        value = @message_record[field.name].snapshot
+        value = nil if value == field.undefined_value
+
+        if filter && fields_dump &&
+           (filter.field_names.nil? ||
+            filter.field_names.include?(field_name)) &&
+           !(((value.respond_to?('count') &&
+               (value.count(field.undefined_value) == value.length)) ||
+              value == field.undefined_value) && filter.ignore_undef)
+          fields_dump << DumpedField.new(
+            native_message_number,
+            256 * (1 + field.developer_data_index) + field_number,
+            field_name, type, field.to_s(value))
+        end
+      end
+
       if @name == 'field_description'
         obj.create_global_definition(fit_entity)
       end

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -75,6 +75,10 @@ module Fit4Ruby
     entry 4, 'low'
     entry 5, 'critical'
 
+    dict 'date_mode'
+    entry 0, 'day_month'
+    entry 1, 'month_day'
+
     dict 'body_location'
     entry 0, 'left_leg'
     entry 1, 'left_calf'
@@ -245,6 +249,7 @@ module Fit4Ruby
     entry 45, 'elev_high_alert'
     entry 46, 'elev_low_alert'
     entry 47, 'comm_timeout'
+    entry 48, 'functional_threshold_power' # guess (in Watt)
     entry 49, 'lactate_threshold_heart_rate' # guess (in BPM)
     entry 50, 'lactate_threshold_speed' # guess (in m/s)
 
@@ -276,6 +281,10 @@ module Fit4Ruby
     entry 20, 'activity_summary'
     entry 28, 'monitoring_daily'
     entry 32, 'monitoring_b'
+    entry 34, 'segment'
+    entry 35, 'segment_list'
+    entry 40, 'exd_configuration'
+    entry 44, 'metrics'
 
     dict 'fitness_equipment_state'
     entry 0, 'ready'
@@ -344,6 +353,8 @@ module Fit4Ruby
     entry 2593, 'running_dynamics_pod'
     entry 2691, 'fr935'
     entry 2697, 'fenix5'
+    entry 2957, 'fenix5_gps_galileo' # Just a guess
+    entry 3111, 'fenix5x_plus'
     entry 10007, 'sdm4'
     entry 20119, 'training_center'
     entry 65532, 'android_antplus_plugin'
@@ -651,6 +662,22 @@ module Fit4Ruby
     entry 59, 'obstacle '
     entry 254, 'all'
 
+    dict 'training_status'
+    entry 0, 'overreaching'
+    entry 1, 'detraining'
+    entry 2, 'unproductive'
+    entry 3, 'recovery'
+    entry 4, 'maintaining'
+    entry 5, 'productive'
+    entry 6, 'peaking'
+    entry 7, 'productive'
+
+    dict 'training_status_trend'
+    entry 0, 'undefined'
+    entry 1, 'down'
+    entry 2, 'maintaining'
+    entry 3, 'up'
+
   end
 
 end

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -44,8 +44,12 @@ module Fit4Ruby
     field 14, 'uint8', 'undocumented_field_14'
     field 15, 'uint8', 'undocumented_field_15'
     field 22, 'enum', 'undocumented_field_22'
+    field 23, 'enum', 'undocumented_field_23'
+    field 25, 'enum', 'undocumented_field_25'
     field 26, 'enum', 'undocumented_field_26'
     field 28, 'enum', 'undocumented_field_28'
+    field 30, 'enum', 'undocumented_field_30'
+    field 31, 'enum', 'undocumented_field_31'
     field 34, 'enum', 'undocumented_field_34'
     field 35, 'enum', 'undocumented_field_35'
     field 36, 'enum', 'activity_tracker_enabled'
@@ -56,6 +60,7 @@ module Fit4Ruby
     field 44, 'enum', 'undocumented_field_44'
     field 45, 'enum', 'undocumented_field_45'
     field 46, 'enum', 'move_alert_enabled'
+    field 47, 'enum', 'date_mode'
     field 48, 'enum', 'undocumented_field_48'
     field 49, 'uint16', 'undocumented_field_49'
     field 51, 'enum', 'undocumented_field_51'
@@ -75,6 +80,8 @@ module Fit4Ruby
     field 68, 'enum', 'undocumented_field_68'
     field 69, 'enum', 'undocumented_field_69'
     field 75, 'enum', 'undocumented_field_75'
+    field 76, 'enum', 'undocumented_field_76'
+    field 77, 'enum', 'undocumented_field_77'
     field 80, 'enum', 'lactate_threshold_autodetect_enabled'
     field 81, 'enum', 'undocumented_field_81'
     field 82, 'enum', 'undocumented_field_82'
@@ -84,6 +91,7 @@ module Fit4Ruby
     field 87, 'enum', 'undocumented_field_87'
     field 90, 'uint32', 'auto_activity_detect'
     field 94, 'uint8', 'number_of_screens'
+    field 96, 'enum', 'undocumented_field_96'
     field 97, 'uint8z', 'undocumented_field_97'
     field 101, 'enum', 'undocumented_field_101'
     field 104, 'enum', 'undocumented_field_104'
@@ -93,14 +101,27 @@ module Fit4Ruby
     field 110, 'enum', 'undocumented_field_110'
     field 111, 'enum', 'undocumented_field_111'
     field 112, 'enum', 'undocumented_field_112'
+    field 116, 'enum', 'undocumented_field_116'
+    field 117, 'enum', 'undocumented_field_117'
     field 124, 'uint8', 'undocumented_field_124'
     field 125, 'uint8', 'undocumented_field_125'
     field 126, 'enum', 'undocumented_field_126'
     field 127, 'enum', 'undocumented_field_127'
     field 128, 'enum', 'undocumented_field_128'
+    field 129, 'enum', 'undocumented_field_129'
+    field 130, 'enum', 'undocumented_field_130'
+    field 131, 'enum', 'undocumented_field_131'
+    field 132, 'enum', 'undocumented_field_132'
     field 133, 'enum', 'undocumented_field_133'
+    field 137, 'enum', 'undocumented_field_137'
     field 138, 'enum', 'undocumented_field_138'
+    field 139, 'enum', 'undocumented_field_139'
+    field 141, 'uint8', 'undocumented_field_141'
+    field 142, 'uint8', 'undocumented_field_142'
+    field 143, 'uint8', 'undocumented_field_143'
     field 144, 'enum', 'true_up_enabled'
+    field 148, 'enum', 'undocumented_field_148'
+    field 149, 'enum', 'undocumented_field_149'
 
     message 3, 'user_profile'
     field 0, 'string', 'friendly_name'
@@ -124,7 +145,7 @@ module Fit4Ruby
     field 30, 'enum', 'height_setting', :dict => 'display_measure'
     field 31, 'uint16', 'user_running_step_length'
     field 32, 'uint16', 'user_walking_step_length'
-    field 33, 'uint16', 'undocumented_field_33'
+    field 33, 'uint16', 'undocumented_field_33' # varies between 800 to 1600, seems VO2max related
     field 34, 'uint16', 'undocumented_field_34'
     field 35, 'uint32', 'undocumented_field_35'
     field 36, 'uint8', 'undocumented_field_36'
@@ -132,11 +153,54 @@ module Fit4Ruby
     field 38, 'uint16', 'undocumented_field_38'
     field 39, 'float32', 'undocumented_field_39'
     field 40, 'float32', 'undocumented_field_40'
-    field 41, 'uint32', 'undocumented_field_41'
+    field 41, 'uint32', 'time_last_lthr_update', :type => 'date_time'
     field 42, 'uint32', 'undocumented_field_42'
     field 43, 'enum', 'undocumented_field_43'
+    field 47, 'enum', 'undocumented_field_47'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    message 5, 'sdm_profile'
+    field 0, 'bool', 'enabled'
+    field 1, 'uint16z', 'sdm_ant_id'
+    field 2, 'uint16', 'sdm_cal_factor', :scale => 10, :unit => '%'
+    field 3, 'uint32', 'odometer', :scale => 100, :unit => 'm'
+    field 4, 'bool', 'speed_source'
+    field 5, 'uint8z', 'sdm_ant_id_trans_type'
+    field 7, 'uint8', 'odometer_rollover'
+
+    message 6, 'bike_profile'
+    field 0, 'string', 'name'
+    field 1, 'sport', 'sport'
+    field 2, 'sub_sport', 'sub_sport'
+    field 3, 'uint32', 'odometer', :scale => 100, :unit => 'm'
+    field 4, 'uint16z', 'bike_spd_ant_id'
+    field 5, 'uint16z', 'bike_cad_ant_id'
+    field 6, 'uint16z', 'bike_spdcad_ant_id'
+    field 7, 'uint16z', 'bike_power_ant_id'
+    field 8, 'uint16', 'custom_wheelsize', :scale => 1000, :unit => 'm'
+    field 9, 'uint16', 'auto_wheelsize', :scale => 1000, :unit => 'm'
+    field 10, 'uint16', 'bike_weight', :scale => 10, :unit => 'kg'
+    field 11, 'uint16', 'power_cal_factor', :scale => 10, :unit => '%'
+    field 12, 'bool', 'auto_wheel_cal'
+    field 13, 'bool', 'auto_power_zero'
+    field 14, 'uint8', 'id'
+    field 15, 'bool', 'spd_enabled'
+    field 16, 'bool', 'cad_enabled'
+    field 17, 'bool', 'spdcad_enabled'
+    field 18, 'bool', 'power_enabled'
+    field 19, 'uint8', 'crank_length', :scale => 2, :offset => -110, :unit => 'mm'
+    field 20, 'bool', 'enabled'
+    field 21, 'uint8z', 'bike_spd_ant_id_trans_type'
+    field 22, 'uint8z', 'bike_cad_ant_id_trans_type'
+    field 23, 'uint8z', 'bike_spdcad_ant_id_trans_type'
+    field 24, 'uint8z', 'bike_power_ant_id_trans_type'
+    field 37, 'uint8', 'odometer_rollover'
+    field 38, 'uint8z', 'front_gear_num', :array => true
+    field 39, 'uint8z', 'front_gear'
+    field 40, 'uint8z', 'rear_gear_num', :array => true
+    field 41, 'uint8z', 'rear_gear'
+    field 44, 'bool', 'shimano_di2_enabled'
+
     message 7, 'zones_target'
     field 1, 'uint8', 'max_heart_rate'
     field 2, 'uint8', 'threshold_heart_rate'
@@ -157,10 +221,13 @@ module Fit4Ruby
     field 4, 'uint16', 'undocumented_field_4'
     field 5, 'enum', 'undocumented_field_5'
     field 6, 'enum', 'undocumented_field_6'
+    field 9, 'uint8', 'undocumented_field_9'
     field 10, 'uint8', 'undocumented_field_10', :array => true
     field 11, 'enum', 'undocumented_field_11'
-    field 12, 'uint8', 'undocumented_field_12'
+    field 12, 'uint8', 'undocumented_field_12', :array => true
     field 13, 'enum', 'undocumented_field_13'
+    field 15, 'enum', 'undocumented_field_15'
+    field 19, 'enum', 'undocumented_field_19', :array => true
 
     # Not part of the official ANT SDK doc.
     message 13, 'undocumented_13'
@@ -198,14 +265,23 @@ module Fit4Ruby
     field 40, 'enum', 'undocumented_field_40'
     field 41, 'sint32', 'undocumented_field_41'
     field 42, 'uint8', 'undocumented_field_42'
+    field 43, 'enum', 'undocumented_field_43'
+    field 44, 'enum', 'undocumented_field_44'
+    field 45, 'enum', 'undocumented_field_45'
     field 46, 'enum', 'undocumented_field_46'
+    field 47, 'enum', 'undocumented_field_47'
+    field 48, 'enum', 'undocumented_field_48'
     field 53, 'enum', 'undocumented_field_53'
     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 62, 'enum', 'undocumented_field_62'
+    field 63, 'enum', 'undocumented_field_63'
+    field 64, 'uint16', 'undocumented_field_64'
     field 65, 'enum', 'undocumented_field_65'
     field 66, 'enum', 'undocumented_field_66'
+    field 76, 'enum', 'undocumented_field_76'
     field 254, 'uint16', 'message_index'
 
     message 18, 'session'
@@ -304,10 +380,15 @@ module Fit4Ruby
     field 121, 'uint16', 'max_power_position', :array => true, :unit => 'watts'
     field 122, 'uint8', 'avg_cadence_position', :array => true, :unit => 'rpm'
     field 123, 'uint8', 'max_cadence_position', :array => true, :unit => 'rpm'
+    field 124, 'uint32', 'enhanced_avg_speed', :scale => 1000, :unit => 'm/s'
+    field 125, 'uint32', 'enhanced_max_speed', :scale => 1000, :unit => 'm/s'
+    field 126, 'uint32', 'enhanced_avg_altitude', :scale => 5, :offset => 500, :unit => 'm'
+    field 127, 'uint32', 'enhanced_min_altitude', :scale => 5, :offset => 500, :unit => 'm'
+    field 128, 'uint32', 'enhanced_max_altitude', :scale => 5, :offset => 500, :unit => 'm'
     field 132, 'uint16', 'avg_vertical_ratio', :scale => 100, :unit => '%'
     field 133, 'uint16', 'avg_stance_time_balance', :scale => 100, :unit => '%'
-    field 134, 'uint16', 'avg_step_length', :scale => 100, :unit => 'mm'
-    field 137, 'uint8', 'g_effect', :scale => 10
+    field 134, 'uint16', 'avg_step_length', :scale => 10, :unit => 'mm'
+    field 137, 'uint8', 'total_anaerobic_training_effect', :scale => 10
     field 138, 'uint8', 'undocumented_field_138'
     field 150, 'sint8', 'min_temperature', :unit => 'C' # guessed
     field 151, 'uint16', 'undocumented_field_151'
@@ -316,6 +397,7 @@ module Fit4Ruby
     field 158, 'uint16', 'undocumented_field_158'
     field 153, 'enum', 'undocumented_field_153'
     field 154, 'enum', 'undocumented_field_154'
+    field 184, 'enum', 'undocumented_field_184'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -403,9 +485,14 @@ module Fit4Ruby
     field 107, 'uint16', 'max_power_position', :array => true, :unit => 'watts'
     field 108, 'uint8', 'avg_cadence_position', :array => true, :unit => 'rpm'
     field 109, 'uint8', 'max_cadence_position', :array => true, :unit => 'rpm'
-    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 110, 'uint32', 'enhanced_avg_speed', :scale => 1000, :unit => 'm/s'
+    field 111, 'uint32', 'enhanced_max_speed', :scale => 1000, :unit => 'm/s'
+    field 112, 'uint32', 'enhanced_avg_altitude', :scale => 5, :offset => 500, :unit => 'm'
+    field 113, 'uint32', 'enhanced_min_altitude', :scale => 5, :offset => 500, :unit => 'm'
+    field 114, 'uint32', 'enhanced_max_altitude', :scale => 5, :offset => 500, :unit => 'm'
+    field 118, 'uint16', 'avg_vertical_ratio', :scale => 100, :unit => '%'
+    field 119, 'uint16', 'avg_stance_time_balance', :scale => 100, :unit => '%'
+    field 120, 'uint16', 'avg_step_length', :scale => 10000, :unit => 'm'
     field 124, 'sint8', 'min_temperature', :unit => 'C' # guessed
     field 125, 'uint16', 'undocumented_field_125'
     field 126, 'uint16', 'undocumented_field_126'
@@ -488,6 +575,7 @@ module Fit4Ruby
       field 'recovery_time', 'uint32', 'recovery_time', :unit => 'min'
       field 'recovery_info', 'uint32', 'recovery_info', :unit => 'min'
       field 'vo2max', 'uint32', 'vo2max'
+      field 'functional_threshold_power', 'uint32', 'functional_threshold_power', :unit => 'W'
       field 'lactate_threshold_heart_rate', 'uint32', 'lactate_threshold_heart_rate', :unit => 'bpm'
       field 'lactate_threshold_speed', 'uint32', 'lactate_threshold_speed', :scale => 1000, :unit => 'm/s'
     end
@@ -495,6 +583,8 @@ module Fit4Ruby
     field 14, 'enum', 'undocumented_field_14'
     field 15, 'uint32', 'undocumented_field_15'
     field 16, 'enum', 'undocumented_field_16'
+    field 19, 'uint8', 'undocumented_field_19'
+    field 20, 'uint8', 'undocumented_field_20'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Possibly which device is used as metering source.
@@ -642,7 +732,7 @@ module Fit4Ruby
 
     # Not part of the official ANT SDK doc
     message 79, 'user_data'
-    field 0, 'uint16', 'metmax', :scale => 1000, :unit => 'MET' # VO2max / 3.5
+    field 0, 'uint16', 'metmax', :scale => 1024, :unit => 'MET' # VO2max / 3.5
     field 1, 'uint8', 'age', :unit => 'years'
     field 2, 'uint8', 'height', :scale => 100, :unit => 'm'
     field 3, 'uint16', 'weight', :scale => 10, :unit => 'kg'
@@ -652,9 +742,9 @@ module Fit4Ruby
     field 7, 'sint8', 'undocumented_field_7' # seems to be always 1
     field 8, 'uint16', 'recovery_time', :scale => 60, :unit => 'hours'
     field 9, 'uint16', 'undocumented_field_9' # maybe activity measurement
-    field 10, 'uint8', 'undocumented_field_10'
+    field 10, 'uint8', 'avg_resting_heart_rate', :unit => 'bpm'
     field 11, 'uint16', 'running_lactate_threshold_heart_rate', :unit => 'bpm'
-    field 12, 'uint16', 'undocumented_field_12'
+    field 12, 'uint16', 'functional_threshold_power', :unit => 'W'
     field 13, 'uint16', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
     field 15, 'uint8', 'undocumented_field_15'
@@ -722,18 +812,18 @@ module Fit4Ruby
     # All known fields so far seem to be physiological values. We'll use the
     # name physiological_metrics for now.
     message 140, 'physiological_metrics'
-    field 0, 'uint8', 'max_heart_rate', :unit => 'bpm'
-    field 1, 'uint8', 'undocumented_field_1'
+    field 0, 'uint8', 'min_heart_rate', :unit => 'bpm'
+    field 1, 'uint8', 'max_heart_rate', :unit => 'bpm'
     field 2, 'sint32', 'undocumented_field_2'
     field 3, 'sint32', 'undocumented_field_3'
     field 4, 'uint8', 'aerobic_training_effect', :scale => 10
     field 5, 'sint32', 'undocumented_field_5'
     field 6, 'sint32', 'undocumented_field_6'
-    field 7, 'sint32', 'undocumented_field_7'
+    field 7, 'sint32', 'metmax', :scale => 65536, :unit => 'MET'
     # Field 8 used to be uint8 but recent devices use sint8. We model this
     # with an alt_field. The switch field is randomly picked as we have no
     # details why the type has been changed.
-    alt_field 8, 'undocumented_field_1' do
+    alt_field 8, 'max_heart_rate' do
       field :default, 'sint8', 'undocumented_field_8s'
       field 255, 'uint8', 'undocumented_field_8u'
     end
@@ -755,9 +845,10 @@ module Fit4Ruby
     field 24, 'sint32', 'undocumented_field_24'
     field 25, 'uint8', 'undocumented_field_25'
     field 26, 'sint32', 'undocumented_field_26'
-    field 29, 'sint32', 'undocumented_field_29'
+    field 29, 'sint32', 'metmax_running', :scale => 65536, :unit => 'MET'
     field 34, 'enum', 'undocumented_field_34'
     field 35, 'uint32', 'undocumented_field_35'
+    field 36, 'uint32', 'undocumented_field_36'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc. The message name is guessed and
@@ -824,6 +915,9 @@ module Fit4Ruby
     field 58, 'enum', 'undocumented_field_58'
     field 59, 'uint8', 'undocumented_field_59'
     field 62, 'uint8', 'undocumented_field_62'
+    field 63, 'enum', 'undocumented_field_63'
+    field 64, 'uint32', 'undocumented_field_64'
+    field 65, 'uint32', 'undocumented_field_65'
     field 254, 'uint16', 'message_index'
 
     # Not part of the official ANT SDK doc.
@@ -881,6 +975,74 @@ module Fit4Ruby
     field 1, 'uint32', 'stress_level_time', :type => 'date_time'
     field 2, 'sint8', 'undocumented_field_2'
 
+    # Not part of the official ANT SDK doc.
+    message 229, 'undocumented_229'
+    field 0, 'uint32', 'time', :type => 'date_time'
+    field 1, 'sint32', 'metmax', :scale => 65536, :unit => 'MET'
+    field 2, 'uint16', 'vo2max', :scale => 10, :unit => 'ml/kg/min'
+    field 3, 'sint8', 'undocumented_field_3'
+    field 4, 'sint8', 'undocumented_field_4'
+    field 5, 'enum', 'undocumented_field_5'
+    field 6, 'enum', 'undocumented_field_6'
+    field 7, 'enum', 'undocumented_field_7'
+    field 8, 'enum', 'undocumented_field_8'
+    field 9, 'enum', 'undocumented_field_9'
+
+    # Not part of the official ANT SDK doc.
+    message 232, 'training_status'
+    field 0, 'enum', 'undocumented_0'
+    field 1, 'enum', 'undocumented_1'
+    field 2, 'enum', 'current_status', :dict => 'training_status'
+    field 3, 'enum', 'fitness', :dict => 'training_status_trend'
+    field 4, 'enum', 'load', :dict => 'training_status_trend'
+    field 5, 'uint16', 'training_load'
+    field 6, 'uint16', 'low_training_load'
+    field 7, 'uint16', 'high_training_load'
+    field 8, 'uint16', 'max_training_load'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
+    # Not part of the official ANT SDK doc.
+    message 233, 'undocumented_233'
+    field 2, 'byte', 'undocumented_field_2'
+
+    # Not part of the official ANT SDK doc.
+    message 241, 'metrics'
+    field 0, 'uint32', 'localtime', :type => 'date_time'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
+    # Not part of the official ANT SDK doc.
+    message 243, 'media_player_info'
+    field 0, 'uint32', 'undocumented_field_0'
+    field 1, 'uint16', 'undocumented_field_1'
+    field 2, 'string', 'track_1'
+    field 3, 'string', 'track_2'
+    field 4, 'string', 'track_3'
+    field 5, 'uint16', 'undocumented_field_5'
+    field 6, 'uint16', 'undocumented_field_6'
+
+    # Not part of the official ANT SDK doc.
+    message 244, 'undocumented_244'
+    field 0, 'uint32', 'undocumented_field_0'
+    field 1, 'enum', 'undocumented_field_1'
+    field 2, 'uint16', 'undocumented_field_2'
+
+    # Not part of the official ANT SDK doc.
+    message 269, 'undocumented_269'
+    field 0, 'uint8', 'undocumented_field_0'
+    field 1, 'uint8', 'undocumented_field_1'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
+    # Not part of the official ANT SDK doc.
+    message 279, 'undocumented_279'
+    field 0, 'uint32', 'undocumented_field_0'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
+    # Not part of the official ANT SDK doc.
+    message 284, 'training_load'
+    field 0, 'uint16', 'load'
+    field 1, 'uint32', 'timestamp', :type => 'date_time'
+
+    # Not part of the official ANT SDK doc.
     message 1024, 'undocumented_1024'
     field 0, 'enum', 'undocumented_field_0'
     field 2, 'enum', 'undocumented_field_2'
@@ -890,10 +1052,6 @@ module Fit4Ruby
     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'
-
   end
 
 end

data/lib/fit4ruby/Metrics.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Metrics.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'
+require 'fit4ruby/FileId'
+require 'fit4ruby/FileCreator'
+require 'fit4ruby/DeviceInfo'
+require 'fit4ruby/TrainingStatus'
+
+module Fit4Ruby
+
+  # The Metrics object is a FIT file class. It's a top-level object that
+  # holds all references to other FIT records that are part of the FIT file.
+  # Each of the objects it references are direct equivalents of the message
+  # record structures used in the FIT file.
+  #
+  # This is not part of the officially documented FIT API. Names may change in
+  # the future if the real Garmin names get known.
+  class Metrics < FitDataRecord
+
+    attr_accessor :field_descriptions, :file_id, :file_creator, :device_infos
+
+    # Create a new Metrics object.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    def initialize(field_values = {})
+      super('metrics')
+
+      @field_descriptions = []
+
+      @file_id = FileId.new
+      @device_infos = []
+      @file_creator = nil
+      @training_statuses = []
+    end
+
+    # Perform some basic logical checks on the object and all references sub
+    # objects. Any errors will be reported via the Log object.
+    def check
+    end
+
+    # Create a new FitDataRecord.
+    # @param record_type [String] Type that identifies the FitDataRecord
+    #        derived class to create.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return FitDataRecord
+    def new_fit_data_record(record_type, field_values = {})
+      case record_type
+      when 'file_id'
+        @file_id = (record = FileId.new(field_values))
+      when 'file_creator'
+        @software = (record = FileCreator.new(field_values))
+      when 'device_info'
+        @device_infos << (record = DeviceInfo.new(field_values))
+      when 'training_status'
+        @training_statuses << (record = TrainingStatus.new(field_values))
+      else
+        record = nil
+      end
+
+      record
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/TrainingStatus.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = TrainingStatus.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 training_status message.
+  #
+  # This is not part of the officially documented FIT API. Names may change in
+  # the future if the real Garmin names get known.
+  class TrainingStatus < FitDataRecord
+
+    def initialize(field_values = {})
+      super('training_status')
+      set_field_values(field_values)
+    end
+
+    # Ensure that FitDataRecords have a deterministic sequence. Device infos
+    # are sorted by device_index.
+    def <=>(fdr)
+      @timestamp == fdr.timestamp ?
+        @message.name == fdr.message.name ?
+          @device_index <=> fdr.device_index :
+          RecordOrder.index(@message.name) <=>
+            RecordOrder.index(fdr.message.name) :
+        @timestamp <=> fdr.timestamp
+    end
+
+    def check(index)
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -119,6 +119,7 @@ files:
 - lib/fit4ruby/HeartRateZones.rb
 - lib/fit4ruby/Lap.rb
 - lib/fit4ruby/Log.rb
+- lib/fit4ruby/Metrics.rb
 - lib/fit4ruby/Monitoring.rb
 - lib/fit4ruby/MonitoringInfo.rb
 - lib/fit4ruby/Monitoring_B.rb
@@ -129,6 +130,7 @@ files:
 - lib/fit4ruby/SensorSettings.rb
 - lib/fit4ruby/Session.rb
 - lib/fit4ruby/Software.rb
+- lib/fit4ruby/TrainingStatus.rb
 - lib/fit4ruby/UserData.rb
 - lib/fit4ruby/UserProfile.rb
 - lib/fit4ruby/version.rb