rubyfit 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105f4f3b3bf24cf21007a2bf83e2b2d09119f575
-  data.tar.gz: 2486ded9e5f267ea18c455048a789f0c7c948a3f
+  metadata.gz: 33df17859113bfabf926430108e48e832a16609d
+  data.tar.gz: 67bf9d1069e605c1bd4fe8402c442a3eb9d55531
 SHA512:
-  metadata.gz: 33ffdd1af14d01745ed3f8c118f27d888693fb4b9692a26db99546c98855f058c7ea05e8b45811b456be50255368e6dc69ccd6eb13f0f1087a62fee648a51fad
-  data.tar.gz: db5a2fec83c9b6217d4365afbf48a57e19e347f67f37a5e86b6ce97a007ff90ffd6e0f63c461a5106e166bc6c209af7761a25786e4821e5d575b1de520261e06
+  metadata.gz: c79dd06cb89f79330f458b2a7aae56cbd9dd7dbd30a1bfc7054931c960623b66097226a8c6a729e75dda582c4928d652438eadc4c82f631fbde07636652739f7
+  data.tar.gz: 5ba13d8485c785f17f2e25a90e940b04eb54272e099eea0f1167615acf432813e5b7023eb702c04679b62b2d098ee6cbdf03271151ff00ec309a6467570e0469

data/ext/rubyfit/fit.c

@@ -7,18 +7,17 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2014 Dynastream Innovations Inc.
+// Copyright 2016 Dynastream Innovations Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 11.0Release
-// Tag = $Name: AKW11_000 $
+// Profile Version = 20.16Release
+// Tag = production/akw/20.16.00-0-gce20b51
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////
 
 
 #include "string.h"
-#include "fit.h"
 #include "fit_example.h"
 
 
@@ -42,8 +41,33 @@ const FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES] =
    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;
@@ -52,12 +76,13 @@ 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_FLOAT32 fit_float32_invalid = FIT_FLOAT32_INVALID;
-const FIT_FLOAT64 fit_float64_invalid = FIT_FLOAT64_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] =
 {
@@ -69,12 +94,15 @@ const FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES] =
    (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)&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,
 };
 
 
@@ -101,6 +129,17 @@ const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num)
    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)
@@ -128,6 +167,25 @@ FIT_UINT8 Fit_GetMesgSize(FIT_UINT16 global_mesg_num)
    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;
@@ -183,12 +241,13 @@ FIT_FIELD_DEF Fit_GetFieldDef(const FIT_MESG_DEF *mesg_def, FIT_UINT8 field_def_
    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);
@@ -213,24 +272,27 @@ 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; 
+   {
+      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;
+   }
 
-   while (1)
+   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)
@@ -298,7 +360,7 @@ FIT_UINT8 Fit_LookupMessage(FIT_UINT16 global_mesg_num, FIT_UINT16 message_index
             {
                current_message_index++;
             }
-            
+
             #if defined(FIT_MESSAGE_INDEX)
                if ((message_index & FIT_MESSAGE_INDEX_MASK) == (current_message_index & FIT_MESSAGE_INDEX_MASK))
             #else
@@ -320,7 +382,7 @@ 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_UINT32 offset = 0;
    FIT_UINT16 i = 0;
 
    while (i < file_def->mesg_count)
@@ -336,15 +398,13 @@ FIT_UINT32 Fit_GetFileMesgOffset(const FIT_FILE_DEF *file_def, FIT_UINT16 mesg_n
 
    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;
+   // Compute size of each message (header byte + data)
+   i = FIT_HDR_SIZE + Fit_GetMesgSize(mesg_num);
 
    offset += mesg_index * i;
 

data/ext/rubyfit/fit.h

@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2014 Dynastream Innovations Inc.
+// Copyright 2016 Dynastream Innovations Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 11.0Release
-// Tag = $Name: AKW11_000 $
+// Profile Version = 20.16Release
+// Tag = production/akw/20.16.00-0-gce20b51
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////
@@ -31,6 +31,8 @@
    typedef signed short int16_t;
    typedef unsigned long uint32_t;
    typedef signed long int32_t;
+   typedef signed long long int64_t;
+   typedef unsigned long long uint64_t;
 #endif
 
 #if defined(__cplusplus)
@@ -42,18 +44,26 @@
 // Version
 ///////////////////////////////////////////////////////////////////////
 
-#define FIT_PROTOCOL_VERSION_MAJOR           1 // Non-backwards compatible changes. Decode compatible with this version and earlier.
-#define FIT_PROTOCOL_VERSION_MINOR           0 // Backwards compatible changes.
-#define FIT_PROTOCOL_VERSION_MAJOR_SHIFT     4
-#define FIT_PROTOCOL_VERSION_MAJOR_MASK      ((FIT_UINT8) (0x0F << FIT_PROTOCOL_VERSION_MAJOR_SHIFT))
-#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_PROTOCOL_VERSION_10              ( ( FIT_UINT8 )( 1 << FIT_PROTOCOL_VERSION_MAJOR_SHIFT ) | 0 )
+#define FIT_PROTOCOL_VERSION_20              ( ( FIT_UINT8 )( 2 << FIT_PROTOCOL_VERSION_MAJOR_SHIFT ) | 0 )
 
-#define FIT_PROFILE_VERSION_MAJOR            11
-#define FIT_PROFILE_VERSION_MINOR            0
-#define FIT_PROFILE_VERSION_SCALE			 100
-#define FIT_PROFILE_VERSION					 ((FIT_UINT16) (FIT_PROFILE_VERSION_MAJOR * 100 + FIT_PROFILE_VERSION_MINOR))
+#if !defined(FIT_CPP_INCLUDE_C)
+    #define FIT_PROTOCOL_VERSION_MAJOR(version)  ( ( FIT_UINT8 )( version >> FIT_PROTOCOL_VERSION_MAJOR_SHIFT ) )
+    #define FIT_PROTOCOL_VERSION_MINOR(version)  ( ( FIT_UINT8 )( version & FIT_PROTOCOL_VERSION_MINOR_MASK ) )
+    #define FIT_PROTOCOL_VERSION_MAJOR_SHIFT     4
+    #define FIT_PROTOCOL_VERSION_MAJOR_MASK      ((FIT_UINT8) (0x0F << FIT_PROTOCOL_VERSION_MAJOR_SHIFT))
+    #define FIT_PROTOCOL_VERSION_MINOR_MASK      ((FIT_UINT8) 0x0F)
 
+    // Deprecated.
+    #define FIT_PROTOCOL_VERSION                 FIT_PROTOCOL_VERSION_10
+
+    #define FIT_PROTOCOL_VERSION_MAX             FIT_PROTOCOL_VERSION_20
+
+    #define FIT_PROFILE_VERSION_MAJOR            20
+    #define FIT_PROFILE_VERSION_MINOR            16
+    #define FIT_PROFILE_VERSION_SCALE            100
+    #define FIT_PROFILE_VERSION                  ((FIT_UINT16) (FIT_PROFILE_VERSION_MAJOR * 100 + FIT_PROFILE_VERSION_MINOR))
+#endif // !defined(FIT_CPP_INCLUDE_C)
 
 ///////////////////////////////////////////////////////////////////////
 // Type Definitions
@@ -99,25 +109,23 @@ 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; // 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)
+#if !defined(FIT_CPP_INCLUDE_C)
+    typedef float FIT_FLOAT32;
+    typedef const FIT_FLOAT32 * FIT_CONST_FLOAT32_PTR;
+    #define FIT_FLOAT32_INVALID   ((FIT_FLOAT32)*((FIT_FLOAT32*)fit_base_type_invalids[FIT_BASE_TYPE_FLOAT32 & FIT_BASE_TYPE_NUM_MASK]))
+    #define FIT_BASE_TYPE_FLOAT32 ((FIT_UINT8)0x88)
 
-typedef double FIT_FLOAT64;
-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 double FIT_FLOAT64;
+    typedef const FIT_FLOAT64 * FIT_CONST_FLOAT64_PTR;
+    #define FIT_FLOAT64_INVALID   ((FIT_FLOAT64)*((FIT_FLOAT64*)fit_base_type_invalids[FIT_BASE_TYPE_FLOAT64 & FIT_BASE_TYPE_NUM_MASK]))
+    #define FIT_BASE_TYPE_FLOAT64 ((FIT_UINT8)0x89)
+#endif // !defined(FIT_CPP_INCLUDE_C)
 
 typedef uint8_t FIT_UINT8Z;
 typedef const FIT_UINT8Z * FIT_CONST_UINT8Z_PTR;
@@ -139,7 +147,22 @@ 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
+typedef int64_t FIT_SINT64;
+typedef const FIT_SINT64 * FIT_CONST_SINT64_PTR;
+#define FIT_SINT64_INVALID   ((FIT_SINT64)0x7FFFFFFFFFFFFFFFL)
+#define FIT_BASE_TYPE_SINT64 ((FIT_UINT8)0x8E)
+
+typedef uint64_t FIT_UINT64;
+typedef const FIT_UINT64 * FIT_CONST_UINT64_PTR;
+#define FIT_UINT64_INVALID   ((FIT_UINT64)0xFFFFFFFFFFFFFFFFL)
+#define FIT_BASE_TYPE_UINT64 ((FIT_UINT8)0x8F)
+
+typedef uint64_t FIT_UINT64Z;
+typedef const FIT_UINT64Z * FIT_CONST_UINT64Z_PTR;
+#define FIT_UINT64Z_INVALID   ((FIT_UINT64Z)0x0000000000000000L)
+#define FIT_BASE_TYPE_UINT64Z ((FIT_UINT8)0x90)
+
+#define FIT_BASE_TYPES    17
 
 typedef FIT_ENUM FIT_BOOL;
 #define FIT_BOOL_INVALID      FIT_ENUM_INVALID
@@ -168,6 +191,7 @@ typedef struct
 } FIT_FILE_HDR;
 
 #define FIT_FILE_HDR_SIZE         14
+#define FIT_FILE_CRC_SIZE         2
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -180,6 +204,7 @@ typedef struct
 #define FIT_HDR_TIME_TYPE_SHIFT   5
 #define FIT_HDR_TIME_OFFSET_MASK  ((FIT_UINT8) 0x1F)
 #define FIT_HDR_TYPE_DEF_BIT      ((FIT_UINT8) 0x40)
+#define FIT_HDR_DEV_DATA_BIT      ((FIT_UINT8) 0x20)
 #define FIT_HDR_TYPE_MASK         ((FIT_UINT8) 0x0F)
 #define FIT_MAX_LOCAL_MESGS       (FIT_HDR_TYPE_MASK + 1)
 
@@ -187,7 +212,7 @@ typedef struct
 // File Definitions
 ///////////////////////////////////////////////////////////////////////
 
-typedef struct 
+typedef struct
 {
    FIT_UINT32 def_file_offset;
    FIT_UINT32 data_file_offset;
@@ -196,7 +221,7 @@ typedef struct
    FIT_UINT16 mesg;
 } FIT_FILE_MESG;
 
-typedef struct 
+typedef struct
 {
    FIT_UINT32 data_size;
    const FIT_FILE_MESG *mesgs;
@@ -219,6 +244,15 @@ typedef struct
 
 #define FIT_FIELD_DEF_SIZE        3
 
+typedef struct
+{
+   FIT_UINT8 def_num;
+   FIT_UINT8 size;
+   FIT_UINT8 dev_index;
+} FIT_DEV_FIELD_DEF;
+
+#define FIT_DEV_FIELD_DEF_SIZE    3
+
 typedef struct
 {
    FIT_UINT8 reserved_1;
@@ -270,8 +304,8 @@ typedef struct
 // Public Constants
 ///////////////////////////////////////////////////////////////////////
 
-const extern FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES];
-const extern FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES];
+extern const FIT_UINT8 fit_base_type_sizes[FIT_BASE_TYPES];
+extern const FIT_CONST_UINT8_PTR fit_base_type_invalids[FIT_BASE_TYPES];
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -290,6 +324,11 @@ FIT_UINT8 Fit_GetArch(void);
 ///////////////////////////////////////////////////////////////////////
 const FIT_MESG_DEF *Fit_GetMesgDef(FIT_UINT16 global_mesg_num);
 
+///////////////////////////////////////////////////////////////////////
+// Returns message definition corresponding to FIT_MESG enum.
+///////////////////////////////////////////////////////////////////////
+const FIT_MESG_DEF *Fit_GetMesgDefFromEnum(FIT_UINT32 fit_mesg_enum);
+
 ///////////////////////////////////////////////////////////////////////
 // Returns the size of message definition.
 ///////////////////////////////////////////////////////////////////////
@@ -300,6 +339,11 @@ 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 FIT_MESG enum.
+///////////////////////////////////////////////////////////////////////
+FIT_UINT8 Fit_GetMesgSizeFromEnum(FIT_UINT32 fit_mesg_enum);
+
 ///////////////////////////////////////////////////////////////////////
 // Initializes message with invalids.
 // Returns 1 if successful, otherwise 0.

data/ext/rubyfit/fit_config.h

@@ -7,7 +7,7 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2014 Dynastream Innovations Inc.
+// Copyright 2016 Dynastream Innovations Inc.
 ////////////////////////////////////////////////////////////////////////////////
 
 
@@ -19,9 +19,9 @@
    extern "C" {
 #endif
 
-#define FIT_USE_STDINT_H // Define to use stdint.h types. By default size in bytes of integer types assumed to be char=1, short=2, long=4. 
+#define FIT_USE_STDINT_H // Define to use stdint.h types. By default size in bytes of integer types assumed to be char=1, short=2, long=4.
 
-#define FIT_LOCAL_MESGS     16 // 1-16. Sets maximum number of local messages that can be decoded. Lower to minimize RAM requirements. 
+#define FIT_LOCAL_MESGS     16 // 1-16. Sets maximum number of local messages that can be decoded. Lower to minimize RAM requirements.
 #define FIT_ARCH_ENDIAN     FIT_ARCH_ENDIAN_LITTLE   // Set to correct endian for build architecture.
 
 #define FIT_CONVERT_CHECK_CRC // Define to check file crc.

data/ext/rubyfit/fit_convert.c

@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2014 Dynastream Innovations Inc.
+// Copyright 2016 Dynastream Innovations Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 11.0Release
-// Tag = $Name: AKW11_000 $
+// Profile Version = 20.16Release
+// Tag = production/akw/20.16.00-0-gce20b51
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////
@@ -71,6 +71,20 @@
 #else
    FIT_CONVERT_RETURN FitConvert_Read(const void *data, FIT_UINT32 size)
 #endif
+{
+#if defined(FIT_CONVERT_MULTI_THREAD)
+    return FitConvert_ReadExt(state, data, size, FIT_FALSE);
+#else
+    return FitConvert_ReadExt(data, size, FIT_FALSE);
+#endif
+}
+
+///////////////////////////////////////////////////////////////////////
+#if defined(FIT_CONVERT_MULTI_THREAD)
+   FIT_CONVERT_RETURN FitConvert_ReadExt(FIT_CONVERT_STATE *state, const void *data, FIT_UINT32 size, FIT_BOOL return_message_numbers)
+#else
+   FIT_CONVERT_RETURN FitConvert_ReadExt(const void *data, FIT_UINT32 size, FIT_BOOL return_message_numbers)
+#endif
 {
    while (state->data_offset < size)
    {
@@ -129,9 +143,10 @@
                      return FIT_CONVERT_DATA_TYPE_NOT_SUPPORTED;
                #endif
 
-               if ((state->u.file_hdr.protocol_version & FIT_PROTOCOL_VERSION_MAJOR_MASK) > (FIT_PROTOCOL_VERSION_MAJOR << FIT_PROTOCOL_VERSION_MAJOR_SHIFT))
+               if (FIT_PROTOCOL_VERSION_MAJOR(state->u.file_hdr.protocol_version) >
+                   FIT_PROTOCOL_VERSION_MAJOR(FIT_PROTOCOL_VERSION_MAX))
                   return FIT_CONVERT_PROTOCOL_VERSION_NOT_SUPPORTED;
-               
+
                state->decode_state = FIT_CONVERT_DECODE_RECORD;
             }
             break;
@@ -163,8 +178,16 @@
                }
                else
                {
+                  state->has_dev_data = FIT_FALSE;
                   // This is a message definition record.
+                  if ((datum & FIT_HDR_DEV_DATA_BIT) != 0)
+                  {
+                     // This message has Dev Data
+                     state->has_dev_data = FIT_TRUE;
+                  }
+
                   state->mesg_sizes[state->mesg_index] = 0;
+                  state->dev_data_sizes[state->mesg_index] = 0;
                   state->decode_state = FIT_CONVERT_DECODE_RESERVED1;
                }
             }
@@ -242,12 +265,22 @@
 
             if (state->num_fields == 0)
             {
-               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+               state->decode_state = state->has_dev_data ?
+                  FIT_CONVERT_DECODE_NUM_DEV_FIELDS : FIT_CONVERT_DECODE_RECORD;
                break;
             }
 
             state->field_index = 0;
             state->decode_state = FIT_CONVERT_DECODE_FIELD_DEF;
+
+            //Return That a message number has been found (The user can then optionally over-ride the mesg_def property on the state object
+            //to use the alternate message definition if needed.
+            if ( return_message_numbers )
+            {
+                //When this event is received, the consuming application can call "FitConvert_SetMessageDefinition"
+                //to override the message definition to use (for alternate message definitions).
+                return FIT_CONVERT_MESSAGE_NUMBER_FOUND;
+            }
             break;
 
          case FIT_CONVERT_DECODE_FIELD_DEF:
@@ -292,9 +325,9 @@
                   if (datum < state->convert_table[state->mesg_index].fields[state->convert_table[state->mesg_index].num_fields].size)
                      state->convert_table[state->mesg_index].fields[state->convert_table[state->mesg_index].num_fields].size = datum;
                }
-            }
 
-            state->mesg_sizes[state->mesg_index] += datum;
+               state->mesg_sizes[state->mesg_index] += datum;
+            }
 
             state->decode_state = FIT_CONVERT_DECODE_FIELD_BASE_TYPE;
             break;
@@ -309,9 +342,48 @@
             state->field_index++;
 
             if (state->field_index >= state->num_fields)
-               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+            {
+               state->decode_state = state->has_dev_data ?
+                  FIT_CONVERT_DECODE_NUM_DEV_FIELDS : FIT_CONVERT_DECODE_RECORD;
+            }
             else
+            {
                state->decode_state = FIT_CONVERT_DECODE_FIELD_DEF;
+            }
+            break;
+
+         case FIT_CONVERT_DECODE_NUM_DEV_FIELDS:
+            state->num_fields = datum;
+
+            if (state->num_fields == 0)
+            {
+               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+               break;
+            }
+
+            state->field_index = 0;
+            state->decode_state = FIT_CONVERT_DECODE_DEV_FIELD_DEF;
+            break;
+
+         case FIT_CONVERT_DECODE_DEV_FIELD_DEF:
+            // Doesn't matter yet
+            state->decode_state = FIT_CONVERT_DECODE_DEV_FIELD_SIZE;
+            break;
+
+         case FIT_CONVERT_DECODE_DEV_FIELD_SIZE:
+            // Just keep track of the amount of data that we need to ignore
+            state->dev_data_sizes[state->mesg_index] += datum;
+            state->decode_state = FIT_CONVERT_DECODE_DEV_FIELD_INDEX;
+            break;
+
+         case FIT_CONVERT_DECODE_DEV_FIELD_INDEX:
+            // Increment the number of fields that we have read
+            state->field_index++;
+
+            if (state->field_index >= state->num_fields)
+               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+            else
+               state->decode_state = FIT_CONVERT_DECODE_DEV_FIELD_DEF;
             break;
 
          case FIT_CONVERT_DECODE_FIELD_DATA:
