diff --git a/Sources/FitFileParser/rzfit_swift_map.swift b/Sources/FitFileParser/rzfit_swift_map.swift index 40b6191..2c06163 100644 --- 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.89" + public static let sdkVersion = "21.94" } //MARK: - Module Entry Point Functions @@ -2690,6 +2690,8 @@ fileprivate func rzfit_swift_string_from_manufacturer(_ input : FIT_UINT16) -> S case 317: return "race_republic" case 318: return "fazua" case 319: return "oreka_training" + case 320: return "isec" + case 321: return "lululemon_studio" case 5759: return "actigraphcorp" default: return "manufacturer_\(input)" } @@ -2905,6 +2907,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) -> case 2769: return "foretrex_601_701" case 2772: return "vivo_move_hr" case 2713: return "edge_1030" + case 2727: return "fr35_sea" case 2787: return "vector_3" case 2796: return "fenix5_asia" case 2797: return "fenix5s_asia" @@ -3031,6 +3034,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) -> case 3823: return "approach_s12" case 3872: return "enduro_asia" case 3837: return "venusq_asia" + case 3843: return "edge_1040" case 3850: return "marq_golfer_asia" case 3851: return "venu2_plus" case 3869: return "fr55" @@ -3049,6 +3053,7 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) -> case 3949: return "venu2s_asia" case 3950: return "venu2_asia" case 3978: return "fr945_lte_asia" + case 3982: return "vivo_move_sport" case 3986: return "approach_S12_asia" case 3990: return "fr255_music" case 3991: return "fr255_small_music" @@ -3062,9 +3067,12 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) -> case 4033: return "fr55_asia" case 4063: return "vivosmart_5" case 4071: return "instinct_2_asia" + case 4115: return "venusq2" + case 4116: return "venusq2music" case 4125: return "d2_air_x10" case 4130: return "hrm_pro_plus" case 4132: return "descent_g1_asia" + case 4135: return "tactix7" case 4169: return "edge_explore2" case 4265: return "tacx_neo_smart" case 4266: return "tacx_neo2_smart" @@ -3078,7 +3086,8 @@ fileprivate func rzfit_swift_string_from_garmin_product(_ input : FIT_UINT16) -> case 4274: return "tacx_flux_flux_s_smart" case 4275: return "tacx_flux2_smart" case 4276: return "tacx_magnum" - case 4135: return "tactix7" + case 4305: return "edge_1040_asia" + case 4341: return "enduro2" case 10007: return "sdm4" case 10014: return "edge_remote" case 20533: return "tacx_training_app_win" @@ -3216,6 +3225,11 @@ fileprivate func rzfit_swift_string_from_workout_hr(_ input : FIT_UINT32) -> Str } } +fileprivate func rzfit_swift_value_from_workout_hr(_ input : FIT_UINT32) -> Double +{ + let offset : Double = 100 + return Double( input ) - offset +} fileprivate func rzfit_swift_string_from_workout_power(_ input : FIT_UINT32) -> String { switch input { @@ -3224,6 +3238,11 @@ fileprivate func rzfit_swift_string_from_workout_power(_ input : FIT_UINT32) -> } } +fileprivate func rzfit_swift_value_from_workout_power(_ input : FIT_UINT32) -> Double +{ + let offset : Double = 1000 + return Double( input ) - offset +} fileprivate func rzfit_swift_string_from_bp_status(_ input : FIT_ENUM) -> String { switch input { @@ -11416,6 +11435,10 @@ fileprivate func rzfit_swift_value_dict_for_workout_step( ptr : UnsafePointer RzFit case "fazua": return .string("318") case "319": return .string("oreka_training") case "oreka_training": return .string("319") + case "320": return .string("isec") + case "isec": return .string("320") + case "321": return .string("lululemon_studio") + case "lululemon_studio": return .string("321") case "5759": return .string("actigraphcorp") case "actigraphcorp": return .string("5759") default: return .unknown @@ -6919,6 +6923,8 @@ fileprivate func rzfit_swift_reverse_value_garmin_product(value : String) -> RzF case "vivo_move_hr": return .string("2772") case "2713": return .string("edge_1030") case "edge_1030": return .string("2713") + case "2727": return .string("fr35_sea") + case "fr35_sea": return .string("2727") case "2787": return .string("vector_3") case "vector_3": return .string("2787") case "2796": return .string("fenix5_asia") @@ -7171,6 +7177,8 @@ fileprivate func rzfit_swift_reverse_value_garmin_product(value : String) -> RzF case "enduro_asia": return .string("3872") case "3837": return .string("venusq_asia") case "venusq_asia": return .string("3837") + case "3843": return .string("edge_1040") + case "edge_1040": return .string("3843") case "3850": return .string("marq_golfer_asia") case "marq_golfer_asia": return .string("3850") case "3851": return .string("venu2_plus") @@ -7207,6 +7215,8 @@ fileprivate func rzfit_swift_reverse_value_garmin_product(value : String) -> RzF case "venu2_asia": return .string("3950") case "3978": return .string("fr945_lte_asia") case "fr945_lte_asia": return .string("3978") + case "3982": return .string("vivo_move_sport") + case "vivo_move_sport": return .string("3982") case "3986": return .string("approach_S12_asia") case "approach_S12_asia": return .string("3986") case "3990": return .string("fr255_music") @@ -7233,12 +7243,18 @@ fileprivate func rzfit_swift_reverse_value_garmin_product(value : String) -> RzF case "vivosmart_5": return .string("4063") case "4071": return .string("instinct_2_asia") case "instinct_2_asia": return .string("4071") + case "4115": return .string("venusq2") + case "venusq2": return .string("4115") + case "4116": return .string("venusq2music") + case "venusq2music": return .string("4116") case "4125": return .string("d2_air_x10") case "d2_air_x10": return .string("4125") case "4130": return .string("hrm_pro_plus") case "hrm_pro_plus": return .string("4130") case "4132": return .string("descent_g1_asia") case "descent_g1_asia": return .string("4132") + case "4135": return .string("tactix7") + case "tactix7": return .string("4135") case "4169": return .string("edge_explore2") case "edge_explore2": return .string("4169") case "4265": return .string("tacx_neo_smart") @@ -7265,8 +7281,10 @@ fileprivate func rzfit_swift_reverse_value_garmin_product(value : String) -> RzF case "tacx_flux2_smart": return .string("4275") case "4276": return .string("tacx_magnum") case "tacx_magnum": return .string("4276") - case "4135": return .string("tactix7") - case "tactix7": return .string("4135") + case "4305": return .string("edge_1040_asia") + case "edge_1040_asia": return .string("4305") + case "4341": return .string("enduro2") + case "enduro2": return .string("4341") case "10007": return .string("sdm4") case "sdm4": return .string("10007") case "10014": return .string("edge_remote") diff --git a/Sources/FitFileParserObjc/fit.h b/Sources/FitFileParserObjc/fit.h index 96d3c50..4e41048 100644 --- a/Sources/FitFileParserObjc/fit.h +++ b/Sources/FitFileParserObjc/fit.h @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // 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 89 + #define FIT_PROFILE_VERSION_MINOR 94 #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 index 0b7d9e6..2db31bd 100644 --- a/Sources/FitFileParserObjc/fit.m +++ b/Sources/FitFileParserObjc/fit.m @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/fit_convert.h b/Sources/FitFileParserObjc/fit_convert.h index de8aa83..73703ff 100644 --- a/Sources/FitFileParserObjc/fit_convert.h +++ b/Sources/FitFileParserObjc/fit_convert.h @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/fit_convert.m b/Sources/FitFileParserObjc/fit_convert.m index cc4a0b6..a095d75 100644 --- a/Sources/FitFileParserObjc/fit_convert.m +++ b/Sources/FitFileParserObjc/fit_convert.m @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/fit_crc.h b/Sources/FitFileParserObjc/fit_crc.h index 6890544..baec1d1 100644 --- a/Sources/FitFileParserObjc/fit_crc.h +++ b/Sources/FitFileParserObjc/fit_crc.h @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/fit_crc.m b/Sources/FitFileParserObjc/fit_crc.m index aa7968a..d3076e5 100644 --- a/Sources/FitFileParserObjc/fit_crc.m +++ b/Sources/FitFileParserObjc/fit_crc.m @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/fit_product.h b/Sources/FitFileParserObjc/fit_product.h index c480b08..dcd0f90 100644 --- a/Sources/FitFileParserObjc/fit_product.h +++ b/Sources/FitFileParserObjc/fit_product.h @@ -10,8 +10,8 @@ // Copyright 2021 Garmin Canada Inc. //////////////////////////////////////////////////////////////////////////////// // ****WARNING**** This file is auto-generated! Do NOT edit this file. -// Profile Version = 21.89Release -// Tag = production/akw/21.89.00-0-g487f2ed0 +// Profile Version = 21.94Release +// Tag = production/akw/21.94.00-0-g0f668193 // Product = EXAMPLE // Alignment = 4 bytes, padding disabled. //////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/FitFileParserObjc/rzfit_objc_map.m b/Sources/FitFileParserObjc/rzfit_objc_map.m index e1a575b..2c6f85f 100644 --- a/Sources/FitFileParserObjc/rzfit_objc_map.m +++ b/Sources/FitFileParserObjc/rzfit_objc_map.m @@ -1282,6 +1282,8 @@ case 317: return @"race_republic"; case 318: return @"fazua"; case 319: return @"oreka_training"; + case 320: return @"isec"; + case 321: return @"lululemon_studio"; case 5759: return @"actigraphcorp"; default: return [NSString stringWithFormat:@"manufacturer_%u", (unsigned int)manufacturer]; } @@ -1497,6 +1499,7 @@ case 2769: return @"foretrex_601_701"; case 2772: return @"vivo_move_hr"; case 2713: return @"edge_1030"; + case 2727: return @"fr35_sea"; case 2787: return @"vector_3"; case 2796: return @"fenix5_asia"; case 2797: return @"fenix5s_asia"; @@ -1623,6 +1626,7 @@ case 3823: return @"approach_s12"; case 3872: return @"enduro_asia"; case 3837: return @"venusq_asia"; + case 3843: return @"edge_1040"; case 3850: return @"marq_golfer_asia"; case 3851: return @"venu2_plus"; case 3869: return @"fr55"; @@ -1641,6 +1645,7 @@ case 3949: return @"venu2s_asia"; case 3950: return @"venu2_asia"; case 3978: return @"fr945_lte_asia"; + case 3982: return @"vivo_move_sport"; case 3986: return @"approach_S12_asia"; case 3990: return @"fr255_music"; case 3991: return @"fr255_small_music"; @@ -1654,9 +1659,12 @@ case 4033: return @"fr55_asia"; case 4063: return @"vivosmart_5"; case 4071: return @"instinct_2_asia"; + case 4115: return @"venusq2"; + case 4116: return @"venusq2music"; case 4125: return @"d2_air_x10"; case 4130: return @"hrm_pro_plus"; case 4132: return @"descent_g1_asia"; + case 4135: return @"tactix7"; case 4169: return @"edge_explore2"; case 4265: return @"tacx_neo_smart"; case 4266: return @"tacx_neo2_smart"; @@ -1670,7 +1678,8 @@ case 4274: return @"tacx_flux_flux_s_smart"; case 4275: return @"tacx_flux2_smart"; case 4276: return @"tacx_magnum"; - case 4135: return @"tactix7"; + case 4305: return @"edge_1040_asia"; + case 4341: return @"enduro2"; case 10007: return @"sdm4"; case 10014: return @"edge_remote"; case 20533: return @"tacx_training_app_win"; diff --git a/python/Profile.xlsx b/python/Profile.xlsx index 910394b..8e0fa71 100644 Binary files a/python/Profile.xlsx and b/python/Profile.xlsx differ diff --git a/python/fitsdkversion.txt b/python/fitsdkversion.txt index 70ac27e..f12c918 100644 --- a/python/fitsdkversion.txt +++ b/python/fitsdkversion.txt @@ -1 +1 @@ -21.89 \ No newline at end of file +21.94 \ No newline at end of file