fit4ruby 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247b4e5fd81ffc3c5e12bc1d3235196126fdb8cc
-  data.tar.gz: b493e5b073e63d977ed28edc3600dac73519d0b6
+  metadata.gz: c76d1a2e0091c4aa84e7e26a381630def4b5e5b0
+  data.tar.gz: 21814b487808a93810dfedf2fe4908d7f9ecf246
 SHA512:
-  metadata.gz: 88b2fe75bdf8a1bfb4a6f3d4892db4253f942a3a251118fc054f4671f9f3927960552fe9005334da6f884e95990babae029071edbf287740efaff2450748824b
-  data.tar.gz: f8aa4152a1d37f682d0ca526045d10a19628ba79bad41eebbf3b3e3e963fcb971fc82d38fef8756b2bfa50eaefd3eea80388c849cb1bc0bf34aa79d64754e7eb
+  metadata.gz: fbb6bf23b5adadb57b114444de5d067b13273bb73537e76b6a8b6436e61a5fea69af8f619625369ac5c6c9fd13018a31514e3e1662d8437f33ba71b8a52b949e
+  data.tar.gz: 5404ca45effe3b389041a036711c55006c95f304f4afa91a888c2dfda4f38ad2fc55faf450e23791cfd571c6b0c9373865161b881e87e53e268af36e93f130a3

data/fit4ruby.gemspec

@@ -25,7 +25,7 @@ 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('yard', '~>0.9.20')
   spec.add_development_dependency('rake', '~>0.9.6')
   spec.add_development_dependency('bundler', '>=1.6.4')
 end

data/lib/fit4ruby/Activity.rb

@@ -216,7 +216,7 @@ module Fit4Ruby
     # Convenience method that averages the speed over all sessions.
     def avg_speed
       speed = 0.0
-      @sessions.each { |s| speed += s.avg_speed }
+      @sessions.each { |s| speed += s.avg_speed if s.avg_speed }
       speed / @sessions.length
     end
 

data/lib/fit4ruby/GlobalFitMessage.rb

@@ -126,7 +126,7 @@ module Fit4Ruby
         when 'date_time'
           value = time_to_fit_time(value)
         end
-        if value.is_a?(Float) && @opts[:scale].nil?
+        if @type != 'float32' && value.is_a?(Float) && @opts[:scale].nil?
           Log.error "Field #{@name} must not be a Float value"
         end
 

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -43,13 +43,18 @@ module Fit4Ruby
     field 13, 'uint8', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
     field 15, 'uint8', 'undocumented_field_15'
+    field 16, 'enum', 'undocumented_field_16'
+    field 17, 'enum', 'undocumented_field_17'
+    field 18, 'enum', 'undocumented_field_18'
     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 29, 'enum', 'undocumented_field_29'
     field 30, 'enum', 'undocumented_field_30'
     field 31, 'enum', 'undocumented_field_31'
+    field 33, 'uint8', 'undocumented_field_33'
     field 34, 'enum', 'undocumented_field_34'
     field 35, 'enum', 'undocumented_field_35'
     field 36, 'enum', 'activity_tracker_enabled'
@@ -90,11 +95,14 @@ module Fit4Ruby
     field 85, 'enum', 'undocumented_field_85'
     field 87, 'enum', 'undocumented_field_87'
     field 90, 'uint32', 'auto_activity_detect'
+    field 91, 'uint8z', 'undocumented_field_91'
     field 94, 'uint8', 'number_of_screens'
     field 96, 'enum', 'undocumented_field_96'
     field 97, 'uint8z', 'undocumented_field_97'
+    field 98, 'enum', 'undocumented_field_98'
     field 101, 'enum', 'undocumented_field_101'
     field 104, 'enum', 'undocumented_field_104'
+    field 106, 'enum', 'undocumented_field_106'
     field 107, 'enum', 'undocumented_field_107'
     field 108, 'enum', 'undocumented_field_108'
     field 109, 'enum', 'undocumented_field_109'
@@ -103,6 +111,7 @@ module Fit4Ruby
     field 112, 'enum', 'undocumented_field_112'
     field 116, 'enum', 'undocumented_field_116'
     field 117, 'enum', 'undocumented_field_117'
+    field 121, 'enum', 'undocumented_field_121'
     field 124, 'uint8', 'undocumented_field_124'
     field 125, 'uint8', 'undocumented_field_125'
     field 126, 'enum', 'undocumented_field_126'
@@ -133,9 +142,12 @@ module Fit4Ruby
     field 6, 'enum', 'elev_setting'
     field 7, 'enum', 'weight_setting'
     field 8, 'uint8', 'resting_heart_rate', :unit => 'bpm'
+    field 10, 'uint8', 'default_max_biking_heart_rate', :dict => 'display_heart'
+    field 11, 'uint8', 'default_max_heart_rate', :dict => 'display_heart'
     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 16, 'enum', 'power_setting'
     field 17, 'enum', 'activity_class', :scale => 10
     field 18, 'enum', 'position_setting', :dict => 'display_position'
     field 21, 'enum', 'temperature_setting', :dict => 'display_measure'
@@ -212,6 +224,7 @@ module Fit4Ruby
     field 10, 'enum', 'undocumented_field_10'
     field 11, 'enum', 'undocumented_field_11'
     field 12, 'enum', 'undocumented_field_12'
+    field 13, 'enum', 'undocumented_field_13'
     field 254, 'uint16', 'message_index'
 
     message 12, 'sport'
@@ -221,12 +234,16 @@ module Fit4Ruby
     field 4, 'uint16', 'undocumented_field_4'
     field 5, 'enum', 'undocumented_field_5'
     field 6, 'enum', 'undocumented_field_6'
+    field 7, 'uint8', 'undocumented_field_7'
+    field 8, 'uint8', 'undocumented_field_8'
     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', :array => true
     field 13, 'enum', 'undocumented_field_13'
     field 15, 'enum', 'undocumented_field_15'
+    field 17, 'enum', 'undocumented_field_17'
+    field 18, 'enum', 'undocumented_field_18'
     field 19, 'enum', 'undocumented_field_19', :array => true
 
     # Not part of the official ANT SDK doc.
@@ -239,16 +256,21 @@ module Fit4Ruby
     field 6, 'sint32', 'undocumented_field_6'
     field 7, 'enum', 'undocumented_field_7'
     field 8, 'uint16', 'undocumented_field_8'
+    field 9, 'enum', 'undocumented_field_9'
+    field 10, 'uint16', 'undocumented_field_10'
     field 11, 'uint8', 'undocumented_field_11'
     field 12, 'enum', 'undocumented_field_12'
     field 13, 'enum', 'undocumented_field_13'
     field 14, 'enum', 'undocumented_field_14'
     field 15, 'enum', 'undocumented_field_15'
     field 16, 'enum', 'undocumented_field_16'
+    field 18, 'enum', 'undocumented_field_18'
+    field 19, 'uint16', 'undocumented_field_19'
     field 21, 'enum', 'undocumented_field_21'
     field 22, 'uint16', 'undocumented_field_22'
     field 23, 'enum', 'undocumented_field_23'
     field 24, 'enum', 'undocumented_field_24'
+    field 25, 'enum', 'undocumented_field_25'
     field 27, 'enum', 'undocumented_field_27'
     field 28, 'enum', 'undocumented_field_28'
     field 29, 'enum', 'undocumented_field_29'
@@ -271,16 +293,27 @@ module Fit4Ruby
     field 46, 'enum', 'undocumented_field_46'
     field 47, 'enum', 'undocumented_field_47'
     field 48, 'enum', 'undocumented_field_48'
+    field 50, 'enum', 'undocumented_field_50'
+    field 51, 'enum', 'undocumented_field_51'
+    field 52, 'uint16', 'undocumented_field_52'
     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 58, 'enum', 'undocumented_field_58'
     field 60, 'enum', 'undocumented_field_60'
+    field 61, 'enum', 'undocumented_field_61'
     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 67, 'enum', 'undocumented_field_67'
+    field 69, 'uint16', 'undocumented_field_69'
+    field 70, 'enum', 'undocumented_field_70'
+    field 73, 'sint32', 'undocumented_field_73'
+    field 74, 'sint32', 'undocumented_field_74'
+    field 75, 'enum', 'undocumented_field_75'
     field 76, 'enum', 'undocumented_field_76'
     field 254, 'uint16', 'message_index'
 
@@ -368,6 +401,7 @@ module Fit4Ruby
     field 108, 'uint16', 'undefined_value_108'
     field 109, 'uint8', 'undefined_value_109'
     field 110, 'string', 'undefined_value_110'
+    field 111, 'uint8', 'undefined_value_111'
     field 112, 'uint32', 'time_standing', :scale => 1000, :unit => 's'
     field 113, 'uint16', 'stand_count'
     field 114, 'sint8', 'avg_left_pco', :unit => 'mm'
@@ -390,6 +424,7 @@ module Fit4Ruby
     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 139, 'uint16', 'avg_vam', :scale => 1000, :unit => 'm/s'
     field 150, 'sint8', 'min_temperature', :unit => 'C' # guessed
     field 151, 'uint16', 'undocumented_field_151'
     field 152, 'uint32', 'undocumented_field_152'
@@ -397,7 +432,19 @@ module Fit4Ruby
     field 158, 'uint16', 'undocumented_field_158'
     field 153, 'enum', 'undocumented_field_153'
     field 154, 'enum', 'undocumented_field_154'
+    field 168, 'sint32', 'undocumented_field_168'
+    field 169, 'uint16', 'undocumented_field_169'
+    field 170, 'uint16', 'undocumented_field_170'
+    field 177, 'uint16', 'undocumented_field_177'
+    field 178, 'uint16', 'undocumented_field_178'
+    field 179, 'uint16', 'undocumented_field_179'
+    field 180, 'uint16', 'undocumented_field_180'
+    field 181, 'float32', 'undocumented_field_181'
+    field 183, 'uint16', 'undocumented_field_183'
     field 184, 'enum', 'undocumented_field_184'
+    field 185, 'uint8', 'undocumented_field_185'
+    field 187, 'float32', 'undocumented_field_187'
+    field 188, 'enum', 'undocumented_field_188'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -493,9 +540,18 @@ module Fit4Ruby
     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 121, 'uint16', 'avg_vam', :scale => 1000, :unit => 'm/s'
     field 124, 'sint8', 'min_temperature', :unit => 'C' # guessed
     field 125, 'uint16', 'undocumented_field_125'
     field 126, 'uint16', 'undocumented_field_126'
+    field 136, 'uint16', 'undocumented_field_136'
+    field 137, 'uint16', 'undocumented_field_137'
+    field 143, 'uint16', 'undocumented_field_143'
+    field 145, 'uint16', 'undocumented_field_145'
+    field 149, 'float32', 'undocumented_field_149'
+    field 151, 'uint16', 'undocumented_field_151'
+    field 152, 'uint8', 'undocumented_field_152'
+    field 154, 'float32', 'undocumented_field_154'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -541,6 +597,8 @@ module Fit4Ruby
     field 70, 'uint8', 'left_power_phase_peak', :scale => 0.7111111, :unit => 'degrees', :array => true
     field 71, 'uint8', 'right_power_phase', :scale => 0.7111111, :unit => 'degrees', :array => true
     field 72, 'uint8', 'right_power_phase_peak', :scale => 0.7111111, :unit => 'degrees', :array => true
+    field 73, 'uint32', 'enhanced_speed', :scale => 1000, :unit => 'm/s'
+    field 78, 'uint32', 'enhanced_elevation', :scale => 5, :offset => 500, :unit => 'm'
     field 83, 'uint16', 'vertical_ratio', :scale => 100, :unit => '%' # guessed
     field 84, 'uint16', 'gct_balance', :scale => 100, :unit => '%' # guessed
     field 85, 'uint16', 'stride_length', :scale => 10000, :unit => 'm' # guessed
