nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade FIT SDK to 21.188 (#4776) [skip ci]

Browse Source 
The presence of a \ in a string will produce an error in python 3.13
Using raw strings in all regexes avoids this.
This commit is contained in:
Poncho
2025-12-27 20:05:48 +01:00
committed by GitHub
parent a45bb2503c
commit 2d463c8bc2
3 changed files with 9454 additions and 9483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Resources/json/FITmetadata.json
View File

@@ -1,5 +1,5 @@
{
"VERSION":1755650470,
"VERSION":1766851697,
"COMMENT":"Do not edit this file directly it is generated.",
"PRODUCTS":[
{ "manu":1, "prod":3592, "name":"Varia Rtl515" },
@@ -508,6 +508,7 @@
{ "manu":1, "prod":4446, "name":"Hrm Fit" },
{ "manu":1, "prod":4472, "name":"Marq Gen2 Commander" },
{ "manu":1, "prod":4477, "name":"Lily Athlete" },
{ "manu":1, "prod":4525, "name":"Rally X10" },
{ "manu":1, "prod":4532, "name":"Fenix8 Solar" },
{ "manu":1, "prod":4533, "name":"Fenix8 Solar Large" },
{ "manu":1, "prod":4534, "name":"Fenix8 Small" },
@@ -520,14 +521,25 @@
{ "manu":1, "prod":4586, "name":"Instinct3 Amoled 45Mm" },
{ "manu":1, "prod":4587, "name":"Instinct3 Amoled 50Mm" },
{ "manu":1, "prod":4588, "name":"Descent G2" },
{ "manu":1, "prod":4603, "name":"Venu X1" },
{ "manu":1, "prod":4606, "name":"Hrm 200" },
{ "manu":1, "prod":4625, "name":"Vivoactive6" },
{ "manu":1, "prod":4631, "name":"Fenix8 Pro" },
{ "manu":1, "prod":4633, "name":"Edge 550" },
{ "manu":1, "prod":4634, "name":"Edge 850" },
{ "manu":1, "prod":4643, "name":"Venu4" },
{ "manu":1, "prod":4644, "name":"Venu4S" },
{ "manu":1, "prod":4647, "name":"Approachs44" },
{ "manu":1, "prod":4655, "name":"Edge Mtb" },
{ "manu":1, "prod":4656, "name":"Approachs50" },
{ "manu":1, "prod":4666, "name":"Fenix E" },
{ "manu":1, "prod":4745, "name":"Bounce2" },
{ "manu":1, "prod":4759, "name":"Instinct3 Solar 50Mm" },
{ "manu":1, "prod":4775, "name":"Tactix8 Amoled" },
{ "manu":1, "prod":4776, "name":"Tactix8 Solar" },
{ "manu":1, "prod":4879, "name":"D2 Mach2" },
{ "manu":1, "prod":4678, "name":"Instinct Crossover Amoled" },
{ "manu":1, "prod":4944, "name":"D2 Air X15" },
{ "manu":1, "prod":10007, "name":"Sdm4" },
{ "manu":1, "prod":10014, "name":"Edge Remote" },
{ "manu":1, "prod":20533, "name":"Tacx Training App Win" },
@@ -774,6 +786,7 @@
{ "manu":333, "name":"Tektro Racing Products" },
{ "manu":334, "name":"Darad Innovation Corporation" },
{ "manu":335, "name":"Cycloptim" },
{ "manu":337, "name":"Runna" },
{ "manu":5759, "name":"Actigraphcorp" }
],
@@ -2177,6 +2190,8 @@
{ "num": 389 , "desc":"Hsa Configuration Data" },
{ "num": 393 , "desc":"Dive Apnea Alarm" },
{ "num": 398 , "desc":"Skin Temp Overnight" },
{ "num": 409 , "desc":"Hsa Wrist Temperature Data" }
{ "num": 409 , "desc":"Hsa Wrist Temperature Data" },
{ "num": 470 , "desc":"Sleep Disruption Severity Period" },
{ "num": 471 , "desc":"Sleep Disruption Overnight Severity" }
]
}

18912
util/fit/fit_example.h
View File

File diff suppressed because it is too large Load Diff

6
util/fit/fitprod.py
View File

@@ -23,7 +23,7 @@ for line in lines:
match = re.search("FIT_GARMIN_PROD", line)
if match:
name = re.search("(FIT_GARMIN_PRODUCT_)([^ \t]*)", line)
id = re.search("\(FIT_GARMIN_PRODUCT, ([ 0-9]*)", line)
id = re.search(r"\(FIT_GARMIN_PRODUCT, ([ 0-9]*)", line)
if name and id:
# extract name
print(pre+ '{ "manu":1, "prod":' + id.group(1).strip() + ', "name":"' + name.group(2).strip().replace('_',' ').title() + '" }', end="")
@@ -36,7 +36,7 @@ print("\n ],\n")
print(' "MANUFACTURERS":[')
pre=" "
for line in lines:
match = re.search("MANUFACTURER_([^ \t]*).*\(FIT_MANUFACTURER, ([ 0-9]*)", line)
match = re.search(r"MANUFACTURER_([^ \t]*).*\(FIT_MANUFACTURER, ([ 0-9]*)", line)
if match:
print(pre+ '{ "manu":' + match.group(2).strip() + ', "name":"' + match.group(1).strip().replace('_',' ').title() + '" }', end="")
pre=",\n "
@@ -59,7 +59,7 @@ for line in fieldlines:
print(' "MESSAGES":[')
pre=" "
for line in lines:
match = re.search("FIT_MESG_NUM_([^ \t]*).*\(FIT_MESG_NUM, ([ 0-9]*)", line)
match = re.search(r"FIT_MESG_NUM_([^ \t]*).*\(FIT_MESG_NUM, ([ 0-9]*)", line)
if match:
num = int(match.group(2).strip())
if num > 0: