fit4ruby 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ee014802983dc12f9d4204e29e1c80d33be729
-  data.tar.gz: 7d52d887dea393412752a72974d189452ffea3e3
+  metadata.gz: d789b2e373decc4dfff48739b65a320c66da88fd
+  data.tar.gz: 1a40f4aac55b45f66cb082b6ffef4ca6e3c3ed9e
 SHA512:
-  metadata.gz: 0d306e3ff6d58837943461a2508c6a81d05043b49eb186e352f273e11b341ffe6b0db92e500d764e327c37f38c5f3a5ec466a8bb8172599dd1df563a3b9a0075
-  data.tar.gz: cb7692535f35056b613c8f9e3a334d9690400ec2f614c8e5676af0919cb8132b1a280caa7efcd3c6265044008def7deed8a6e706e4718aad1be57a96b12700f3
+  metadata.gz: 2ec0e96be6dd2d0cf44b03a5ac41197a693d4a4b8861063a55f7d37e98252656f380d8cb57bb4d77476d7f805fdab1668c598f5ec81208e7225102e151b12e8a
+  data.tar.gz: d92c14c4af7c98c043d3a675bb8eefa741fe30b18a05d4606358cd69a49c05b4564355b1c213dac9c9196d1b1c2f0bf5122bca7808652db310fccf1c59fe92f1

data/lib/fit4ruby/Activity.rb

@@ -261,10 +261,10 @@ module Fit4Ruby
       @events.each do |e|
         return e.vo2max if e.event == 'vo2max'
       end
-      # Then check the user_profile entries for a metmax entry. METmax * 3.5
+      # Then check the user_data entries for a metmax entry. METmax * 3.5
       # is same value as VO2max.
-      @user_profiles.each do |u|
-        return u.metmax * 3.5 if u.metmax
+      @user_data.each do |u|
+        return ((u.metmax * 1000.0) * 3.5) / 1024.0 if u.metmax
       end
 
       nil

data/lib/fit4ruby/CRC16.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = CRC16.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2014, 2015, 2016, 2017, 2018
+#   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.
+#
+
+module Fit4Ruby
+
+  module CRC16
+
+    def write_crc(io, start_pos, end_pos)
+      # Compute the checksum over the data section of the file and append it
+      # to the file. Ideally, we should compute the CRC from data in memory
+      # instead of the file data.
+      crc = compute_crc(io, start_pos, end_pos)
+      io.seek(end_pos)
+      BinData::Uint16le.new(crc).write(io)
+
+      crc
+    end
+
+    def compute_crc(io, start_pos, end_pos)
+      crc_table = [
+        0x0000, 0xCC01, 0xD801, 0x1400, 0xF001, 0x3C00, 0x2800, 0xE401,
+        0xA001, 0x6C00, 0x7800, 0xB401, 0x5000, 0x9C01, 0x8801, 0x4400
+      ]
+
+      io.seek(start_pos)
+
+      crc = 0
+      while io.pos < end_pos
+        if io.eof?
+          raise IOError, "Premature end of file"
+        end
+
+        byte = io.readbyte
+
+        0.upto(1) do |i|
+          tmp = crc_table[crc & 0xF]
+          crc = (crc >> 4) & 0x0FFF
+          crc = crc ^ tmp ^ crc_table[(byte >> (4 * i)) & 0xF]
+        end
+      end
+
+      crc
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/FitFile.rb

@@ -3,7 +3,8 @@
 #
 # = FitFile.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2017, 2018
+#   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
@@ -11,6 +12,7 @@
 #
 
 require 'fit4ruby/Log'
+require 'fit4ruby/CRC16'
 require 'fit4ruby/FileNameCoder'
 require 'fit4ruby/FitHeader'
 require 'fit4ruby/FitFileEntity'
@@ -24,6 +26,8 @@ module Fit4Ruby
 
   class FitFile
 
+    include CRC16
+
     def initialize()
       @header = nil
     end
@@ -43,9 +47,14 @@ module Fit4Ruby
           offset = io.pos
 
           header = FitHeader.read(io)
-          header.check
 
-          check_crc(io, io.pos, offset + header.end_pos)
+          # If the header has a CRC the header is not included in the
+          # checksumed bytes. Otherwise it is included.
+          check_crc(io, header.has_crc? ? header.header_size : 0,
+                    offset + header.end_pos)
+
+          # Rewind back to the beginning of the data right after the header.
+          io.seek(header.header_size)
 
           entity = FitFileEntity.new
           # This Array holds the raw data of the records that may be needed to
@@ -86,6 +95,7 @@ module Fit4Ruby
         # 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
@@ -97,7 +107,6 @@ module Fit4Ruby
         # 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
@@ -113,47 +122,14 @@ module Fit4Ruby
       # Read the 2 CRC bytes from the end of the file
       io.seek(end_pos)
       crc_ref = io.readbyte.to_i | (io.readbyte.to_i << 8)
-      io.seek(start_pos)
 
       unless crc == crc_ref
-        Log.fatal "Checksum error in file '#{@file_name}'. " +
+        Log.error "Checksum error of segment #{start_pos} to #{end_pos} " +
+                  "in file '#{@file_name}'. " +
                   "Computed 0x#{"%04X" % crc} instead of 0x#{"%04X" % crc_ref}."
       end
     end
 
-    def write_crc(io, start_pos, end_pos)
-      # Compute the checksum over the data section of the file and append it
-      # to the file. Ideally, we should compute the CRC from data in memory
-      # instead of the file data.
-      crc = compute_crc(io, start_pos, end_pos)
-      io.seek(end_pos)
-      BinData::Uint16le.new(crc).write(io)
-
-      crc
-    end
-
-    def compute_crc(io, start_pos, end_pos)
-      crc_table = [
-        0x0000, 0xCC01, 0xD801, 0x1400, 0xF001, 0x3C00, 0x2800, 0xE401,
-        0xA001, 0x6C00, 0x7800, 0xB401, 0x5000, 0x9C01, 0x8801, 0x4400
-      ]
-
-      io.seek(start_pos)
-
-      crc = 0
-      while io.pos < end_pos
-        byte = io.readbyte
-
-        0.upto(1) do |i|
-          tmp = crc_table[crc & 0xF]
-          crc = (crc >> 4) & 0x0FFF
-          crc = crc ^ tmp ^ crc_table[(byte >> (4 * i)) & 0xF]
-        end
-      end
-
-      crc
-    end
-
     def dump_records(records)
       # For each message number we keep a count for how often we already had
       # this kind of message.

data/lib/fit4ruby/FitHeader.rb

@@ -3,7 +3,8 @@
 #
 # = FitHeader.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# Copyright (c) 2014, 2015, 2016, 2017, 2018
+#   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
@@ -12,41 +13,60 @@
 
 require 'bindata'
 require 'fit4ruby/Log'
+require 'fit4ruby/CRC16'
 
 module Fit4Ruby
 
   class FitHeader < BinData::Record
 
+    include CRC16
+
     endian :little
 
     uint8 :header_size, :initial_value => 14
-    uint8 :protocol_version, :initial_value => 16
+    uint8 :protocol_version, :initial_value => 32
     uint16 :profile_version, :initial_value => 1012
     uint32 :data_size, :initial_value => 0
     string :data_type, :read_length => 4, :initial_value => '.FIT'
-    uint16 :crc, :initial_value => 0
+    uint16 :crc, :initial_value => 0, :onlyif => :has_crc?
+
+    def read(io)
+      super
 
-    def check
-      unless header_size == 14
-        Log.fatal "Unsupported header size #{header_size}"
+      unless header_size.snapshot == 12 || header_size.snapshot == 14
+        Log.fatal "Unsupported header size #{header_size.snapshot}"
       end
-      unless data_type == '.FIT'
-        Log.fatal "Unknown file type #{data_type}"
+      unless data_type.snapshot == '.FIT'
+        Log.fatal "Unknown file type #{data_type.snapshot}"
       end
+      if crc.snapshot != 0 &&
+         compute_crc(io, 0, header_size.snapshot - 2) != crc.snapshot
+        Log.fatal "CRC mismatch in header."
+      end
+    end
+
+    def write(io)
+      super
+
+      write_crc(io, 0, header_size.snapshot - 2)
     end
 
     def dump
       puts <<"EOT"
 Fit File Header
