updated to fit sdk 20.47

roznet · Feb 12, 2021 · d693f59 · d693f59
1 parent d30c3c5
commit d693f59
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 35 deletions.
diff --git a/Sources/FitFileParser/rzfit_swift_map.swift b/Sources/FitFileParser/rzfit_swift_map.swift
@@ -3,7 +3,7 @@
 import FitFileParserObjc
 
 extension FitFile {
-  public static let sdkVersion = "21.40"
+  public static let sdkVersion = "21.47"
 }
 
 //MARK: - Module Entry Point Functions
@@ -2050,6 +2050,9 @@ fileprivate func rzfit_swift_string_from_intensity(_ input : FIT_ENUM) -> String
     case 1: return "rest"
     case 2: return "warmup"
     case 3: return "cooldown"
+    case 4: return "recovery"
+    case 5: return "interval"
+    case 6: return "other"
    default: return "intensity_\(input)"
   }
 }
@@ -2543,6 +2546,7 @@ fileprivate func rzfit_swift_string_from_manufacturer(_ input : FIT_UINT16) -> S
     case 131: return "chileaf"
     case 132: return "cycplus"
     case 133: return "gravaa_byte"
+    case 134: return "sigeyi"
     case 255: return "development"
     case 257: return "healthandlife"
     case 258: return "lezyne"
@@ -2597,6 +2601,7 @@ fileprivate func rzfit_swift_string_from_manufacturer(_ input : FIT_UINT16) -> S
     case 307: return "onelap"
     case 308: return "monark_exercise"
     case 309: return "form"
+    case 310: return "decathlon"
     case 5759: return "actigraphcorp"
    default: return "manufacturer_\(input)"
   }
@@ -2846,6 +2851,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) ->
     case 3113: return "fr945"
     case 3121: return "edge_530"
     case 3122: return "edge_830"
+    case 3126: return "instinct_esports"
     case 3134: return "fenix5s_plus_apac"
     case 3135: return "fenix5x_plus_apac"
     case 3142: return "edge_520_plus_apac"
@@ -2864,6 +2870,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) ->
     case 3249: return "marq_commander"
     case 3250: return "marq_expedition"
     case 3251: return "marq_athlete"
+    case 3258: return "descent_mk2"
     case 3287: return "fenix6S_sport"
     case 3288: return "fenix6S"
     case 3289: return "fenix6_sport"
@@ -2903,6 +2910,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) ->
     case 3624: return "marq_adventurer"
     case 3648: return "marq_adventurer_asia"
     case 3639: return "swim2_apac"
+    case 3702: return "descent_mk2_asia"
     case 3737: return "venu_daimler_asia"
     case 3739: return "marq_golfer"
     case 3740: return "venu_daimler"
@@ -3714,6 +3722,7 @@ fileprivate func rzfit_swift_string_from_exd_layout(_ input : FIT_ENUM) -> Strin
     case 5: return "full_quarter_split"
     case 6: return "half_vertical_left_split"
     case 7: return "half_horizontal_top_split"
+    case 8: return "dynamic"
    default: return "exd_layout_\(input)"
   }
 }

diff --git a/Sources/FitFileParserObjc/fit.h b/Sources/FitFileParserObjc/fit.h
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@
     #define FIT_PROTOCOL_VERSION_MAX             FIT_PROTOCOL_VERSION_20
 
     #define FIT_PROFILE_VERSION_MAJOR            21
-    #define FIT_PROFILE_VERSION_MINOR            40
+    #define FIT_PROFILE_VERSION_MINOR            47
     #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)

diff --git a/Sources/FitFileParserObjc/fit.m b/Sources/FitFileParserObjc/fit.m
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_convert.h b/Sources/FitFileParserObjc/fit_convert.h
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_convert.m b/Sources/FitFileParserObjc/fit_convert.m
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_crc.h b/Sources/FitFileParserObjc/fit_crc.h
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_crc.m b/Sources/FitFileParserObjc/fit_crc.m
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_include.h b/Sources/FitFileParserObjc/fit_include.h
@@ -7,7 +7,7 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 
 

diff --git a/Sources/FitFileParserObjc/fit_product.h b/Sources/FitFileParserObjc/fit_product.h
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_ram.h b/Sources/FitFileParserObjc/fit_ram.h
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/fit_ram.m b/Sources/FitFileParserObjc/fit_ram.m
@@ -7,11 +7,11 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 // ****WARNING****  This file is auto-generated!  Do NOT edit this file.
-// Profile Version = 21.40Release
-// Tag = production/akw/21.40.00-0-g813c158
+// Profile Version = 21.47Release
+// Tag = production/akw/21.47.00-0-geec27411
 // Product = EXAMPLE
 // Alignment = 4 bytes, padding disabled.
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/Sources/FitFileParserObjc/include/fit_config.h b/Sources/FitFileParserObjc/include/fit_config.h
@@ -7,7 +7,7 @@
 // warranties of merchantability, non-infringement, or fitness for a particular
 // purpose, are specifically disclaimed.
 //