@@ -319,7 +391,15 @@
 
             if (state->mesg_offset >= state->mesg_sizes[state->mesg_index])
             {
-               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+               if (state->dev_data_sizes[state->mesg_index] > 0)
+               {
+                  // There is dev data to read
+                  state->decode_state = FIT_CONVERT_DECODE_DEV_FIELD_DATA;
+               }
+               else
+               {
+                  state->decode_state = FIT_CONVERT_DECODE_RECORD;
+               }
             }
 
             if (state->mesg_index < FIT_LOCAL_MESGS)
@@ -368,13 +448,13 @@
                         if (state->convert_table[state->mesg_index].fields[state->field_index].base_type == FIT_BASE_TYPE_STRING)
                         {
                            FIT_UINT8 length = state->convert_table[state->mesg_index].fields[state->field_index].size;
-                           FIT_UINT8 index = 0; 
-                           
+                           FIT_UINT8 index = 0;
+
                            while (index < length)
                            {
                               FIT_UINT8 char_size;
                               FIT_UINT8 size_mask = 0x80;
-                              
+
                               if (field[index] & size_mask)
                               {
                                  char_size = 0;
@@ -389,7 +469,7 @@
                               {
                                  char_size = 1;
                               }
-                              
+
                               if ((FIT_UINT16)(index + char_size) > length)
                               {
                                  while (index < length)
@@ -398,11 +478,11 @@
                                  }
                                  break;
                               }
-                              
+
                               index += char_size;
                            }
                         }
-                        
+
                         state->field_offset = 0; // Reset the offset.
                         state->field_index++; // Move on to the next field.
 
@@ -423,8 +503,12 @@
                               }
                            #endif
 
-                           // We have successfully decoded a mesg.
-                           return FIT_CONVERT_MESSAGE_AVAILABLE;
+                           state->field_index = 0;
+                           if ( state->dev_data_sizes[state->mesg_index] == 0 )
+                           {
+                              // We have successfully decoded a mesg and there is no dev data to read.
+                              return FIT_CONVERT_MESSAGE_AVAILABLE;
+                           }
                         }
                      }
                   }
@@ -432,6 +516,18 @@
             }
             break;
 
+         case FIT_CONVERT_DECODE_DEV_FIELD_DATA:
+            state->field_offset++;
+            if (state->field_offset >= state->dev_data_sizes[state->mesg_index])
+            {
+               // Done Parsing Dev Field Data
+               state->decode_state = FIT_CONVERT_DECODE_RECORD;
+
+               // We have successfully decoded a mesg and there is no dev data to read.
+               return FIT_CONVERT_MESSAGE_AVAILABLE;
+            }
+            break;
+
          default:
             // This shouldn't happen.
             return FIT_CONVERT_ERROR;
@@ -442,6 +538,14 @@
    return FIT_CONVERT_CONTINUE;
 }
 
+///////////////////////////////////////////////////////////////////////
+#if !defined(FIT_CONVERT_MULTI_THREAD)
+   void FitConvert_SetMessageDefinition(FIT_MESG_DEF *mesg_def)
+{
+   state->mesg_def = mesg_def;
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////
 #if defined(FIT_CONVERT_MULTI_THREAD)
    FIT_UINT16 FitConvert_GetMessageNumber(FIT_CONVERT_STATE *state)