Commit 644521f5 authored by Grégory JANISZEWSKI's avatar Grégory JANISZEWSKI

Fix behavior of SDO processing with the new async state machine

(SDO blocks would freeze the app in a 'while' condition, and the
waitingFrame flag was always set true if transfer wasn't finished, which
is wrong for block transfers obviously)
parent 971e9bba
......@@ -119,7 +119,7 @@ CanOpenSdoTransferQueue::CanOpenSdoTransferQueue (const CanOpenNodeId nodeId, QO
{
_timerError.setSingleShot (true);
_timerError.setTimerType (Qt::PreciseTimer);
_timerProcess.setSingleShot (false);
_timerProcess.setSingleShot (true);
_timerProcess.setTimerType (Qt::PreciseTimer);
connect (&_timerError, &QTimer::timeout, this, &CanOpenSdoTransferQueue::onTimeoutError);
connect (&_timerProcess, &QTimer::timeout, this, &CanOpenSdoTransferQueue::processNeeded);
......
......@@ -224,8 +224,8 @@ public:
// read
PendingRead, // client wants to send read req
RequestReadExpOrSegSent, // client sent exp write request (ask init)
RequestReadExpOrSegRecv, // server recv exp write request (ask init)
RequestReadExpOrSegSent, // client sent exp read request (ask init)
RequestReadExpOrSegRecv, // server recv exp read request (ask init)
/// EXP READ : > RequestInitUpload[IDX][SSIDX] < RequestReadExpOrSeg
/// > ReplyAcceptUpload[IDX][SSIDX][DATA] < ReplyReadExp
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment