From 1b4ac63a8b3a0bdcf38db4fe9f3aafc70d2a678f Mon Sep 17 00:00:00 2001 From: tstellanova Date: Tue, 27 Aug 2013 16:11:35 -0700 Subject: [PATCH] fix sense of RC pitch calibration; notify user when we abandon reads/writes after timeout --- src/uas/UASParameterCommsMgr.cc | 6 +++--- src/ui/QGCPX4VehicleConfig.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uas/UASParameterCommsMgr.cc b/src/uas/UASParameterCommsMgr.cc index a176114e9..d33eed747 100644 --- a/src/uas/UASParameterCommsMgr.cc +++ b/src/uas/UASParameterCommsMgr.cc @@ -250,10 +250,10 @@ void UASParameterCommsMgr::silenceTimerExpired() int totalElapsed = (int)(curTime - lastReceiveTime); if (totalElapsed > maxSilenceTimeout) { - qDebug() << "Max silence time exceeded: " + totalElapsed; + qDebug() << "maxSilenceTimeout exceeded: " << totalElapsed; int missingReads, missingWrites; clearRetransmissionLists(missingReads,missingWrites); - //TODO notify user! + setParameterStatusMsg(tr("TIMEOUT: Abandoning %1 reads %2 writes after %3 seconds").arg(missingReads).arg(missingWrites).arg(totalElapsed/1000)); } else { resendReadWriteRequests(); @@ -360,7 +360,7 @@ void UASParameterCommsMgr::updateSilenceTimer() if (missReadCount > 0 || missWriteCount > 0) { - silenceTimer.start(silenceTimeout); //TODO configurable silence timeout + silenceTimer.start(silenceTimeout); lastSilenceTimerReset = QGC::groundTimeMilliseconds(); } else { diff --git a/src/ui/QGCPX4VehicleConfig.cc b/src/ui/QGCPX4VehicleConfig.cc index 09b3e17e3..30dd3e036 100644 --- a/src/ui/QGCPX4VehicleConfig.cc +++ b/src/ui/QGCPX4VehicleConfig.cc @@ -393,7 +393,7 @@ void QGCPX4VehicleConfig::detectChannelInversion(int aert_index) QStringList instructions; instructions << "ROLL: Move stick left"; - instructions << "PITCH: Move stick up"; + instructions << "PITCH: Move stick down";//matches the other sticks: should cause DECREASE in raw rc channel value when not reversed instructions << "YAW: Move stick left"; instructions << "THROTTLE: Move stick down"; instructions << "MODE SWITCH: Push down / towards you"; -- 2.22.0