zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #2936 from DonLakeFlyer/FM2 

Add switch assignment to simple flight mode
QGC4.4
Don Gagne 9 years ago
parent
73f9a5d510 c148068009
commit
2fd104fa8d
3 changed files with 126 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 177
      src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
  2. 6
      src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.cc
  3. 7
      src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h

177
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
Unescape View File

@ -57,79 +57,132 @@ Item {
id: contentColumn id: contentColumn
spacing: _margins spacing: _margins
QGCLabel { Row {
id: flightModeLabel id: settingsRow
text: "Flight Mode Settings" spacing: _margins
font.weight: Font.DemiBold
}
Item {
height: modeChannelCombo.height
width: modeChannelCombo.x + modeChannelCombo.width
QGCLabel {
id: modeChannelLabel
anchors.baseline: modeChannelCombo.baseline
text: "Flight mode channel:"
}
FactComboBox {
id: modeChannelCombo
anchors.leftMargin: _margins
anchors.left: modeChannelLabel.right
width: ScreenTools.defaultFontPixelWidth * 15
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false
}
}
Rectangle {
id: flightModeSettings
width: flightModeColumn.width + (_margins * 2)
height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
Column { Column {
id: flightModeColumn id: flightModeSettingsColumn
anchors.margins: ScreenTools.defaultFontPixelWidth spacing: _margins
anchors.left: parent.left
anchors.top: parent.top QGCLabel {
spacing: ScreenTools.defaultFontPixelHeight id: flightModeLabel
text: "Flight Mode Settings"
font.weight: Font.DemiBold
}
Rectangle {
id: flightModeSettings
width: flightModeColumn.width + (_margins * 2)
height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
Column {
id: flightModeColumn
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
Row {
spacing: _margins
QGCLabel {
id: modeChannelLabel
anchors.baseline: modeChannelCombo.baseline
text: "Flight mode channel:"
}
FactComboBox {
id: modeChannelCombo
width: ScreenTools.defaultFontPixelWidth * 15
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false
}
}
Repeater { Repeater {
model: 6 model: 6
Row { Row {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
property int index: modelData + 1 property int index: modelData + 1
property var pwmStrings: [ "PWM 0 - 1230", "PWM 1231 - 1360", "PWM 1361 - 1490", "PWM 1491 - 1620", "PWM 1621 - 1749", "PWM 1750 +"] property var pwmStrings: [ "PWM 0 - 1230", "PWM 1231 - 1360", "PWM 1361 - 1490", "PWM 1491 - 1620", "PWM 1621 - 1749", "PWM 1750 +"]
QGCLabel { QGCLabel {
anchors.baseline: modeCombo.baseline anchors.baseline: modeCombo.baseline
text: "Flight Mode " + index + ":" text: "Flight Mode " + index + ":"
color: controller.activeFlightMode == index ? "yellow" : qgcPal.text color: controller.activeFlightMode == index ? "yellow" : qgcPal.text
} }
FactComboBox { FactComboBox {
id: modeCombo id: modeCombo
width: ScreenTools.defaultFontPixelWidth * 20 width: ScreenTools.defaultFontPixelWidth * 20
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index) fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false indexModel: false
} }
QGCLabel { QGCLabel {
anchors.baseline: modeCombo.baseline anchors.baseline: modeCombo.baseline
text: pwmStrings[modelData] text: pwmStrings[modelData]
} }
} }
} // Repeater - Flight Modes } // Repeater - Flight Modes
} // Column - Flight Modes } // Column - Flight Modes
} // Rectangle - Flight Modes } // Rectangle - Flight Modes
} // Column - Flight mode settings
Column {
spacing: _margins
QGCLabel {
text: "Switch Settings"
font.weight: Font.DemiBold
}
Rectangle {
width: switchSettingsColumn.width + (_margins * 2)
height: switchSettingsColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
Column {
id: switchSettingsColumn
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
Repeater {
model: [ "RC_MAP_RETURN_SW", "RC_MAP_KILL_SW", "RC_MAP_FLAPS", "RC_MAP_AUX1", "RC_MAP_AUX2", "RC_MAP_AUX3", "RC_MAP_OFFB_SW" ]
Row {
spacing: ScreenTools.defaultFontPixelWidth
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel {
anchors.baseline: optCombo.baseline
text: fact.shortDescription + ":"
color: fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
}
FactComboBox {
id: optCombo
width: ScreenTools.defaultFontPixelWidth * 15
fact: parent.fact
indexModel: false
}
}
} // Repeater
} // Column
} // Rectangle
} // Column - Switch settings
} // Row - Settings
QGCButton { QGCButton {
text: "Use Advanced Flight Modes" text: "Use Advanced Flight Modes"
onClicked: { onClicked: {
controller.getParameterFact(-1, "RC_MAP_MODE_SW").value = 5 controller.getParameterFact(-1, "RC_MAP_MODE_SW").value = 5
controller.getParameterFact(-1, "RC_MAP_FLTMODE").value = 0 controller.getParameterFact(-1, "RC_MAP_FLTMODE").value = 0

6
src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.cc
Unescape View File

@ -47,6 +47,12 @@ PX4SimpleFlightModesController::PX4SimpleFlightModesController(void)
/// Connected to Vehicle::rcChannelsChanged signal /// Connected to Vehicle::rcChannelsChanged signal
void PX4SimpleFlightModesController::_rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels]) void PX4SimpleFlightModesController::_rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels])
{ {
_rcChannelValues.clear();
for (int i=0; i<channelCount; i++) {
_rcChannelValues.append(pwmValues[i]);
}
emit rcChannelValuesChanged();
int flightModeChannel = getParameterFact(-1, "RC_MAP_FLTMODE")->rawValue().toInt() - 1; int flightModeChannel = getParameterFact(-1, "RC_MAP_FLTMODE")->rawValue().toInt() - 1;
if (flightModeChannel < 0 || flightModeChannel > channelCount) { if (flightModeChannel < 0 || flightModeChannel > channelCount) {

7
src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h
Unescape View File

@ -42,14 +42,16 @@ class PX4SimpleFlightModesController : public FactPanelController
public: public:
PX4SimpleFlightModesController(void); PX4SimpleFlightModesController(void);
Q_PROPERTY(int activeFlightMode READ activeFlightMode NOTIFY activeFlightModeChanged) Q_PROPERTY(int activeFlightMode READ activeFlightMode NOTIFY activeFlightModeChanged)
Q_PROPERTY(int channelCount MEMBER _channelCount CONSTANT) Q_PROPERTY(int channelCount MEMBER _channelCount CONSTANT)
Q_PROPERTY(QVariantList rcChannelValues MEMBER _rcChannelValues NOTIFY rcChannelValuesChanged)
int activeFlightMode(void) const { return _activeFlightMode; } int activeFlightMode(void) const { return _activeFlightMode; }
signals: signals:
void activeFlightModeChanged(int activeFlightMode); void activeFlightModeChanged(int activeFlightMode);
void channelOptionEnabledChanged(void); void channelOptionEnabledChanged(void);
void rcChannelValuesChanged(void);
private slots: private slots:
void _rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels]); void _rcChannelsChanged(int channelCount, int pwmValues[Vehicle::cMaxRcChannels]);
@ -57,6 +59,7 @@ private slots:
private: private:
int _activeFlightMode; int _activeFlightMode;
int _channelCount; int _channelCount;
QVariantList _rcChannelValues;
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save