@@ -583,6 +641,8 @@ module Fit4Ruby
     field 14, 'enum', 'undocumented_field_14'
     field 15, 'uint32', 'undocumented_field_15'
     field 16, 'enum', 'undocumented_field_16'
+    field 17, 'uint16', 'undocumented_field_17'
+    field 18, 'uint16', 'undocumented_field_18'
     field 19, 'uint8', 'undocumented_field_19'
     field 20, 'uint8', 'undocumented_field_20'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
@@ -597,6 +657,9 @@ module Fit4Ruby
     field 4, 'uint8', 'heart_rate'
     field 5, 'enum', 'mode' # 0 or 3 seen, unknown meaning
     field 6, 'uint8', 'power' # First found in FR920XT
+    field 7, 'uint8', 'undocumented_field_7'
+    field 8, 'uint8', 'undocumented_field_8'
+    field 9, 'uint8', 'undocumented_field_9'
     field 14, 'uint8', 'calories' # First found in FR920XT
     field 15, 'uint8', 'undocumented_field_15'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
@@ -748,6 +811,11 @@ module Fit4Ruby
     field 13, 'uint16', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
     field 15, 'uint8', 'undocumented_field_15'
+    field 16, 'uint32', 'undocumented_field_16'
+    field 17, 'sint32', 'undocumented_field_17'
+    field 18, 'sint32', 'undocumented_field_18'
+    field 19, 'sint32', 'undocumented_field_19'
+    field 20, 'uint16', 'undocumented_field_20'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 101, 'length'
@@ -833,7 +901,7 @@ module Fit4Ruby
     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 15, 'uint16', 'running_lactate_threshold_speed', :scale => 1000, :unit => 'm/s'
     field 16, 'uint16', 'undocumented_field_16' # very correlated to 14 and 15
     field 17, 'sint8', 'performance_condition'
     field 18, 'uint8', 'undocumented_field_18'
@@ -845,10 +913,21 @@ module Fit4Ruby
     field 24, 'sint32', 'undocumented_field_24'
     field 25, 'uint8', 'undocumented_field_25'
     field 26, 'sint32', 'undocumented_field_26'
+    field 27, 'sint32', 'undocumented_field_27'
+    field 28, 'sint32', 'undocumented_field_28'
     field 29, 'sint32', 'metmax_running', :scale => 65536, :unit => 'MET'
+    field 30, 'sint8', 'undocumented_field_30'
+    field 31, 'sint8', 'undocumented_field_31'
+    field 32, 'sint32', 'undocumented_field_32'
+    field 33, 'uint8', 'undocumented_field_33'
     field 34, 'enum', 'undocumented_field_34'
     field 35, 'uint32', 'undocumented_field_35'
     field 36, 'uint32', 'undocumented_field_36'
+    field 37, 'sint32', 'undocumented_field_37'
+    field 38, 'sint32', 'undocumented_field_38'
+    field 39, 'sint32', 'undocumented_field_39'
+    field 40, 'sint32', 'undocumented_field_40'
+    field 41, 'enum', 'undocumented_field_41'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc. The message name is guessed and
@@ -872,7 +951,7 @@ module Fit4Ruby
     field 5, 'enum', 'undocumented_field_5'
     field 6, 'enum', 'undocumented_field_6'
     field 7, 'enum', 'undocumented_field_7'
-    field 8, 'uint8', 'undocumented_field_8'
+    field 8, 'enum', 'undocumented_field_8'
     field 9, 'uint8', 'undocumented_field_9'
     field 10, 'uint16', 'undocumented_field_10'
     field 11, 'uint16', 'calibration_factor', :scale => 10
