fit4ruby 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db683019a2227bedc32be291a3dfc0944a73608
-  data.tar.gz: bffd0e1c2afa57b10ccde0f2dc4b2de7574f82c2
+  metadata.gz: 65a965e6c32ad68e1372db0c7d84edcec72fee33
+  data.tar.gz: e5e0e5c24f2c52438c02a456acb70e9ea03ffa8e
 SHA512:
-  metadata.gz: 2361ae4059e936e3757481645e556ff28d83530331cd4bbf4716fc4f89f3e20e204d5e3db9d198ea79eb312004297f82155ce2a8b37d7b0f6112f166975216f4
-  data.tar.gz: edd160bec64bf6cf04f5af8d3288eb4780d5d709d10e11913f887db9a0ae42a4fe1d2eb629e1f000a85d23f46d18599d6f87a5ad12efb8d330283b2f570449e0
+  metadata.gz: 39ac37ed06770fce85694f8d9ce6efc218d9a4e4af8c7c5a5f069c0e9d26fa0e8dfcd453831e1442eb4ad1b59175910c0823117aebf4142e622862b9c11d51a5
+  data.tar.gz: 73ccb053c98130d9dda748031d2afcefcd90967a7e4103f60f656155d3d9a6e8fdec7139e9efb265c4fae09155b75a6bb83b6d8920d77c435220f39d818eed07

data/lib/fit4ruby/Activity.rb

@@ -15,12 +15,15 @@ require 'fit4ruby/FileId'
 require 'fit4ruby/EPO_Data'
 require 'fit4ruby/FileCreator'
 require 'fit4ruby/DeviceInfo'
+require 'fit4ruby/SensorSettings'
 require 'fit4ruby/DataSources'
 require 'fit4ruby/UserProfile'
+require 'fit4ruby/PhysiologicalMetrics'
 require 'fit4ruby/Session'
 require 'fit4ruby/Lap'
 require 'fit4ruby/Record'
 require 'fit4ruby/HRV'
+require 'fit4ruby/HeartRateZones'
 require 'fit4ruby/Event'
 require 'fit4ruby/PersonalRecords'
 
@@ -32,9 +35,10 @@ module Fit4Ruby
   class Activity < FitDataRecord
 
     attr_accessor :file_id, :epo_data,
-                  :file_creator, :device_infos, :data_sources,
-                  :user_profiles, :sessions, :laps, :records, :hrv,
-                  :events, :personal_records
+                  :file_creator, :device_infos, :sensor_settings, :data_sources,
+                  :user_profiles, :physiological_metrics,
+                  :sessions, :laps, :records, :hrv,
+                  :heart_rate_zones, :events, :personal_records
 
     # Create a new Activity object.
     # @param field_values [Hash] A Hash that provides initial values for
@@ -48,13 +52,16 @@ module Fit4Ruby
       @epo_data = nil
       @file_creator = FileCreator.new
       @device_infos = []
+      @sensor_settings = []
       @data_sources = []
       @user_profiles = []
+      @physiological_metrics = []
       @events = []
       @sessions = []
       @laps = []
       @records = []
       @hrv = []
+      @heart_rate_zones = []
       @personal_records = []
 
       @cur_session_laps = []
@@ -78,6 +85,7 @@ module Fit4Ruby
         Log.fatal "Activity must have at least one device_info section"
       end
       @device_infos.each.with_index { |d, index| d.check(index) }
+      @sensor_settings.each.with_index { |s, index| s.check(index) }
       unless @num_sessions == @sessions.count
         Log.fatal "Activity record requires #{@num_sessions}, but "
                   "#{@sessions.length} session records were found in the "
@@ -128,6 +136,9 @@ module Fit4Ruby
       # Laps must have a consecutively growing message index.
       @laps.each.with_index do |lap, index|
         lap.check(index)
+        # If we have heart rate zone records, there should be one for each
+        # lap
+        @heart_rate_zones[index].check(index) if @heart_rate_zones[index]
       end
       @sessions.each { |s| s.check(self) }
     end
@@ -271,8 +282,10 @@ module Fit4Ruby
       @file_id.write(io, id_mapper)
       @file_creator.write(io, id_mapper)
 
-      (@device_infos + @data_sources + @user_profiles + @events +
-       @sessions + @laps + @records + @personal_records).sort.each do |s|
+      (@device_infos + @sensor_settings + @data_sources + @user_profiles +
+       @physiological_metrics + @events +
+       @sessions + @laps + @records + @heart_rate_zones +
+       @personal_records).sort.each do |s|
         s.write(io, id_mapper)
       end
       super
