Skip to content

Q
qgroundcontrol
Unverified Commit 45b02d74 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge branch 'master' into FlashRework

parents ce829717 666b27fb
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 5 deletions
src/ADSB/ADSBVehicleManager.cc
View file @ 45b02d74
......@@ -44,6 +44,7 @@ void ADSBVehicleManager::_cleanupStaleVehicles()
if (adsbVehicle->expired()) {
qCDebug(ADSBVehicleManagerLog) << "Expired" << QStringLiteral("%1").arg(adsbVehicle->icaoAddress(), 0, 16);
_adsbVehicles.removeAt(i);
_adsbICAOMap.remove(adsbVehicle->icaoAddress());
adsbVehicle->deleteLater();
}
}
......
src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
View file @ 45b02d74
......@@ -8302,7 +8302,7 @@ Particularly useful for testing different low-battery behaviour</short_desc>
<short_desc>Rotation of magnetometer 0 relative to airframe</short_desc>
<long_desc>An internal magnetometer will force a value of -1, so a GCS should only attempt to configure the rotation if the value is greater than or equal to zero.</long_desc>
<min>-1</min>
<max>30</max>
<max>45</max>
<reboot_required>true</reboot_required>
<values>
<value code="-1">Internal mag</value>
......@@ -8332,6 +8332,26 @@ Particularly useful for testing different low-battery behaviour</short_desc>
<value code="23">Roll 270°, Yaw 135°</value>
<value code="24">Pitch 90°</value>
<value code="25">Pitch 270°</value>
<value code="26">Pitch 180°, Yaw 90°</value>
<value code="27">Pitch 180°, Yaw 270°</value>
<value code="28">Roll 90°, Pitch 90°</value>
<value code="29">Roll 180°, Pitch 90°</value>
<value code="30">Roll 270°, Pitch 90°</value>
<value code="31">Roll 90°, Pitch 180°</value>
<value code="32">Roll 270°, Pitch 180°</value>
<value code="33">Roll 90°, Pitch 270°</value>
<value code="34">Roll 180°, Pitch 270°</value>
<value code="35">Roll 270°, Pitch 270°</value>
<value code="36">Roll 90°, Pitch 180°, Yaw 90°</value>
<value code="37">Roll 90°, Yaw 270°</value>
<value code="38">Roll 90°, Pitch 68°, Yaw 293°</value>
<value code="39">Pitch 315°</value>
<value code="40">Roll 90°, Pitch 315°</value>
<value code="41">Roll 270°, Yaw 180°</value>
<value code="42">Roll 270°, Yaw 270°</value>
<value code="43">Pitch 90°, Yaw 180°</value>
<value code="44">Pitch 9°, Yaw 180°</value>
<value code="45">Pitch 45°</value>
</values>
</parameter>
<parameter category="System" default="0.0" name="CAL_MAG0_XCOMP" type="FLOAT">
......@@ -8383,7 +8403,7 @@ for current-based compensation [G/kA]</short_desc>
<short_desc>Rotation of magnetometer 1 relative to airframe</short_desc>
<long_desc>An internal magnetometer will force a value of -1, so a GCS should only attempt to configure the rotation if the value is greater than or equal to zero.</long_desc>
<min>-1</min>
<max>30</max>
<max>45</max>
<reboot_required>true</reboot_required>
<values>
<value code="-1">Internal mag</value>
......@@ -8413,6 +8433,26 @@ for current-based compensation [G/kA]</short_desc>
<value code="23">Roll 270°, Yaw 135°</value>
<value code="24">Pitch 90°</value>
<value code="25">Pitch 270°</value>
<value code="26">Pitch 180°, Yaw 90°</value>
<value code="27">Pitch 180°, Yaw 270°</value>
<value code="28">Roll 90°, Pitch 90°</value>
<value code="29">Roll 180°, Pitch 90°</value>
<value code="30">Roll 270°, Pitch 90°</value>
<value code="31">Roll 90°, Pitch 180°</value>
<value code="32">Roll 270°, Pitch 180°</value>
<value code="33">Roll 90°, Pitch 270°</value>
<value code="34">Roll 180°, Pitch 270°</value>
<value code="35">Roll 270°, Pitch 270°</value>
<value code="36">Roll 90°, Pitch 180°, Yaw 90°</value>
<value code="37">Roll 90°, Yaw 270°</value>
<value code="38">Roll 90°, Pitch 68°, Yaw 293°</value>
<value code="39">Pitch 315°</value>
<value code="40">Roll 90°, Pitch 315°</value>
<value code="41">Roll 270°, Yaw 180°</value>
<value code="42">Roll 270°, Yaw 270°</value>
<value code="43">Pitch 90°, Yaw 180°</value>
<value code="44">Pitch 9°, Yaw 180°</value>
<value code="45">Pitch 45°</value>
</values>
</parameter>
<parameter category="System" default="0.0" name="CAL_MAG1_XCOMP" type="FLOAT">
......@@ -8464,7 +8504,7 @@ for current-based compensation [G/kA]</short_desc>
<short_desc>Rotation of magnetometer 2 relative to airframe</short_desc>
<long_desc>An internal magnetometer will force a value of -1, so a GCS should only attempt to configure the rotation if the value is greater than or equal to zero.</long_desc>
<min>-1</min>
<max>30</max>
<max>45</max>
<reboot_required>true</reboot_required>
<values>
<value code="-1">Internal mag</value>
......@@ -8494,6 +8534,26 @@ for current-based compensation [G/kA]</short_desc>
<value code="23">Roll 270°, Yaw 135°</value>
<value code="24">Pitch 90°</value>
<value code="25">Pitch 270°</value>
<value code="26">Pitch 180°, Yaw 90°</value>
<value code="27">Pitch 180°, Yaw 270°</value>
<value code="28">Roll 90°, Pitch 90°</value>
<value code="29">Roll 180°, Pitch 90°</value>
<value code="30">Roll 270°, Pitch 90°</value>
<value code="31">Roll 90°, Pitch 180°</value>
<value code="32">Roll 270°, Pitch 180°</value>
<value code="33">Roll 90°, Pitch 270°</value>
<value code="34">Roll 180°, Pitch 270°</value>
<value code="35">Roll 270°, Pitch 270°</value>
<value code="36">Roll 90°, Pitch 180°, Yaw 90°</value>
<value code="37">Roll 90°, Yaw 270°</value>
<value code="38">Roll 90°, Pitch 68°, Yaw 293°</value>
<value code="39">Pitch 315°</value>
<value code="40">Roll 90°, Pitch 315°</value>
<value code="41">Roll 270°, Yaw 180°</value>
<value code="42">Roll 270°, Yaw 270°</value>
<value code="43">Pitch 90°, Yaw 180°</value>
<value code="44">Pitch 9°, Yaw 180°</value>
<value code="45">Pitch 45°</value>
</values>
</parameter>
<parameter category="System" default="0.0" name="CAL_MAG2_XCOMP" type="FLOAT">
......@@ -8545,7 +8605,7 @@ for current-based compensation [G/kA]</short_desc>
<short_desc>Rotation of magnetometer 2 relative to airframe</short_desc>
<long_desc>An internal magnetometer will force a value of -1, so a GCS should only attempt to configure the rotation if the value is greater than or equal to zero.</long_desc>
<min>-1</min>
<max>30</max>
<max>45</max>
<reboot_required>true</reboot_required>
<values>
<value code="-1">Internal mag</value>
......@@ -8575,6 +8635,26 @@ for current-based compensation [G/kA]</short_desc>
<value code="23">Roll 270°, Yaw 135°</value>
<value code="24">Pitch 90°</value>
<value code="25">Pitch 270°</value>
<value code="26">Pitch 180°, Yaw 90°</value>
<value code="27">Pitch 180°, Yaw 270°</value>
<value code="28">Roll 90°, Pitch 90°</value>
<value code="29">Roll 180°, Pitch 90°</value>
<value code="30">Roll 270°, Pitch 90°</value>
<value code="31">Roll 90°, Pitch 180°</value>
<value code="32">Roll 270°, Pitch 180°</value>
<value code="33">Roll 90°, Pitch 270°</value>
<value code="34">Roll 180°, Pitch 270°</value>
<value code="35">Roll 270°, Pitch 270°</value>
<value code="36">Roll 90°, Pitch 180°, Yaw 90°</value>
<value code="37">Roll 90°, Yaw 270°</value>
<value code="38">Roll 90°, Pitch 68°, Yaw 293°</value>
<value code="39">Pitch 315°</value>
<value code="40">Roll 90°, Pitch 315°</value>
<value code="41">Roll 270°, Yaw 180°</value>
<value code="42">Roll 270°, Yaw 270°</value>
<value code="43">Pitch 90°, Yaw 180°</value>
<value code="44">Pitch 9°, Yaw 180°</value>
<value code="45">Pitch 45°</value>
</values>
</parameter>
<parameter category="System" default="0.0" name="CAL_MAG3_XCOMP" type="FLOAT">
......
src/VehicleSetup/Bootloader.h
View file @ 45b02d74
......@@ -71,7 +71,7 @@ private:
bool _write (const uint8_t* data, qint64 maxSize);
bool _write (const uint8_t byte);
bool _write (const char* data);
bool _read (uint8_t* data, qint64 maxSize, int readTimeout = _readTimout);
bool _read (uint8_t* data, qint64 cBytesExpected, int readTimeout = _readTimout);
bool _sendCommand (uint8_t cmd, int responseTimeout = _responseTimeout);
bool _getCommandResponse (const int responseTimeout = _responseTimeout);
bool _protoGetDevice (uint8_t param, uint32_t& value);
......
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