@@ -886,6 +965,12 @@ module Fit4Ruby
     field 19, 'uint8z', 'undocumented_field_19'
     field 20, 'uint8z', 'undocumented_field_20'
     field 21, 'uint16', 'undocumented_field_21'
+    field 25, 'uint16', 'undocumented_field_25'
+    field 26, 'uint16', 'undocumented_field_26'
+    field 27, 'uint8', 'undocumented_field_27'
+    field 28, 'uint8', 'undocumented_field_28'
+    field 29, 'uint8', 'undocumented_field_29'
+    field 30, 'uint8', 'undocumented_field_30'
     field 24, 'enum', 'undocumented_field_24'
     field 31, 'uint8', 'undocumented_field_31'
     field 32, 'uint16', 'undocumented_field_32'
@@ -909,15 +994,20 @@ module Fit4Ruby
     field 51, 'enum', 'undocumented_field_51'
     field 52, 'uint8', 'undocumented_field_52'
     field 53, 'uint8', 'undocumented_field_53'
+    field 54, 'enum', 'undocumented_field_54'
     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 59, 'uint8', 'undocumented_field_59'
+    field 60, 'enum', 'undocumented_field_60'
+    field 61, 'enum', 'undocumented_field_61'
     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 70, 'uint32', 'undocumented_field_70'
+    field 71, 'enum', 'undocumented_field_71'
     field 254, 'uint16', 'message_index'
 
     # Not part of the official ANT SDK doc.
@@ -1032,6 +1122,17 @@ module Fit4Ruby
     field 1, 'uint8', 'undocumented_field_1'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    # Not part of the official ANT SDK doc.
+    message 261, 'undocumented_261'
+    field 0, 'enum', 'undocumented_field_0'
+    field 1, 'sint32', 'undocumented_field_1'
+    field 2, 'sint32', 'undocumented_field_2'
+    field 3, 'uint32', 'undocumented_field_3'
+    field 7, 'uint8', 'undocumented_field_7'
+    field 8, 'uint8', 'undocumented_field_8'
+    field 9, 'uint8', 'undocumented_field_9'
+    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'
@@ -1042,6 +1143,15 @@ module Fit4Ruby
     field 0, 'uint16', 'load'
     field 1, 'uint32', 'timestamp', :type => 'date_time'
 
+    # Not part of the official ANT SDK doc.
+    message 288, 'undocumented_288'
+    field 0, 'sint8', 'undocumented_field_0'
+    field 1, 'sint8', 'undocumented_field_1'
+    field 2, 'uint16', 'undocumented_field_2'
+    field 251, 'byte', 'undocumented_field_251'
+    field 252, 'uint8', 'undocumented_field_252'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
     # Not part of the official ANT SDK doc.
     message 1024, 'undocumented_1024'
     field 0, 'enum', 'undocumented_field_0'

data/lib/fit4ruby/Record.rb

@@ -38,14 +38,14 @@ module Fit4Ruby
       end
     end
 
-    # Convert the 'speed' field into a running pace. The pace is measured in
-    # minutes per Kilometer.
+    # Convert the 'speed' or 'enhanced_speed' field into a running pace. The
+    # pace is measured in minutes per Kilometer.
     # @return [Float or nil] pace for this Record in m/s or nil if not
     #         available.
     def pace
-      return nil unless @speed
+      return nil unless @speed || @enhanced_speed
 
-      1000.0 / (@speed * 60.0)
+      1000.0 / ((@speed || @enhanced_speed) * 60.0)
     end
 
   end

data/lib/fit4ruby/version.rb

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

data/spec/FitFile_spec.rb

@@ -14,6 +14,8 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'fit4ruby'
 
+ENV['TZ'] = 'UTC'
+
 describe Fit4Ruby do
 
   before(:each) do
@@ -109,7 +111,7 @@ describe Fit4Ruby do
     expect(File.exists?(fit_file)).to be true
 
     b = Fit4Ruby.read(fit_file)
-    expect(b).to eq(@activity)
+    expect(b.inspect).to eq(@activity.inspect)
     File.delete(fit_file)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement