Commit d2557030 authored by Bryan Godbolt's avatar Bryan Godbolt

fixed sending radio calibration with new defines

parent bda18db3
...@@ -143,7 +143,7 @@ void OpalLink::writeBytes(const char *bytes, qint64 length) ...@@ -143,7 +143,7 @@ void OpalLink::writeBytes(const char *bytes, qint64 length)
// this->sendRCValues = static_cast<bool>(rc.enabled); // this->sendRCValues = static_cast<bool>(rc.enabled);
// } // }
// break; // break;
#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES #ifdef MAVLINK_ENABLED_UALBERTA
case MAVLINK_MSG_ID_RADIO_CALIBRATION: case MAVLINK_MSG_ID_RADIO_CALIBRATION:
{ {
mavlink_radio_calibration_t radio; mavlink_radio_calibration_t radio;
......
...@@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double ...@@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
mavlink_message_t message; 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); 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); 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()); emit attitudeThrustSetPointChanged(this, roll, pitch, yaw, thrust, MG::TIME::getGroundTimeNow());
#endif #endif
......
...@@ -265,7 +265,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP ...@@ -265,7 +265,7 @@ void RadioCalibrationWindow::parseSetpoint(const QDomElement &setpoint, const QP
void RadioCalibrationWindow::send() void RadioCalibrationWindow::send()
{ {
qDebug() << __FILE__ << __LINE__ << "uasId = " << uasId; qDebug() << __FILE__ << __LINE__ << "uasId = " << uasId;
#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES #ifdef MAVLINK_ENABLED_UALBERTA
UAS *uas = dynamic_cast<UAS*>(UASManager::instance()->getUASForId(uasId)); UAS *uas = dynamic_cast<UAS*>(UASManager::instance()->getUASForId(uasId));
if (uas) if (uas)
{ {
......
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