Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lib/fit4ruby/FieldDescription.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,18 @@ def full_field_name(developer_data_ids)
return
end

app_id = developer_data_ids[@developer_data_index].application_id
# Convert the byte array with the app ID into a 16 character hex string.
app_id_str = app_id.map { |i| '%02X' % i }.join('')
@full_field_name =
"#{@field_name.gsub(/[^A-Za-z0-9_]/, '_')}_#{app_id_str}"
if (app_id = developer_data_ids[@developer_data_index].application_id)
# Convert the byte array with the app ID into a 16 character hex string.
id_str = app_id.map { |i| '%02X' % i }.join('')
@full_field_name =
"#{@field_name.gsub(/[^A-Za-z0-9_]/, '_')}_#{id_str}"
elsif (manf_id = developer_data_ids[@developer_data_index].manufacturer_id)
id_str = '%02X' % manf_id
@full_field_name = @field_name
else
id_str = ""
@full_field_name = @field_name
end
end

def create_global_definition(fit_entity)
Expand Down Expand Up @@ -78,4 +85,3 @@ def create_global_definition(fit_entity)
end

end

3 changes: 1 addition & 2 deletions lib/fit4ruby/FitMessageRecord.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def read(io, entity, filter = nil, fields_dump = nil, fit_entity)
next
end

field_name = field_description.full_field_name(fit_entity)
field_name = field_description.full_field_name(fit_entity.top_level_record.developer_data_ids)
units = field_description.units
type = field.type
native_message_number = field_description.native_mesg_num
Expand Down Expand Up @@ -205,4 +205,3 @@ def produce(definition)
end

end