rubyfit 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3be546cfa7a5482170c47929f530546bcba7ca9ec8f4e2fa8ceb9eb0e4843b
-  data.tar.gz: 350d14c83dec28be1e45618266fd27d13e4b8e56b32adbbf87948f97c7281e00
+  metadata.gz: d4887d7b80c68cf2b4dba3ed78f7495b2a085d3906415012d3a03743d71b2465
+  data.tar.gz: bd37458348a2f60fdd2a44f39725ac428c1e5e54c14e0c8d8a638655be2c95b1
 SHA512:
-  metadata.gz: e0bef57964095765259e02836bf7f75bb317396e7b4e4bc38cf6f5139d39ff95dec36a199bfbedf49394d728f2655f27001c7704b383c3391ea06984fcf63e9d
-  data.tar.gz: 35070d9d937a063720a6533d62ce5980d5c9209a926e0759585f0651af40961b46bf10ba5d6efa7471dfa8e3cc9ef88bb0e96e3989616398ca8da62c81eeccc9
+  metadata.gz: 405e5114d750281b9b51fa458a4bf5493864b6be8ed3b7a1670daa3329174690884d5610db689eb9fc45c0f0b9282b54700785c4588c2cb8e69e2ed81a684dbd
+  data.tar.gz: d2a31ad0cc0ac32ed7958e3ee81bd176f0918183426966bcd6af1ad54a8d03bcb644f319daea400d251d5cd147af55c7e32080911d30b6d19da6ae7a412ab79c

data/ext/rubyfit/fit.c

@@ -1,412 +1,418 @@
-////////////////////////////////////////////////////////////////////////////////
-// The following FIT Protocol software provided may be used with FIT protocol
-// devices only and remains the copyrighted property of Dynastream Innovations Inc.
-// The software is being provided on an "as-is" basis and as an accommodation,
-// and therefore all warranties, representations, or guarantees of any kind
-// (whether express, implied or statutory) including, without limitation,
-// warranties of merchantability, non-infringement, or fitness for a particular
-// purpose, are specifically disclaimed.
-//
-// Copyright 2016 Dynastream Innovations Inc.
-////////////////////////////////////////////////////////////////////////////////
-// ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 20.16Release
-// Tag = production/akw/20.16.00-0-gce20b51
-// Product = EXAMPLE
-// Alignment = 4 bytes, padding disabled.
-////////////////////////////////////////////////////////////////////////////////
-
-
-#include "string.h"
-#include "fit_example.h"
-
-
-///////////////////////////////////////////////////////////////////////
-// Public Constants
-///////////////////////////////////////////////////////////////////////
-
-const FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES] =
-{
-   sizeof(FIT_ENUM),
-   sizeof(FIT_SINT8),
-   sizeof(FIT_UINT8),
-   sizeof(FIT_SINT16),
-   sizeof(FIT_UINT16),
-   sizeof(FIT_SINT32),
-   sizeof(FIT_UINT32),
-   sizeof(FIT_STRING),
-   sizeof(FIT_FLOAT32),
-   sizeof(FIT_FLOAT64),
-   sizeof(FIT_UINT8Z),
-   sizeof(FIT_UINT16Z),
-   sizeof(FIT_UINT32Z),
-   sizeof(FIT_BYTE),
-   sizeof(FIT_SINT64),
-   sizeof(FIT_UINT64),
-   sizeof(FIT_UINT64Z),
-};
-
-
-typedef union
-    {
-    FIT_UINT8       uint8_value[8];
-    FIT_FLOAT64     float64_value;
-    FIT_FLOAT32     float32_value;
-    } FIT_INVALID_FLOAT;
-
-static const FIT_INVALID_FLOAT invalid_float =
-    {
-        {
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF
-        }
-    };
-
-const FIT_ENUM fit_enum_invalid = FIT_ENUM_INVALID;
-const FIT_SINT8 fit_sint8_invalid = FIT_SINT8_INVALID;
-const FIT_UINT8 fit_uint8_invalid = FIT_UINT8_INVALID;
-const FIT_SINT16 fit_sint16_invalid = FIT_SINT16_INVALID;
-const FIT_UINT16 fit_uint16_invalid = FIT_UINT16_INVALID;
-const FIT_SINT32 fit_sint32_invalid = FIT_SINT32_INVALID;
-const FIT_UINT32 fit_uint32_invalid = FIT_UINT32_INVALID;
-const FIT_STRING fit_string_invalid = FIT_STRING_INVALID;
-const FIT_UINT8Z fit_uint8z_invalid = FIT_UINT8Z_INVALID;
-const FIT_UINT16Z fit_uint16z_invalid = FIT_UINT16Z_INVALID;
-const FIT_UINT32Z fit_uint32z_invalid = FIT_UINT32Z_INVALID;
-const FIT_BYTE fit_byte_invalid = FIT_BYTE_INVALID;
-const FIT_SINT64 fit_sint64_invalid = FIT_SINT64_INVALID;
-const FIT_UINT64 fit_uint64_invalid = FIT_UINT64_INVALID;
-const FIT_UINT64Z fit_uint64z_invalid = FIT_UINT64Z_INVALID;
-
-const FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES] =
-{
-   (FIT_CONST_UINT8_PTR)&fit_enum_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_sint8_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint8_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_sint16_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint16_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_sint32_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint32_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_string_invalid,
-   (FIT_CONST_UINT8_PTR)&invalid_float.float32_value,
-   (FIT_CONST_UINT8_PTR)&invalid_float.float64_value,
-   (FIT_CONST_UINT8_PTR)&fit_uint8z_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint16z_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint32z_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_byte_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_sint64_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint64_invalid,
-   (FIT_CONST_UINT8_PTR)&fit_uint64z_invalid,
-};
-
-
-///////////////////////////////////////////////////////////////////////
-// Public Functions
-///////////////////////////////////////////////////////////////////////
-
-FIT_UINT8 Fit_GetArch(void)
-{
-   const FIT_UINT16 arch = 0x0100;
-   return (*(FIT_UINT8 *)&arch);
-}
-
-const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num)
-{
-   FIT_UINT8 index;
-
-   for (index = 0; index < FIT_MESGS; index++)
-   {
-      if (fit_mesg_defs[index]->global_mesg_num == global_mesg_num)
-         return (FIT_MESG_DEF *) fit_mesg_defs[index];
-   }
-
-   return (FIT_MESG_DEF *) FIT_NULL;
-}
-
-const FIT_MESG_DEF *Fit_GetMesgDefFromEnum(FIT_UINT32 fit_mesg_num)
-{
-    //Verify enum in range
-    if (FIT_MESGS > fit_mesg_num)
-    {
-        return fit_mesg_defs[fit_mesg_num];
-    }
-
-    return (FIT_MESG_DEF *)FIT_NULL;
-}
-
-FIT_UINT16 Fit_GetMesgDefSize(const FIT_MESG_DEF *mesg_def)
-{
-   if (mesg_def == FIT_NULL)
-      return 0;
-
-   return FIT_STRUCT_OFFSET(fields, FIT_MESG_DEF) + (FIT_UINT16)mesg_def->num_fields * FIT_FIELD_DEF_SIZE;
-}
-
-FIT_UINT8 Fit_GetMesgSize(FIT_UINT16 global_mesg_num)
-{
-   const FIT_MESG_DEF *mesg_def;
-   FIT_UINT8 field;
-   FIT_UINT8 size = 0;
-
-   mesg_def = Fit_GetMesgDef(global_mesg_num);
-
-   if (mesg_def == FIT_NULL)
-      return 0;
-
-   for (field = 0; field < mesg_def->num_fields; field++)
-   {
-      size += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
-   }
-
-   return size;
-}
-
-FIT_UINT8 Fit_GetMesgSizeFromEnum(FIT_UINT32 fit_mesg_num)
-{
-   const FIT_MESG_DEF *mesg_def;
-   FIT_UINT8 field;
-   FIT_UINT8 size = 0;
-
-   mesg_def = Fit_GetMesgDefFromEnum(fit_mesg_num);
-
-   if (mesg_def == FIT_NULL)
-      return 0;
-
-   for (field = 0; field < mesg_def->num_fields; field++)
-   {
-      size += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
-   }
-
-   return size;
-}
-
-FIT_BOOL Fit_InitMesg(const FIT_MESG_DEF *mesg_def, void *mesg)
-{
-   FIT_UINT8 *mesg_buf = (FIT_UINT8 *) mesg;
-   FIT_UINT8 field;
-
-   if (mesg_def == FIT_NULL)
-      return FIT_FALSE;
-
-   for (field = 0; field < mesg_def->num_fields; field++)
-   {
-      FIT_UINT8 base_type_num = mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(base_type, field)] & FIT_BASE_TYPE_NUM_MASK;
-      FIT_UINT8 base_type_size;
-      FIT_UINT8 field_size;
-
-      if (base_type_num >= FIT_BASE_TYPES)
-         return FIT_FALSE;
-
-      base_type_size = fit_base_type_sizes[base_type_num];
-
-      for (field_size = 0; field_size < mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)]; field_size += base_type_size)
-      {
-         memcpy(mesg_buf, fit_base_type_invalids[base_type_num], base_type_size);
-         mesg_buf += base_type_size;
-      }
-   }
-
-   return FIT_TRUE;
-}
-
-FIT_UINT8 Fit_GetFieldOffset(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num)
-{
-   FIT_UINT8 offset = 0;
-   FIT_UINT8 field;
-
-   if (mesg_def == FIT_NULL)
-      return FIT_UINT8_INVALID;
-
-   for (field = 0; field < mesg_def->num_fields; field++)
-   {
-      if (mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(field_def_num, field)] == field_def_num)
-         return offset;
-
-      offset += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
-   }
-
-   return FIT_UINT8_INVALID;
-}
-
-FIT_FIELD_DEF Fit_GetFieldDef(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num)
-{
-   FIT_FIELD_DEF field_def;
-   const FIT_UINT8 *field_def_ptr = mesg_def->fields;
-   FIT_UINT8 field;
-
-   field_def.field_def_num = FIT_FIELD_NUM_INVALID;
-   field_def.size = 0;
-   field_def.base_type = FIT_BASE_TYPE_UINT8;
-
-   if (mesg_def != FIT_NULL)
-   {
-      for (field = 0; field < mesg_def->num_fields; field++)
-      {
-         if (mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(field_def_num, field)] == field_def_num)
-         {
-            memcpy(&field_def, field_def_ptr, FIT_FIELD_DEF_SIZE);
-            break;
-         }
-
-         field_def_ptr += FIT_FIELD_DEF_SIZE;
-      }
-   }
-
-   return field_def;
-}
-
-FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index, FIT_UINT32 *offset, FIT_READ_BYTES_FUNC read_bytes_func, FIT_BOOL read_header)
-{
-   FIT_UINT16 global_mesg_nums[FIT_MAX_LOCAL_MESGS];
-   FIT_UINT8 sizes[FIT_MAX_LOCAL_MESGS];
-   FIT_UINT16 current_message_index = FIT_UINT16_INVALID;
-   #if defined(FIT_MESSAGE_INDEX)
-      FIT_UINT16 message_index_offset = FIT_UINT16_INVALID;
-   #endif
-   FIT_UINT8 i;
-
-   *offset = 0;
-
-   if (read_header)
-   {
-      if(read_bytes_func(offset, FIT_STRUCT_OFFSET(header_size, FIT_FILE_HDR), sizeof(FIT_UINT8)) != sizeof(FIT_UINT8))
-         return FIT_UINT8_INVALID;
-   }
-
-   for (i = 0; i < FIT_MAX_LOCAL_MESGS; i++)
-   {
-      global_mesg_nums[i] = FIT_UINT16_INVALID;
-      sizes[i] = 0;
-   }
-
-   for (;;)
-   {
-      FIT_UINT8 header;
-      FIT_UINT8 local_mesg_num;
-
-      if (read_bytes_func(&header, *offset, sizeof(header)) != sizeof(header))
-         return FIT_UINT8_INVALID;
-
-      *offset += sizeof(header);
-
-      if ((header & (FIT_HDR_TIME_REC_BIT | FIT_HDR_TYPE_DEF_BIT)) == FIT_HDR_TYPE_DEF_BIT)
-      {
-         FIT_MESG_DEF mesg_def_header;
-         FIT_FIELD_DEF field_def;
-         #if defined(FIT_MESSAGE_INDEX)
-            FIT_UINT16 current_message_index_offset = FIT_UINT16_INVALID;  // Initialize to invalid.  If not found, it will remain invalid.
-         #endif
-         FIT_UINT8 current_size;
-         FIT_UINT8 current_field_def;
-
-         local_mesg_num = header & FIT_HDR_TYPE_MASK;
-
-         if (read_bytes_func(&mesg_def_header, *offset, FIT_MESG_DEF_HEADER_SIZE) != FIT_MESG_DEF_HEADER_SIZE)
-            return FIT_UINT8_INVALID;
-
-         *offset += FIT_MESG_DEF_HEADER_SIZE;
-         global_mesg_nums[local_mesg_num] = mesg_def_header.global_mesg_num;
-         current_size = 0;
-
-         for (current_field_def = 0; current_field_def < mesg_def_header.num_fields; current_field_def++)
-         {
-            if (read_bytes_func(&field_def, *offset, FIT_FIELD_DEF_SIZE) != FIT_FIELD_DEF_SIZE)
-               return FIT_UINT8_INVALID;
-
-            #if defined(FIT_MESSAGE_INDEX)
-               if (field_def.field_def_num == FIT_FIELD_NUM_MESSAGE_INDEX)
-                  current_message_index_offset = current_size;
-            #endif
-
-            current_size += field_def.size;
-            *offset += FIT_FIELD_DEF_SIZE;
-         }
-
-         sizes[local_mesg_num] = current_size;
-
-         #if defined(FIT_MESSAGE_INDEX)
-            if (global_mesg_nums[local_mesg_num] == global_mesg_num)
-               message_index_offset = current_message_index_offset;
-         #endif
-      }
-      else
-      {
-         if (header & FIT_HDR_TIME_REC_BIT)
-            local_mesg_num = (header & FIT_HDR_TIME_TYPE_MASK) >> FIT_HDR_TIME_TYPE_SHIFT;
-         else
-            local_mesg_num = header & FIT_HDR_TYPE_MASK;
-
-         if (global_mesg_nums[local_mesg_num] == global_mesg_num)
-         {
-            // If the requested message index is invalid, we've found a match.
-            if (message_index == FIT_UINT16_INVALID)
-               return local_mesg_num;
-
-            #if defined(FIT_MESSAGE_INDEX)
-               if (message_index_offset != FIT_UINT16_INVALID)
-               {
-                  // Read the message index.
-                  if (read_bytes_func(&current_message_index, *offset + message_index_offset, sizeof(current_message_index)) != sizeof(current_message_index))
-                     return FIT_UINT8_INVALID;
-               }
-               else
-            #endif
-            {
-               current_message_index++;
-            }
-
-            #if defined(FIT_MESSAGE_INDEX)
-               if ((message_index & FIT_MESSAGE_INDEX_MASK) == (current_message_index & FIT_MESSAGE_INDEX_MASK))
-            #else
-               if (message_index == current_message_index)
-            #endif
-            {
-               return local_mesg_num;
-            }
-         }
-         else if (global_mesg_nums[local_mesg_num] == FIT_UINT16_INVALID)
-         {
-            return FIT_UINT8_INVALID;
-         }
-
-         *offset += sizes[local_mesg_num];
-      }
-   }
-}
-
-FIT_UINT32 Fit_GetFileMesgOffset(const FIT_FILE_DEF *file_def, FIT_UINT16 mesg_num, FIT_UINT16 mesg_index)
-{
-   FIT_UINT32 offset = 0;
-   FIT_UINT16 i = 0;
-
-   while (i < file_def->mesg_count)
-   {
-      if (mesg_num == file_def->mesgs[i].num)
-      {
-         offset = file_def->mesgs[i].data_file_offset;
-         break;
-      }
-
-      i++;
-   }
-
-   if (i >= file_def->mesg_count)
-      return FIT_UINT32_INVALID;
-
-   // Make sure mesg_index is valid for this mesg num and file definition
-   if (mesg_index >= file_def->mesgs[i].count)
-      return FIT_UINT32_INVALID;
-
-   // Compute size of each message (header byte + data)
-   i = FIT_HDR_SIZE + Fit_GetMesgSize(mesg_num);
-
-   offset += mesg_index * i;
-
-   return offset;
-}
+////////////////////////////////////////////////////////////////////////////////
+// The following FIT Protocol software provided may be used with FIT protocol
+// devices only and remains the copyrighted property of Garmin Canada Inc.
+// The software is being provided on an "as-is" basis and as an accommodation,
+// and therefore all warranties, representations, or guarantees of any kind
+// (whether express, implied or statutory) including, without limitation,
+// warranties of merchantability, non-infringement, or fitness for a particular
+// purpose, are specifically disclaimed.
+//
+// Copyright 2020 Garmin Canada Inc.
+////////////////////////////////////////////////////////////////////////////////
+// ****WARNING****  This file is auto-generated!  Do NOT edit this file.
+// Profile Version = 21.27Release
+// Tag = production/akw/21.27.00-0-gef9575d
+// Product = EXAMPLE
+// Alignment = 4 bytes, padding disabled.
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "string.h"
+#include "fit_example.h"
+
+
+///////////////////////////////////////////////////////////////////////
+// Public Constants
+///////////////////////////////////////////////////////////////////////
+
+const FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES] =
+{
+   sizeof(FIT_ENUM),
+   sizeof(FIT_SINT8),
+   sizeof(FIT_UINT8),
+   sizeof(FIT_SINT16),
+   sizeof(FIT_UINT16),
+   sizeof(FIT_SINT32),
+   sizeof(FIT_UINT32),
+   sizeof(FIT_STRING),
+   sizeof(FIT_FLOAT32),
+   sizeof(FIT_FLOAT64),
+   sizeof(FIT_UINT8Z),
+   sizeof(FIT_UINT16Z),
+   sizeof(FIT_UINT32Z),
+   sizeof(FIT_BYTE),
+   sizeof(FIT_SINT64),
+   sizeof(FIT_UINT64),
+   sizeof(FIT_UINT64Z),
+};
+
+
+typedef union
+    {
+    FIT_UINT8       uint8_value[8];
+    FIT_FLOAT64     float64_value;
+    FIT_FLOAT32     float32_value;
+    } FIT_INVALID_FLOAT;
+
+static const FIT_INVALID_FLOAT invalid_float =
+    {
+        {
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF
+        }
+    };
+
+const FIT_ENUM fit_enum_invalid = FIT_ENUM_INVALID;
+const FIT_SINT8 fit_sint8_invalid = FIT_SINT8_INVALID;
+const FIT_UINT8 fit_uint8_invalid = FIT_UINT8_INVALID;
+const FIT_SINT16 fit_sint16_invalid = FIT_SINT16_INVALID;
+const FIT_UINT16 fit_uint16_invalid = FIT_UINT16_INVALID;
+const FIT_SINT32 fit_sint32_invalid = FIT_SINT32_INVALID;
+const FIT_UINT32 fit_uint32_invalid = FIT_UINT32_INVALID;
+const FIT_STRING fit_string_invalid = FIT_STRING_INVALID;
+const FIT_UINT8Z fit_uint8z_invalid = FIT_UINT8Z_INVALID;
+const FIT_UINT16Z fit_uint16z_invalid = FIT_UINT16Z_INVALID;
+const FIT_UINT32Z fit_uint32z_invalid = FIT_UINT32Z_INVALID;
+const FIT_BYTE fit_byte_invalid = FIT_BYTE_INVALID;
+const FIT_SINT64 fit_sint64_invalid = FIT_SINT64_INVALID;
+const FIT_UINT64 fit_uint64_invalid = FIT_UINT64_INVALID;
+const FIT_UINT64Z fit_uint64z_invalid = FIT_UINT64Z_INVALID;
+
+const FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES] =
+{
+   (FIT_CONST_UINT8_PTR)&fit_enum_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_sint8_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint8_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_sint16_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint16_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_sint32_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint32_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_string_invalid,
+   (FIT_CONST_UINT8_PTR)&invalid_float.float32_value,
+   (FIT_CONST_UINT8_PTR)&invalid_float.float64_value,
+   (FIT_CONST_UINT8_PTR)&fit_uint8z_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint16z_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint32z_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_byte_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_sint64_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint64_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_uint64z_invalid,
+};
+
+
+///////////////////////////////////////////////////////////////////////
+// Public Functions
+///////////////////////////////////////////////////////////////////////
+
+FIT_UINT8 Fit_GetArch(void)
+{
+   const FIT_UINT16 arch = 0x0100;
+   return (*(FIT_UINT8 *)&arch);
+}
+
+const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num)
+{
+   FIT_UINT8 index;
+
+   for (index = 0; index < FIT_MESGS; index++)
+   {
+      if (fit_mesg_defs[index]->global_mesg_num == global_mesg_num)
+         return (FIT_MESG_DEF *) fit_mesg_defs[index];
+   }
+
+   return (FIT_MESG_DEF *) FIT_NULL;
+}
+
+const FIT_MESG_DEF *Fit_GetMesgDefFromEnum(FIT_UINT32 fit_mesg_num)
+{
+    //Verify enum in range
+    if (FIT_MESGS > fit_mesg_num)
+    {
+        return fit_mesg_defs[fit_mesg_num];
+    }
+
+    return (FIT_MESG_DEF *)FIT_NULL;
+}
+
+FIT_UINT16 Fit_GetMesgDefSize(const FIT_MESG_DEF *mesg_def)
+{
+   if (mesg_def == FIT_NULL)
+      return 0;
+
+   return FIT_STRUCT_OFFSET(fields, FIT_MESG_DEF) + (FIT_UINT16)mesg_def->num_fields * FIT_FIELD_DEF_SIZE;
+}
+
+#if defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+FIT_UINT16 Fit_GetMesgSize(FIT_UINT16 global_mesg_num)
+{
+   const FIT_MESG_DEF *mesg_def;
+   FIT_UINT8 field;
+   FIT_UINT16 size = 0;
+
+   mesg_def = Fit_GetMesgDef(global_mesg_num);
+
+   if (mesg_def == FIT_NULL)
+      return 0;
+
+   for (field = 0; field < mesg_def->num_fields; field++)
+   {
+      size += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
+   }
+
+   return size;
+}
+#endif // defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+
+#if defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+FIT_UINT16 Fit_GetMesgSizeFromEnum(FIT_UINT32 fit_mesg_num)
+{
+   const FIT_MESG_DEF *mesg_def;
+   FIT_UINT8    field;
+   FIT_UINT16   size = 0;
+
+   mesg_def = Fit_GetMesgDefFromEnum(fit_mesg_num);
+
+   if (mesg_def == FIT_NULL)
+      return 0;
+
+   for (field = 0; field < mesg_def->num_fields; field++)
+   {
+      size += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
+   }
+
+   return size;
+}
+#endif // defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+
+FIT_BOOL Fit_InitMesg(const FIT_MESG_DEF *mesg_def, void *mesg)
+{
+   FIT_UINT8 *mesg_buf = (FIT_UINT8 *) mesg;
+   FIT_UINT8 field;
+
+   if (mesg_def == FIT_NULL)
+      return FIT_FALSE;
+
+   for (field = 0; field < mesg_def->num_fields; field++)
+   {
+      FIT_UINT8 base_type_num = mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(base_type, field)] & FIT_BASE_TYPE_NUM_MASK;
+      FIT_UINT8 base_type_size;
+      FIT_UINT8 field_size;
+
+      if (base_type_num >= FIT_BASE_TYPES)
+         return FIT_FALSE;
+
+      base_type_size = fit_base_type_sizes[base_type_num];
+
+      for (field_size = 0; field_size < mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)]; field_size += base_type_size)
+      {
+         memcpy(mesg_buf, fit_base_type_invalids[base_type_num], base_type_size);
+         mesg_buf += base_type_size;
+      }
+   }
+
+   return FIT_TRUE;
+}
+
+#if defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+FIT_UINT16 Fit_GetFieldOffset(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num)
+{
+   FIT_UINT16   offset = 0;
+   FIT_UINT8    field;
+
+   if (mesg_def == FIT_NULL)
+      return FIT_UINT16_INVALID;
+
+   for (field = 0; field < mesg_def->num_fields; field++)
+   {
+      if (mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(field_def_num, field)] == field_def_num)
+         return offset;
+
+      offset += mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(size, field)];
+   }
+
+   return FIT_UINT16_INVALID;
+}
+#endif // defined(FIT_16BIT_MESG_LENGTH_SUPPORT)
+
+FIT_FIELD_DEF Fit_GetFieldDef(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num)
+{
+   FIT_FIELD_DEF field_def;
+   const FIT_UINT8 *field_def_ptr = mesg_def->fields;
+   FIT_UINT8 field;
+
+   field_def.field_def_num = FIT_FIELD_NUM_INVALID;
+   field_def.size = 0;
+   field_def.base_type = FIT_BASE_TYPE_UINT8;
+
+   if (mesg_def != FIT_NULL)
+   {
+      for (field = 0; field < mesg_def->num_fields; field++)
+      {
+         if (mesg_def->fields[FIT_MESG_DEF_FIELD_OFFSET(field_def_num, field)] == field_def_num)
+         {
+            memcpy(&field_def, field_def_ptr, FIT_FIELD_DEF_SIZE);
+            break;
+         }
+
+         field_def_ptr += FIT_FIELD_DEF_SIZE;
+      }
+   }
+
+   return field_def;
+}
+
+FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index, FIT_UINT32 *offset, FIT_READ_BYTES_FUNC read_bytes_func, FIT_BOOL read_header)
+{
+   FIT_UINT16 global_mesg_nums[FIT_MAX_LOCAL_MESGS];
+   FIT_UINT16 sizes[FIT_MAX_LOCAL_MESGS];
+   FIT_UINT16 current_message_index = FIT_UINT16_INVALID;
+   #if defined(FIT_MESSAGE_INDEX)
+      FIT_UINT16 message_index_offset = FIT_UINT16_INVALID;
+   #endif
+   FIT_UINT8 i;
+
+   *offset = 0;
+
+   if (read_header)
+   {
+      if(read_bytes_func(offset, FIT_STRUCT_OFFSET(header_size, FIT_FILE_HDR), sizeof(FIT_UINT8)) != sizeof(FIT_UINT8))
+         return FIT_UINT8_INVALID;
+   }
+
+   for (i = 0; i < FIT_MAX_LOCAL_MESGS; i++)
+   {
+      global_mesg_nums[i] = FIT_UINT16_INVALID;
+      sizes[i] = 0;
+   }
+
+   for (;;)
+   {
+      FIT_UINT8 header;
+      FIT_UINT8 local_mesg_num;
+
+      if (read_bytes_func(&header, *offset, sizeof(header)) != sizeof(header))
+         return FIT_UINT8_INVALID;
+
+      *offset += sizeof(header);
+
+      if ((header & (FIT_HDR_TIME_REC_BIT | FIT_HDR_TYPE_DEF_BIT)) == FIT_HDR_TYPE_DEF_BIT)
+      {
+         FIT_MESG_DEF mesg_def_header;
+         FIT_FIELD_DEF field_def;
+         #if defined(FIT_MESSAGE_INDEX)
+            FIT_UINT16 current_message_index_offset = FIT_UINT16_INVALID;  // Initialize to invalid.  If not found, it will remain invalid.
+         #endif
+         FIT_UINT16 current_size;
+         FIT_UINT8  current_field_def;
+
+         local_mesg_num = header & FIT_HDR_TYPE_MASK;
+
+         if (read_bytes_func(&mesg_def_header, *offset, FIT_MESG_DEF_HEADER_SIZE) != FIT_MESG_DEF_HEADER_SIZE)
+            return FIT_UINT8_INVALID;
+
+         *offset += FIT_MESG_DEF_HEADER_SIZE;
+         global_mesg_nums[local_mesg_num] = mesg_def_header.global_mesg_num;
+         current_size = 0;
+
+         for (current_field_def = 0; current_field_def < mesg_def_header.num_fields; current_field_def++)
+         {
+            if (read_bytes_func(&field_def, *offset, FIT_FIELD_DEF_SIZE) != FIT_FIELD_DEF_SIZE)
+               return FIT_UINT8_INVALID;
+
+            #if defined(FIT_MESSAGE_INDEX)
+               if (field_def.field_def_num == FIT_FIELD_NUM_MESSAGE_INDEX)
+                  current_message_index_offset = current_size;
+            #endif
+
+            current_size += field_def.size;
+            *offset += FIT_FIELD_DEF_SIZE;
+         }
+
+         sizes[local_mesg_num] = current_size;
+
+         #if defined(FIT_MESSAGE_INDEX)
+            if (global_mesg_nums[local_mesg_num] == global_mesg_num)
+               message_index_offset = current_message_index_offset;
+         #endif
+      }
+      else
+      {
+         if (header & FIT_HDR_TIME_REC_BIT)
+            local_mesg_num = (header & FIT_HDR_TIME_TYPE_MASK) >> FIT_HDR_TIME_TYPE_SHIFT;
+         else
+            local_mesg_num = header & FIT_HDR_TYPE_MASK;
+
+         if (global_mesg_nums[local_mesg_num] == global_mesg_num)
+         {
+            // If the requested message index is invalid, we've found a match.
+            if (message_index == FIT_UINT16_INVALID)
+               return local_mesg_num;
+
+            #if defined(FIT_MESSAGE_INDEX)
+               if (message_index_offset != FIT_UINT16_INVALID)
+               {
+                  // Read the message index.
+                  if (read_bytes_func(&current_message_index, *offset + message_index_offset, sizeof(current_message_index)) != sizeof(current_message_index))
+                     return FIT_UINT8_INVALID;
+               }
+               else
+            #endif
+            {
+               current_message_index++;
+            }
+
+            #if defined(FIT_MESSAGE_INDEX)
+               if ((message_index & FIT_MESSAGE_INDEX_MASK) == (current_message_index & FIT_MESSAGE_INDEX_MASK))
+            #else
+               if (message_index == current_message_index)
+            #endif
+            {
+               return local_mesg_num;
+            }
+         }
+         else if (global_mesg_nums[local_mesg_num] == FIT_UINT16_INVALID)
+         {
+            return FIT_UINT8_INVALID;
+         }
+
+         *offset += sizes[local_mesg_num];
+      }
+   }
+}
+
+FIT_UINT32 Fit_GetFileMesgOffset(const FIT_FILE_DEF *file_def, FIT_UINT16 mesg_num, FIT_UINT16 mesg_index)
+{
+   FIT_UINT32 offset = 0;
+   FIT_UINT16 i = 0;
+
+   while (i < file_def->mesg_count)
+   {
+      if (mesg_num == file_def->mesgs[i].num)
+      {
+         offset = file_def->mesgs[i].data_file_offset;
+         break;
+      }
+
+      i++;
+   }
+
+   if (i >= file_def->mesg_count)
+      return FIT_UINT32_INVALID;
+
+   // Make sure mesg_index is valid for this mesg num and file definition
+   if (mesg_index >= file_def->mesgs[i].count)
+      return FIT_UINT32_INVALID;
+
+   // Compute size of each message (header byte + data)
+   i = FIT_HDR_SIZE + Fit_GetMesgSize(mesg_num);
+
+   offset += mesg_index * i;
+
+   return offset;
+}