-// Copyright 2020 Garmin Canada Inc.
+// Copyright 2021 Garmin Canada Inc.
 ////////////////////////////////////////////////////////////////////////////////
 
 

diff --git a/Sources/FitFileParserObjc/rzfit_objc_map.m b/Sources/FitFileParserObjc/rzfit_objc_map.m
@@ -678,6 +678,9 @@
     case 1: return @"rest";
     case 2: return @"warmup";
     case 3: return @"cooldown";
+    case 4: return @"recovery";
+    case 5: return @"interval";
+    case 6: return @"other";
     default: return [NSString stringWithFormat:@"intensity_%u", (unsigned int)intensity];
   }
 }
@@ -1171,6 +1174,7 @@
     case 131: return @"chileaf";
     case 132: return @"cycplus";
     case 133: return @"gravaa_byte";
+    case 134: return @"sigeyi";
     case 255: return @"development";
     case 257: return @"healthandlife";
     case 258: return @"lezyne";
@@ -1225,6 +1229,7 @@
     case 307: return @"onelap";
     case 308: return @"monark_exercise";
     case 309: return @"form";
+    case 310: return @"decathlon";
     case 5759: return @"actigraphcorp";
     default: return [NSString stringWithFormat:@"manufacturer_%u", (unsigned int)manufacturer];
   }
@@ -1474,6 +1479,7 @@
     case 3113: return @"fr945";
     case 3121: return @"edge_530";
     case 3122: return @"edge_830";
+    case 3126: return @"instinct_esports";
     case 3134: return @"fenix5s_plus_apac";
     case 3135: return @"fenix5x_plus_apac";
     case 3142: return @"edge_520_plus_apac";
@@ -1492,6 +1498,7 @@
     case 3249: return @"marq_commander";
     case 3250: return @"marq_expedition";
     case 3251: return @"marq_athlete";
+    case 3258: return @"descent_mk2";
     case 3287: return @"fenix6S_sport";
     case 3288: return @"fenix6S";
     case 3289: return @"fenix6_sport";
@@ -1531,6 +1538,7 @@
     case 3624: return @"marq_adventurer";
     case 3648: return @"marq_adventurer_asia";
     case 3639: return @"swim2_apac";
+    case 3702: return @"descent_mk2_asia";
     case 3737: return @"venu_daimler_asia";
     case 3739: return @"marq_golfer";
     case 3740: return @"venu_daimler";
@@ -2342,6 +2350,7 @@
     case 5: return @"full_quarter_split";
     case 6: return @"half_vertical_left_split";
     case 7: return @"half_horizontal_top_split";
+    case 8: return @"dynamic";
     default: return [NSString stringWithFormat:@"exd_layout_%u", (unsigned int)exd_layout];
   }
 }

diff --git a/python/Profile.xlsx b/python/Profile.xlsx
diff --git a/python/fitsdkupdate.py b/python/fitsdkupdate.py
@@ -37,7 +37,9 @@ def update_version(fn_from,fn_to,execute=False):
     patterns = {
         'copyright' : re.compile( '// Copyright ([0-9]+) Garmin Canada' ),
         'profile'   : re.compile( '// Profile Version = ([0-9.]+)' ),
-        'tag'       : re.compile( '// Tag = production/' )
+        'tag'       : re.compile( '// Tag = production/' ),
+        'def_minor' : re.compile( ' +#define FIT_PROFILE_VERSION_MINOR +([0-9]+)' ),
+        'def_major' : re.compile( ' +#define FIT_PROFILE_VERSION_MAJOR +([0-9]+)' ),
         }
 
     version = None
@@ -46,7 +48,7 @@ def update_version(fn_from,fn_to,execute=False):
     f_i = open(fn_from, 'r')
 
     for line in f_i:
-        if line.startswith( '//' ):
+        if line.startswith( '//' ) or 'FIT_PROFILE_VERSION' in line:
             for k,v in patterns.items():
                 m = v.match( line )
                 if m:
@@ -63,7 +65,7 @@ def update_version(fn_from,fn_to,execute=False):
 
     for line in f_o:
         wrote = False
-        if line.startswith( '//' ):
+        if line.startswith( '//' ) or 'FIT_PROFILE_VERSION' in line:
             for k,v in patterns.items():
                 if k in values:
                     if v.match( line ):

diff --git a/python/fitsdkversion.txt b/python/fitsdkversion.txt
@@ -1 +1 @@
-21.40
+21.47