mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
OP-1438 VSI_Arc_PFD+Status : Display Vsi waypoint with guided flymodes only. Check AirframeType for FW/VTOL pathfollower use.
This commit is contained in:
parent
e51529d025
commit
501a59fcdc
@ -35,7 +35,7 @@ Item {
|
||||
y: scaledBounds.y * sceneItem.height
|
||||
|
||||
smooth: true
|
||||
visible: VelocityDesired.Down !== 0.0
|
||||
visible: VelocityDesired.Down !== 0.0 && FlightStatus.FlightMode > 7
|
||||
|
||||
//rotate it around the center
|
||||
transform: Rotation {
|
||||
|
@ -23,10 +23,12 @@ Item {
|
||||
property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey",
|
||||
"green", "green", "green", "cyan"]
|
||||
|
||||
// SystemSettings.AirframeType 3 - 17 : VtolPathFollower, check ThrustControl
|
||||
|
||||
property var thrust_mode: FlightStatus.FlightMode < 7 ? StabilizationDesired.StabilizationMode_Thrust :
|
||||
FlightStatus.FlightMode > 7 && HwSettings.OptionalModules_VtolPathFollower == 1
|
||||
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 18
|
||||
&& VtolPathFollowerSettings.ThrustControl == 1 ? 12 :
|
||||
FlightStatus.FlightMode > 7 && HwSettings.OptionalModules_FixedWingPathFollower == 1 ? 12: 0
|
||||
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 12: 0
|
||||
|
||||
|
||||
property real flight_time: Math.round(SystemStats.FlightTime / 1000)
|
||||
@ -219,7 +221,7 @@ Item {
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: warnings.thrustmodeColors[thrust_mode.toString()]
|
||||
color: FlightStatus.FlightMode < 1 ? "grey" : warnings.thrustmodeColors[thrust_mode.toString()]
|
||||
|
||||
// Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Rattitude,RelayRate,RelayAttitude,
|
||||
// AltitudeHold,AltitudeVario,CruiseControl
|
||||
|
@ -73,7 +73,8 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
|
||||
"StabilizationDesired" <<
|
||||
"VtolPathFollowerSettings" <<
|
||||
"HwSettings" <<
|
||||
"ManualControlCommand";
|
||||
"ManualControlCommand" <<
|
||||
"SystemSettings";
|
||||
|
||||
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
|
||||
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
|
||||
|
Loading…
x
Reference in New Issue
Block a user