rubyfit 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64141f50e66fea97d5e3c78fbb7389f88b1276ef
+  data.tar.gz: 5b5fe0f8426a89efb7c386eb1a4a357f152108ac
+SHA512:
+  metadata.gz: 8f519440065cf79423762fa2779b01e5a09b477370a8810e453461e5b4799a2e75a1ffbe295ec5e637bd2e3c7332d4b2c32f31be40a8ca3e8d9a29a2eb3e1750
+  data.tar.gz: 62f07c53fd8a423e316d2e23f3a26577e085fee98921bf421327d400abe2518ef1b318446742e093219490896b940ce514488ae361f5ee2f329488ae04075084

data/ext/rubyfit/fit.c

@@ -1,19 +1,25 @@
 ////////////////////////////////////////////////////////////////////////////////
-// The following .FIT software provided may be used with .FIT devices only and
-// remains the copyrighted property of Dynastream Innovations Inc.
+// 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 2008 Dynastream Innovations Inc.
-// All rights reserved. This software may not be reproduced by any means
-// without express written approval of Dynastream Innovations Inc.
+// Copyright 2013 Dynastream Innovations Inc.
 ////////////////////////////////////////////////////////////////////////////////
+// ****WARNING****  This file is auto-generated!  Do NOT edit this file.
+// Profile Version = 8.10Release
+// Tag = $Name: AKW8_100 $
+// Product = EXAMPLE
+// Alignment = 4 bytes, padding disabled.
+////////////////////////////////////////////////////////////////////////////////
+
 
 #include "string.h"
-#include "fit_product.h"
+#include "fit.h"
+#include "fit_example.h"
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -53,22 +59,22 @@ 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_UINT8 *fit_base_type_invalids[FIT_BASE_TYPES] =
+const FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES] =
 {
-   (FIT_UINT8 *)&fit_enum_invalid,
-   (FIT_UINT8 *)&fit_sint8_invalid,
-   (FIT_UINT8 *)&fit_uint8_invalid,
-   (FIT_UINT8 *)&fit_sint16_invalid,
-   (FIT_UINT8 *)&fit_uint16_invalid,
-   (FIT_UINT8 *)&fit_sint32_invalid,
-   (FIT_UINT8 *)&fit_uint32_invalid,
-   (FIT_UINT8 *)&fit_string_invalid,
-   (FIT_UINT8 *)&fit_float32_invalid,
-   (FIT_UINT8 *)&fit_float64_invalid,
-   (FIT_UINT8 *)&fit_uint8z_invalid,
-   (FIT_UINT8 *)&fit_uint16z_invalid,
-   (FIT_UINT8 *)&fit_uint32z_invalid,
-   (FIT_UINT8 *)&fit_byte_invalid,
+   (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)&fit_float32_invalid,
+   (FIT_CONST_UINT8_PTR)&fit_float64_invalid,
+   (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,
 };
 
 
@@ -82,7 +88,7 @@ FIT_UINT8 Fit_GetArch(void)
    return (*(FIT_UINT8 *)&arch);
 }
 
-const FIT_MESG_DEF *Fit_GetMesgDef(FIT_MESG_NUM global_mesg_num)
+const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num)
 {
    FIT_UINT8 index;
 
@@ -103,7 +109,7 @@ FIT_UINT16 Fit_GetMesgDefSize(const FIT_MESG_DEF *mesg_def)
    return FIT_STRUCT_OFFSET(fields, FIT_MESG_DEF) + (FIT_UINT16)mesg_def->num_fields * FIT_FIELD_DEF_SIZE;
 }
 
-FIT_UINT8 Fit_GetMesgSize(FIT_MESG_NUM global_mesg_num)
+FIT_UINT8 Fit_GetMesgSize(FIT_UINT16 global_mesg_num)
 {
    const FIT_MESG_DEF *mesg_def;
    FIT_UINT8 field;
@@ -170,7 +176,33 @@ FIT_UINT8 Fit_GetFieldOffset(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_n
    return FIT_UINT8_INVALID;
 }
 
-FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index, FIT_UINT32 *offset, FIT_READ_BYTES_FUNC read_bytes_func)
+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;
+
+   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];
@@ -181,6 +213,12 @@ FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index
    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;
@@ -220,7 +258,7 @@ FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index
                return FIT_UINT8_INVALID;
 
             #if defined(FIT_MESSAGE_INDEX)
-               if (field_def.field_def_num == FIT_MESSAGE_INDEX_FIELD_NUM)
+               if (field_def.field_def_num == FIT_FIELD_NUM_MESSAGE_INDEX)
                   current_message_index_offset = current_size;
             #endif
 
@@ -279,3 +317,36 @@ FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index
       }
    }
 }
+
+FIT_UINT32 Fit_GetFileMesgOffset(const FIT_FILE_DEF *file_def, FIT_UINT16 mesg_num, FIT_UINT16 mesg_index)
+{
+   FIT_UINT32 offset;
+   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;
+   
+   i = 1 + Fit_GetMesgSize(mesg_num); // Message header byte + data.
+
+   if (FIT_ALIGNMENT > FIT_HDR_SIZE)
+      i += FIT_ALIGNMENT - FIT_HDR_SIZE;
+
+   offset += mesg_index * i;
+
+   return offset;
+}

data/ext/rubyfit/fit.h

@@ -1,15 +1,19 @@
 ////////////////////////////////////////////////////////////////////////////////
-// The following .FIT software provided may be used with .FIT devices only and
-// remains the copyrighted property of Dynastream Innovations Inc.
+// 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 2008 Dynastream Innovations Inc.
-// All rights reserved. This software may not be reproduced by any means
-// without express written approval of Dynastream Innovations Inc.
+// Copyright 2013 Dynastream Innovations Inc.
+////////////////////////////////////////////////////////////////////////////////
+// ****WARNING****  This file is auto-generated!  Do NOT edit this file.
+// Profile Version = 8.10Release
+// Tag = $Name: AKW8_100 $
+// Product = EXAMPLE
+// Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////
 
 
@@ -18,6 +22,17 @@
 
 #include "fit_config.h"
 
+#if defined(FIT_USE_STDINT_H)
+   #include <stdint.h>
+#else
+   typedef unsigned char uint8_t;
+   typedef signed char int8_t;
+   typedef unsigned short uint16_t;
+   typedef signed short int16_t;
+   typedef unsigned long uint32_t;
+   typedef signed long int32_t;
+#endif
+
 #if defined(__cplusplus)
    extern "C" {
 #endif
@@ -34,6 +49,11 @@
 #define FIT_PROTOCOL_VERSION_MINOR_MASK      ((FIT_UINT8) 0x0F)
 #define FIT_PROTOCOL_VERSION                 ((FIT_UINT8) (FIT_PROTOCOL_VERSION_MAJOR << FIT_PROTOCOL_VERSION_MAJOR_SHIFT) | FIT_PROTOCOL_VERSION_MINOR)      
 
+#define FIT_PROFILE_VERSION_MAJOR            8
+#define FIT_PROFILE_VERSION_MINOR            10
+#define FIT_PROFILE_VERSION_SCALE			 100
+#define FIT_PROFILE_VERSION					 ((FIT_UINT16) (FIT_PROFILE_VERSION_MAJOR * 100 + FIT_PROFILE_VERSION_MINOR))
+
 
 ///////////////////////////////////////////////////////////////////////
 // Type Definitions
@@ -45,60 +65,78 @@
 #define FIT_BASE_TYPE_RESERVED      ((FIT_UINT8)0x60)
 #define FIT_BASE_TYPE_NUM_MASK      ((FIT_UINT8)0x1F)
 
-typedef unsigned char FIT_ENUM;
+typedef uint8_t FIT_ENUM;
+typedef const FIT_ENUM * FIT_CONST_ENUM_PTR;
 #define FIT_ENUM_INVALID            ((FIT_ENUM)0xFF)
 #define FIT_BASE_TYPE_ENUM          ((FIT_UINT8)0x00)
 
-typedef signed char FIT_SINT8;
+typedef int8_t FIT_SINT8;
+typedef const FIT_SINT8 * FIT_CONST_SINT8_PTR;
 #define FIT_SINT8_INVALID           ((FIT_SINT8)0x7F)
 #define FIT_BASE_TYPE_SINT8         ((FIT_UINT8)0x01)
 
-typedef unsigned char FIT_UINT8;
+typedef uint8_t FIT_UINT8;
+typedef const FIT_UINT8 * FIT_CONST_UINT8_PTR;
 #define FIT_UINT8_INVALID           ((FIT_UINT8)0xFF)
 #define FIT_BASE_TYPE_UINT8         ((FIT_UINT8)0x02)
 
-typedef signed short FIT_SINT16;
+typedef int16_t FIT_SINT16;
+typedef const FIT_SINT16 * FIT_CONST_SINT16_PTR;
 #define FIT_SINT16_INVALID          ((FIT_SINT16)0x7FFF)
 #define FIT_BASE_TYPE_SINT16        ((FIT_UINT8)0x83)
 
-typedef unsigned short FIT_UINT16;
+typedef uint16_t FIT_UINT16;
+typedef const FIT_UINT16 * FIT_CONST_UINT16_PTR;
 #define FIT_UINT16_INVALID   ((FIT_UINT16)0xFFFF)
 #define FIT_BASE_TYPE_UINT16 ((FIT_UINT8)0x84)
 
-typedef signed long FIT_SINT32;
+typedef int32_t FIT_SINT32;
+typedef const FIT_SINT32 * FIT_CONST_SINT32_PTR;
 #define FIT_SINT32_INVALID   ((FIT_SINT32)0x7FFFFFFF)
 #define FIT_BASE_TYPE_SINT32 ((FIT_UINT8)0x85)
 
-typedef unsigned long FIT_UINT32;
+typedef uint32_t FIT_UINT32;
+typedef const FIT_UINT32 * FIT_CONST_UINT32_PTR;
 #define FIT_UINT32_INVALID   ((FIT_UINT32)0xFFFFFFFF)
 #define FIT_BASE_TYPE_UINT32 ((FIT_UINT8)0x86)
                                                                             
-typedef char FIT_STRING;
+typedef char FIT_STRING; // UTF-8 null terminated string
+typedef const FIT_STRING * FIT_CONST_STRING_PTR;
 #define FIT_STRING_INVALID   ((FIT_STRING)0x00)
 #define FIT_BASE_TYPE_STRING ((FIT_UINT8)0x07)
 
 typedef float FIT_FLOAT32;
+typedef const FIT_FLOAT32 * FIT_CONST_FLOAT32_PTR;
 #define FIT_FLOAT32_INVALID   ((FIT_FLOAT32)0xFFFFFFFF)
 #define FIT_BASE_TYPE_FLOAT32 ((FIT_UINT8)0x88)
 
 typedef double FIT_FLOAT64;
-#define FIT_FLOAT64_INVALID   ((FIT_FLOAT64)0xFFFFFFFFFFFFFFFFull)
+typedef const FIT_FLOAT64 * FIT_CONST_FLOAT64_PTR;
+#if defined (_BORLANDC_)
+   #define FIT_FLOAT64_INVALID   ((FIT_FLOAT64)0xFFFFFFFFFFFFFFFFui64)
+#else
+   #define FIT_FLOAT64_INVALID   ((FIT_FLOAT64)0xFFFFFFFFFFFFFFFFull)
+#endif
 #define FIT_BASE_TYPE_FLOAT64 ((FIT_UINT8)0x89)
 
-typedef unsigned char FIT_UINT8Z;
+typedef uint8_t FIT_UINT8Z;
+typedef const FIT_UINT8Z * FIT_CONST_UINT8Z_PTR;
 #define FIT_UINT8Z_INVALID   ((FIT_UINT8Z)0x00)
 #define FIT_BASE_TYPE_UINT8Z ((FIT_UINT8)0x0A)
 
-typedef unsigned short FIT_UINT16Z;
+typedef uint16_t FIT_UINT16Z;
+typedef const FIT_UINT16Z * FIT_CONST_UINT16Z_PTR;
 #define FIT_UINT16Z_INVALID   ((FIT_UINT16Z)0x0000)
 #define FIT_BASE_TYPE_UINT16Z ((FIT_UINT8)0x8B)
 
-typedef unsigned long FIT_UINT32Z;
+typedef uint32_t FIT_UINT32Z;
+typedef const FIT_UINT32Z * FIT_CONST_UINT32Z_PTR;
 #define FIT_UINT32Z_INVALID   ((FIT_UINT32Z)0x00000000)
 #define FIT_BASE_TYPE_UINT32Z ((FIT_UINT8)0x8C)
 
-typedef unsigned char FIT_BYTE;
-#define FIT_BYTE_INVALID   ((FIT_BYTE)0xFF)
+typedef uint8_t FIT_BYTE;
+typedef const FIT_BYTE * FIT_CONST_BYTE_PTR;
+#define FIT_BYTE_INVALID   ((FIT_BYTE)0xFF) // Field is invalid if all bytes are invalid.
 #define FIT_BASE_TYPE_BYTE ((FIT_UINT8)0x0D)
 
 #define FIT_BASE_TYPES    14
@@ -109,7 +147,7 @@ typedef FIT_ENUM FIT_BOOL;
 #define FIT_BOOL_TRUE         ((FIT_BOOL)1)
 #define FIT_FALSE             FIT_BOOL_FALSE
 #define FIT_TRUE              FIT_BOOL_TRUE
-#define FIT_NULL              ((void *) 0)
+#define FIT_NULL              0
 
 typedef FIT_UINT32 (*FIT_READ_BYTES_FUNC)(void *, FIT_UINT32, FIT_UINT32);
 #define FIT_MESG_DEF_HEADER_SIZE  FIT_STRUCT_OFFSET(fields, FIT_MESG_DEF)
@@ -123,19 +161,20 @@ typedef struct
 {
    FIT_UINT8 header_size; // FIT_FILE_HDR_SIZE (size of this structure)
    FIT_UINT8 protocol_version; // FIT_PROTOCOL_VERSION
-   FIT_UINT8 profile_version_minor; // FIT_PROFILE_VERSION_MINOR
-   FIT_UINT8 profile_version_major; // FIT_PROFILE_VERSION_MAJOR
+   FIT_UINT16 profile_version; // FIT_PROFILE_VERSION
    FIT_UINT32 data_size; // Does not include file header or crc.  Little endian format.
    FIT_UINT8 data_type[4]; // ".FIT"
+   FIT_UINT16 crc; // CRC of this file header in little endian format.
 } FIT_FILE_HDR;
 
-#define FIT_FILE_HDR_SIZE         12
+#define FIT_FILE_HDR_SIZE         14
+
 
 ///////////////////////////////////////////////////////////////////////
 // Record Definitions
 ///////////////////////////////////////////////////////////////////////
 
-#define FIT_HDR_SIZE               1
+#define FIT_HDR_SIZE              1
 #define FIT_HDR_TIME_REC_BIT      ((FIT_UINT8) 0x80)
 #define FIT_HDR_TIME_TYPE_MASK    ((FIT_UINT8) 0x60)
 #define FIT_HDR_TIME_TYPE_SHIFT   5
@@ -144,6 +183,28 @@ typedef struct
 #define FIT_HDR_TYPE_MASK         ((FIT_UINT8) 0x0F)
 #define FIT_MAX_LOCAL_MESGS       (FIT_HDR_TYPE_MASK + 1)
 
+///////////////////////////////////////////////////////////////////////
+// File Definitions
+///////////////////////////////////////////////////////////////////////
+
+typedef struct 
+{
+   FIT_UINT32 def_file_offset;
+   FIT_UINT32 data_file_offset;
+   FIT_UINT16 num;
+   FIT_UINT16 count;
+   FIT_UINT16 mesg;
+} FIT_FILE_MESG;
+
+typedef struct 
+{
+   FIT_UINT32 data_size;
+   const FIT_FILE_MESG *mesgs;
+   FIT_UINT16 mesg_count;
+   FIT_UINT8 type;
+   FIT_UINT8 count;
+} FIT_FILE_DEF;
+
 
 ///////////////////////////////////////////////////////////////////////
 // Message Definitions
@@ -156,7 +217,7 @@ typedef struct
    FIT_UINT8 base_type;
 } FIT_FIELD_DEF;
 
