Commit 84dc0758 authored by Don Gagne's avatar Don Gagne

parent 2fd39fe1
...@@ -675,7 +675,7 @@ QObject* QGCApplication::_rootQmlObject() ...@@ -675,7 +675,7 @@ QObject* QGCApplication::_rootQmlObject()
void QGCApplication::showMessage(const QString& message) void QGCApplication::showMessage(const QString& message)
{ {
// PreArm messages are handled by Vehicle and shown in Map // PreArm messages are handled by Vehicle and shown in Map
if (message.startsWith(QStringLiteral("PreArm")) || message.startsWith(QStringLiteral("PREFLIGHT"))) { if (message.startsWith(QStringLiteral("PreArm")) || message.startsWith(QStringLiteral("preflight"), Qt::CaseInsensitive)) {
return; return;
} }
......
...@@ -827,7 +827,7 @@ void Vehicle::_handleStatusText(mavlink_message_t& message) ...@@ -827,7 +827,7 @@ void Vehicle::_handleStatusText(mavlink_message_t& message)
QString messageText = QString(b); QString messageText = QString(b);
bool skipSpoken = false; bool skipSpoken = false;
if (messageText.startsWith(QStringLiteral("PreArm")) || messageText.startsWith(QStringLiteral("PREFLIGHT"))) { if (messageText.startsWith(QStringLiteral("PreArm")) || messageText.startsWith(QStringLiteral("preflight"), Qt::CaseInsensitive)) {
// Limit repeated PreArm message to once every 10 seconds // Limit repeated PreArm message to once every 10 seconds
if (_noisySpokenPrearmMap.contains(messageText) && _noisySpokenPrearmMap[messageText].msecsTo(QTime::currentTime()) < (10 * 1000)) { if (_noisySpokenPrearmMap.contains(messageText) && _noisySpokenPrearmMap[messageText].msecsTo(QTime::currentTime()) < (10 * 1000)) {
skipSpoken = true; skipSpoken = true;
......
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