Browse Source

fix sense of RC pitch calibration; notify user when we abandon reads/writes after timeout

QGC4.4
tstellanova 12 years ago
parent
commit
1b4ac63a8b
  1. 6
      src/uas/UASParameterCommsMgr.cc
  2. 2
      src/ui/QGCPX4VehicleConfig.cc

6
src/uas/UASParameterCommsMgr.cc

@ -250,10 +250,10 @@ void UASParameterCommsMgr::silenceTimerExpired()
int totalElapsed = (int)(curTime - lastReceiveTime); int totalElapsed = (int)(curTime - lastReceiveTime);
if (totalElapsed > maxSilenceTimeout) { if (totalElapsed > maxSilenceTimeout) {
qDebug() << "Max silence time exceeded: " + totalElapsed; qDebug() << "maxSilenceTimeout exceeded: " << totalElapsed;
int missingReads, missingWrites; int missingReads, missingWrites;
clearRetransmissionLists(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 { else {
resendReadWriteRequests(); resendReadWriteRequests();
@ -360,7 +360,7 @@ void UASParameterCommsMgr::updateSilenceTimer()
if (missReadCount > 0 || missWriteCount > 0) { if (missReadCount > 0 || missWriteCount > 0) {
silenceTimer.start(silenceTimeout); //TODO configurable silence timeout silenceTimer.start(silenceTimeout);
lastSilenceTimerReset = QGC::groundTimeMilliseconds(); lastSilenceTimerReset = QGC::groundTimeMilliseconds();
} }
else { else {

2
src/ui/QGCPX4VehicleConfig.cc

@ -393,7 +393,7 @@ void QGCPX4VehicleConfig::detectChannelInversion(int aert_index)
QStringList instructions; QStringList instructions;
instructions << "ROLL: Move stick left"; 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 << "YAW: Move stick left";
instructions << "THROTTLE: Move stick down"; instructions << "THROTTLE: Move stick down";
instructions << "MODE SWITCH: Push down / towards you"; instructions << "MODE SWITCH: Push down / towards you";

Loading…
Cancel
Save