Skip to content

Remove blocking loop.exec write flow from ftmsbike #4382

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

Merged
cagnulein merged 2 commits into from
Jul 1, 2026
Merged

Remove blocking loop.exec write flow from ftmsbike #4382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144d533
Remove blocking event loop writes from ftmsbike
cagnulein Mar 2, 2026
9442fcd
Merge branch 'master' into codex/remove-loop.exec-from-ftmsbike-class
cagnulein May 1, 2026
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
118 changes: 74 additions & 44 deletions src/devices/ftmsbike/ftmsbike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,20 @@ ftmsbike::ftmsbike(bool noWriteResistance, bool noHeartService, int8_t bikeResis
ergModeSupported = true; // by default ftms devices SHOULD have ergMode supported
connect(refresh, &QTimer::timeout, this, &ftmsbike::update);
refresh->start(settings.value(QZSettings::poll_device_time, QZSettings::default_poll_device_time).toInt());

writeTimeoutTimer = new QTimer(this);
writeTimeoutTimer->setSingleShot(true);
connect(writeTimeoutTimer, &QTimer::timeout, this, [this]() {
qDebug() << QStringLiteral("writeCharacteristic timeout - processing next in queue");
completeCurrentWrite();
});

wheelCircumference::GearTable g;
g.printTable();
}

void ftmsbike::writeCharacteristicZwiftPlay(uint8_t *data, uint8_t data_len, const QString &info, bool disable_log,
bool wait_for_response) {
QEventLoop loop;
QTimer timeout;
QSettings settings;
bool gears_zwift_ratio = settings.value(QZSettings::gears_zwift_ratio, QZSettings::default_gears_zwift_ratio).toBool();

Expand All @@ -54,37 +60,12 @@ void ftmsbike::writeCharacteristicZwiftPlay(uint8_t *data, uint8_t data_len, con
return;
}

if (wait_for_response) {
connect(zwiftPlayService, &QLowEnergyService::characteristicChanged, &loop, &QEventLoop::quit);
timeout.singleShot(300ms, &loop, &QEventLoop::quit);
} else {
connect(zwiftPlayService, &QLowEnergyService::characteristicWritten, &loop, &QEventLoop::quit);
timeout.singleShot(300ms, &loop, &QEventLoop::quit);
}

if (writeBuffer) {
delete writeBuffer;
}
writeBuffer = new QByteArray((const char *)data, data_len);

if (zwiftPlayWriteChar.properties() & QLowEnergyCharacteristic::WriteNoResponse) {
zwiftPlayService->writeCharacteristic(zwiftPlayWriteChar, *writeBuffer,
QLowEnergyService::WriteWithoutResponse);
} else {
zwiftPlayService->writeCharacteristic(zwiftPlayWriteChar, *writeBuffer);
}

if (!disable_log) {
emit debug(QStringLiteral(" >> ") + writeBuffer->toHex(' ') + QStringLiteral(" // ") + info);
}

loop.exec();
enqueueWrite(zwiftPlayService, zwiftPlayWriteChar, data, data_len, info, disable_log, wait_for_response,
zwiftPlayWriteChar.properties() & QLowEnergyCharacteristic::WriteNoResponse);
}