@@ -320,6 +333,14 @@ module Fit4Ruby
       new_fit_data_record('old_user_profile', field_values)
     end
 
+    # Add a new PhysiologicalMetrics to the Activity.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [PhysiologicalMetrics]
+    def new_physiological_metrics(field_values = {})
+      new_fit_data_record('physiological_metrics', field_values)
+    end
+
     # Add a new Event to the Activity.
     # @param field_values [Hash] A Hash that provides initial values for
     #        certain fields of the FitDataRecord.
@@ -351,6 +372,14 @@ module Fit4Ruby
       new_fit_data_record('lap', field_values)
     end
 
+    # Add a new HeartRateZones record to the Activity.
+    # @param field_values [Heash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [HeartRateZones]
+    def new_heart_rate_zones(field_values = {})
+      new_fit_data_record('heart_rate_zones', field_values)
+    end
+
     # Add a new PersonalRecord to the Activity.
     # @param field_values [Hash] A Hash that provides initial values for
     #        certain fields of the FitDataRecord.
@@ -375,8 +404,11 @@ module Fit4Ruby
       super(a) && @file_id == a.file_id &&
         @file_creator == a.file_creator &&
         @device_infos == a.device_infos &&
+        @sensor_settings == a.sensor_settings &&
         @data_sources == a.data_sources &&
+        @physiological_metrics == a.physiological_metrics &&
         @user_profiles == a.user_profiles &&
+        @heart_rate_zones == a.heart_rate_zones &&
         @events == a.events &&
         @sessions == a.sessions && personal_records == a.personal_records
     end
@@ -397,10 +429,15 @@ module Fit4Ruby
         @file_creator = (record = FileCreator.new(field_values))
       when 'device_info'
         @device_infos << (record = DeviceInfo.new(field_values))
+      when 'sensor_settings'
+        @sensor_settings << (record = SensorSettings.new(field_values))
       when 'data_sources'
         @data_sources << (record = DataSources.new(field_values))
       when 'old_user_profile'
         @user_profiles << (record = UserProfile.new(field_values))
+      when 'physiological_metrics'
+        @physiological_metrics <<
+          (record = PhysiologicalMetrics.new(field_values))
       when 'event'
         @events << (record = Event.new(field_values))
       when 'session'
@@ -424,6 +461,8 @@ module Fit4Ruby
         @records << record
       when 'hrv'
         @hrv << (record = HRV.new(field_values))
+      when 'heart_rate_zones'
+        @heart_rate_zones << (record = HeartRateZones.new(field_values))
       when 'personal_records'
         @personal_records << (record = PersonalRecords.new(field_values))
       else

data/lib/fit4ruby/FitDataRecord.rb

@@ -20,7 +20,8 @@ module Fit4Ruby
     include Converters
 
     RecordOrder = [ 'old_user_profile', 'device_info', 'data_sources', 'event',
-                    'record', 'lap', 'session', 'personal_records' ]
+                    'record', 'lap', 'session', 'heart_rate_zones',
+                    'personal_records' ]
 
     attr_reader :message
 
@@ -65,6 +66,8 @@ module Fit4Ruby
     def get_as(name, to_unit)
       value = respond_to?(name) ? send(name) : get(name)
       return nil if value.nil?
+      # If the requested unit is empty we return the value as is.
+      return value if to_unit.nil? || to_unit.empty?
 
       if @meta_field_units.include?(name)
         unit = @meta_field_units[name]

data/lib/fit4ruby/FitFile.rb

@@ -38,38 +38,40 @@ module Fit4Ruby
       end
 
       entities = []
-      while !io.eof?
-        offset = io.pos
-
-        header = FitHeader.read(io)
-        header.check
-
-        check_crc(io, io.pos, offset + header.end_pos)
-
-        entity = FitFileEntity.new
-        # This Array holds the raw data of the records that may be needed to
-        # dump a human readable form of the FIT file.
-        records = []
-        # This hash will hold a counter for each record type. The counter is
-        # 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.read(io, entity, filter, record_counters)
-          records << record if filter
+      begin
+        while !io.eof?
+          offset = io.pos
+
+          header = FitHeader.read(io)
+          header.check
+
+          check_crc(io, io.pos, offset + header.end_pos)
+
+          entity = FitFileEntity.new
+          # This Array holds the raw data of the records that may be needed to
+          # dump a human readable form of the FIT file.
+          records = []
+          # This hash will hold a counter for each record type. The counter is
+          # 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.read(io, entity, filter, record_counters)
+            records << record if filter
+          end
+          # Skip the 2 CRC bytes
+          io.seek(2, :CUR)
+
+          header.dump if filter && filter.record_numbers.nil?
+          dump_records(records) if filter
+
+          entity.check
+          entities << entity
         end
