rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/laurent/OP-1648_PFD_flight_mode_update' into next

Browse Source
This commit is contained in:
Laurent Lalanne 2015-01-07 14:09:45 +01:00
commit a7677843e6
13 changed files with 101 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml
View File

@ -45,7 +45,7 @@ Item {
text: altitude_scale.topNumber - index
color: "white"
font.pixelSize: parent.height / 3
font.family: "Arial"
font.family: pt_bold.name
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.top
@ -100,7 +100,7 @@ Item {
text: " " +altitude.toFixed(1)
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 0.35
weight: Font.DemiBold
}
@ -125,7 +125,7 @@ Item {
text: qmlWidget.altitudeUnit
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 0.6
weight: Font.DemiBold
}

2
ground/openpilotgcs/share/openpilotgcs/pfd/default/Compass.qml
View File

@ -88,7 +88,7 @@ Item {
text: Math.floor(AttitudeState.Yaw).toFixed()
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 1.2
}
anchors.centerIn: parent

28
ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
View File

@ -105,7 +105,7 @@ Item {
text: ["NO GPS", "NO FIX", "FIX 2D", "FIX 3D"][GPSPositionSensor.Status]
anchors.centerIn: parent
font.pixelSize: Math.floor(parent.height*1.3)
font.family: "Arial"
font.family: pt_bold.name
font.weight: Font.DemiBold
color: "white"
}
@ -138,7 +138,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -159,7 +159,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -182,7 +182,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -208,7 +208,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -229,7 +229,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -251,7 +251,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.5)
weight: Font.DemiBold
}
@ -307,7 +307,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
weight: Font.DemiBold
}
@ -334,7 +334,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
weight: Font.DemiBold
}
@ -368,7 +368,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
weight: Font.DemiBold
}
@ -405,7 +405,7 @@ Item {
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1)
weight: Font.DemiBold
}
@ -471,7 +471,7 @@ Item {
anchors.centerIn: parent
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 1.2
}
}
@ -502,7 +502,7 @@ Item {
anchors.centerIn: parent
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 1.2
}
}
@ -533,7 +533,7 @@ Item {
anchors.centerIn: parent
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 1.2
}
}

37
ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml
View File

@ -69,7 +69,10 @@ Item {
property real smeter_angle
property real memory_free : SystemStats.HeapRemaining > 1024 ? SystemStats.HeapRemaining / 1024 : SystemStats.HeapRemaining
property real memory_free : SystemStats.HeapRemaining > 1024 ? SystemStats.HeapRemaining / 1024 : SystemStats.HeapRemaining
// Needed to get correctly int8 value
property int cpuTemp : SystemStats.CPUTemp
// Needed to get correctly int8 value, reset value (-127) on disconnect
property int oplm0_db: telemetry_link == 1 ? OPLinkStatus.PairSignalStrengths_0 : -127
@ -404,7 +407,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
}
}
@ -445,7 +448,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
}
}
@ -490,7 +493,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
}
}
@ -536,7 +539,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.6)
}
}
@ -809,7 +812,7 @@ Item {
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
capitalization: Font.AllUppercase
@ -895,7 +898,7 @@ Item {
anchors.right: parent.right
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
@ -922,13 +925,13 @@ Item {
}
Text {
// CC3D hack, Cputemp not working
text: SystemStats.CPULoad+"% - "+
[String(SystemStats.CPUTemp).charCodeAt(0) == "64" ? "??" : String(SystemStats.CPUTemp).charCodeAt(0)] +"°C"
// Coptercontrol detect with mem free : Only display Cpu load, no temperature available.
text: SystemStats.CPULoad+"%"+
[SystemStats.HeapRemaining < 3000 ? "" : " | "+cpuTemp+"°C"]
anchors.right: parent.right
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
@ -959,7 +962,7 @@ Item {
anchors.right: parent.right
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
@ -986,12 +989,12 @@ Item {
}
Text {
text: ["None", "Complementary", "CompMag", "Comp+Mag+GPS", "EKFIndoor", "EKFOutdoor"][RevoSettings.FusionAlgorithm]
text: ["None", "Basic (No Nav)", "CompMag", "Comp+Mag+GPS", "EKFIndoor", "GPS Nav (INS13)"][RevoSettings.FusionAlgorithm]
anchors.right: parent.right
color: "white"
font {
family: "Arial"
pixelSize: Math.floor(parent.height * 1.2)
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.35)
weight: Font.DemiBold
}
}
@ -1021,7 +1024,7 @@ Item {
anchors.right: parent.right
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
@ -1052,7 +1055,7 @@ Item {
anchors.right: parent.right
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}

5
ground/openpilotgcs/share/openpilotgcs/pfd/default/Pfd.qml
View File

@ -24,6 +24,11 @@ Rectangle {
Item {
id: sceneItem
FontLoader {
id: pt_bold
source: "qrc:/pfdqml/fonts/PTS75F.ttf"
}
width: Math.floor((parent.paintedHeight * 1.32) - (parent.paintedHeight * 0.013))
height: Math.floor(parent.paintedHeight - parent.paintedHeight * 0.02)
property variant viewportSize : Qt.size(width, height)

6
ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml
View File

@ -22,7 +22,7 @@ Item {
id: telemetry_rate
text: GCSTelemetryStats.TxDataRate.toFixed()+"/"+GCSTelemetryStats.RxDataRate.toFixed()
color: "white"
font.family: "Arial"
font.family: pt_bold.name
font.pixelSize: telemetry_status.height * 0.75
anchors.top: telemetry_status.bottom
@ -33,7 +33,7 @@ Item {
id: gps_text
text: "GPS: " + GPSPositionSensor.Satellites + "\nPDP: " + Math.round(GPSPositionSensor.PDOP*10)/10
color: "white"
font.family: "Arial"
font.family: pt_bold.name
font.pixelSize: telemetry_status.height * 0.75
visible: GPSPositionSensor.Satellites > 0
@ -52,7 +52,7 @@ Item {
color: "white"
font.family: "Arial"
font.family: pt_bold.name
//I think it should be pixel size,
//but making it more consistent with C++ version instead

6
ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml
View File

@ -49,7 +49,7 @@ Item {
visible: speed_scale.topNumber - index >= 0
font.pixelSize: parent.height / 3
font.family: "Arial"
font.family: pt_bold.name
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.top
@ -90,7 +90,7 @@ Item {
text: sceneItem.groundSpeed.toFixed(1)+" "
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 0.35
weight: Font.DemiBold
}
@ -115,7 +115,7 @@ Item {
text: qmlWidget.speedUnit
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 0.6
weight: Font.DemiBold
}

2
ground/openpilotgcs/share/openpilotgcs/pfd/default/VsiScale.qml
View File

@ -86,7 +86,7 @@ Item {
text: qmlWidget.altitudeUnit == "m" ? "m/s" : "ft/s"
color: "cyan"
font {
family: "Arial"
family: pt_bold.name
pixelSize: parent.height * 1.7
weight: Font.DemiBold
}

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

@ -2,19 +2,20 @@ import QtQuick 2.0
Item {
id: warnings
property variant sceneSize
// Uninitialised, OK, Warning, Error, Critical
property variant statusColors : ["gray", "green", "red", "red", "red"]
// DisArmed , Arming, Armed
property variant armColors : ["gray", "orange", "green"]
// All 'manual modes' are green, 'assisted' modes in cyan
// "MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6", "AUTOTUNE",
// "POS HOLD", "POS VFPV", "POS VLOS", "POS VNSEW", "RTB", "LAND", "PATHPLANNER", "POI", "AUTOCRUISE"
// "MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6",
// "POS HOLD", "COURSE LOCK", "POS ROAM", "HOME LEASH", "ABS POS", "RTB", "LAND", "PATHPLANNER", "POI", "AUTOCRUISE"
property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green", "red",
"cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"]
property variant flightmodeColors : ["gray", "green", "green", "green", "green", "green", "green",
"cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan", "cyan"]
// Manual,Rate,Attitude,AxisLock,WeakLeveling,VirtualBar,Acro+,Rattitude,
// AltitudeHold,AltitudeVario,CruiseControl + Auto mode (VTOL/Wing pathfollower)
@ -26,9 +27,9 @@ Item {
// SystemSettings.AirframeType 3 - 18 : VtolPathFollower, check ThrustControl
property var thrust_mode: FlightStatus.FlightMode < 7 ? StabilizationDesired.StabilizationMode_Thrust :
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 19
FlightStatus.FlightMode > 6 && SystemSettings.AirframeType > 2 && SystemSettings.AirframeType < 19
&& VtolPathFollowerSettings.ThrustControl == 1 ? 11 :
FlightStatus.FlightMode > 7 && SystemSettings.AirframeType < 3 ? 11: 0
FlightStatus.FlightMode > 6 && SystemSettings.AirframeType < 3 ? 11: 0
property real flight_time: Math.round(SystemStats.FlightTime / 1000)
@ -70,7 +71,7 @@ Item {
anchors.centerIn: parent
text: formatTime(time_h) + ":" + formatTime(time_m) + ":" + formatTime(time_s)
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.8)
weight: Font.DemiBold
}
@ -95,7 +96,7 @@ Item {
anchors.centerIn: parent
text: ["DISARMED","ARMING","ARMED"][FlightStatus.Armed]
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}
@ -120,7 +121,7 @@ Item {
anchors.centerIn: parent
text: "RC INPUT"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}
@ -152,7 +153,7 @@ Item {
text: "MASTER CAUTION"
color: "white"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}
@ -177,7 +178,7 @@ Item {
anchors.centerIn: parent
text: "AUTOPILOT"
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}
@ -200,10 +201,10 @@ Item {
Text {
anchors.centerIn: parent
text: ["MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6", "AUTOTUNE", "POS HOLD", "POS VFPV",
"POS VLOS", "POS VNSEW", "RTB", "LAND", "PATHPLAN", "POI", "AUTOCRUISE"][FlightStatus.FlightMode]
text: ["MANUAL","STAB 1","STAB 2", "STAB 3", "STAB 4", "STAB 5", "STAB 6", "POS HOLD", "COURSELOCK",
"POS ROAM", "HOME LEASH", "ABS POS", "RTB", "LAND", "PATHPLAN", "POI", "AUTOCRUISE"][FlightStatus.FlightMode]
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}
@ -232,7 +233,7 @@ Item {
text: ["MANUAL"," "," ", " ", " ", " ", " ", " ",
"ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()]
font {
family: "Arial"
family: pt_bold.name
pixelSize: Math.floor(parent.height * 0.74)
weight: Font.DemiBold
}

5
ground/openpilotgcs/src/plugins/pfdqml/PfdResources.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/pfdqml">
<file>fonts/PTS75F.ttf</file>
</qresource>
</RCC>

BIN
ground/openpilotgcs/src/plugins/pfdqml/fonts/PTS75F.ttf Normal file
View File

Binary file not shown.

26
ground/openpilotgcs/src/plugins/pfdqml/fonts/Paratype PT Sans Free Font License.txt Normal file
View File

@ -0,0 +1,26 @@
Copyright © 2009 ParaType Ltd.
with Reserved Names &amp;quot;PT Sans&amp;quot; and &amp;quot;ParaType&amp;quot;.
FONT LICENSE
PERMISSION &amp;amp; CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the font software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the font software, subject to the following conditions:
1) Neither the font software nor any of its individual components, in original or modified versions, may be sold by itself.
2) Original or modified versions of the font software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
3) No modified version of the font software may use the Reserved Name(s) or combinations of Reserved Names with other words unless explicit written permission is granted by the ParaType. This restriction only applies to the primary font name as presented to the users.
4) The name of ParaType or the author(s) of the font software shall not be used to promote, endorse or advertise any modified version, except to acknowledge the contribution(s) of ParaType and the author(s) or with explicit written permission of ParaType.
5) The font software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
TERMINATION &amp;amp; TERRITORY
This license has no limits on time and territory, but it becomes null and void if any of the above conditions are not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED &amp;quot;AS IS&amp;quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL PARATYPE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
ParaType Ltd
http://www.paratype.ru

3
ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro
View File

@ -40,3 +40,6 @@ OTHER_FILES += PfdQml.pluginspec
FORMS += pfdqmlgadgetoptionspage.ui
RESOURCES += \
PfdResources.qrc