-  Header Size: #{header_size}
-  Protocol Version: #{protocol_version}
-  Profile Version: #{profile_version}
-  Data Size: #{data_size}
+  Header Size: #{header_size.snapshot}
+  Protocol Version: #{protocol_version.snapshot}
+  Profile Version: #{profile_version.snapshot}
+  Data Size: #{data_size.snapshot}
 EOT
     end
 
+    def has_crc?
+      header_size.snapshot == 14
+    end
+
     def end_pos
-      header_size + data_size
+      header_size.snapshot  + data_size.snapshot
     end
 
   end

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -304,6 +304,8 @@ module Fit4Ruby
 
     dict 'garmin_product'
     entry 8, 'hrm_run_single_byte_product_id'
+    entry 9, 'bsm'
+    entry 10, 'bcm'
     entry 1551, 'fenix'
     # The Fenix3 is rumored to have a Mediatek MT3333 GPS chipset. Not sure if
     # that would be a beter name.
@@ -470,7 +472,61 @@ module Fit4Ruby
     entry 85, 'woodway'
     entry 86, 'elite'
     entry 95, 'stryd'
+    entry 96, 'icg'
+    entry 97, 'MiPulse'
+    entry 98, 'bsx_athletics'
+    entry 99, 'look'
+    entry 100, 'campagnolo_srl'
+    entry 101, 'body_bike_smart'
+    entry 102, 'praxisworks'
+    entry 103, 'limits_technology'
+    entry 104, 'topaction_technology'
+    entry 105, 'cosinuss'
+    entry 106, 'fitcare'
+    entry 107, 'magene'
+    entry 108, 'giant_manufacturing_co'
+    entry 109, 'tigrasport'
+    entry 110, 'salutron'
+    entry 111, 'technogym'
+    entry 112, 'bryton_sensors'
+    entry 113, 'latitude_limited'
+    entry 114, 'soaring_technology'
+    entry 115, 'igpsport'
+    entry 116, 'thinkrider'
+    entry 117, 'gopher_sport'
+    entry 118, 'waterrower'
     entry 255, 'development'
+    entry 257, 'healthandlife'
+    entry 258, 'lezyne'
+    entry 259, 'scribe_labs'
+    entry 260, 'zwift'
+    entry 261, 'watteam'
+    entry 262, 'recon'
+    entry 263, 'favero_electronics'
+    entry 264, 'dynovelo'
+    entry 265, 'strava'
+    entry 266, 'precor'
+    entry 267, 'bryton'
+    entry 268, 'sram'
+    entry 269, 'navman'
+    entry 270, 'cobi'
+    entry 271, 'spivi'
+    entry 272, 'mio_magellan'
+    entry 273, 'evesports'
+    entry 274, 'sensitivus_gauge'
+    entry 275, 'podoon'
+    entry 276, 'life_time_fitness'
+    entry 277, 'falco_e_motors'
+    entry 278, 'minoura'
+    entry 279, 'cycliq'
+    entry 280, 'luxottica'
+    entry 281, 'trainer_road'
+    entry 282, 'the_sufferfest'
+    entry 283, 'fullspeedahead'
+    entry 284, 'virtualtraining'
+    entry 285, 'feedbacksports'
+    entry 286, 'omata'
+    entry 287, 'vdo'
     entry 5759, 'actigraphcorp'
 
     dict 'message_index'
@@ -560,6 +616,39 @@ module Fit4Ruby
     entry 24, 'challenge'
     entry 25, 'indoor_skiing'
     entry 26, 'cardio_training'
+    entry 27, 'indoor_walking '
+    entry 28, 'e_bike_fitness '
+    entry 29, 'bmx'
+    entry 30, 'casual_walking '
+    entry 31, 'speed_walking'
+    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 44, 'pilates'
+    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 52, 'map'
+    entry 53, 'single_gas_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 254, 'all'
 
   end

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -100,6 +100,7 @@ module Fit4Ruby
     field 128, 'enum', 'undocumented_field_128'
     field 133, 'enum', 'undocumented_field_133'
     field 138, 'enum', 'undocumented_field_138'
+    field 144, 'enum', 'true_up_enabled'
 
     message 3, 'user_profile'
     field 0, 'string', 'friendly_name'