-        # Skip the 2 CRC bytes
-        io.seek(2, :CUR)
-
-        header.dump if filter && filter.record_numbers.nil?
-        dump_records(records) if filter
-
-        entity.check
-        entities << entity
+      ensure
+        io.close
       end
 
-      io.close
-
       entities[0].top_level_record
     end
 
@@ -80,25 +82,27 @@ module Fit4Ruby
         Log.fatal "Cannot open FIT file '#{file_name}': #{e.message}"
       end
 
-      # Create a header object, but don't yet write it into the file.
-      header = FitHeader.new
-      start_pos = header.header_size
-      # Move the pointer behind the header section.
-      io.seek(start_pos)
-      id_mapper = FitMessageIdMapper.new
-      top_level_record.write(io, id_mapper)
-      end_pos = io.pos
-
-      crc = write_crc(io, start_pos, end_pos)
-
-      # Complete the data of the header section and write it at the start of
-      # the file.
-      header.data_size = end_pos - start_pos
-      header.crc = crc
-      io.seek(0)
-      header.write(io)
-
-      io.close
+      begin
+        # Create a header object, but don't yet write it into the file.
+        header = FitHeader.new
+        start_pos = header.header_size
+        # Move the pointer behind the header section.
+        io.seek(start_pos)
+        id_mapper = FitMessageIdMapper.new
+        top_level_record.write(io, id_mapper)
+        end_pos = io.pos
+
+        crc = write_crc(io, start_pos, end_pos)
+
+        # Complete the data of the header section and write it at the start of
+        # the file.
+        header.data_size = end_pos - start_pos
+        header.crc = crc
+        io.seek(0)
+        header.write(io)
+      ensure
+        io.close
+      end
     end
 
     private

data/lib/fit4ruby/FitMessageRecord.rb

@@ -78,7 +78,9 @@ module Fit4Ruby
         if filter && fields_dump &&
            (filter.field_names.nil? ||
             filter.field_names.include?(field_name)) &&
-           (value != field.undefined_value || !filter.ignore_undef)
+           !(((value.respond_to?('count') &&
+               (value.count(field.undefined_value) == value.length)) ||
+              value == field.undefined_value) && filter.ignore_undef)
           fields_dump << DumpedField.new(
             @global_message_number,
             field.field_definition_number.snapshot,

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -59,6 +59,15 @@ module Fit4Ruby
     entry 2, 'antfs'
     entry 3, 'private'
 
+    dict 'backlight_mode'
+    entry 0, 'off'
+    entry 1, 'manual'
+    entry 2, 'key_and_messages'
+    entry 3, 'auto_brightness'
+    entry 4, 'smart_notifications'
+    entry 5, 'key_and_messages_night'
+    entry 6, 'key_and_messages_and_smart_notifications'
+
     dict 'battery_status'
     entry 1, 'new'
     entry 2, 'good'
@@ -66,13 +75,54 @@ module Fit4Ruby
     entry 4, 'low'
     entry 5, 'critical'
 
+    dict 'body_location'
+    entry 0, 'left_leg'
+    entry 1, 'left_calf'
+    entry 2, 'left_shin'
+    entry 3, 'left_hamstring'
+    entry 4, 'left_quad'
+    entry 5, 'left_glute'
+    entry 6, 'right_leg'
+    entry 7, 'right_calf'
+    entry 8, 'right_shin'
+    entry 9, 'right_hamstring'
+    entry 10, 'right_quad'
+    entry 11, 'right_glute'
+    entry 12, 'torso_back'
+    entry 13, 'left_lower_back'
+    entry 14, 'left_upper_back'
+    entry 15, 'right_lower_back'
+    entry 16, 'right_upper_back'
+    entry 17, 'torso_front'
+    entry 18, 'left_abdomen'
+    entry 19, 'left_chest'
+    entry 20, 'right_abdomen'
+    entry 21, 'right_chest'
+    entry 22, 'left_arm'
+    entry 23, 'left_shoulder'
+    entry 24, 'left_bicep'
+    entry 25, 'left_tricep'
+    entry 26, 'left_brachioradialis'
+    entry 27, 'left_forearm_extensors'
+    entry 28, 'right_arm'
+    entry 29, 'right_shoulder'
+    entry 30, 'right_bicep'
+    entry 31, 'right_tricep'
+    entry 32, 'right_brachioradialis'
+    entry 33, 'right_forearm_extensors'
+    entry 34, 'neck'
+    entry 35, 'throat'
+    entry 36, 'waist_mid_back'
+    entry 37, 'waist_front'
+    entry 38, 'waist_left'
+    entry 39, 'waist_right'
+
     dict 'comm_timeout_type'
     entry 0, 'wildcard_paring_timeout'
     entry 1, 'pairing_timeout'
     entry 2, 'connection_lost'
     entry 3, 'connection_timeout'
 
-
     dict 'device_type'
     entry 0, 'gps' # Just a guess
     entry 3, 'acceleration' # Just a guess
@@ -97,9 +147,63 @@ module Fit4Ruby
     entry 123, 'bike_speed'
     entry 124, 'stride_speed_distance'
 
+    dict 'display_heart'
+    entry 0, 'bpm'
+    entry 1, 'max'
+    entry 2, 'reserve'
+
     dict 'display_measure'
     entry 0, 'metric'
     entry 1, 'statute'
+    entry 2, 'nautical'
+
+    dict 'display_position'
+    entry 0, 'degree'
+    entry 1, 'degree_minute'
+    entry 2, 'degree_minute_second'
+    entry 3, 'austrian_grid'
+    entry 4, 'british_grid'
+    entry 5, 'dutch_grid'
+    entry 6, 'hungarian_grid'
+    entry 7, 'finnish_grid'
+    entry 8, 'german_grid'
+    entry 9, 'icelandic_grid'
+    entry 10, 'indonesian_equatorial'
+    entry 11, 'indonesian_irian'
+    entry 12, 'indonesian_southern'
+    entry 13, 'india_zone_0'
+    entry 14, 'india_zone_IA'
+    entry 15, 'india_zone_IB'
+    entry 16, 'india_zone_IIA'
+    entry 17, 'india_zone_IIB'
+    entry 18, 'india_zone_IIIA'
+    entry 19, 'india_zone_IIIB'
+    entry 20, 'india_zone_IVA'
+    entry 21, 'india_zone_IVB'
+    entry 22, 'irish_transverse'
+    entry 23, 'irish_grid'
+    entry 24, 'loran'
+    entry 25, 'maidenhead_grid'
+    entry 26, 'mgrs_grid'
+    entry 27, 'new_zealand_grid'
+    entry 28, 'new_zealand_transverse'
+    entry 29, 'qatar_grid'
+    entry 30, 'modified_swedish_grid'
+    entry 31, 'swedish_grid'
+    entry 32, 'south_african_grid'
+    entry 33, 'swiss_grid'
+    entry 34, 'taiwan_grid'
+    entry 35, 'united_states_grid'
+    entry 36, 'utm_ups_grid'
+    entry 37, 'west_malayan'
+    entry 38, 'borneo_rso'
+    entry 39, 'estonian_grid'
+    entry 40, 'latvian_grid'
+    entry 41, 'swedish_ref_99_grid'
+
+    dict 'display_power'
+    entry 0, 'watts'
+    entry 1, 'percent_ftp'
 
     dict 'event'
     entry 0, 'timer'
@@ -185,12 +289,14 @@ module Fit4Ruby
     # The Fenix3 is rumored to have a Mediatek MT3333 GPS chipset. Not sure if
     # that would be a beter name.
     entry 1620, 'fenix3_gps' # Just a guess
+    entry 1621, 'fenix5_gps' # Just a guess
     entry 1623, 'fr620'
     entry 1632, 'fr220'
     # The FR620 is rumored to have a MediaTek MT3339 GPS chipset while the
     # FR920XT is rumored to have a MT3333. Not sure why they have the same ID
     # in the FIT file for the GPS device.
     entry 1689, 'fr620_fr920xt_gps' # Just a guess
+    entry 1743, 'hrm_tri'
     entry 1752, 'hrm_run'
     entry 1765, 'fr920xt'
     entry 1928, 'fr620_japan'
@@ -208,7 +314,15 @@ module Fit4Ruby
     entry 2173, 'fr620_taiwan'
     entry 2188, 'fenix3_china'
     entry 2189, 'fenix3_twn'
+    entry 2327, 'hrm4_run'
     entry 2413, 'fenix3_hr'
+    entry 2431, 'fr235'
+    entry 2432, 'fenix3_chronos'
+    entry 2544, 'fenix5s'
+    entry 2604, 'fenix5x'
+    entry 2593, 'running_dynamics_pod'
+    entry 2691, 'fr935'
+    entry 2697, 'fenix5'
     entry 10007, 'sdm4'
     entry 20119, 'training_center'
     entry 65532, 'android_antplus_plugin'
@@ -224,6 +338,11 @@ module Fit4Ruby
     entry 2, 'warmup'
     entry 3, 'cooldown'
 
+    dict 'hr_zone_calc'
+    entry 0, 'custom'
+    entry 1, 'percent_max_hr'
+    entry 2, 'percent_hrr'
+
     dict 'lap_trigger'
     entry 0, 'manual'
     entry 1, 'time'
@@ -339,6 +458,10 @@ module Fit4Ruby
     entry 0x7000, 'reserved'
     entry 0x8000, 'selected'
 
+    dict 'pwr_zone_calc'
+    entry 0, 'custom'
+    entry 1, 'percent_ftp'
+
     dict 'rider_position_type'
     entry 0, 'seated'
     entry 1, 'standing'

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -34,12 +34,12 @@ module Fit4Ruby
     field 2, 'uint32', 'time_offset', :array => true
     field 3, 'enum', 'undocumented_field_3'
     field 4, 'enum', 'time_mode', :array => true
-    field 5, 'sint8', 'time_zone_offset', :array => true
+    field 5, 'sint8', 'time_zone_offset', :array => true, :scale => 4
     field 8, 'uint16', 'undocumented_field_8'
     field 9, 'enum', 'undocumented_field_9'
     field 10, 'enum', 'undocumented_field_10'
     field 11, 'enum', 'undocumented_field_11'
-    field 12, 'enum', 'backlight_mode'
+    field 12, 'enum', 'backlight_mode', :dict => 'backlight_mode'
     field 13, 'uint8', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
     field 15, 'uint8', 'undocumented_field_15'
@@ -61,6 +61,7 @@ module Fit4Ruby
     field 51, 'enum', 'undocumented_field_51'
     field 52, 'enum', 'undocumented_field_52'
     field 53, 'enum', 'undocumented_field_53'
+    field 54, 'enum', 'undocumented_field_54'
     field 56, 'enum', 'mounting_side'
     field 58, 'uint16', 'autosync_min_steps'
     field 59, 'uint16', 'autosync_min_time'
@@ -72,6 +73,7 @@ module Fit4Ruby
     field 67, 'enum', 'undocumented_field_67'
     field 68, 'enum', 'undocumented_field_68'
     field 69, 'enum', 'undocumented_field_69'
+    field 75, 'enum', 'undocumented_field_75'
     field 80, 'enum', 'lactate_threshold_autodetect_enabled'
     field 81, 'enum', 'undocumented_field_81'
     field 82, 'enum', 'undocumented_field_82'
@@ -79,26 +81,44 @@ module Fit4Ruby
     field 84, 'enum', 'undocumented_field_84'
     field 85, 'enum', 'undocumented_field_85'
     field 87, 'enum', 'undocumented_field_87'
+    field 90, 'uint32', 'auto_activity_detect'
     field 94, 'uint8', 'number_of_screens'
+    field 97, 'uint8z', 'undocumented_field_97'
+    field 101, 'enum', 'undocumented_field_101'
+    field 104, 'enum', 'undocumented_field_104'
+    field 107, 'enum', 'undocumented_field_107'
+    field 108, 'enum', 'undocumented_field_108'
+    field 109, 'enum', 'undocumented_field_109'
+    field 110, 'enum', 'undocumented_field_110'
+    field 111, 'enum', 'undocumented_field_111'
+    field 112, 'enum', 'undocumented_field_112'
+    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 133, 'enum', 'undocumented_field_133'
 
     message 3, 'user_profile'
+    field 0, 'string', 'friendly_name'
     field 1, 'enum', 'gender', :dict => 'gender'
-    field 3, 'uint8', 'height'
-    field 4, 'uint16', 'weight'
+    field 2, 'uint8', 'age'
+    field 3, 'uint8', 'height', :scale => 100, :unit => 'm'
+    field 4, 'uint16', 'weight', :scale => 10, :unit => 'kg'
     field 5, 'enum', 'language'
     field 6, 'enum', 'elev_setting'
     field 7, 'enum', 'weight_setting'
-    field 8, 'uint8', 'resting_heart_rate'
-    field 12, 'enum', 'hr_setting'
-    field 13, 'enum', 'speed_setting'
-    field 14, 'enum', 'dist_setting'
+    field 8, 'uint8', 'resting_heart_rate', :unit => 'bpm'
+    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 18, 'enum', 'position_setting'
-    field 21, 'enum', 'temperature_setting'
+    field 18, 'enum', 'position_setting', :dict => 'display_position'
+    field 21, 'enum', 'temperature_setting', :dict => 'display_measure'
     field 24, 'uint8', 'undocumented_field_24'
-    field 28, 'uint32', 'wake_time'
-    field 29, 'uint32', 'sleep_time'
-    field 30, 'enum', 'height_setting'
+    field 28, 'uint32', 'wake_time', :type => 'duration'
+    field 29, 'uint32', 'sleep_time', :type => 'duration'
+    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'
@@ -111,13 +131,14 @@ module Fit4Ruby
     field 40, 'float32', 'undocumented_field_40'
     field 41, 'uint32', 'undocumented_field_41'
     field 42, 'uint32', 'undocumented_field_42'
+    field 43, 'enum', 'undocumented_field_43'
 
     message 7, 'zones_target'
     field 1, 'uint8', 'max_heart_rate'
     field 2, 'uint8', 'threshold_heart_rate'
     field 3, 'uint16', 'functional_threshold_power'
-    field 5, 'enum', 'hr_zone_calc'
-    field 7, 'enum', 'pwr_zone_calc'
+    field 5, 'enum', 'hr_zone_calc', :dict => 'hr_zone_calc'
+    field 7, 'enum', 'pwr_zone_calc', :dict => 'pwr_zone_calc'
     field 8, 'uint16', 'undocumented_field_8'
     field 9, 'enum', 'undocumented_field_9'
     field 10, 'enum', 'undocumented_field_10'
@@ -134,6 +155,8 @@ module Fit4Ruby
     field 6, 'enum', 'undocumented_field_6'
     field 10, 'uint8', 'undocumented_field_10', :array => true
     field 11, 'enum', 'undocumented_field_11'
+    field 12, 'uint8', 'undocumented_field_12'
+    field 13, 'enum', 'undocumented_field_13'
 
     # Not part of the official ANT SDK doc.
     message 13, 'undocumented_13'
@@ -172,6 +195,10 @@ module Fit4Ruby
     field 41, 'sint32', 'undocumented_field_41'
     field 42, 'uint8', 'undocumented_field_42'
     field 46, 'enum', 'undocumented_field_46'
+    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 254, 'uint16', 'message_index'
 
     message 18, 'session'
@@ -221,6 +248,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 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'
@@ -251,6 +280,7 @@ module Fit4Ruby
     field 103, 'uint8', 'avg_left_pedal_smoothness', :scale => 2, :unit => 'percent'
     field 104, 'uint8', 'avg_right_pedal_smoothness', :scale => 2, :unit => 'percent'
     field 105, 'uint8', 'avg_combined_pedal_smoothness', :scale => 2, :unit => 'percent'
+    field 106, 'uint16', 'undocumented_field_106'
     field 107, 'uint16', 'undefined_value_107'
     field 108, 'uint16', 'undefined_value_108'
     field 109, 'uint8', 'undefined_value_109'
@@ -270,6 +300,8 @@ module Fit4Ruby
     field 132, 'uint16', 'vertical_ratio', :scale => 100, :unit => '%' # guessed
     field 133, 'uint16', 'avg_gct_balance', :scale => 100, :unit => '%' # guessed
     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 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -402,6 +434,7 @@ module Fit4Ruby
     field 85, 'uint16', 'stride_length', :scale => 10000, :unit => 'm' # guessed
     field 87, 'uint16', 'undefined_value_87' # first seen on F3 FW6.80
     field 88, 'uint16', 'undefined_value_88' # first seen on F3HR FW3.60
+    field 90, 'sint8', 'performance_condition' # guessed
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 21, 'event'
@@ -434,6 +467,9 @@ module Fit4Ruby
       field 'lactate_threshold_speed', 'uint32', 'lactate_threshold_speed', :scale => 1000, :unit => 'm/s'
     end
     field 4, 'uint8', 'event_group'
+    field 14, 'enum', 'undocumented_field_14'
+    field 15, 'uint32', 'undocumented_field_15'
+    field 16, 'enum', 'undocumented_field_16'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Possibly which device is used as metering source.
@@ -447,6 +483,7 @@ module Fit4Ruby
     field 5, 'enum', 'mode' # 0 or 3 seen, unknown meaning
     field 6, 'uint8', 'power' # First found in FR920XT
     field 14, 'uint8', 'calories' # First found in FR920XT
+    field 15, 'uint8', 'undocumented_field_15'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 23, 'device_info'
@@ -465,15 +502,19 @@ module Fit4Ruby
     field 9, 'uint8', 'undocumented_field_9'
     field 10, 'uint16', 'battery_voltage', :scale => 256, :unit => 'V'
     field 11, 'uint8', 'battery_status', :dict => 'battery_status'
+    field 13, 'uint16', 'undocumented_field_13'
     field 15, 'uint32', 'rx_packets_ok' # just a guess
     field 16, 'uint32', 'rx_packets_err' # just a guess
     field 17, 'string', 'undocumented_field_17'
+    field 18, 'enum', 'sendor_position', :dict => 'body_location'
     field 20, 'uint8z', 'ant_transmission_type'
     field 21, 'uint16z', 'ant_device_number'
     field 22, 'enum', 'ant_network', :dict => 'ant_network'
     field 23, 'uint8', 'undocumented_field_23'
-    field 24, 'uint32z', 'undocumented_field_24'
+    field 24, 'uint32z', 'ant_id' # just a guess
     field 25, 'enum', 'source_type', :dict => 'source_type'
+    field 29, 'uint8', 'undocumented_field_29'
+    field 30, 'uint8', 'undocumented_field_30'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # This message was first seen on the Fenix3HR with firmware 3.0.
@@ -620,6 +661,14 @@ module Fit4Ruby
     field 8, 'enum', 'undocumented_field_8', :array => true
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    # Not part of the official ANT SDK doc
+    message 104, 'battery'
+    field 0, 'uint16', 'unit_voltage', :unit => 'V', :scale => 1000
+    field 1, 'sint16', 'undocumented_field_1'
+    field 2, 'uint8', 'percent', :unit => '%'
+    field 3, 'sint8', 'current', :unit => 'mA' # just a wild guess
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
     # Not part of the official ANT SDK doc
     message 113, 'personal_records'
     field 0, 'uint16', 'longest_distance'
@@ -641,30 +690,40 @@ module Fit4Ruby
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc
-    # The values in this message seem to be related to the activity history.
-    # If no HRM is used, most of them are 0. Fields 4, 7, 9 and 10 always have
-    # non-zero values.
-    message 140, 'undocumented_140'
+    # 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 2, 'sint32', 'undocumented_field_2'
     field 3, 'sint32', 'undocumented_field_3'
-    field 4, 'uint8', 'total_training_effect', :scale => 10
+    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 8, 'uint8', 'undocumented_field_8'
+    # 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
+      field :default, 'sint8', 'undocumented_field_8s'
+      field 255, 'uint8', 'undocumented_field_8u'
+    end
     field 9, 'uint16', 'recovery_time', :scale => 60, :unit => 'hours'
-    field 10, 'uint16', 'undocumented_field_10' # always seems to be 340
+    field 10, 'uint16', 'undocumented_field_10'
     field 11, 'enum', 'undocumented_field_11'
     field 12, 'enum', 'undocumented_field_12'
     field 13, 'uint8', 'undocumented_field_13'
     field 14, 'uint16', 'running_lactate_threshold_heart_rate', :unit => 'bpm'
     field 15, 'uint16', 'running_lactate_threshold_speed', :scale => 100, :unit => 'm/s'
     field 16, 'uint16', 'undocumented_field_16' # very correlated to 14 and 15
-    field 17, 'sint8', 'undocumented_field_17'
+    field 17, 'sint8', 'performance_condition'
     field 18, 'uint8', 'undocumented_field_18'
     field 19, 'uint8', 'undocumented_field_19'
+    field 20, 'uint8', 'anaerobic_training_effect', :scale => 10
+    field 21, 'sint32', 'undocumented_field_21'
+    field 22, 'uint8', 'undocumented_field_22'
+    field 23, 'uint8', 'undocumented_field_23'
+    field 24, 'sint32', 'undocumented_field_24'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc. The message name is guessed and
@@ -679,10 +738,10 @@ module Fit4Ruby
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc.
-    message 147, 'undocumented_147'
-    field 0, 'uint32z', 'undocumented_field_0'
+    message 147, 'sensor_settings'
+    field 0, 'uint32z', 'ant_id'
     field 1, 'uint8', 'undocumented_field_1'
-    field 2, 'string', 'undocumented_field_2'
+    field 2, 'string', 'name'
     field 3, 'enum', 'undocumented_field_3'
     field 4, 'enum', 'undocumented_field_4'
     field 5, 'enum', 'undocumented_field_5'
@@ -691,7 +750,7 @@ module Fit4Ruby
     field 8, 'uint8', 'undocumented_field_8'
     field 9, 'uint8', 'undocumented_field_9'
     field 10, 'uint16', 'undocumented_field_10'
-    field 11, 'uint16', 'undocumented_field_11'
+    field 11, 'uint16', 'calibration_factor', :scale => 10
     field 12, 'uint8', 'undocumented_field_12'
     field 13, 'uint32', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
@@ -720,6 +779,14 @@ module Fit4Ruby
     field 45, 'enum', 'undocumented_field_45'
     field 46, 'enum', 'undocumented_field_46'
     field 47, 'enum', 'undocumented_field_47'
+    field 50, 'uint8', 'undocumented_field_50'
+    field 51, 'enum', 'undocumented_field_51'
+    field 52, 'uint8', 'undocumented_field_52'
+    field 53, 'uint8', 'undocumented_field_53'
+    field 55, 'uint16', 'undocumented_field_55'
+    field 56, 'uint16', 'undocumented_field_56'
+    field 57, 'uint16', 'undocumented_field_57'
+    field 58, 'enum', 'undocumented_field_58'
     field 254, 'uint16', 'message_index'
 
     # Not part of the official ANT SDK doc.
@@ -729,21 +796,25 @@ module Fit4Ruby
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc.
-    message 216, 'undocumented_216'
-    field 0, 'uint16', 'undocumented_field_0'
-    field 1, 'uint16', 'undocumented_field_1'
-    field 2, 'uint32', 'undocumented_field_2'
+    message 216, 'heart_rate_zones'
+    field 0, 'uint16', 'type' # 19 for laps, 18 for sessions
+    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', 'undocumented_field_6'
+    field 6, 'uint8', 'heart_rate_zones', :array => true
     field 9, 'uint16', 'undocumented_field_9'
     field 10, 'enum', 'undocumented_field_10'
-    field 11, 'uint8', 'undocumented_field_11'
-    field 12, 'uint8', 'undocumented_field_12'
+    field 11, 'uint8', 'max_heart_rate'
+    field 12, 'uint8', 'resting_heart_rate'
     field 13, 'uint8', 'undocumented_field_13'
     field 14, 'enum', 'undocumented_field_14'
     field 15, 'uint16', 'undocumented_field_15'
     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'
+
   end
 
 end

data/lib/fit4ruby/HeartRateZones.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = HeartRateZones.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'
+require 'fit4ruby/RecordAggregator'
+
+module Fit4Ruby
+
+  class HeartRateZones < FitDataRecord
+
+    include RecordAggregator
+
+    def initialize(field_values)
+      super('heart_rate_zones')
+
+      set_field_values(field_values)
+    end
+
+    def check(index)
+      unless @lap_index == index
+        Log.fatal "lap_index must be #{index}, not #{@lap_index}"
+      end
+    end
+
+  end
+
+end

data/lib/fit4ruby/PhysiologicalMetrics.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = PhysiologicalMetrics.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 old_user_profile FIT message.
+  class PhysiologicalMetrics < FitDataRecord
+
+    # Create a new PhysiologicalMetrics object.
+    # @param field_values [Hash] Hash that provides initial values for certain
+    #        fields.
+    def initialize(field_values = {})
+      super('physiological_metrics')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+
+

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -110,12 +110,14 @@ files:
 - lib/fit4ruby/GlobalFitMessage.rb
 - lib/fit4ruby/GlobalFitMessages.rb
 - lib/fit4ruby/HRV.rb
+- lib/fit4ruby/HeartRateZones.rb
 - lib/fit4ruby/Lap.rb
 - lib/fit4ruby/Log.rb
 - lib/fit4ruby/Monitoring.rb
 - lib/fit4ruby/MonitoringInfo.rb
 - lib/fit4ruby/Monitoring_B.rb
 - lib/fit4ruby/PersonalRecords.rb
+- lib/fit4ruby/PhysiologicalMetrics.rb
 - lib/fit4ruby/Record.rb
 - lib/fit4ruby/RecordAggregator.rb
 - lib/fit4ruby/Session.rb
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Library to read GARMIN FIT files.
@@ -157,4 +159,3 @@ test_files:
 - spec/FileNameCoder_spec.rb
 - spec/FitFile_spec.rb
 - spec/GeoMath_spec.rb
-has_rdoc: