fit4ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8031616797fec0865e6ba35680ec240f5b7264f
-  data.tar.gz: c9b0255d76f4776dc2259cc91ce784e8295a3394
+  metadata.gz: 1db7e14706602d5c1890a89e173ea889ffd14a71
+  data.tar.gz: b184b8cf98d082435663d4df5d674ab57e3c6cea
 SHA512:
-  metadata.gz: 14b252ae0a5993c9bc53fc95bcea5a75aa798af444b30e62378a1f1bff10b76196bd18c9f34945136a7c09e5b8022ca56ee96a4f9281b1dee3b347d37c5a7316
-  data.tar.gz: 1028184b60ca4aa62db0378199006f97563c13f96b4b50868256e107043a95d0ae416a30fdabc4f75d0053dc232b6bca4f84ea6c587958eb37342e35d2e55abd
+  metadata.gz: 9c4e23196bede4ab4d416fc7d8b732298a3ed97f573777a6f11f179ed269366bd7818d06296c27efc1797cce53bd5d07cebc1b3572232f345f1ed4b88ffd39c0
+  data.tar.gz: 537a25d36c77d7daabc2c2c0f0dcdc676bdee66269f58e02050349d030747d613eeba0db9929dd028b451c479123327891a303f8efcd2060e205e3ee4c97ed65

data/lib/fit4ruby/Activity.rb

@@ -80,6 +80,25 @@ module Fit4Ruby
                   "#{@sessions.length} session records were found in the "
                   "FIT file."
       end
+
+      # Records must have consecutively growing timestamps and distances.
+      ts = Time.parse('1989-12-31')
+      distance = nil
+      @records.each do |r|
+        Log.fatal "Record has no timestamp" unless r.timestamp
+        if r.timestamp < ts
+          Log.fatal "Record has earlier timestamp than previous record"
+        end
+        if r.distance
+          if distance && r.distance < distance
+            Log.fatal "Record #{r.timestamp} has smaller distance " +
+                      "(#{r.distance}) than an earlier record (#{distance})"
+          end
+          distance = r.distance
+        end
+        ts = r.timestamp
+      end
+
       # Laps must have a consecutively growing message index.
       @laps.each.with_index do |lap, index|
         lap.check(index)

data/lib/fit4ruby/FileNameCoder.rb

@@ -38,8 +38,8 @@ module Fit4Ruby
     end
 
     # Convert a FIT file name into the corresponding Time value.
-    # @param [String] FIT file name. This can be a full path name but must end
-    #        with a '.FIT' extension.
+    # @param file_name [String] FIT file name. This can be a full path name
+    #        but must end with a '.FIT' extension.
     # @return [Time] corresponding Time value
     def FileNameCoder::decode(file_name)
       base = File.basename(file_name.upcase)

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -231,6 +231,10 @@ module Fit4Ruby
     entry 7, 'session_end'
     entry 8, 'fitness_equipment'
 
+    dict 'left_right_balance'
+    entry 0x7F, 'mask'
+    entry 0x80, 'right'
+
     dict 'left_right_balance_100'
     entry 0x3FFF, 'mask'
     entry 0x8000, 'right'

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -234,14 +234,31 @@ module Fit4Ruby
     field 5, 'uint32', 'distance', :scale => 100, :unit => 'm'
     field 6, 'uint16', 'speed', :scale => 1000, :unit => 'm/s'
     field 7, 'uint16', 'power', :unit => 'watts'
+    field 11, 'sint32', 'time_from_course', :scale => 1000, :unit => 's'
     field 13, 'sint8', 'temperature', :unit => 'C'
+    field 29, 'uint32', 'accumulated_power', :unit => 'watts'
+    field 30, 'uint8', 'left_right_balance', :dict => 'left_right_balance'
     field 39, 'uint16', 'vertical_oscillation', :scale => 10, :unit => 'mm'
     field 40, 'uint16', 'stance_time_percent', :scale => 100, :unit => 'percent'
     field 41, 'uint16', 'stance_time', :scale => 10, :unit => 'ms'
     field 42, 'enum', 'activity_type', :dict => 'activity_type'
+    field 43, 'uint8', 'left_torque_effectiveness', :scale => 2, :unit => '%'
+    field 44, 'uint8', 'right_torque_effectiveness', :scale => 2, :unit => '%'
+    field 45, 'uint8', 'left_pedal_smoothness', :scale => 2, :unit => '%'
+    field 46, 'uint8', 'right_pedal_smoothness', :scale => 2, :unit => '%'
+    field 47, 'uint8', 'combined_pedal_smoothness', :scale => 2, :unit => '%'
     field 53, 'uint8', 'fractional_cadence', :scale => 128
     field 61, 'uint16', 'undefined_value_61'
+    field 63, 'uint16', 'undefined_value_63'
+    field 64, 'uint16', 'undefined_value_64'
+    field 65, 'uint16', 'undefined_value_65'
     field 66, 'sint16', 'undefined_value_66'
+    field 67, 'sint8', 'left_pco', :unit => 'mm'
+    field 68, 'sint8', 'right_pco', :unit => 'mm'
+    field 69, 'uint8', 'left_power_phase', :scale => 0.7111111, :unit => 'degrees', :array => true
+    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 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
@@ -378,11 +395,17 @@ module Fit4Ruby
     field 19, 'uint16', 'active_calories', :unit => 'kcal'
     field 24, 'byte', 'current_activity_type_intensity', :type => 'activity_intensity'
     field 26, 'uint16', 'timestamp_16', :unit => 's'
+    field 27, 'uint8', 'heart_rate', :unit => 'bpm'
     field 29, 'uint16', 'duration_min', :unit => 'min'
-    field 31, 'uint32', 'undocumented_field_31'
-    field 32, 'uint32', 'undocumented_field_32'
+    field 30, 'uint32', 'duration', :unit => 's'
+    field 31, 'uint32', 'ascent', :scale => 1000, :unit => 'm'
+    field 32, 'uint32', 'descent', :scale => 1000, :unit => 'm'
+    field 33, 'uint16', 'moderate_activity_minutes', :unit => 'minutes'
+    field 34, 'uint16', 'vigorous_activity_minutes', :unit => 'minutes'
     field 35, 'uint32', 'undocumented_field_35'
     field 36, 'uint32', 'undocumented_field_36'
+    field 37, 'uint16', 'weekly_moderate_activity_minutes', :unit => 'minutes' # just a guess
+    field 38, 'uint16', 'weekly_vigorous_activity_minutes', :unit => 'minutes' # just a guess
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 72, 'training_file'

data/lib/fit4ruby/Lap.rb

@@ -47,21 +47,6 @@ module Fit4Ruby
       unless @message_index == index
         Log.fatal "message_index must be #{index}, not #{@message_index}"
       end
-      ts = Time.parse('1989-12-31')
-      distance = nil
-      @records.each do |r|
-        Log.fatal "Record has no timestamp" unless r.timestamp
-        if r.timestamp < ts
-          Log.fatal "Record has earlier timestamp than previous record"
-        end
-        if r.distance
-          if distance && r.distance < distance
-            Log.fatal "Record has smaller distance than previous record"
-          end
-          distance = r.distance
-        end
-        ts = r.timestamp
-      end
     end
 
     # Compute the average stride length for this Session.

data/lib/fit4ruby/version.rb

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

data/tasks/changelog.rake

@@ -12,10 +12,10 @@ task :changelog do
       @author = author
       @time = time
       @message = message
-      if (m = /New: (.*)/.match(@message))
+      if (m = /New: (.*)/i.match(@message))
         @type = :feature
         @message = m[1]
-      elsif (m = /Fix: (.*)/.match(@message))
+      elsif (m = /Fix: (.*)/i.match(@message))
         @type = :bugfix
         @message = m[1]
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata