From 59eba1b1321fa48a74e1b0794dc659d9a8b8465a Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 21 Feb 2021 12:05:25 -0800 Subject: [PATCH] Fix double send of MAV_CMD_PREFLIGHT_CALIBRATION --- ChangeLog.md | 8 ++++++++ src/AutoPilotPlugins/Common/RadioComponentController.cc | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 70edf3f..78c0fee 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -4,6 +4,14 @@ Note: This file only contains high level features or important fixes. ## 4.1 - Daily build +### 4.1.2 - Not yet released +* Bug: Radio setup - Fix double send of `MAV_CMD_PREFLIGHT_CALIBRATION` causing "Unable to send command" error. + +### 4.1.1 - Stable +* Fix TCP link comms + +### 4.1.0 + * Support simple cameras which only support DIGICAM_CONTROL in the Photo/Video control on Fly View. * Load Parameters From File: Support loading parameters which don't currently existing on the vehicle. * Load Parameters From File: Add dialog which shows diff of file and vehicle params. Selective param upload from file. diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc index e8c30fb..0c3c6b6 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.cc +++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc @@ -700,10 +700,6 @@ void RadioComponentController::_writeCalibration(void) { if (!_uas) return; - if (_px4Vehicle()) { - _vehicle->stopCalibration(); - } - if (!_px4Vehicle() && (_vehicle->vehicleType() == MAV_TYPE_HELICOPTER || _vehicle->multiRotor()) && _rgChannelInfo[_rgFunctionChannelMapping[rcCalFunctionThrottle]].reversed) { // A reversed throttle could lead to dangerous power up issues if the firmware doesn't handle it absolutely correctly in all places. // So in this case fail the calibration for anything other than PX4 which is known to be able to handle this correctly.