Merge pull request #4212 from DonLakeFlyer/MultiRotorFlaps

No flaps for multi-rotor
9 years ago · 17f74fe79a
2 changed files with 8 additions and 3 deletions
--- a/src/AutoPilotPlugins/Common/RadioComponent.qml
+++ b/src/AutoPilotPlugins/Common/RadioComponent.qml
@ -423,7 +423,11 @@ SetupPage {
				@@ -423,7 +423,11 @@ SetupPage {
                }

                Repeater {
-                    model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ? [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] : 0
+                    model: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ?
+                               (QGroundControl.multiVehicleManager.activeVehicle.multiRotor ?
+                                   [ "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"] :
+                                   [ "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_PARAM1", "RC_MAP_PARAM2", "RC_MAP_PARAM3"]) :
+                               0

                    Row {
                        spacing: ScreenTools.defaultFontPixelWidth
--- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
@ -46,8 +46,9 @@ FactPanel {
				@@ -46,8 +46,9 @@ FactPanel {
        }

        VehicleSummaryRow {
-            labelText: qsTr("Flaps:")
-            valueText: mapFlapsFact ? (mapFlapsFact.value === 0 ? qsTr("Disabled") : mapFlapsFact.valueString) : ""
+            labelText:  qsTr("Flaps:")
+            valueText:  mapFlapsFact ? (mapFlapsFact.value === 0 ? qsTr("Disabled") : mapFlapsFact.valueString) : ""
+            visible:    !controller.vehicle.multiRotor
        }

        VehicleSummaryRow {