-#define FIT_FIELD_DEF_SIZE  3
+#define FIT_FIELD_DEF_SIZE        3
 
 typedef struct
 {
@@ -170,8 +231,8 @@ typedef struct
 #define FIT_MAX_MESG_SIZE         ((FIT_UINT8)255)
 
 #define FIT_ARCH_ENDIAN_MASK      ((FIT_UINT8)0x01)
-#define FIT_ARCH_ENDIAN_LITTLE    ((FIT_UINT8)0)
-#define FIT_ARCH_ENDIAN_BIG       ((FIT_UINT8)1)
+#define FIT_ARCH_ENDIAN_LITTLE    0
+#define FIT_ARCH_ENDIAN_BIG       1
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -180,18 +241,29 @@ typedef struct
 
 #define FIT_MAX_FIELD_SIZE             ((FIT_UINT8)255)
 #define FIT_FIELD_NUM_INVALID          ((FIT_UINT8)0xFF)
-#define FIT_MESSAGE_INDEX_FIELD_NUM    ((FIT_UINT8)254)
-#define FIT_TIMESTAMP_FIELD_NUM        ((FIT_UINT8)253)
+#define FIT_FIELD_NUM_MESSAGE_INDEX    ((FIT_UINT8)254)
+#define FIT_FIELD_NUM_TIMESTAMP        ((FIT_UINT8)253)
+
+#define FIT_MESSAGE_INDEX_FIELD_NUM    FIT_FIELD_NUM_MESSAGE_INDEX // For reverse compatibility only.  Use FIT_FIELD_NUM_MESSAGE_INDEX instead.
+#define FIT_TIMESTAMP_FIELD_NUM        FIT_FIELD_NUM_TIMESTAMP // For reverse compatibility only.  Use FIT_FIELD_NUM_TIMESTAMP instead.
 
 
 ///////////////////////////////////////////////////////////////////////
 // Macros
 ///////////////////////////////////////////////////////////////////////
 
-#define FIT_STRUCT_OFFSET(MEMBER, STRUCT_TYPE)                                 ( ((FIT_UINT8 *) &(((STRUCT_TYPE *) FIT_NULL)->MEMBER)) - ((FIT_UINT8 *) (FIT_NULL)) ) // Computes the byte offset of a member in a file.  Compiles to a constant.
-#define FIT_MESG_OFFSET(MESG_MEMBER, MESG_TYPE, MESG_INDEX, MESG_SIZE, FILE)   (FIT_STRUCT_OFFSET(MESG_MEMBER, FILE) + MESG_INDEX * (FIT_HDR_SIZE + MESG_SIZE) + FIT_HDR_SIZE) // Computes the byte offset of a message in a file structure.  Compiles to a constant.
-#define FIT_MESG_DEF_OFFSET(MESG_DEF_MEMBER, FILE)                             (FIT_STRUCT_OFFSET(MESG_DEF_MEMBER, FILE) + FIT_HDR_SIZE) // Computes the byte offset of a message definition in a file structure.  Compiles to a constant.
-#define FIT_MESG_DEF_FIELD_OFFSET(FIELD_MEMBER, FIELD_INDEX)                   (FIT_STRUCT_OFFSET(FIELD_MEMBER, FIT_FIELD_DEF) + FIT_FIELD_DEF_SIZE * FIELD_INDEX) // Computes the byte offset of a field definition member.  Compiles to a constant.
+#define FIT_STRUCT_OFFSET(MEMBER, STRUCT_TYPE)                          ( ((FIT_UINT8 *) &(((STRUCT_TYPE *) FIT_NULL)->MEMBER)) - ((FIT_UINT8 *) (FIT_NULL)) ) // Computes the byte offset of a member in a file.  Compiles to a constant.
+
+#define FIT_MESG_DEF_FIELD_OFFSET(FIELD_MEMBER, FIELD_INDEX)            (FIT_STRUCT_OFFSET(FIELD_MEMBER, FIT_FIELD_DEF) + FIT_FIELD_DEF_SIZE * FIELD_INDEX) // Computes the byte offset of a field definition member.  Compiles to a constant.
+
+// Offset of message in file including file header.
+#define FIT_MESG_OFFSET(MESG_MEMBER, MESG_INDEX, MESG_SIZE, FILE)       (FIT_STRUCT_OFFSET(MESG_MEMBER, FILE) + MESG_INDEX * (FIT_HDR_SIZE + MESG_SIZE) + FIT_HDR_SIZE) // Computes the byte offset of a message in a file structure.  Compiles to a constant.
+#define FIT_MESG_DEF_OFFSET(MESG_DEF_MEMBER, FILE)                      (FIT_STRUCT_OFFSET(MESG_DEF_MEMBER, FILE) + FIT_HDR_SIZE) // Computes the byte offset of a message definition in a file structure.  Compiles to a constant.
+
+// Below macros are obsolete because C file structures now include file header.  For reverse compatibility only.
+#define FIT_FILE_MESG_OFFSET(MESG_MEMBER, MESG_INDEX, MESG_SIZE, FILE)  FIT_MESG_OFFSET(MESG_MEMBER, MESG_INDEX, MESG_SIZE, FILE)
+#define FIT_FILE_MESG_DEF_OFFSET(MESG_DEF_MEMBER, FILE)                 FIT_MESG_DEF_OFFSET(MESG_DEF_MEMBER, FILE)
+#define FIT_FILE_MESG_DEF_FIELD_OFFSET(FIELD_MEMBER, FIELD_INDEX)       FIT_MESG_DEF_FIELD_OFFSET(FIELD_MEMBER, FIELD_INDEX)
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -199,52 +271,63 @@ typedef struct
 ///////////////////////////////////////////////////////////////////////
 
 const extern FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES];
