fit4ruby 3.2.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 247b4e5fd81ffc3c5e12bc1d3235196126fdb8cc
-  data.tar.gz: b493e5b073e63d977ed28edc3600dac73519d0b6
+SHA256:
+  metadata.gz: 1867e2f6e32d331216b372024ba0607837bb5dc3baf7daad107b5a23d6465aa6
+  data.tar.gz: 25f0423ccf5e68259f48d02f35400fa2a723a9f7209613f77eca2631d056f2d0
 SHA512:
-  metadata.gz: 88b2fe75bdf8a1bfb4a6f3d4892db4253f942a3a251118fc054f4671f9f3927960552fe9005334da6f884e95990babae029071edbf287740efaff2450748824b
-  data.tar.gz: f8aa4152a1d37f682d0ca526045d10a19628ba79bad41eebbf3b3e3e963fcb971fc82d38fef8756b2bfa50eaefd3eea80388c849cb1bc0bf34aa79d64754e7eb
+  metadata.gz: 05641db1523d5e8a9b8ab939d4b65def4e5a50ca6bbcae3fb1c727dc7d641cfeda6d7a5e892b38819b840b0a2222e0d775d20bf4f93ae4af6db2c79b4b6753b3
+  data.tar.gz: f4b7d619de81444329009c7a188f08bd4684524ecc1654a57b77df147a0e22730658d57247e30729f619a0ab2c6fbd6fce796908df05ff2d409a06a909656298

data/Gemfile.lock

@@ -1,15 +1,34 @@
 PATH
   remote: .
   specs:
-    fit4ruby (0.0.1)
-      bindata (>= 2.0.0)
+    fit4ruby (3.3.0)
+      bindata (= 2.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bindata (2.1.0)
+    bindata (2.3.0)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (0.9.6)
-    yard (0.8.7.4)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
@@ -17,5 +36,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.6.4)
   fit4ruby!
-  rake
-  yard
+  pry (>= 0.12)
+  rake (~> 12.0.0)
+  rspec (>= 3.8)
+  yard (~> 0.9.20)
+
+BUNDLED WITH
+   2.0.2

data/fit4ruby.gemspec

@@ -25,7 +25,9 @@ EOT
   spec.required_ruby_version = '>=2.0'
 
   spec.add_dependency('bindata', '=2.3.0')
-  spec.add_development_dependency('yard', '~>0.9.12')
-  spec.add_development_dependency('rake', '~>0.9.6')
+  spec.add_development_dependency('yard', '~>0.9.20')
+  spec.add_development_dependency('rake', '~>12.0.0')
   spec.add_development_dependency('bundler', '>=1.6.4')
+  spec.add_development_dependency('rspec', '>=3.8')
+  spec.add_development_dependency('pry', '>=0.12')
 end

data/lib/fit4ruby/Activity.rb

@@ -24,6 +24,7 @@ require 'fit4ruby/UserProfile'
 require 'fit4ruby/PhysiologicalMetrics'
 require 'fit4ruby/Session'
 require 'fit4ruby/Lap'
+require 'fit4ruby/Length'
 require 'fit4ruby/Record'
 require 'fit4ruby/HRV'
 require 'fit4ruby/HeartRateZones'
@@ -40,7 +41,7 @@ module Fit4Ruby
     attr_accessor :file_id, :field_descriptions, :developer_data_ids, :epo_data,
                   :file_creator, :device_infos, :sensor_settings, :data_sources,
                   :user_data, :user_profiles, :physiological_metrics,
-                  :sessions, :laps, :records, :hrv,
+                  :sessions, :laps, :records, :lengths, :hrv,
                   :heart_rate_zones, :events, :personal_records
 
     # Create a new Activity object.
@@ -65,15 +66,21 @@ module Fit4Ruby
       @events = []
       @sessions = []
       @laps = []
+      @lengths = []
       @records = []
       @hrv = []
       @heart_rate_zones = []
       @personal_records = []
 
       @cur_session_laps = []
+
       @cur_lap_records = []
+      @cur_lap_lengths = []
+
+      @cur_length_records = []
 
       @lap_counter = 1
+      @length_counter = 1
 
       set_field_values(field_values)
     end
@@ -141,11 +148,20 @@ module Fit4Ruby
 
       # Laps must have a consecutively growing message index.
       @laps.each.with_index do |lap, index|
-        lap.check(index)
+        lap.check(index, self)
         # 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
+
+      # Lengths must have a consecutively growing message index.
+      @lengths.each.with_index do |length, index|
+        length.check(index)
+        # If we have heart rate zone records, there should be one for each
+        # length
+        @heart_rate_zones[index].check(index) if @heart_rate_zones[index]
+      end
+
       @sessions.each { |s| s.check(self) }
     end
 
@@ -206,17 +222,22 @@ module Fit4Ruby
       d
     end
 
-    # Call this method to update the aggregated data fields stored in Lap and
-    # Session objects.
+    # Call this method to update the aggregated data fields stored in Lap,
+    # Length, and Session objects.
     def aggregate
       @laps.each { |l| l.aggregate }
+      @lengths.each { |l| l.aggregate }
       @sessions.each { |s| s.aggregate }
     end
 
     # Convenience method that averages the speed over all sessions.
     def avg_speed
       speed = 0.0
-      @sessions.each { |s| speed += s.avg_speed }
+      @sessions.each do |s|
+        if (spd = s.avg_speed || s.enhanced_avg_speed)
+          speed += spd
+        end
+      end
       speed / @sessions.length
     end
 
@@ -292,8 +313,8 @@ module Fit4Ruby
        @device_infos + @sensor_settings +
        @data_sources + @user_profiles +
        @physiological_metrics + @events +
-       @sessions + @laps + @records + @heart_rate_zones +
-       @personal_records).sort.each do |s|
+       @sessions + @laps + @records + @lengths +
+       @heart_rate_zones + @personal_records).sort.each do |s|
         s.write(io, id_mapper)
       end
       super
@@ -404,6 +425,16 @@ module Fit4Ruby
       new_fit_data_record('lap', field_values)
     end
 
+    # Add a new Length to the Activity. All previoulsy added Record objects are
+    # associated with this Length unless they have been associated with another
+    # Length before.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [Length]
+    def new_length(field_values = {})
+      new_fit_data_record('length', 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.
@@ -496,8 +527,12 @@ module Fit4Ruby
         @cur_session_laps = []
       when 'lap'
         record = create_new_lap(field_values)
+      when 'length'
+        record = create_new_length(field_values)
       when 'record'
-        @cur_lap_records << (record = Record.new(field_values))
+        record = Record.new(field_values)
+        @cur_lap_records << record
+        @cur_length_records << record
         @records << record
       when 'hrv'
         @hrv << (record = HRV.new(field_values))
@@ -515,16 +550,29 @@ module Fit4Ruby
     private
 
     def create_new_lap(field_values)
-      lap = Lap.new(@cur_lap_records, @laps.last, field_values)
+      lap = Lap.new(@cur_lap_records, @laps.last,
+                    field_values,
+                    @length_counter, @cur_lap_lengths)
       lap.message_index = @lap_counter - 1
       @lap_counter += 1
       @cur_session_laps << lap
       @laps << lap
       @cur_lap_records = []
+      @cur_lap_lengths = []
 
       lap
     end
 
+    def create_new_length(field_values)
+      length = Length.new(@cur_length_records, @lengths.last, field_values)
+      length.message_index = @length_counter - 1
+      @length_counter += 1
+      @cur_lap_lengths << length
+      @lengths << length
+      @cur_length_records = []
+
+      length
+    end
   end
 
 end

data/lib/fit4ruby/DeviceInfo.rb

@@ -32,6 +32,43 @@ module Fit4Ruby
         @timestamp <=> fdr.timestamp
     end
 
+    def numeric_manufacturer
+      if @manufacturer && @manufacturer.is_a?(String)
+        if @manufacturer[0..17] == 'Undocumented value'
+          return @manufacturer[18..-1].to_i
+        else
+          return GlobalFitDictionaries['manufacturer'].
+            value_by_name(@manufacturer)
+        end
+      end
+
+      Log.fatal "Unexpected @manufacturer (#{@manufacturer}) value"
+    end
+
+    def numeric_product
+      # The numeric product ID must be an integer or nil. In case the
+      # dictionary did not contain an entry for the numeric ID in the fit file
+      # the @garmin_product or @product variables contain a String starting
+      # with 'Undocumented value ' followed by the ID.
+      if @garmin_product && @garmin_product.is_a?(String)
+        if @garmin_product[0..17] == 'Undocumented value'
+          return @garmin_product[18..-1].to_i
+        else
+          return GlobalFitDictionaries['garmin_product'].
+            value_by_name(@garmin_product)
+        end
+      elsif @product && @product.is_a?(String)
+        if @product[0..17] == 'Undocumented value'
+          return @product[18..-1].to_i
+        else
+          return GlobalFitDictionaries['product'].value_by_name(@product)
+        end
+      end
+
+      Log.fatal "Unexpected @product (#{@product}) or " +
+        "@garmin_product (#{@garmin_product}) values"
+    end
+
     def check(index)
       unless @device_index
         Log.fatal 'device info record must have a device_index'

data/lib/fit4ruby/FieldDescription.rb

@@ -47,6 +47,12 @@ module Fit4Ruby
         Log.error "fit_base_type_id #{@fit_base_type_id} is too large"
         return
       end
+
+      name = "_#{@developer_data_index}_#{@field_name}"
+      # A fit file may include multiple definitions of the same field. We
+      # ignore all subsequent definitions.
+      return if msg.has_field?(name)
+
       options = {}
       options[:scale] = @scale if @scale
       options[:offset] = @offset if @offset
@@ -54,7 +60,7 @@ module Fit4Ruby
       options[:unit] = @units
       msg.field(@field_definition_number,
                 FIT_TYPE_DEFS[@fit_base_type_id & 0x7F][1],
-                "_#{@developer_data_index}_#{@field_name}", options)
+                name, options)
     end
 
   end

data/lib/fit4ruby/FitDataRecord.rb

@@ -21,7 +21,7 @@ module Fit4Ruby
 
     RecordOrder = [ 'user_data', 'user_profile',
                     'device_info', 'data_sources', 'event',
-                    'record', 'lap', 'session', 'heart_rate_zones',
+                    'record', 'lap', 'length', 'session', 'heart_rate_zones',
                     'personal_records' ]
 
     attr_reader :message
@@ -50,8 +50,8 @@ module Fit4Ruby
     def set(name, value)
       ivar_name = '@' + name
       unless instance_variable_defined?(ivar_name)
-        Log.warn("Unknown FIT record field '#{name}' in global message " +
-                 "#{@message.name} (#{@message.number}).")
+        Log.debug("Unknown FIT record field '#{name}' in global message " +
+                  "#{@message.name} (#{@message.number}).")
         return
       end
       instance_variable_set(ivar_name, value)

data/lib/fit4ruby/FitDefinitionField.rb

@@ -54,8 +54,8 @@ module Fit4Ruby
       else
         @name = "field#{field_definition_number.snapshot}"
         @type = nil
-        Log.warn { "Unknown field number #{field_definition_number} " +
-                   "in global message #{@global_message_number}" }
+        Log.debug { "Unknown field number #{field_definition_number} " +
+                    "in global message #{@global_message_number}" }
       end
     end
 

data/lib/fit4ruby/FitMessageRecord.rb

@@ -36,7 +36,7 @@ module Fit4Ruby
         @name = @gfm.name
       else
         @name = "message#{@global_message_number}"
-        Log.warn { "Unknown global message number #{@global_message_number}" }
+        Log.debug { "Unknown global message number #{@global_message_number}" }
       end
       @message_record = produce(definition)
     end
@@ -59,8 +59,8 @@ module Fit4Ruby
       end
       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 has already been already set.
+      # It's important to ensure that alternative fields are processed after
+      # the regular fields so that the decision field has already been set.
       sorted_fields = @definition.data_fields.sort do |f1, f2|
         f1alt = is_alt_field?(f1)
         f2alt = is_alt_field?(f2)

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -312,50 +312,306 @@ module Fit4Ruby
     entry 144, 'uint64z'
 
     dict 'garmin_product'
