Skip to content

Commit e695994

Browse files
authored
feat: compute power from resistance for MOK Fitness S10 Ultra bike (#4845)
1 parent 302d193 commit e695994

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/devices/ftmsbike/ftmsbike.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,9 @@ void ftmsbike::characteristicChanged(const QLowEnergyCharacteristic &characteris
976976
if (SMARTBIKE_3DIGIT && manualResistancePowerAdjustmentActive) {
977977
m_watt = cscbike::customResistanceAdjustedWatts(currentCadence().value(), manualResistanceTarget);
978978
emit debug(QStringLiteral("Current Watt (custom resistance table): ") + QString::number(m_watt.value()));
979+
} else if (MOK_FITNESS && cscbike::useCustomResistancePowerTable()) {
980+
m_watt = cscbike::customResistanceAdjustedWatts(currentCadence().value(), Resistance.value());
981+
emit debug(QStringLiteral("Current Watt (custom resistance table): ") + QString::number(m_watt.value()));
979982
} else if(DU30_bike) {
980983
m_watt = wattsFromResistance(Resistance.value());
981984
emit debug(QStringLiteral("Current Watt: ") + QString::number(m_watt.value()));
@@ -2149,6 +2152,10 @@ void ftmsbike::deviceDiscovered(const QBluetoothDeviceInfo &device) {
21492152
ergModeSupported = false;
21502153
max_resistance = 10;
21512154
Resistance = 1; // Initialize resistance to 1 for SPORT01
2155+
} else if(device.name().toUpper().startsWith("MOKFITNESS-")) {
2156+
qDebug() << QStringLiteral("MOKFITNESS found");
2157+
MOK_FITNESS = true;
2158+
max_resistance = 32;
21522159
} else if (isSmartBikeThreeDigitName(device.name())) {
21532160
qDebug() << QStringLiteral("SMARTBIKE-### found");
21542161
SMARTBIKE_3DIGIT = true;

src/devices/ftmsbike/ftmsbike.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ class ftmsbike : public bike {
210210
bool USDC_D700 = false;
211211
bool TOPUTURE_TEB5 = false;
212212
bool SMARTBIKE_3DIGIT = false;
213+
bool MOK_FITNESS = false;
213214

214215
uint8_t secondsToResetTimer = 5;
215216

0 commit comments

Comments
 (0)