-const extern FIT_UINT8 *fit_base_type_invalids[FIT_BASE_TYPES];
+const extern FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES];
 
 
 ///////////////////////////////////////////////////////////////////////
 // Public Functions
 ///////////////////////////////////////////////////////////////////////
 
-FIT_UINT8 Fit_GetArch(void);
 ///////////////////////////////////////////////////////////////////////
 // Returns architecture type.
 // Includes runtime check for little or big endian.
 // See FIT_MESG_DEF->arch and FIT_ARCH_*.
 ///////////////////////////////////////////////////////////////////////
+FIT_UINT8 Fit_GetArch(void);
 
-const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num);
 ///////////////////////////////////////////////////////////////////////
 // Returns message definition corresponding to global message number.
 ///////////////////////////////////////////////////////////////////////
+const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num);
 
-FIT_UINT16 Fit_GetMesgDefSize(const FIT_MESG_DEF *mesg_def);
 ///////////////////////////////////////////////////////////////////////
 // Returns the size of message definition.
 ///////////////////////////////////////////////////////////////////////
+FIT_UINT16 Fit_GetMesgDefSize(const FIT_MESG_DEF *mesg_def);
 
-FIT_UINT8 Fit_GetMesgSize(FIT_UINT16 global_mesg_num);
 ///////////////////////////////////////////////////////////////////////
 // Returns the size of message corresponding to global message number.
 ///////////////////////////////////////////////////////////////////////
