fit4ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f651054b5f16738a2ca5fc4146cdb817c4ef102
-  data.tar.gz: b1af399d6335bcf932dfdeb3b35897191bfc6290
+  metadata.gz: 03a178c07a618005acb996433ce4c8d1dd4f1cce
+  data.tar.gz: 84ee7b840af9cfac5411bd4480737cdf8e4fcaff
 SHA512:
-  metadata.gz: 773e7c729a6ecae371b03269da9da1312f9ca7da35f3e14e6cc6e2c8429955d5f4ea0f965a975bde69368853d9a7555280f4da9a630dd8e1525f827e090b06d1
-  data.tar.gz: 2e4ea74d55a4496977133a15e0ccb5bf0902b4104c32587e783c3427c175cc123c70a498a8e0b0a56cc28451e3fb95b6c0a509b9b28431ff376194b2a94c0932
+  metadata.gz: cd71d3ffafc982031ae56a62ab8c76780a329346108717d2f54b3a2f7e82c866da5e424167530a4b5452bc48916ab24ec037ab43c4cdd4e6ce30259e3280bada
+  data.tar.gz: 5e9cab1af4d8a3bd048b73ab44a60cbc475d228e50c20746ca33cc027d0aa6c89d39e928d72ac111e438afc62c3ef0bf1dfd52bdccd46b8f3e18a89f3e2f7361

data/lib/fit4ruby/Activity.rb

@@ -19,6 +19,7 @@ require 'fit4ruby/UserProfile'
 require 'fit4ruby/Session'
 require 'fit4ruby/Lap'
 require 'fit4ruby/Record'
+require 'fit4ruby/HRV'
 require 'fit4ruby/Event'
 require 'fit4ruby/PersonalRecords'
 
@@ -30,7 +31,7 @@ module Fit4Ruby
   class Activity < FitDataRecord
 
     attr_accessor :file_id, :file_creator, :device_infos, :data_sources,
-                  :user_profiles, :sessions, :laps, :records,
+                  :user_profiles, :sessions, :laps, :records, :hrv,
                   :events, :personal_records
 
     # Create a new Activity object.
@@ -50,6 +51,7 @@ module Fit4Ruby
       @sessions = []
       @laps = []
       @records = []
+      @hrv = []
       @personal_records = []
 
       @cur_session_laps = []
@@ -111,24 +113,31 @@ module Fit4Ruby
       # the total distance purely on the GPS coordinates found in the records.
       d = 0.0
       last_lat = last_long = nil
+      last_timestamp = nil
 
       # Iterate over all the records and accumlate the distances between the
       # neiboring coordinates.
       @records.each do |r|
         if (lat = r.position_lat) && (long = r.position_long)
           if last_lat && last_long
-            d += Fit4Ruby::GeoMath.distance(last_lat, last_long,
-                                            lat, long)
+            distance = Fit4Ruby::GeoMath.distance(last_lat, last_long,
+                                                  lat, long)
+            d += distance
+          end
+          if last_timestamp
+            speed = distance / (r.timestamp - last_timestamp)
           end
           if timer_stops[0] == r.timestamp
             # If a stop event was found for this record timestamp we clear the
             # last_* values so that the distance covered while being stopped
             # is not added to the total.
             last_lat = last_long = nil
+            last_timestamp = nil
             timer_stops.shift
           else
             last_lat = lat
             last_long = long
+            last_timestamp = r.timestamp
           end
         end
       end
@@ -163,6 +172,16 @@ module Fit4Ruby
       nil
     end
 
+    # Returns the remaining recovery time at the start of the activity.
+    # @return remaining recovery time in seconds.
+    def recovery_info
+      @events.each do |e|
+        return e.recovery_info if e.event == 'recovery_info'
+      end
+
+      nil
+    end
+
     # Returns the predicted recovery time needed after this activity.
     # @return recovery time in seconds.
     def recovery_time
@@ -350,6 +369,8 @@ module Fit4Ruby
       when 'record'
         @cur_lap_records << (record = Record.new(field_values))
         @records << record
+      when 'hrv'
+        @hrv << (record = HRV.new(field_values))
       when 'personal_records'
         @personal_records << (record = PersonalRecords.new(field_values))
       else

data/lib/fit4ruby/Converters.rb

@@ -39,7 +39,9 @@ module Fit4Ruby
 
     def speedToPace(speed, distance = 1000.0)
       if speed && speed > 0.01
-        pace = distance / (speed * 60.0)
+        # We only show 2 fractional digits, so make sure we round accordingly
+        # before we crack it up.
+        pace = (distance.to_f / (speed * 60.0)).round(2)
         int, dec = pace.divmod 1
         "#{int}:#{'%02d' % (dec * 60)}"
       else

data/lib/fit4ruby/FitFile.rb

@@ -11,6 +11,7 @@
 #
 
 require 'fit4ruby/Log'
+require 'fit4ruby/FileNameCoder'
 require 'fit4ruby/FitHeader'
 require 'fit4ruby/FitFileEntity'
 require 'fit4ruby/FitRecord'

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -66,6 +66,13 @@ module Fit4Ruby
     entry 4, 'low'
     entry 5, 'critical'
 
+    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
@@ -129,6 +136,10 @@ module Fit4Ruby
     entry 39, 'recovery_info' # guess (in minutes, < 24 good, > 24h poor)
     entry 42, 'front_gear_change'
     entry 43, 'rear_gear_change'
+    entry 44, 'rider_position_change'
+    entry 45, 'elev_high_alert'
+    entry 46, 'elev_low_alert'
+    entry 47, 'comm_timeout'
 
     dict 'event_type'
     entry 0, 'start_time'
@@ -159,6 +170,12 @@ module Fit4Ruby
     entry 28, 'monitoring_daily'
     entry 32, 'monitoring_b'
 
+    dict 'fitness_equipment_state'
+    entry 0, 'ready'
+    entry 1, 'in_use'
+    entry 2, 'paused'
+    entry 3, 'unknown'
+
     dict 'garmin_product'
     entry 8, 'hrm_run_single_byte_product_id'
     entry 1551, 'fenix'
@@ -314,6 +331,10 @@ module Fit4Ruby
     entry 0x7000, 'reserved'
     entry 0x8000, 'selected'
 
+    dict 'rider_position_type'
+    entry 0, 'seated'
+    entry 1, 'standing'
+
     dict 'session_trigger'
     entry 0, 'activity_end'
     entry 1, 'manual'

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -131,6 +131,9 @@ 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 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 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -216,6 +219,9 @@ 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 253, 'uint32', 'timestamp', :type => 'date_time'
     field 254, 'uint16', 'message_index'
 
@@ -236,6 +242,9 @@ module Fit4Ruby
     field 53, 'uint8', 'fractional_cadence', :scale => 128
     field 61, 'uint16', 'undefined_value_61'
     field 66, 'sint16', 'undefined_value_66'
+    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
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 21, 'event'
@@ -247,8 +256,22 @@ module Fit4Ruby
       field 'timer', 'enum', 'timer_trigger', :dict => 'timer_trigger'
       field 'course_point', 'enum', 'message_index', :dict => 'message_index'
       field 'battery', 'uint16', 'battery_level', :scale => 1000, :unit => 'V'
+      field 'hr_high_alert', 'uint8', 'hr_high_alert', :unit => 'bpm'
+      field 'hr_low_alert', 'uint8', 'hr_low_alert', :unit => 'bpm'
+      field 'speed_high_alert', 'uint16', 'speed_high_alert', :scale => 1000, :unit => 'm/s'
+      field 'speed_low_alert', 'uint16', 'speed_low_alert', :scale => 1000, :unit => 'm/s'
+      field 'cad_high_alert', 'uint16', 'cad_high_alert', :unit => 'bpm'
+      field 'cad_low_alert', 'uint16', 'cad_low_alert', :unit => 'bpm'
+      field 'power_high_alert', 'uint16', 'power_high_alert', :unit => 'watts'
+      field 'power_low_alert', 'uint16', 'power_low_alert', :unit => 'watts'
+      field 'time_duration_alert', 'uint32', 'time_duration_alert', :scale => 100, :unit => 's'
+      field 'calorie_duration_alert', 'uint32', 'calorie_duration_alert', :unit  => 'calories'
+      field 'fitness_equipment', 'enum', 'fitness_equipment_state', :dict => 'fitness_equipment_state'
+      field 'rider_position', 'enum', 'rider_position', :dict => 'rider_position_type'
+      field 'comm_timeout', 'uint16', 'comm_timeout', :dict => 'comm_timeout_type'
       field 'recovery_hr', 'uint32', 'recovery_hr', :unit => 'bpm'
       field 'recovery_time', 'uint32', 'recovery_time', :unit => 'min'
+      field 'recovery_info', 'uint32', 'recovery_info', :unit => 'min'
       field 'vo2max', 'uint32', 'vo2max'
     end
     field 4, 'uint8', 'event_group'
@@ -355,6 +378,10 @@ module Fit4Ruby
     field 24, 'byte', 'current_activity_type_intensity', :type => 'activity_intensity'
     field 26, 'uint16', 'timestamp_16', :unit => 's'
     field 29, 'uint16', 'duration_min', :unit => 'min'
+    field 31, 'uint32', 'undocumented_field_31'
+    field 32, 'uint32', 'undocumented_field_32'
+    field 35, 'uint32', 'undocumented_field_35'
+    field 36, 'uint32', 'undocumented_field_36'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 72, 'training_file'
@@ -383,6 +410,11 @@ 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 11, 'uint16', 'undocumented_field_11'
+    field 12, 'uint16', 'undocumented_field_12'
+    field 13, 'uint16', 'undocumented_field_13'
+    field 14, 'uint8', 'undocumented_field_14'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 101, 'length'
@@ -424,6 +456,15 @@ module Fit4Ruby
     field 5, 'enum', 'new_record'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    # Not part of the official ANT SDK doc
+    # It shows up in swimming activities.
+    message 125, 'undocumented_125'
+    field 1, 'uint8', 'undocumented_field_1', :array => true
+    field 2, 'uint16', 'undocumented_field_2', :array => true
+    field 3, 'uint16', 'undocumented_field_3'
+    field 4, 'uint8', 'undocumented_field_4'
+    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
@@ -442,6 +483,13 @@ module Fit4Ruby
     field 10, 'uint16', 'undocumented_field_10' # always seems to be 340
     field 11, 'enum', 'undocumented_field_11'
     field 12, 'enum', 'undocumented_field_12'
+    field 13, 'uint8', 'undocumented_field_13'
+    field 14, 'uint16', 'undocumented_field_14'
+    field 15, 'uint16', 'undocumented_field_15'
+    field 16, 'uint16', 'undocumented_field_16'
+    field 17, 'sint8', 'undocumented_field_17'
+    field 18, 'uint8', 'undocumented_field_18'
+    field 19, 'uint8', 'undocumented_field_19'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc

data/lib/fit4ruby/HRV.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = RR_Intervals.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2015 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
+
+  # The Heart Rate Variability or HRV data is contained in message number 78.
+  # It is an array of values that represent the time in seconds since the
+  # previous heart beat (R-R interval).
+  class HRV < FitDataRecord
+
+    def initialize(field_values = {})
+      super('hrv')
+      set_field_values(field_values)
+    end
+
+    def check(index)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/Log.rb

@@ -3,7 +3,7 @@
 #
 # = Log.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2015 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
@@ -30,6 +30,17 @@ module Fit4Ruby
 
     @@logger = Logger.new(STDOUT)
 
+    # Redirect all log messages to the given IO.
+    # @param io [IO] Output file descriptor
+    def open(io)
+      begin
+        @@logger = Logger.new(io)
+      rescue => e
+        @@logger = Logger.new(STDERR)
+        Log.fatal "Cannot open log file: #{e.message}"
+      end
+    end
+
     # Pass all calls to unknown methods to the @@logger object.
     def method_missing(method, *args, &block)
       @@logger.send(method, *args, &block)
@@ -42,8 +53,8 @@ module Fit4Ruby
 
     # Print an error message via the Logger and raise and Fit4Ruby::Error.
     # code 1.
-    def fatal(msg)
-      @@logger.error(msg)
+    def fatal(msg, &block)
+      @@logger.error(msg, &block)
       raise Error, msg
     end
 

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
 description: |
@@ -106,6 +106,7 @@ files:
 - lib/fit4ruby/GlobalFitDictionaries.rb
 - lib/fit4ruby/GlobalFitMessage.rb
 - lib/fit4ruby/GlobalFitMessages.rb
+- lib/fit4ruby/HRV.rb
 - lib/fit4ruby/Lap.rb
 - lib/fit4ruby/Log.rb
 - lib/fit4ruby/Monitoring.rb
@@ -135,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to read GARMIN FIT files.