+    entry 1, 'hrm1'
+    entry 2, 'axh01'
+    entry 3, 'axb01'
+    entry 4, 'axb02'
+    entry 5, 'hrm2ss'
+    entry 6, 'dsi_alf02'
+    entry 7, 'hrm3ss'
     entry 8, 'hrm_run_single_byte_product_id'
     entry 9, 'bsm'
     entry 10, 'bcm'
+    entry 11, 'axs01'
+    entry 12, 'hrm_tri_single_byte_product_id'
+    entry 13, 'hrm4_run_single_byte_product_id'
+    entry 14, 'fr225_single_byte_product_id'
+    entry 473, 'fr301_china'
+    entry 474, 'fr301_japan'
+    entry 475, 'fr301_korea'
+    entry 494, 'fr301_taiwan'
+    entry 717, 'fr405'
+    entry 782, 'fr50'
+    entry 987, 'fr405_japan'
+    entry 988, 'fr60'
+    entry 1011, 'dsi_alf01'
+    entry 1018, 'fr310xt'
+    entry 1036, 'edge500'
+    entry 1124, 'fr110'
+    entry 1169, 'edge800'
+    entry 1199, 'edge500_taiwan'
+    entry 1213, 'edge500_japan'
+    entry 1253, 'chirp'
+    entry 1274, 'fr110_japan'
+    entry 1325, 'edge200'
+    entry 1328, 'fr910xt'
+    entry 1333, 'edge800_taiwan'
+    entry 1334, 'edge800_japan'
+    entry 1341, 'alf04'
+    entry 1345, 'fr610'
+    entry 1360, 'fr210_japan'
+    entry 1380, 'vector_ss'
+    entry 1381, 'vector_cp'
+    entry 1386, 'edge800_china'
+    entry 1387, 'edge500_china'
+    entry 1405, 'approach_g10'
+    entry 1410, 'fr610_japan'
+    entry 1422, 'edge500_korea'
+    entry 1436, 'fr70'
+    entry 1446, 'fr310xt_4t'
+    entry 1461, 'amx'
+    entry 1482, 'fr10'
+    entry 1497, 'edge800_korea'
+    entry 1499, 'swim'
+    entry 1537, 'fr910xt_china'
     entry 1551, 'fenix'
+    entry 1555, 'edge200_taiwan'
+    entry 1561, 'edge510'
+    entry 1567, 'edge810'
+    entry 1570, 'tempe'
+    entry 1600, 'fr910xt_japan'
     # 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'
+    entry 1664, 'fr910xt_korea'
+    entry 1688, 'fr10_japan'
     # 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 1721, 'edge810_japan'
+    entry 1735, 'virb_elite'
+    entry 1736, 'edge_touring'
+    entry 1742, 'edge510_japan'
     entry 1743, 'hrm_tri'
     entry 1752, 'hrm_run'
     entry 1765, 'fr920xt'
+    entry 1821, 'edge510_asia'
+    entry 1822, 'edge810_china'
+    entry 1823, 'edge810_taiwan'
+    entry 1836, 'edge1000'
+    entry 1837, 'vivo_fit'
+    entry 1853, 'virb_remote'
+    entry 1885, 'vivo_ki'
+    entry 1903, 'fr15'
+    entry 1907, 'vivo_active'
+    entry 1918, 'edge510_korea'
     entry 1928, 'fr620_japan'
     entry 1929, 'fr620_china'
     entry 1930, 'fr220_japan'
     entry 1931, 'fr220_china'
+    entry 1936, 'approach_s6'
+    entry 1956, 'vivo_smart'
     entry 1967, 'fenix2'
     entry 1988, 'epix'
     entry 2050, 'fenix3'
+    entry 2052, 'edge1000_taiwan'
+    entry 2053, 'edge1000_japan'
+    entry 2061, 'fr15_japan'
+    entry 2067, 'edge520'
+    entry 2070, 'edge1000_china'
     entry 2072, 'fr620_russia'
     entry 2073, 'fr220_russia'
+    entry 2079, 'vector_s'
+    entry 2100, 'edge1000_korea'
     entry 2130, 'fr920xt_taiwan'
     entry 2131, 'fr920xt_china'
     entry 2132, 'fr920xt_japan'
+    entry 2134, 'virbx'
+    entry 2135, 'vivo_smart_apac'
+    entry 2140, 'etrex_touch'
+    entry 2147, 'edge25'
+    entry 2148, 'fr25'
+    entry 2150, 'vivo_fit2'
+    entry 2153, 'fr225'
+    entry 2156, 'fr630'
+    entry 2157, 'fr230'
+    entry 2158, 'fr735xt'
+    entry 2160, 'vivo_active_apac'
+    entry 2161, 'vector_2'
+    entry 2162, 'vector_2s'
+    entry 2172, 'virbxe'
     entry 2173, 'fr620_taiwan'
+    entry 2174, 'fr220_taiwan'
+    entry 2175, 'truswing'
     entry 2188, 'fenix3_china'
     entry 2189, 'fenix3_twn'
+    entry 2192, 'varia_headlight'
+    entry 2193, 'varia_taillight_old'
+    entry 2204, 'edge_explore_1000'
+    entry 2219, 'fr225_asia'
+    entry 2225, 'varia_radar_taillight'
+    entry 2226, 'varia_radar_display'
+    entry 2238, 'edge20'
+    entry 2260, 'edge520_asia'
+    entry 2261, 'edge520_japan'
+    entry 2262, 'd2_bravo'
+    entry 2266, 'approach_s20'
+    entry 2271, 'vivo_smart2'
+    entry 2274, 'edge1000_thai'
+    entry 2276, 'varia_remote'
+    entry 2288, 'edge25_asia'
+    entry 2289, 'edge25_jpn'
+    entry 2290, 'edge20_asia'
+    entry 2292, 'approach_x40'
+    entry 2293, 'fenix3_japan'
+    entry 2294, 'vivo_smart_emea'
+    entry 2310, 'fr630_asia'
+    entry 2311, 'fr630_jpn'
+    entry 2313, 'fr230_jpn'
     entry 2327, 'hrm4_run'
+    entry 2332, 'epix_japan'
+    entry 2337, 'vivo_active_hr'
+    entry 2347, 'vivo_smart_gps_hr'
+    entry 2348, 'vivo_smart_hr'
+    entry 2361, 'vivo_smart_hr_asia'
+    entry 2362, 'vivo_smart_gps_hr_asia'
+    entry 2368, 'vivo_move'
+    entry 2379, 'varia_taillight'
+    entry 2397, 'fr235_japan'
+    entry 2398, 'varia_vision'
+    entry 2406, 'vivo_fit3'
+    entry 2407, 'fenix3_korea'
+    entry 2408, 'fenix3_sea'
     entry 2413, 'fenix3_hr'
+    entry 2417, 'virb_ultra_30'
+    entry 2429, 'index_smart_scale'
     entry 2431, 'fr235'
     entry 2432, 'fenix3_chronos'
+    entry 2441, 'oregon7xx'
+    entry 2444, 'rino7xx'
+    entry 2457, 'epix_korea'
+    entry 2473, 'fenix3_hr_chn'
+    entry 2474, 'fenix3_hr_twn'
+    entry 2475, 'fenix3_hr_jpn'
+    entry 2476, 'fenix3_hr_sea'
+    entry 2477, 'fenix3_hr_kor'
+    entry 2496, 'nautix'
+    entry 2497, 'vivo_active_hr_apac'
+    entry 2512, 'oregon7xx_ww'
+    entry 2530, 'edge_820'
+    entry 2531, 'edge_explore_820'
+    entry 2533, 'fr735xt_apac'
+    entry 2534, 'fr735xt_japan'
     entry 2544, 'fenix5s'
-    entry 2604, 'fenix5x'
+    entry 2547, 'd2_bravo_titanium'
+    entry 2567, 'varia_ut800'
     entry 2593, 'running_dynamics_pod'
