rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

OP-1564 Fix regression introduced with relaytuning removed

Browse Source
This commit is contained in:
Laurent Lalanne 2014-11-08 16:16:17 +01:00
parent 247f08239c
commit 34dfac8c0a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
View File

@ -16,19 +16,19 @@ Item {
property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green", "red", property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green", "red",
"cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"] "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"]
// Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude, // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,
// AltitudeHold,AltitudeVario,CruiseControl + Auto mode (VTOL/Wing pathfollower) // AltitudeHold,AltitudeVario,CruiseControl + Auto mode (VTOL/Wing pathfollower)
// grey : 'disabled' modes // grey : 'disabled' modes
property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey", "grey", property variant thrustmodeColors : ["green", "grey", "grey", "grey", "grey", "grey", "grey", "grey",
"green", "green", "green", "cyan"] "green", "green", "green", "cyan"]
// SystemSettings.AirframeType 3 - 18 : VtolPathFollower, check ThrustControl // SystemSettings.AirframeType 3 - 18 : VtolPathFollower, check ThrustControl
property var thrust_mode: FlightStatus.FlightMode < 7 ? StabilizationDesired.StabilizationMode_Thrust : property var thrust_mode: FlightStatus.FlightMode < 7 ? StabilizationDesired.StabilizationMode_Thrust :
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 19 FlightStatus.FlightMode > 7 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 19
&& VtolPathFollowerSettings.ThrustControl == 1 ? 13 : && VtolPathFollowerSettings.ThrustControl == 1 ? 11 :
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 13: 0 FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 11: 0
property real flight_time: Math.round(SystemStats.FlightTime / 1000) property real flight_time: Math.round(SystemStats.FlightTime / 1000)
@ -224,12 +224,12 @@ Item {
anchors.fill: parent anchors.fill: parent
color: FlightStatus.FlightMode < 1 ? "grey" : warnings.thrustmodeColors[thrust_mode.toString()] color: FlightStatus.FlightMode < 1 ? "grey" : warnings.thrustmodeColors[thrust_mode.toString()]
// Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,RelayRate,RelayAttitude, // Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,
// AltitudeHold,AltitudeVario,CruiseControl // AltitudeHold,AltitudeVario,CruiseControl
// grey : 'disabled' modes // grey : 'disabled' modes
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ", " ", text: ["MANUAL"," "," ", " ", " ", " ", " ", " ",
"ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()] "ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()]
font { font {
family: "Arial" family: "Arial"