rubyfit 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250aefed2638033617a97b1789e967c90a26940a
-  data.tar.gz: 46b607c278b112a5dffa6519d54f0bb2c585b0fa
+  metadata.gz: 00b20b537878f333895f88bcd88bfa2aed26118a
+  data.tar.gz: 5638078b60c7fdbe1dd984e94225a4645959eb3e
 SHA512:
-  metadata.gz: d7fbc3064d7e5f8af5947228731c0c2f3213ea196cf4d9f0b2045968216bd41864e04d17c8a646694c5e3ac3541b73fe95861b2574ffa8d84453b9765263e9ca
-  data.tar.gz: 848eaca18d3bb03a830405671fd1c43e51020bfd51f4a6a66378c225b31e8b29f9d13bf82919c9473bf6fc77bbe03f76cecd443935b19d3ab337ab89b75ec307
+  metadata.gz: 5643d322008304a699877b16b8eac3dfdf8a08ce0a29bef8bf1eab7795ce6e64b4f99b7c2dd0720636d83e8e6d4e88ee36388e9a2182f7b80365134a7f53764e
+  data.tar.gz: 887e0f5f1d80504287437b935b16dc82c989e3b6a6709e0c54ecaff4a96c6f5e0e51c743c78e73be7e0f749fca7be646cf332cb257660814a668880be3c2febf

data/lib/rubyfit/message_constants.rb

@@ -0,0 +1,83 @@
+module RubyFit::MessageConstants
+  COURSE_POINT_TYPE = {
+    invalid: 255,
+    generic: 0,
+    summit: 1,
+    valley: 2,
+    water: 3,
+    food: 4,
+    danger: 5,
+    left: 6,
+    right: 7,
+    straight: 8,
+    first_aid: 9,
+    fourth_category: 10,
+    third_category: 11,
+    second_category: 12,
+    first_category: 13,
+    hors_category: 14,
+    sprint: 15,
+    left_fork: 16,
+    right_fork: 17,
+    middle_fork: 18,
+    slight_left: 19,
+    sharp_left: 20,
+    slight_right: 21,
+    sharp_right: 22,
+    u_turn: 23,
+    segment_start: 24,
+    segment_end: 25
+  }.freeze
+
+  EVENT_TYPE = {
+    start: 0,
+    stop: 1,
+    consecutive_depreciated: 2,
+    marker: 3,
+    stop_all: 4,
+    begin_depreciated: 5,
+    end_depreciated: 6,
+    end_all_depreciated: 7,
+    stop_disable: 8,
+    stop_disable_all: 9,
+  }.freeze
+
+  EVENT = {
+    timer: 0, # Group 0.  Start / stop_all
+    workout: 3, # start / stop
+    workout_step: 4, # Start at beginning of workout.  Stop at end of each step.
+    power_down: 5, # stop_all group 0
+    power_up: 6, # stop_all group 0
+    off_course: 7, # start / stop group 0
+    session: 8, # Stop at end of each session.
+    lap: 9, # Stop at end of each lap.
+    course_point: 10, # marker
+    battery: 11, # marker
+    virtual_partner_pace: 12, # Group 1. Start at beginning of activity if VP enabled, when VP pace is changed during activity or VP enabled mid activity.  stop_disable when VP disabled.
+    hr_high_alert: 13, # Group 0.  Start / stop when in alert condition.
+    hr_low_alert: 14, # Group 0.  Start / stop when in alert condition.
+    speed_high_alert: 15, # Group 0.  Start / stop when in alert condition.
+    speed_low_alert: 16, # Group 0.  Start / stop when in alert condition.
+    cad_high_alert: 17, # Group 0.  Start / stop when in alert condition.
+    cad_low_alert: 18, # Group 0.  Start / stop when in alert condition.
+    power_high_alert: 19, # Group 0.  Start / stop when in alert condition.
+    power_low_alert: 20, # Group 0.  Start / stop when in alert condition.
+    recovery_hr: 21, # marker
+    battery_low: 22, # marker
+    time_duration_alert: 23, # Group 1.  Start if enabled mid activity (not required at start of activity). Stop when duration is reached.  stop_disable if disabled.
+    distance_duration_alert: 24, # Group 1.  Start if enabled mid activity (not required at start of activity). Stop when duration is reached.  stop_disable if disabled.
+    calorie_duration_alert: 25, # Group 1.  Start if enabled mid activity (not required at start of activity). Stop when duration is reached.  stop_disable if disabled.
+    activity: 26, # Group 1..  Stop at end of activity.
+    fitness_equipment: 27, # marker
+    length: 28, # Stop at end of each length.
+    user_marker: 32, # marker
+    sport_point: 33, # marker
+    calibration: 36, # start/stop/marker
+    front_gear_change: 42, # marker
+    rear_gear_change: 43, # marker
+    rider_position_change: 44, # marker
+    elev_high_alert: 45, # Group 0.  Start / stop when in alert condition.
+    elev_low_alert: 46, # Group 0.  Start / stop when in alert condition.
+    comm_timeout: 47, # marker
+  }.freeze
+end

