From 4ed7425d0c58d6f306aaffac563cac31d6b916aa Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Mon, 1 Aug 2022 22:57:59 -0300 Subject: [PATCH] Fit import - add new sensor types and devices --- src/FileIO/FitRideFile.cpp | 4 +++- src/Resources/json/FITmetadata.json | 8 ++++++-- util/fit/FITmetadata.json | 8 ++++++-- util/fit/fit_example.h | 3 +++ util/fit/nongarmin.json | 3 ++- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/FileIO/FitRideFile.cpp b/src/FileIO/FitRideFile.cpp index 34876a4edb..30a84b8ea6 100644 --- a/src/FileIO/FitRideFile.cpp +++ b/src/FileIO/FitRideFile.cpp @@ -517,8 +517,10 @@ struct FitFileReaderState switch (device_type) { case 4: return "Headunit"; // bike_power case 11: return "Powermeter"; // bike_power - case 12: return "Sensor Hub"; + case 12: case 25: return "Environment Sensor"; // s.t. temperature + case 16: return "Remote Control"; // s.t. Edge remote case 17: return "Biketrainer"; // fitness equipment + case 18: return "Blood Presure"; case 30: return "Running Dynamics"; case 31: return "Muscle Oxygen"; case 34: return "Shifting"; diff --git a/src/Resources/json/FITmetadata.json b/src/Resources/json/FITmetadata.json index 0c81fe9d8d..a2afdea0ac 100644 --- a/src/Resources/json/FITmetadata.json +++ b/src/Resources/json/FITmetadata.json @@ -1,5 +1,5 @@ { - "VERSION":1659206075, + "VERSION":1659384729, "PRODUCTS":[ { "manu":6, "prod":6, "name":"SRM PC6" }, { "manu":6, "prod":7, "name":"SRM PC7" }, @@ -17,6 +17,7 @@ { "manu":9, "prod":288, "name":"Powertap P1" }, { "manu":9, "prod":4096, "name":"Powertap G3" }, { "manu":9, "prod":4353, "name":"Powercal" }, + { "manu":15, "prod":6, "name":"HRM2A" }, { "manu":29, "prod":1031, "name":"Power2max S" }, { "manu":32, "prod":0, "name":"Wahoo fitness" }, { "manu":32, "prod":28, "name":"Wahoo ELEMNT" }, @@ -65,7 +66,7 @@ { "manu":267, "prod":-1, "name":"Bryton" }, { "manu":268, "prod":-1, "name":"SRAM" }, { "manu":268, "prod":1037, "name":"SRAM Rival eTap AXS" }, - { "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, + { "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, { "manu":282, "prod":-1, "name":"The Sufferfest" }, { "manu":284, "prod":-1, "name":"Rouvy" }, { "manu":289, "prod":-1, "name":"Hammerhead" }, @@ -383,6 +384,7 @@ { "manu":1, "prod":3570, "name":"Edge 1030 Plus" }, { "manu":1, "prod":3578, "name":"Rally 200" }, { "manu":1, "prod":3589, "name":"Fr745" }, + { "manu":1, "prod":3592, "name":"Varia Rtl515" }, { "manu":1, "prod":3600, "name":"Venusq" }, { "manu":1, "prod":3615, "name":"Lily" }, { "manu":1, "prod":3624, "name":"Marq Adventurer" }, @@ -422,10 +424,12 @@ { "manu":1, "prod":3950, "name":"Venu2 Asia" }, { "manu":1, "prod":3978, "name":"Fr945 Lte Asia" }, { "manu":1, "prod":3986, "name":"Approach S12 Asia" }, + { "manu":1, "prod":3990, "name":"Fr255" }, { "manu":1, "prod":4001, "name":"Approach G12 Asia" }, { "manu":1, "prod":4002, "name":"Approach S42 Asia" }, { "manu":1, "prod":4005, "name":"Descent G1" }, { "manu":1, "prod":4017, "name":"Venu2 Plus Asia" }, + { "manu":1, "prod":4024, "name":"Fr955" }, { "manu":1, "prod":4033, "name":"Fr55 Asia" }, { "manu":1, "prod":4071, "name":"Instinct 2 Asia" }, { "manu":1, "prod":4125, "name":"D2 Air X10" }, diff --git a/util/fit/FITmetadata.json b/util/fit/FITmetadata.json index 0c81fe9d8d..a2afdea0ac 100644 --- a/util/fit/FITmetadata.json +++ b/util/fit/FITmetadata.json @@ -1,5 +1,5 @@ { - "VERSION":1659206075, + "VERSION":1659384729, "PRODUCTS":[ { "manu":6, "prod":6, "name":"SRM PC6" }, { "manu":6, "prod":7, "name":"SRM PC7" }, @@ -17,6 +17,7 @@ { "manu":9, "prod":288, "name":"Powertap P1" }, { "manu":9, "prod":4096, "name":"Powertap G3" }, { "manu":9, "prod":4353, "name":"Powercal" }, + { "manu":15, "prod":6, "name":"HRM2A" }, { "manu":29, "prod":1031, "name":"Power2max S" }, { "manu":32, "prod":0, "name":"Wahoo fitness" }, { "manu":32, "prod":28, "name":"Wahoo ELEMNT" }, @@ -65,7 +66,7 @@ { "manu":267, "prod":-1, "name":"Bryton" }, { "manu":268, "prod":-1, "name":"SRAM" }, { "manu":268, "prod":1037, "name":"SRAM Rival eTap AXS" }, - { "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, + { "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, { "manu":282, "prod":-1, "name":"The Sufferfest" }, { "manu":284, "prod":-1, "name":"Rouvy" }, { "manu":289, "prod":-1, "name":"Hammerhead" }, @@ -383,6 +384,7 @@ { "manu":1, "prod":3570, "name":"Edge 1030 Plus" }, { "manu":1, "prod":3578, "name":"Rally 200" }, { "manu":1, "prod":3589, "name":"Fr745" }, + { "manu":1, "prod":3592, "name":"Varia Rtl515" }, { "manu":1, "prod":3600, "name":"Venusq" }, { "manu":1, "prod":3615, "name":"Lily" }, { "manu":1, "prod":3624, "name":"Marq Adventurer" }, @@ -422,10 +424,12 @@ { "manu":1, "prod":3950, "name":"Venu2 Asia" }, { "manu":1, "prod":3978, "name":"Fr945 Lte Asia" }, { "manu":1, "prod":3986, "name":"Approach S12 Asia" }, + { "manu":1, "prod":3990, "name":"Fr255" }, { "manu":1, "prod":4001, "name":"Approach G12 Asia" }, { "manu":1, "prod":4002, "name":"Approach S42 Asia" }, { "manu":1, "prod":4005, "name":"Descent G1" }, { "manu":1, "prod":4017, "name":"Venu2 Plus Asia" }, + { "manu":1, "prod":4024, "name":"Fr955" }, { "manu":1, "prod":4033, "name":"Fr55 Asia" }, { "manu":1, "prod":4071, "name":"Instinct 2 Asia" }, { "manu":1, "prod":4125, "name":"D2 Air X10" }, diff --git a/util/fit/fit_example.h b/util/fit/fit_example.h index 5e289d900a..6df6749131 100644 --- a/util/fit/fit_example.h +++ b/util/fit/fit_example.h @@ -1559,6 +1559,7 @@ typedef FIT_UINT16 FIT_GARMIN_PRODUCT; #define FIT_GARMIN_PRODUCT_EDGE_1030_PLUS ((FIT_GARMIN_PRODUCT)3570) #define FIT_GARMIN_PRODUCT_RALLY_200 ((FIT_GARMIN_PRODUCT)3578) // Rally 100/200 Power Meter Series #define FIT_GARMIN_PRODUCT_FR745 ((FIT_GARMIN_PRODUCT)3589) +#define FIT_GARMIN_PRODUCT_Varia_RTL515 ((FIT_GARMIN_PRODUCT)3592) #define FIT_GARMIN_PRODUCT_VENUSQ ((FIT_GARMIN_PRODUCT)3600) #define FIT_GARMIN_PRODUCT_LILY ((FIT_GARMIN_PRODUCT)3615) #define FIT_GARMIN_PRODUCT_MARQ_ADVENTURER ((FIT_GARMIN_PRODUCT)3624) @@ -1598,10 +1599,12 @@ typedef FIT_UINT16 FIT_GARMIN_PRODUCT; #define FIT_GARMIN_PRODUCT_VENU2_ASIA ((FIT_GARMIN_PRODUCT)3950) #define FIT_GARMIN_PRODUCT_FR945_LTE_ASIA ((FIT_GARMIN_PRODUCT)3978) #define FIT_GARMIN_PRODUCT_APPROACH_S12_ASIA ((FIT_GARMIN_PRODUCT)3986) +#define FIT_GARMIN_PRODUCT_FR255 ((FIT_GARMIN_PRODUCT)3990) #define FIT_GARMIN_PRODUCT_APPROACH_G12_ASIA ((FIT_GARMIN_PRODUCT) 4001) #define FIT_GARMIN_PRODUCT_APPROACH_S42_ASIA ((FIT_GARMIN_PRODUCT)4002) #define FIT_GARMIN_PRODUCT_DESCENT_G1 ((FIT_GARMIN_PRODUCT)4005) #define FIT_GARMIN_PRODUCT_VENU2_PLUS_ASIA ((FIT_GARMIN_PRODUCT)4017) +#define FIT_GARMIN_PRODUCT_FR955 ((FIT_GARMIN_PRODUCT)4024) #define FIT_GARMIN_PRODUCT_FR55_ASIA ((FIT_GARMIN_PRODUCT)4033) #define FIT_GARMIN_PRODUCT_INSTINCT_2_ASIA ((FIT_GARMIN_PRODUCT)4071) #define FIT_GARMIN_PRODUCT_D2_AIR_X10 ((FIT_GARMIN_PRODUCT)4125) diff --git a/util/fit/nongarmin.json b/util/fit/nongarmin.json index db2be35b16..a4a579c292 100644 --- a/util/fit/nongarmin.json +++ b/util/fit/nongarmin.json @@ -14,6 +14,7 @@ { "manu":9, "prod":288, "name":"Powertap P1" }, { "manu":9, "prod":4096, "name":"Powertap G3" }, { "manu":9, "prod":4353, "name":"Powercal" }, +{ "manu":15, "prod":6, "name":"HRM2A" }, { "manu":29, "prod":1031, "name":"Power2max S" }, { "manu":32, "prod":0, "name":"Wahoo fitness" }, { "manu":32, "prod":28, "name":"Wahoo ELEMNT" }, @@ -62,7 +63,7 @@ { "manu":267, "prod":-1, "name":"Bryton" }, { "manu":268, "prod":-1, "name":"SRAM" }, { "manu":268, "prod":1037, "name":"SRAM Rival eTap AXS" }, -{ "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, +{ "manu":268, "prod":1052, "name":"SRAM Rival AXS" }, { "manu":282, "prod":-1, "name":"The Sufferfest" }, { "manu":284, "prod":-1, "name":"Rouvy" }, { "manu":289, "prod":-1, "name":"Hammerhead" },