From d2557030aa65a310d446ac6c4a84d033024979ad Mon Sep 17 00:00:00 2001 From: Bryan Godbolt Date: Thu, 28 Oct 2010 11:54:55 -0600 Subject: [PATCH] fixed sending radio calibration with new defines --- src/comm/OpalLink.cc | 2 +- src/uas/UAS.cc | 2 +- src/ui/RadioCalibration/RadioCalibrationWindow.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/comm/OpalLink.cc b/src/comm/OpalLink.cc index fbc7cba82..b3a467c5f 100644 --- a/src/comm/OpalLink.cc +++ b/src/comm/OpalLink.cc @@ -143,7 +143,7 @@ void OpalLink::writeBytes(const char *bytes, qint64 length) // this->sendRCValues = static_cast(rc.enabled); // } // break; -#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES +#ifdef MAVLINK_ENABLED_UALBERTA case MAVLINK_MSG_ID_RADIO_CALIBRATION: { mavlink_radio_calibration_t radio; diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index 4d0e79d23..0ad9e8cfa 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double mavlink_message_t message; mavlink_msg_manual_control_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualYawAngle, (float)manualThrust, controlRollManual, controlPitchManual, controlYawManual, controlThrustManual); sendMessage(message); - qDebug() << __FILE__ << __LINE__ << ": SENT MANUAL CONTROL MESSAGE: roll" << manualRollAngle << " pitch: " << manualPitchAngle << " yaw: " << manualYawAngle << " thrust: " << manualThrust; + //qDebug() << __FILE__ << __LINE__ << ": SENT MANUAL CONTROL MESSAGE: roll" << manualRollAngle << " pitch: " << manualPitchAngle << " yaw: " << manualYawAngle << " thrust: " << manualThrust; emit attitudeThrustSetPointChanged(this, roll, pitch, yaw, thrust, MG::TIME::getGroundTimeNow()); #endif diff --git a/src/ui/RadioCalibration/RadioCalibrationWindow.cc b/src/ui/RadioCalibration/RadioCalibrationWindow.cc index effb3b52e..e6c483dcc 100644 --- a/src/ui/RadioCalibration/RadioCalibrationWindow.cc +++ b/src/ui/RadioCalibration/RadioCalibrationWindow.cc @@ -265,7 +265,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP void RadioCalibrationWindow::send() { qDebug() << __FILE__ << __LINE__ << "uasId = " << uasId; -#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES +#ifdef MAVLINK_ENABLED_UALBERTA UAS *uas = dynamic_cast(UASManager::instance()->getUASForId(uasId)); if (uas) { -- 2.22.0