bool ftmsbike::writeCharacteristic(uint8_t *data, uint8_t data_len, const QString &info, bool disable_log,
bool wait_for_response) {
QEventLoop loop;
QTimer timeout;
QSettings settings;
bool gears_zwift_ratio = settings.value(QZSettings::gears_zwift_ratio, QZSettings::default_gears_zwift_ratio).toBool();

Expand All @@ -98,33 +79,74 @@ bool ftmsbike::writeCharacteristic(uint8_t *data, uint8_t data_len, const QStrin
return false;
}

if (wait_for_response) {
connect(gattFTMSService, &QLowEnergyService::characteristicChanged, &loop, &QEventLoop::quit);
timeout.singleShot(300ms, &loop, &QEventLoop::quit);
} else {
connect(gattFTMSService, &QLowEnergyService::characteristicWritten, &loop, &QEventLoop::quit);
timeout.singleShot(300ms, &loop, &QEventLoop::quit);
return enqueueWrite(gattFTMSService, gattWriteCharControlPointId, data, data_len, info, disable_log,
wait_for_response,
gattWriteCharControlPointId.properties() & QLowEnergyCharacteristic::WriteNoResponse &&
!DOMYOS);
}

bool ftmsbike::enqueueWrite(QLowEnergyService *service, const QLowEnergyCharacteristic &characteristic, uint8_t *data,
uint8_t data_len, const QString &info, bool disable_log, bool wait_for_response,
bool write_without_response) {
if (!service || !characteristic.isValid()) {
qDebug() << QStringLiteral("writeCharacteristic error because service/characteristic is invalid");
return false;
}

WriteRequest request;
request.data = QByteArray((const char *)data, data_len);
request.info = info;
request.disable_log = disable_log;
request.wait_for_response = wait_for_response;
request.service = service;
request.characteristic = characteristic;
request.write_without_response = write_without_response;

writeQueue.enqueue(request);
processWriteQueue();
return true;
}

void ftmsbike::processWriteQueue() {
if (isWriting || writeQueue.isEmpty()) {
return;
}

WriteRequest request = writeQueue.dequeue();
if (!request.service || request.service->state() != QLowEnergyService::ServiceDiscovered) {
qDebug() << QStringLiteral("writeCharacteristic error because the connection is closed");
writeQueue.clear();
return;
}

if (writeBuffer) {
delete writeBuffer;
}
writeBuffer = new QByteArray((const char *)data, data_len);
writeBuffer = new QByteArray(request.data);

isWriting = true;
currentWriteWaitingForResponse = request.wait_for_response;
currentWriteService = request.service;

if (gattWriteCharControlPointId.properties() & QLowEnergyCharacteristic::WriteNoResponse && !DOMYOS) {
gattFTMSService->writeCharacteristic(gattWriteCharControlPointId, *writeBuffer,
QLowEnergyService::WriteWithoutResponse);
if (request.write_without_response) {
request.service->writeCharacteristic(request.characteristic, *writeBuffer, QLowEnergyService::WriteWithoutResponse);
} else {
gattFTMSService->writeCharacteristic(gattWriteCharControlPointId, *writeBuffer);
request.service->writeCharacteristic(request.characteristic, *writeBuffer);
}

if (!disable_log) {
emit debug(QStringLiteral(" >> ") + writeBuffer->toHex(' ') + QStringLiteral(" // ") + info);
if (!request.disable_log) {
emit debug(QStringLiteral(" >> ") + writeBuffer->toHex(' ') + QStringLiteral(" // ") + request.info);
}

loop.exec();
writeTimeoutTimer->start(300);
}

return true;
void ftmsbike::completeCurrentWrite() {
writeTimeoutTimer->stop();
isWriting = false;
currentWriteWaitingForResponse = false;
currentWriteService = nullptr;
processWriteQueue();
}

void ftmsbike::init() {
Expand Down Expand Up @@ -596,6 +618,10 @@ bool ftmsbike::shouldUseCalculatedResistanceFallback(const QDateTime &now) {
}

void ftmsbike::characteristicChanged(const QLowEnergyCharacteristic &characteristic, const QByteArray &newValue) {
if (isWriting && currentWriteWaitingForResponse && sender() == currentWriteService) {
completeCurrentWrite();
}

QDateTime now = QDateTime::currentDateTime();
// qDebug() << "characteristicChanged" << characteristic.uuid() << newValue << newValue.length();
Q_UNUSED(characteristic);
Expand Down Expand Up @@ -1805,6 +1831,10 @@ void ftmsbike::descriptorRead(const QLowEnergyDescriptor &descriptor, const QByt
}

void ftmsbike::characteristicWritten(const QLowEnergyCharacteristic &characteristic, const QByteArray &newValue) {
if (isWriting && !currentWriteWaitingForResponse && sender() == currentWriteService) {
completeCurrentWrite();
}

Q_UNUSED(characteristic);
emit debug(QStringLiteral("characteristicWritten ") + newValue.toHex(' '));
}
Expand Down
22 changes: 22 additions & 0 deletions src/devices/ftmsbike/ftmsbike.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <QtBluetooth/qlowenergyservice.h>
#include <QtBluetooth/qlowenergyservicedata.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qqueue.h>

#ifndef Q_OS_ANDROID
#include <QtCore/qcoreapplication.h>
Expand Down Expand Up @@ -84,10 +85,25 @@ class ftmsbike : public bike {
bool inclinationAvailableBySoftware() override { return !resistance_lvl_mode; }

private:
struct WriteRequest {
QByteArray data;
QString info;
bool disable_log = false;
bool wait_for_response = false;
QLowEnergyService *service = nullptr;
QLowEnergyCharacteristic characteristic;
bool write_without_response = false;
};

bool writeCharacteristic(uint8_t *data, uint8_t data_len, const QString &info, bool disable_log = false,
bool wait_for_response = false);
void writeCharacteristicZwiftPlay(uint8_t *data, uint8_t data_len, const QString &info, bool disable_log = false,
bool wait_for_response = false);
bool enqueueWrite(QLowEnergyService *service, const QLowEnergyCharacteristic &characteristic, uint8_t *data,
uint8_t data_len, const QString &info, bool disable_log, bool wait_for_response,
bool write_without_response);
void processWriteQueue();
void completeCurrentWrite();
void zwiftPlayInit();
void startDiscover();
void setWheelDiameter(double diameter);
Expand Down Expand Up @@ -194,6 +210,12 @@ class ftmsbike : public bike {
bool wattReceived = false;
bool gearInclinationSent = false;

QQueue<WriteRequest> writeQueue;
bool isWriting = false;
bool currentWriteWaitingForResponse = false;
QLowEnergyService *currentWriteService = nullptr;
QTimer *writeTimeoutTimer = nullptr;

uint16_t oldLastCrankEventTime = 0;
uint16_t oldCrankRevs = 0;
QDateTime lastGoodCadence = QDateTime::currentDateTime();
Expand Down
Loading