Skip to content

Commit

Permalink
Fit import - add new sensor types and devices
Browse files Browse the repository at this point in the history
  • Loading branch information
@amtriathlon
amtriathlon committed Aug 2, 2022
1 parent 1b00701 commit 4ed7425
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
4 changes: 3 additions & 1 deletion src/FileIO/FitRideFile.cpp
View file
Expand Up @@ -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";
Expand Down
8 changes: 6 additions & 2 deletions src/Resources/json/FITmetadata.json
View file
@@ -1,5 +1,5 @@
{
"VERSION":1659206075,
"VERSION":1659384729,
"PRODUCTS":[
{ "manu":6, "prod":6, "name":"SRM PC6" },
{ "manu":6, "prod":7, "name":"SRM PC7" },
Expand All @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down
8 changes: 6 additions & 2 deletions util/fit/FITmetadata.json
View file
@@ -1,5 +1,5 @@
{
"VERSION":1659206075,
"VERSION":1659384729,
"PRODUCTS":[
{ "manu":6, "prod":6, "name":"SRM PC6" },
{ "manu":6, "prod":7, "name":"SRM PC7" },
Expand All @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down
3 changes: 3 additions & 0 deletions util/fit/fit_example.h
View file
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion util/fit/nongarmin.json
View file
Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down

0 comments on commit 4ed7425

Please sign in to comment.