dyuri/garmin-repafield
1
0
Fork 0
mirror of https://github.com/dyuri/garmin-repafield.git synced 2025-12-16 11:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: dyuri:846e40131337ba9070939ada3f1b770e434448df
Branches Tags
dyuri:main
...
compare: dyuri:1e1e28f4e768fe809991ab1bb6e5302b60b54d49
Branches Tags
dyuri:main

2 Commits
846e401313 ... 1e1e28f4e7

Author SHA1 Message Date
Gyuri Horak
1e1e28f4e7
rolling average window size => settings 2023-11-17 16:39:00 +01:00
Gyuri Horak
80faa77afb
#5 linear GAP calculation outside example range 2023-11-17 16:09:15 +01:00
5 changed files with 17 additions and 7 deletions
Show Stats Expand all files Collapse all files

1
resources/settings/properties.xml
View File

@ -8,4 +8,5 @@
<property id="showNextPoint" type="boolean">true</property>
<property id="saveToFit" type="boolean">true</property>
<property id="tlFieldData" type="number">1</property>
<property id="rollingAvgWindow" type="number">5</property>
</properties>

3
resources/settings/settings.xml
View File

@ -36,4 +36,7 @@
<setting propertyKey="@Properties.saveToFit" title="@Strings.SaveToFit">
<settingConfig type="boolean" />
</setting>
<setting propertyKey="@Properties.rollingAvgWindow" title="@Strings.RollingAvgWindow">
<settingConfig type="numeric" />
</setting>
</settings>

1
resources/strings/strings.xml
View File

@ -16,6 +16,7 @@
<string id="TLFGrade">Grade</string>
<string id="TLFGAP">Grade Adjusted Pace</string>
<string id="TLFVSpeed">Vertical Speed</string>
<string id="RollingAvgWindow">Rolling average window (~seconds)</string>
<string id="uGrade">%</string>
<string id="uGAP">min/km</string>
<string id="uVSpeed">m/min</string>

9
source/GAP.mc
View File

@ -11,7 +11,9 @@ const GRADE_ADJUSTMENT as Array<Array<Numeric>> = [
function adjustPaceForGrade(pace, grade) {
if (grade <= GRADE_ADJUSTMENT[0][0]) {
return pace / GRADE_ADJUSTMENT[0][1];
var slope = (GRADE_ADJUSTMENT[1][1] - GRADE_ADJUSTMENT[0][1]) / (GRADE_ADJUSTMENT[1][0] - GRADE_ADJUSTMENT[0][0]);
var adjustment = GRADE_ADJUSTMENT[0][1] + slope * (grade - GRADE_ADJUSTMENT[0][0]);
return pace / adjustment;
}
var size = GRADE_ADJUSTMENT.size();
@ -27,5 +29,8 @@ function adjustPaceForGrade(pace, grade) {
}
}
return pace / GRADE_ADJUSTMENT[size - 1][1];
var slope = (GRADE_ADJUSTMENT[size - 1][1] - GRADE_ADJUSTMENT[size - 2][1]) / (GRADE_ADJUSTMENT[size - 1][0] - GRADE_ADJUSTMENT[size - 2][0]);
var adjustment = GRADE_ADJUSTMENT[size - 1][1] + slope * (grade - GRADE_ADJUSTMENT[size - 1][0]);
return pace / adjustment;
}

10
source/RepaFieldView.mc
View File

@ -55,6 +55,7 @@ class RepaFieldView extends WatchUi.DataField {
hidden var speedNotPace as Boolean;
hidden var showNextPoint as Boolean;
hidden var tlFieldData as Number;
hidden var rollingAvgWindow as Number = 5;
hidden var hrZones as Array<Number>;
hidden var hrHist as Array<Number>;
hidden var hrZoneColors as Array<Number>;
@ -129,8 +130,6 @@ class RepaFieldView extends WatchUi.DataField {
function initialize() {
DataField.initialize();
var RASize = 5; // TODO: rolling average window size => settings
themeColor = Application.Properties.getValue("themeColor").toNumberWithBase(16);
themeColor2 = Application.Properties.getValue("themeColor2").toNumberWithBase(16);
themeColor3 = Application.Properties.getValue("themeColor3").toNumberWithBase(16);
@ -138,6 +137,7 @@ class RepaFieldView extends WatchUi.DataField {
speedNotPace = Application.Properties.getValue("speedNotPace");
showNextPoint = Application.Properties.getValue("showNextPoint");
tlFieldData = Application.Properties.getValue("tlFieldData").toNumber();
rollingAvgWindow = Application.Properties.getValue("rollingAvgWindow").toNumber();
hrValue = 0;
ahrValue = 0;
@ -170,9 +170,9 @@ class RepaFieldView extends WatchUi.DataField {
cgrade = null;
cvspeed = null;
cgap = null;
deltaAlt = new RollingAverage(RASize);
deltaDist = new RollingAverage(RASize);
deltaTime = new RollingAverage(RASize);
deltaAlt = new RollingAverage(rollingAvgWindow);
deltaDist = new RollingAverage(rollingAvgWindow);
deltaTime = new RollingAverage(rollingAvgWindow);
var settings = System.getDeviceSettings();
isDistanceMetric = settings.distanceUnits == System.UNIT_METRIC;