Commit 41dade84 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5242 from DonLakeFlyer/Fixes

Fixes
parents 1c59d4e8 6273c31c
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -238,22 +238,19 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
<< "group: " << group;
Q_ASSERT(!rawMetaData);
rawMetaData = new APMFactMetaDataRaw();
if (_vehicleTypeToParametersMap[currentCategory].contains(name)) {
// We can't trust the meta dafa since we have dups
qCWarning(APMParameterMetaDataLog) << "Duplicate parameter found:" << name;
badMetaData = true;
qCDebug(APMParameterMetaDataLog) << "Duplicate parameter found:" << name;
rawMetaData = _vehicleTypeToParametersMap[currentCategory][name];
} else {
qCDebug(APMParameterMetaDataVerboseLog) << "inserting metadata for field" << name;
rawMetaData = new APMFactMetaDataRaw();
_vehicleTypeToParametersMap[currentCategory][name] = rawMetaData;
rawMetaData->name = name;
rawMetaData->group = group;
rawMetaData->shortDescription = shortDescription;
rawMetaData->longDescription = longDescription;
groupMembers[group] << name;
}
qCDebug(APMParameterMetaDataVerboseLog) << "inserting metadata for field" << name;
rawMetaData->name = name;
rawMetaData->group = group;
rawMetaData->shortDescription = shortDescription;
rawMetaData->longDescription = longDescription;
} else {
// We should be getting meta data now
if (xmlState.top() != XmlStateFoundParameter) {
......
......@@ -51,7 +51,7 @@
<file alias="APMParameterFactMetaData.Rover.3.2.xml">APMParameterFactMetaData.Rover.3.2.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.4.xml">APMParameterFactMetaData.Sub.3.4.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.5.xml">APMParameterFactMetaData.Sub.3.5.xml</file>
<file alias="Copter.OfflineEditing.params">Copter3.4.OfflineEditing.params</file>
<file alias="Copter.OfflineEditing.params">Copter3.5.OfflineEditing.params</file>
<file alias="Plane.OfflineEditing.params">Plane3.7.OfflineEditing.params</file>
</qresource>
</RCC>
......@@ -99,15 +99,21 @@ Button {
return -1
}
ExclusiveGroup { id: eg }
Menu {
id: popup
__minimumWidth: combo.width
__visualItem: combo
style: MenuStyle {
font: combo.font
__menuItemType: "comboboxitem"
__scrollerStyle: ScrollViewStyle { }
font: combo.font
__labelColor: combo._qgcPal.text
__selectedLabelColor: combo._qgcPal.buttonText
__selectedBackgroundColor: combo._qgcPal.buttonHighlight
__maxPopupHeight: 600
__menuItemType: "comboboxitem"
__scrollerStyle: ScrollViewStyle { }
}
property string textRole: ""
......@@ -187,22 +193,6 @@ Button {
}
}
Component {
id: menuItemComponent
MenuItem {
property int index
onTriggered: {
//console.log("onTriggered", index, currentIndex)
if (index !== currentIndex) {
//console.log("activated", index)
activated(index)
}
}
}
}
Instantiator {
id: popupItems
......@@ -239,7 +229,10 @@ Button {
onObjectRemoved: popup.removeItem(object)
MenuItem {
text: popup.textRole === '' ? modelData : ((popup._modelIsArray ? modelData[popup.textRole] : model[popup.textRole]) || '')
text: popup.textRole === '' ? modelData : ((popup._modelIsArray ? modelData[popup.textRole] : model[popup.textRole]) || '')
checked: index == currentIndex
checkable: true
exclusiveGroup: eg
property int itemIndex: index
......
This diff is collapsed.
......@@ -872,7 +872,7 @@ void MockLink::_respondWithAutopilotVersion(void)
uint32_t flightVersion = 0;
if (_firmwareType == MAV_AUTOPILOT_ARDUPILOTMEGA) {
flightVersion |= 3 << (8*3);
flightVersion |= 3 << (8*2);
flightVersion |= 5 << (8*2);
flightVersion |= 0 << (8*1);
flightVersion |= FIRMWARE_VERSION_TYPE_DEV << (8*0);
} else if (_firmwareType == MAV_AUTOPILOT_PX4) {
......
This diff is collapsed.
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