+    entry 2599, 'edge_820_china'
+    entry 2600, 'edge_820_japan'
+    entry 2604, 'fenix5x'
+    entry 2606, 'vivo_fit_jr'
+    entry 2622, 'vivo_smart3'
+    entry 2623, 'vivo_sport'
+    entry 2628, 'edge_820_taiwan'
+    entry 2629, 'edge_820_korea'
+    entry 2630, 'edge_820_sea'
+    entry 2650, 'fr35_hebrew'
+    entry 2656, 'approach_s60'
+    entry 2667, 'fr35_apac'
+    entry 2668, 'fr35_japan'
+    entry 2675, 'fenix3_chronos_asia'
+    entry 2687, 'virb_360'
     entry 2691, 'fr935'
     entry 2697, 'fenix5'
+    entry 2700, 'vivoactive3'
+    entry 2733, 'fr235_china_nfc'
+    entry 2769, 'foretrex_601_701'
+    entry 2772, 'vivo_move_hr'
+    entry 2713, 'edge_1030'
+    entry 2796, 'fenix5_asia'
+    entry 2797, 'fenix5s_asia'
+    entry 2798, 'fenix5x_asia'
+    entry 2806, 'approach_z80'
+    entry 2814, 'fr35_korea'
+    entry 2819, 'd2charlie'
+    entry 2831, 'vivo_smart3_apac'
+    entry 2832, 'vivo_sport_apac'
+    entry 2833, 'fr935_asia'
+    entry 2859, 'descent'
+    entry 2886, 'fr645'
+    entry 2888, 'fr645m'
+    entry 2891, 'fr30'
+    entry 2900, 'fenix5s_plus'
+    entry 2909, 'Edge_130'
+    entry 2924, 'edge_1030_asia'
+    entry 2927, 'vivosmart_4'
+    entry 2945, 'vivo_move_hr_asia'
     entry 2957, 'fenix5_gps_galileo' # Just a guess
+    entry 2962, 'approach_x10'
+    entry 2977, 'fr30_asia'
+    entry 2988, 'vivoactive3m_w'
+    entry 3003, 'fr645_asia'
+    entry 3004, 'fr645m_asia'
+    entry 3011, 'edge_explore'
+    entry 3028, 'gpsmap66'
+    entry 3049, 'approach_s10'
+    entry 3066, 'vivoactive3m_l'
+    entry 3085, 'approach_g80'
+    entry 3092, 'edge_130_asia'
+    entry 3095, 'edge_1030_bontrager'
+    entry 3110, 'fenix5_plus'
     entry 3111, 'fenix5x_plus'
+    entry 3112, 'edge_520_plus'
+    entry 3121, 'edge_530'
+    entry 3122, 'edge_830'
+    entry 3134, 'fenix5s_plus_apac'
+    entry 3135, 'fenix5x_plus_apac'
+    entry 3142, 'edge_520_plus_apac'
+    entry 3144, 'fr235l_asia'
+    entry 3145, 'fr245_asia'
+    entry 3163, 'vivo_active3m_apac'
+    entry 3218, 'vivo_smart4_asia'
+    entry 3224, 'vivoactive4_small'
+    entry 3225, 'vivoactive4_large'
+    entry 3226, 'venu'
+    entry 3246, 'marq_driver'
+    entry 3247, 'marq_aviator'
+    entry 3248, 'marq_captain'
+    entry 3249, 'marq_commander'
+    entry 3250, 'marq_expedition'
+    entry 3251, 'marq_athlete'
+    entry 3287, 'fenix6S_sport'
+    entry 3288, 'fenix6S'
+    entry 3289, 'fenix6_sport'
+    entry 3290, 'fenix6'
+    entry 3291, 'fenix6x'
+    entry 3299, 'hrm_dual'
+    entry 3308, 'vivo_move3_premium'
+    entry 3314, 'approach_s40'
+    entry 3321, 'fr245m_asia'
+    entry 3349, 'edge_530_apac'
+    entry 3350, 'edge_830_apac'
+    entry 3378, 'vivo_move3'
+    entry 3387, 'vivo_active4_small_asia'
+    entry 3388, 'vivo_active4_large_asia'
+    entry 3389, 'vivo_active4_oled_asia'
+    entry 3405, 'swim2'
+    entry 3420, 'marq_driver_asia'
+    entry 3421, 'marq_aviator_asia'
+    entry 3422, 'vivo_move3_asia'
+    entry 3446, 'vivo_active3t_chn'
+    entry 3448, 'marq_captain_asia'
+    entry 3449, 'marq_commander_asia'
+    entry 3450, 'marq_expedition_asia'
+    entry 3451, 'marq_athlete_asia'
+    entry 3469, 'fr45_asia'
+    entry 3473, 'vivoactive3_daimler'
+    entry 3512, 'fenix6s_sport_asia'
+    entry 3513, 'fenix6s_asia'
+    entry 3514, 'fenix6_sport_asia'
+    entry 3515, 'fenix6_asia'
+    entry 3516, 'fenix6x_asia'
+    entry 3624, 'marq_adventurer'
+    entry 3648, 'marq_adventurer_asia'
+    entry 3639, 'swim2_apac'
+    entry 3737, 'venu_daimler_asia'
+    entry 3740, 'venu_daimler'
     entry 10007, 'sdm4'
+    entry 10014, 'edge_remote'
     entry 20119, 'training_center'
     entry 65532, 'android_antplus_plugin'
     entry 65534, 'connect'
@@ -593,7 +849,7 @@ module Fit4Ruby
     dict 'swim_stroke'
     entry 0, 'freestyle'
     entry 1, 'backstroke'
-    entry 2, 'breaststrike'
+    entry 2, 'breaststroke'
     entry 3, 'butterfly'
     entry 4, 'drill'
     entry 5, 'mixed'
@@ -627,39 +883,39 @@ module Fit4Ruby
     entry 24, 'challenge'
     entry 25, 'indoor_skiing'
     entry 26, 'cardio_training'
-    entry 27, 'indoor_walking '
-    entry 28, 'e_bike_fitness '
+    entry 27, 'indoor_walking'
+    entry 28, 'e_bike_fitness'
     entry 29, 'bmx'
-    entry 30, 'casual_walking '
+    entry 30, 'casual_walking'
     entry 31, 'speed_walking'
-    entry 32, 'bike_to_run_transition '
-    entry 33, 'run_to_bike_transition '
+    entry 32, 'bike_to_run_transition'
+    entry 33, 'run_to_bike_transition'
     entry 34, 'swim_to_bike_transition'
     entry 35, 'atv'
     entry 36, 'motocross'
     entry 37, 'backcountry'
-    entry 38, 'resort '
-    entry 39, 'rc_drone '
-    entry 40, 'wingsuit '
-    entry 41, 'whitewater '
-    entry 42, 'skate_skiing '
-    entry 43, 'yoga '
+    entry 38, 'resort'
+    entry 39, 'rc_drone'
+    entry 40, 'wingsuit'
+    entry 41, 'whitewater'
+    entry 42, 'skate_skiing'
+    entry 43, 'yoga'
     entry 44, 'pilates'
-    entry 45, 'indoor_running '
-    entry 46, 'gravel_cycling '
+    entry 45, 'indoor_running'
+    entry 46, 'gravel_cycling'
     entry 47, 'e_bike_mountain'
     entry 48, 'commuting'
     entry 49, 'mixed_surface'
-    entry 50, 'navigate '
-    entry 51, 'track_me '
+    entry 50, 'navigate'
+    entry 51, 'track_me'
     entry 52, 'map'
     entry 53, 'single_gas_diving'
-    entry 54, 'multi_gas_diving '
-    entry 55, 'gauge_diving '
-    entry 56, 'apnea_diving '
+    entry 54, 'multi_gas_diving'
+    entry 55, 'gauge_diving'
+    entry 56, 'apnea_diving'
     entry 57, 'apnea_hunting'
-    entry 58, 'virtual_activity '
-    entry 59, 'obstacle '
+    entry 58, 'virtual_activity'
+    entry 59, 'obstacle'
     entry 254, 'all'
 
     dict 'training_status'