Skip to content

fix: wahoo setSimGrade sent before setSimMode (KICKR CORE race condition) #4814

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

Open
cagnulein wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: wahoo setSimGrade sent before setSimMode (KICKR CORE race condition) #4814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions src/devices/wahookickrsnapbike/wahookickrsnapbike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,8 @@ void wahookickrsnapbike::stateChanged(QLowEnergyService::ServiceState state) {

qDebug() << QStringLiteral("all services discovered!");

const QBluetoothUuid cyclingPowerMeasurementUuid = QBluetoothUuid::CyclingPowerMeasurement;

for (QLowEnergyService *s : qAsConst(gattCommunicationChannelService)) {
if (s->state() == QLowEnergyService::ServiceDiscovered) {
// establish hook into notifications
Expand Down Expand Up @@ -745,6 +747,15 @@ void wahookickrsnapbike::stateChanged(QLowEnergyService::ServiceState state) {
gattPowerChannelService = s;
}

// Only subscribe to CyclingPowerMeasurement to avoid a race where the
// descriptorWritten counter (17 descriptors on KICKR CORE) hasn't reached
// zero before Zwift sends the first indoor-bike-simulation-parameters
// write, causing setSimGrade to be sent without a prior setSimMode.
if (c.uuid() != cyclingPowerMeasurementUuid) {
qDebug() << QStringLiteral("skipping subscription for") << s->serviceUuid() << c.uuid();
continue;
}

if ((c.properties() & QLowEnergyCharacteristic::Notify) == QLowEnergyCharacteristic::Notify) {
QByteArray descriptor;
descriptor.append((char)0x01);
Expand Down Expand Up @@ -784,6 +795,15 @@ void wahookickrsnapbike::stateChanged(QLowEnergyService::ServiceState state) {
}
}

// If no CyclingPowerMeasurement subscription was established (e.g. device not yet
// advertising that characteristic), fire init immediately so setSimMode is always
// sent before the first setSimGrade arrives from Zwift.
if (!notificationSubscribed) {
qDebug() << QStringLiteral("No CyclingPowerMeasurement subscription established, firing init immediately");
initRequest = true;
emit connectedAndDiscovered();
}

// ******************************************* virtual bike init *************************************
if (!firstStateChanged && !this->hasVirtualDevice()
#ifdef Q_OS_IOS
Expand Down
Loading