fit4ruby 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f403fc735e7bda18d7d23d3105ed5c0b2d5ca32f
-  data.tar.gz: 12b973174eff309b24595ebce9651a6d1d2bfc1c
+  metadata.gz: 8ff21e0bc29baae59a7611f60f21f03c764a39d7
+  data.tar.gz: 0591aa35d271c7f817ce6e51fbe5a49cfd8e7827
 SHA512:
-  metadata.gz: c1d98b48933b07c13ec0f50221c8de28512e29a1844c9cbdfd8f39f77ee955e9af4e5876d4883654991453e97d6220e4cc0fc01322051912d5ed9ade5904ec57
-  data.tar.gz: cb795dad345888c54bf55f8fbe486191a2b5832cafb64a0bc641e7a2c8a99b9d5261f88c0df3b4dafe585fd94d9dac232647506f066542db3737a8c2a115f896
+  metadata.gz: f7f3aba8f4af977f471802d237487120cf8481d87f9501f7f16b5ed40fbe5c0f9af8e6aa6f9fd754126de2abd227ce3d1a79c5ab555ff09448b88b553d65c838
+  data.tar.gz: d9aa3f31e00c80ffa963f6f4d83109ca61a460659b2611d353b3347b50059db6ead9f9478c38af4c48dc0aaa927d9fc3338b11b057e03bdee7c69d64b395b0b6

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -334,6 +334,12 @@ module Fit4Ruby
     field 25, 'enum', 'source_type', :dict => 'source_type'
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
+    # This message was first seen on the Fenix3HR with firmware 3.0.
+    message 24, 'undocumented_24'
+    # The Array contains 16 bytes. Bytes 2(lsb) and 3(msb) seem to be a
+    # counter.
+    field 2, 'byte', 'undocumented_field_2', :array => true
+
     # Message 29 is just a guess. It's not officially documented.
     # Found in LCTNS.FIT on Fenix 3
     message 29, 'location'
@@ -403,8 +409,8 @@ module Fit4Ruby
     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 35, 'uint32', 'floors_climbed', :scale => 1000, :unit => 'm' # just a guess, around 3.048m (10ft) per floor
+    field 36, 'uint32', 'floors_descended', :scale => 1000, :unit => 'm' # just a guess
     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'
@@ -464,7 +470,7 @@ module Fit4Ruby
     field 0, 'uint32', 'local_time', :type => 'date_time'
     field 1, 'enum', 'activity_type', :array => true, :dict => 'activity_type'
     field 3, 'uint16', 'cycles_to_distance', :array => true, :scale => 5000, :unit => 'm/cycle'
-    field 4, 'uint16', 'cycle_to_calories', :array => true, :scale => 5000, :unit => 'kcal/cycle'
+    field 4, 'uint16', 'cycles_to_calories', :array => true, :scale => 5000, :unit => 'kcal/cycle'
     field 5, 'uint16', 'resting_metabolic_rate', :unit => 'kcal/day'
     # Just a guess, not officially documented
     field 7, 'uint32', 'goal_cycles', :array => true

data/lib/fit4ruby/Monitoring_B.rb

@@ -46,6 +46,7 @@ module Fit4Ruby
     # objects. Any errors will be reported via the Log object.
     def check
       last_timestamp = ts_16_offset = nil
+      last_ts_16 = nil
 
       # The timestamp_16 is a 2 byte time stamp value that is used instead of
       # the 4 byte timestamp field for monitoring records that have
@@ -54,11 +55,18 @@ module Fit4Ruby
       # to be included in the file. However, it can be approximated using the
       # surrounding timestamp values.
       @monitorings.each do |record|
+        if last_ts_16 && ts_16_offset && record.timestamp_16 &&
+           record.timestamp_16 < last_ts_16
+          # Detect timestamp_16 wrap-arounds. timestamp_16 is a 16 bit value.
+          # In case of a wrap-around we adjust the ts_16_offset accordingly.
+          ts_16_offset += 2 ** 16
+        end
         if ts_16_offset
           # We have already found the offset. Adjust all timestamps according
           # to 'offset + timestamp_16'
           if record.timestamp_16
             record.timestamp = ts_16_offset + record.timestamp_16
+            last_ts_16 = record.timestamp_16
           end
         else
           # We are still looking for the offset.
@@ -70,6 +78,7 @@ module Fit4Ruby
             # thinking here?
             ts_16_offset = last_timestamp + 60 - record.timestamp_16
             record.timestamp = ts_16_offset + record.timestamp_16
+            last_ts_16 = record.timestamp_16
           else
             # Just save the timestamp of the current record.
             last_timestamp = record.timestamp

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata