Browse Source

Mavlink update

QGC4.4
DonLakeFlyer 8 years ago
parent
commit
4e3e6c3503
  1. 2
      libs/mavlink/include/mavlink/v2.0
  2. 7
      src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
  3. 3
      src/comm/MockLink.cc

2
libs/mavlink/include/mavlink/v2.0

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit fb411385d5f00300ab5d04c5adb08e7e17670d58
Subproject commit 9bc6f7d5ecb8c081b554cbd934a20290a5efa529

7
src/AutoPilotPlugins/APM/APMSensorsComponentController.cc

@ -607,7 +607,8 @@ void APMSensorsComponentController::nextClicked(void) @@ -607,7 +607,8 @@ void APMSensorsComponentController::nextClicked(void)
_vehicle->priorityLink()->mavlinkChannel(),
&msg,
0, // command
1); // result
1, // result
0); // progress
_vehicle->sendMessageOnLink(_vehicle->priorityLink(), msg);
@ -677,7 +678,7 @@ void APMSensorsComponentController::_handleMagCalProgress(mavlink_message_t& mes @@ -677,7 +678,7 @@ void APMSensorsComponentController::_handleMagCalProgress(mavlink_message_t& mes
mavlink_msg_mag_cal_progress_decode(&message, &magCalProgress);
qCDebug(APMSensorsComponentControllerVerboseLog) << "_handleMagCalProgress id:mask:pct"
<< magCalProgress.compass_id << magCalProgress.cal_mask << magCalProgress.completion_pct;
<< magCalProgress.compass_id << magCalProgress.cal_mask << magCalProgress.completion_pct;
// How many compasses are we calibrating?
int compassCalCount = 0;
@ -705,7 +706,7 @@ void APMSensorsComponentController::_handleMagCalReport(mavlink_message_t& messa @@ -705,7 +706,7 @@ void APMSensorsComponentController::_handleMagCalReport(mavlink_message_t& messa
mavlink_msg_mag_cal_report_decode(&message, &magCalReport);
qCDebug(APMSensorsComponentControllerVerboseLog) << "_handleMagCalReport id:mask:status:fitness"
<< magCalReport.compass_id << magCalReport.cal_mask << magCalReport.cal_status << magCalReport.fitness;
<< magCalReport.compass_id << magCalReport.cal_mask << magCalReport.cal_status << magCalReport.fitness;
bool additionalCompassCompleted = false;
if (magCalReport.compass_id < 3 && !_rgCompassCalComplete[magCalReport.compass_id]) {

3
src/comm/MockLink.cc

@ -847,7 +847,8 @@ void MockLink::_handleCommandLong(const mavlink_message_t& msg) @@ -847,7 +847,8 @@ void MockLink::_handleCommandLong(const mavlink_message_t& msg)
mavlinkChannel(),
&commandAck,
request.command,
commandResult);
commandResult,
0);
respondWithMavlinkMessage(commandAck);
}

Loading…
Cancel
Save