Browse Source

Fix Status Text option

Status text messages were being sent too early in the creation of the MockLink. This would cause the ui to not see them. Making the whole thing useless for testing.
QGC4.4
Don Gagne 2 years ago committed by Philipp Borgers
parent
commit
1b53ed35d9
  1. 16
      src/comm/MockLink.cc
  2. 10
      src/comm/MockLink.h

16
src/comm/MockLink.cc

@ -199,15 +199,23 @@ void MockLink::run(void)
QTimer timer1HzTasks; QTimer timer1HzTasks;
QTimer timer10HzTasks; QTimer timer10HzTasks;
QTimer timer500HzTasks; QTimer timer500HzTasks;
QTimer timerStatusText;
QObject::connect(&timer1HzTasks, &QTimer::timeout, this, &MockLink::_run1HzTasks); QObject::connect(&timer1HzTasks, &QTimer::timeout, this, &MockLink::_run1HzTasks);
QObject::connect(&timer10HzTasks, &QTimer::timeout, this, &MockLink::_run10HzTasks); QObject::connect(&timer10HzTasks, &QTimer::timeout, this, &MockLink::_run10HzTasks);
QObject::connect(&timer500HzTasks, &QTimer::timeout, this, &MockLink::_run500HzTasks); QObject::connect(&timer500HzTasks, &QTimer::timeout, this, &MockLink::_run500HzTasks);
QObject::connect(&timerStatusText, &QTimer::timeout, this, &MockLink::_sendStatusTextMessages);
timer1HzTasks.start(1000); timer1HzTasks.start(1000);
timer10HzTasks.start(100); timer10HzTasks.start(100);
timer500HzTasks.start(2); timer500HzTasks.start(2);
// Wait a little bit for the ui to finish loading up before sending out status text messages
if (_sendStatusText) {
timerStatusText.setSingleShot(true);
timerStatusText.start(10000);
}
// Send first set right away // Send first set right away
_run1HzTasks(); _run1HzTasks();
_run10HzTasks(); _run10HzTasks();
@ -242,10 +250,6 @@ void MockLink::_run1HzTasks(void)
} else { } else {
_sendHomePosition(); _sendHomePosition();
} }
if (_sendStatusText) {
_sendStatusText = false;
_sendStatusTextMessages();
}
} }
} }
} }

10
src/comm/MockLink.h

@ -189,10 +189,11 @@ private slots:
// LinkInterface overrides // LinkInterface overrides
void _writeBytes(const QByteArray bytes) final; void _writeBytes(const QByteArray bytes) final;
void _writeBytesQueued(const QByteArray bytes); void _writeBytesQueued (const QByteArray bytes);
void _run1HzTasks(void); void _run1HzTasks (void);
void _run10HzTasks(void); void _run10HzTasks (void);
void _run500HzTasks(void); void _run500HzTasks (void);
void _sendStatusTextMessages(void);
private: private:
// LinkInterface overrides // LinkInterface overrides
@ -232,7 +233,6 @@ private:
void _sendVibration (void); void _sendVibration (void);
void _sendSysStatus (void); void _sendSysStatus (void);
void _sendBatteryStatus (void); void _sendBatteryStatus (void);
void _sendStatusTextMessages (void);
void _sendChunkedStatusText (uint16_t chunkId, bool missingChunks); void _sendChunkedStatusText (uint16_t chunkId, bool missingChunks);
void _respondWithAutopilotVersion (void); void _respondWithAutopilotVersion (void);
void _sendRCChannels (void); void _sendRCChannels (void);

Loading…
Cancel
Save