@@ -134,6 +135,7 @@ module Fit4Ruby
     field 41, 'uint32', 'undocumented_field_41'
     field 42, 'uint32', 'undocumented_field_42'
     field 43, 'enum', 'undocumented_field_43'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 7, 'zones_target'
     field 1, 'uint8', 'max_heart_rate'
@@ -202,6 +204,8 @@ module Fit4Ruby
     field 55, 'enum', 'undocumented_field_55'
     field 57, 'enum', 'undocumented_field_57'
     field 60, 'enum', 'undocumented_field_60'
+    field 65, 'enum', 'undocumented_field_65'
+    field 66, 'enum', 'undocumented_field_66'
     field 254, 'uint16', 'message_index'
 
     message 18, 'session'
@@ -417,7 +421,11 @@ 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 8, 'byte', 'compressed_speed_distance', :array => true
+    field 9, 'sint16', 'grade', :scale => 100, :unit => '%'
+    field 10, 'uint8', 'resistence'
     field 11, 'sint32', 'time_from_course', :scale => 1000, :unit => 's'
+    field 12, 'uint8', 'cycle_length', :scale => 100, :unit => 'm'
     field 13, 'sint8', 'temperature', :unit => 'C'
     field 14, 'uint32', 'undefined_field_14'
     field 15, 'uint32', 'undefined_field_15'
@@ -572,6 +580,7 @@ module Fit4Ruby
     field 4, 'enum', 'event_type', :dict => 'event_type'
     field 5, 'uint32', 'local_timestamp', :type => 'date_time'
     field 6, 'uint8', 'event_group'
+    field 7, 'uint8', 'undocumented_field_7'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 35, 'software'
@@ -581,6 +590,7 @@ module Fit4Ruby
     message 49, 'file_creator'
     field 0, 'uint16', 'software_version'
     field 1, 'uint8', 'hardware_version'
+    field 2, 'string', 'undocumented_field_2'
     field 254, 'uint16', 'message_index', :dict => 'message_index'
 
     message 55, 'monitoring'
@@ -744,6 +754,10 @@ module Fit4Ruby
     field 23, 'uint8', 'undocumented_field_23'
     field 24, 'sint32', 'undocumented_field_24'
     field 25, 'uint8', 'undocumented_field_25'
+    field 26, 'sint32', 'undocumented_field_26'
+    field 29, 'sint32', 'undocumented_field_29'
+    field 34, 'enum', 'undocumented_field_34'
+    field 35, 'uint32', 'undocumented_field_35'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Not part of the official ANT SDK doc. The message name is guessed and
@@ -812,6 +826,11 @@ module Fit4Ruby
     field 62, 'uint8', 'undocumented_field_62'
     field 254, 'uint16', 'message_index'
 
+    # Not part of the official ANT SDK doc.
+    message 188, 'undocumented_188'
+    field 0, 'enum', 'undocumented_field_0'
+    field 253, 'uint32', 'timestamp', :type => 'date_time'
+
     message 206, 'field_description'
     field 0, 'uint8', 'developer_data_index'
     field 1, 'uint8', 'field_definition_number'
@@ -857,11 +876,10 @@ module Fit4Ruby
     field 15, 'uint16', 'undocumented_field_15'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
-    # Not part of the official ANT SDK doc.
-    message 227, 'stress'
-    field 0, 'sint16', 'undocumented_0'
-    field 1, 'uint32', 'undocumented_1'
-    field 2, 'sint8', 'level'
+    message 227, 'stress_level'
+    field 0, 'sint16', 'stress_level_value'
+    field 1, 'uint32', 'stress_level_time', :type => 'date_time'
+    field 2, 'sint8', 'undocumented_field_2'
 
     message 1024, 'undocumented_1024'
     field 0, 'enum', 'undocumented_field_0'

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -84,6 +84,7 @@ files:
 - fit4ruby.gemspec
 - lib/fit4ruby.rb
 - lib/fit4ruby/Activity.rb
+- lib/fit4ruby/CRC16.rb
 - lib/fit4ruby/Converters.rb
 - lib/fit4ruby/DataSources.rb
 - lib/fit4ruby/DeveloperDataId.rb