Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

132 - use running average and a tighter threshold to improve calibration accuracy #133

Merged
merged 2 commits into from
Nov 10, 2020
+12 −7
Merged

132 - use running average and a tighter threshold to improve calibration accuracy #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bcdb0c
132 - use running average and a tighter threshold to improve calibrat…
mattipee Nov 10, 2020
e45229a
132 - update comment
mattipee Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions pythoncode/FortiusAntBody.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#-------------------------------------------------------------------------------
# Version info
#-------------------------------------------------------------------------------
__version__ = "2020-11-04"
__version__ = "2020-11-10"
# 2020-11-10 Calibration employs moving average
# 2020-11-04 Basic Resistance implemented as a grade as requested by #119
# 2020-11-03 If there is no dongle, AntDongle becomes completely dummy,
# so that we can run without ANTdongle.
Expand Down Expand Up @@ -594,7 +595,8 @@ def Tacx2DongleSub(self, Restart):
# Calibrate trainer
#---------------------------------------------------------------------------
CountDown = 120 * 4 # 8 minutes; 120 is the max on the cadence meter
ResistanceArray = numpy.array([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) # Array for running everage
ResistanceArray = numpy.array([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) # Array for calculating running average
AvgResistanceArray = numpy.array([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]) # Array for collating running averages
Calibrate = 0
StartPedaling = True
Counter = 0
Expand Down Expand Up @@ -650,16 +652,19 @@ def Tacx2DongleSub(self, Restart):

# --------------------------------------------------------------
# Average power over the last 20 readings
# Stop if difference between min/max is below threshold (30)
# Stop if difference between min/max running average is below threshold (2)
# At least 30 seconds but not longer than the countdown time (8 minutes)
# Note that the limits are empiracally established.
# --------------------------------------------------------------
ResistanceArray = numpy.append(ResistanceArray, TacxTrainer.CurrentResistance * -1) # Add new value to array
ResistanceArray = numpy.append(ResistanceArray, TacxTrainer.CurrentResistance * -1) # Add new instantaneous value to array
ResistanceArray = numpy.delete(ResistanceArray, 0) # Remove oldest from array

AvgResistanceArray = numpy.append(AvgResistanceArray, numpy.average(ResistanceArray)) # Add new running average value to array
AvgResistanceArray = numpy.delete(AvgResistanceArray, 0) # Remove oldest from array

if CountDown < (120 * 4 - 30) and numpy.min(ResistanceArray) > 0:
if (numpy.max(ResistanceArray) - numpy.min(ResistanceArray) ) < 30 or CountDown <= 0:
Calibrate = TacxTrainer.CurrentResistance * -1
if (numpy.max(AvgResistanceArray) - numpy.min(AvgResistanceArray) ) < 2 or CountDown <= 0:
Calibrate = numpy.average(AvgResistanceArray)
if debug.on(debug.Function):
logfile.Write('Tacx2Dongle; calibration ended %s' % Calibrate)

Expand Down Expand Up @@ -1191,4 +1196,4 @@ def Tacx2DongleSub(self, Restart):
AntDongle.ResetDongle()
TacxTrainer.SendToTrainer(True, usbTrainer.modeStop)

return True
return True