Merge branch 'master' of github.com:/GoldenCheetah/GoldenCheetah

This commit is contained in:
Mark Liversedge
2014-01-17 20:21:44 +00:00
2 changed files with 90 additions and 0 deletions

View File

@@ -1115,6 +1115,15 @@ AddFinal::AddFinal(AddDeviceWizard *parent) : QWizardPage(parent), wizard(parent
virtualPower->addItem(tr("Power - Tacx Flow (4)"));
virtualPower->addItem(tr("Power - Tacx Flow (6)"));
virtualPower->addItem(tr("Power - Tacx Flow (8)"));
virtualPower->addItem(tr("Power - Tacx Blue Twist (1)"));
virtualPower->addItem(tr("Power - Tacx Blue Twist (3)"));
virtualPower->addItem(tr("Power - Tacx Blue Twist (5)"));
virtualPower->addItem(tr("Power - Tacx Blue Twist (7)"));
virtualPower->addItem(tr("Power - Tacx Blue Motion (2)"));
virtualPower->addItem(tr("Power - Tacx Blue Motion (4)"));
virtualPower->addItem(tr("Power - Tacx Blue Motion (6)"));
virtualPower->addItem(tr("Power - Tacx Blue Motion (8)"));
virtualPower->addItem(tr("Power - Tacx Blue Motion (10)"));
wheelSize->addItem(tr("Road/Cross (700C/622)")); // 2100mm
wheelSize->addItem(tr("Tri/TT (650C)")); // 1960mm

View File

@@ -268,6 +268,87 @@ RealtimeController::processRealtimeData(RealtimeData &rtData)
rtData.setWatts((slope * V) + intercept);
}
break;
case 25 : // TACX BLUE TWIST SETTING 1
{
double V = rtData.getSpeed();
double slope = 3.2;
double intercept = -24.0;
rtData.setWatts((slope * V) + intercept);
}
break;
case 26 : // TACX BLUE TWIST SETTING 3
{
double V = rtData.getSpeed();
double slope = 6.525;
double intercept = -46.5;
rtData.setWatts((slope * V) + intercept);
}
break;
case 27 : // TACX BLUE TWIST SETTING 5
{
double V = rtData.getSpeed();
double slope = 9.775;
double intercept = -66.5;
rtData.setWatts((slope * V) + intercept);
}
break;
case 28 : // TACX BLUE TWIST SETTING 7
{
double V = rtData.getSpeed();
double slope = 13.075;
double intercept = -89.5;
rtData.setWatts((slope * V) + intercept);
}
break;
case 29 : // TACX BLUE MOTION SETTING 2
{
double V = rtData.getSpeed();
double slope = 5.225;
double intercept = -36.5;
rtData.setWatts((slope * V) + intercept);
}
break;
case 30 : // TACX BLUE MOTION SETTING 4
{
double V = rtData.getSpeed();
double slope = 8.25;
double intercept = -53.0;
rtData.setWatts((slope * V) + intercept);
}
break;
case 31 : // TACX BLUE MOTION SETTING 6
{
double V = rtData.getSpeed();
double slope = 11.45;
double intercept = -74.0;
rtData.setWatts((slope * V) + intercept);
}
break;
case 32 : // TACX BLUE MOTION SETTING 8
{
double V = rtData.getSpeed();
double slope = 14.45;
double intercept = -89.0;
rtData.setWatts((slope * V) + intercept);
}
break;
case 33 : // TACX BLUE MOTION SETTING 10
{
double V = rtData.getSpeed();
double slope = 17.575;
double intercept = -110.5;
rtData.setWatts((slope * V) + intercept);
}
break;
default : // unknown - do nothing
break;