+FIT_UINT8 Fit_GetMesgSize(FIT_UINT16 global_mesg_num);
 
-FIT_BOOL Fit_InitMesg(const FIT_MESG_DEF *mesg_def, void *mesg);
 ///////////////////////////////////////////////////////////////////////
 // Initializes message with invalids.
 // Returns 1 if successful, otherwise 0.
 ///////////////////////////////////////////////////////////////////////
+FIT_BOOL Fit_InitMesg(const FIT_MESG_DEF *mesg_def, void *mesg);
 
-FIT_UINT8 Fit_GetFieldOffset(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num);
 ///////////////////////////////////////////////////////////////////////
 // Returns the byte offset of a field in a message.
 ///////////////////////////////////////////////////////////////////////
+FIT_UINT8 Fit_GetFieldOffset(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num);
+
+///////////////////////////////////////////////////////////////////////
+// Returns the definition for a field in a message.
+// field_def_num is set to FIT_FIELD_NUM_INVALID if field is not found in message.
+///////////////////////////////////////////////////////////////////////
+FIT_FIELD_DEF Fit_GetFieldDef(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_num);
+
+///////////////////////////////////////////////////////////////////////
+// Finds the byte offset of a message with the given message index in a FIT file
+// Requires a pointer to a function which can read a given number of bytes from a provided offset in a FIT file.
+// Returns the local message number if successful, or FIT_UINT8_INVALID if unsuccessful.
+///////////////////////////////////////////////////////////////////////
+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_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index, FIT_UINT32 *offset, FIT_READ_BYTES_FUNC read_bytes_func);
 ///////////////////////////////////////////////////////////////////////
-// Finds the byte offset of a message with the given message index in a .FIT file
-// Requires a pointer to a function which can read a given number of bytes from a provided offset in a .FIT file.
-// Returns the local message number if successful, or FIT_UINT8 if unsuccessful.
+// Returns the byte offset of a message within a file.
 ///////////////////////////////////////////////////////////////////////
+FIT_UINT32 Fit_GetFileMesgOffset(const FIT_FILE_DEF *file_def, FIT_UINT16 mesg_num, FIT_UINT16 mesg_index);
 
 #if defined(__cplusplus)
    }