data/lib/rubyfit/message_writer.rb

@@ -1,5 +1,6 @@
 require "rubyfit/type"
 require "rubyfit/helpers"
+require "rubyfit/message_constants"
 
 class RubyFit::MessageWriter
   extend RubyFit::Helpers
@@ -7,36 +8,6 @@ class RubyFit::MessageWriter
   FIT_PROTOCOL_VERSION = 0x10 # major 1, minor 0
   FIT_PROFILE_VERSION = 1 * 100 + 52 # major 1, minor 52
 
-  COURSE_POINT_TYPE = {
-    invalid: 255,
-    generic: 0,
-    summit: 1,
-    valley: 2,
-    water: 3,
-    food: 4,
-    danger: 5,
-    left: 6,
-    right: 7,
-    straight: 8,
-    first_aid: 9,
-    fourth_category: 10,
-    third_category: 11,
-    second_category: 12,
-    first_category: 13,
-    hors_category: 14,
-    sprint: 15,
-    left_fork: 16,
-    right_fork: 17,
-    middle_fork: 18,
-    slight_left: 19,
-    sharp_left: 20,
-    slight_right: 21,
-    sharp_right: 22,
-    u_turn: 23,
-    segment_start: 24,
-    segment_end: 25
-  }.freeze
-
   MESSAGE_DEFINITIONS = {
     file_id: {
       id: 0,
@@ -59,6 +30,8 @@ class RubyFit::MessageWriter
       fields: {
         timestamp: { id: 253, type: RubyFit::Type.timestamp, required: true},
         start_time: { id: 2, type: RubyFit::Type.timestamp, required: true},
+        total_elapsed_time: { id: 7, type: RubyFit::Type.duration, required: true }, 
+        total_timer_time: { id: 8, type: RubyFit::Type.duration, required: true }, 
         start_y: { id: 3, type: RubyFit::Type.semicircles },
         start_x: { id: 4, type: RubyFit::Type.semicircles },
         end_y: { id: 5, type: RubyFit::Type.semicircles },
@@ -75,7 +48,7 @@ class RubyFit::MessageWriter
         distance: { id: 4, type: RubyFit::Type.centimeters },
         name: { id: 6, type: RubyFit::Type.string(16) },
         message_index: { id: 254, type: RubyFit::Type.uint16 },
-        type: { id: 5, type: RubyFit::Type.enum, values: COURSE_POINT_TYPE, required: true }
+        type: { id: 5, type: RubyFit::Type.enum, values: RubyFit::MessageConstants::COURSE_POINT_TYPE, required: true }
       },
     },
     record: {
@@ -87,6 +60,15 @@ class RubyFit::MessageWriter
         distance: { id: 5, type: RubyFit::Type.centimeters },
         elevation: { id: 2, type: RubyFit::Type.altitude },
       }
+    },
+    event: {
+      id: 21,
+      fields: {
+        timestamp: { id: 253, type: RubyFit::Type.timestamp, required: true },
+        event: { id: 0, type: RubyFit::Type.enum, values: RubyFit::MessageConstants::EVENT, required: true },
+        event_type: { id: 1, type: RubyFit::Type.enum, values: RubyFit::MessageConstants::EVENT_TYPE, required: true },
+        event_group: { id: 4, type: RubyFit::Type.uint8 },
+      }
     }
   }
 

data/lib/rubyfit/type.rb

@@ -151,5 +151,12 @@ class RubyFit::Type
         fit2rb: ->(val, type) { val - 500 }
       })
     end
+
+    def duration
+      uint32({
+        rb2fit: ->(val, type) { (val * 1000).truncate },
+        fit2rb: ->(val, type) { val / 1000.0 }
+      })
+    end
   end
 end

data/lib/rubyfit/version.rb

@@ -1,3 +1,3 @@
 module Rubyfit
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/rubyfit/writer.rb

@@ -1,57 +1,44 @@
 require "rubyfit/message_writer"
 
 class RubyFit::Writer
+  PRODUCT_ID = 65534 # Garmin Connect
+
   def write(stream, opts = {})
     raise "Can't start write mode from #{@state}" if @state
     @state = :write
-    @local_nums = []
+    @local_nums = {}
+    @last_local_num = -1
 
     @stream = stream
 
-    %i(start_time end_time course_point_count track_point_count name
+    %i(start_time duration course_point_count track_point_count name
        total_distance time_created start_x start_y end_x end_y).each do |key|
       raise ArgumentError.new("Missing required option #{key}") unless opts[key]
     end
 
     start_time = opts[:start_time].to_i
-    end_time = opts[:end_time].to_i
+    duration = opts[:duration].to_i
     
     @data_crc = 0
 
-    # Calculate data size to put in header
-    definition_sizes = %i(file_id course lap course_point record)
-      .map{|type| RubyFit::MessageWriter.definition_message_size(type) }
-      .reduce(&:+)
-
-    data_sizes = {
-      file_id: 1,
-      course: 1,
-      lap: 1,
-      course_point: opts[:course_point_count], 
-      record: opts[:track_point_count]
-    }
-      .map{|type, count| RubyFit::MessageWriter.data_message_size(type) * count }
-      .reduce(&:+)
-
-    data_size = definition_sizes + data_sizes
+    data_size = calculate_data_size(opts[:course_point_count], opts[:track_point_count])
     write_data(RubyFit::MessageWriter.file_header(data_size))
 
-    write_definition_message(:file_id)
-    write_data_message(:file_id, {
+    write_message(:file_id, {
       time_created: opts[:time_created],
       type: 6, # Course file
       manufacturer: 1, # Garmin
-      product: 0,
+      product: PRODUCT_ID,
       serial_number: 0,
     })
 
-    write_definition_message(:course)
-    write_data_message(:course, { name: opts[:name] })
+    write_message(:course, { name: opts[:name] })
 
-    write_definition_message(:lap)
-    write_data_message(:lap, {
+    write_message(:lap, {
       start_time: start_time,
-      timestamp: end_time,
+      timestamp: start_time,
+      total_elapsed_time: duration,
+      total_timer_time: duration,
       start_x: opts[:start_x],
       start_y: opts[:start_y],
       end_x: opts[:end_x],
@@ -59,8 +46,22 @@ class RubyFit::Writer
       total_distance: opts[:total_distance]
     })
 
+    write_message(:event, {
+      timestamp: start_time,
+      event: :timer,
+      event_type: :start,
+      event_group: 0
+    })
+
     yield
 
+    write_message(:event, {
+      timestamp: start_time + duration,
+      event: :timer,
+      event_type: :stop_disable_all,
+      event_group: 0
+    })
+
     write_data(RubyFit::MessageWriter.crc(@data_crc))
     @state = nil
   end
@@ -68,7 +69,6 @@ class RubyFit::Writer
   def course_points
     raise "Can only start course points mode inside 'write' block" if @state != :write
     @state = :course_points
-    write_definition_message(:course_point)
     yield
     @state = :write
   end
@@ -76,29 +76,32 @@ class RubyFit::Writer
   def track_points
     raise "Can only write track points inside 'write' block" if @state != :write
     @state = :track_points
-    write_definition_message(:record)
     yield
     @state = :write
   end
 
   def course_point(values)
     raise "Can only write course points inside 'course_points' block" if @state != :course_points
-    write_data_message(:course_point, values)
+    write_message(:course_point, values)
   end
 
   def track_point(values)
     raise "Can only write track points inside 'track_points' block" if @state != :track_points
-    write_data_message(:record, values)
+    write_message(:record, values)
   end
 
   protected
-  
-  def write_definition_message(type)
-    write_data(RubyFit::MessageWriter.definition_message(type, local_num(type)))
-  end
 
-  def write_data_message(type, values)
-    write_data(RubyFit::MessageWriter.data_message(type, local_num(type), values))
+  def write_message(type, values)
+    local_num = @local_nums[type]
+    unless local_num
+      @last_local_num += 1
+      local_num = @last_local_num
+      @local_nums[type] = local_num
+      write_data(RubyFit::MessageWriter.definition_message(type, local_num))
+    end
+
+    write_data(RubyFit::MessageWriter.data_message(type, local_num, values))
   end
 
   def write_data(data)
@@ -107,12 +110,24 @@ class RubyFit::Writer
     @data_crc = RubyFit::CRC.update_crc(@data_crc, data)
   end
 
-  def local_num(type)
-    result = @local_nums.index(type)
-    unless result
-      result = @local_nums.size
-      @local_nums << type
+  def calculate_data_size(course_point_count, track_point_count)
+    record_counts = {
+      file_id: 1,
+      course: 1,
+      lap: 1,
+      event: 2,
+      course_point: course_point_count, 
+      record: track_point_count,
+    }
+
+    data_sizes = record_counts.map do |type, count|
+      def_size = RubyFit::MessageWriter.definition_message_size(type)
+      data_size = RubyFit::MessageWriter.data_message_size(type) * count 
+      result = def_size + data_size
+      puts "#{type}: #{result}"
+      result
     end
-    result
+
+    data_sizes.reduce(&:+)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyfit
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Cullen King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -91,6 +91,7 @@ files:
 - ext/rubyfit/rubyfit.c
 - lib/rubyfit.rb
 - lib/rubyfit/helpers.rb
+- lib/rubyfit/message_constants.rb
 - lib/rubyfit/message_writer.rb
 - lib/rubyfit/type.rb
 - lib/rubyfit/version.rb