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

OP-1354 ETA for home based on current velocity and distance, time conversions/formating

Browse Source
This commit is contained in:
Laurent Lalanne 2014-06-20 20:33:43 +02:00
parent 1921f929f3
commit 21fcbf024d
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,25 @@ Item {
property real home_heading: 180/3.1415 * Math.atan2(TakeOffLocation.East - PositionState.East, property real home_heading: 180/3.1415 * Math.atan2(TakeOffLocation.East - PositionState.East,
TakeOffLocation.North - PositionState.North) TakeOffLocation.North - PositionState.North)
property real home_distance: Math.sqrt((TakeOffLocation.East - PositionState.East)*(TakeOffLocation.East - PositionState.East) property real home_distance: Math.sqrt(Math.pow(TakeOffLocation.East - PositionState.East,2) +
+ (TakeOffLocation.North - PositionState.North)*(TakeOffLocation.North - PositionState.North)) Math.pow(TakeOffLocation.North - PositionState.North,2))
property real current_velocity: Math.sqrt(Math.pow(VelocityState.North,2)+Math.pow(VelocityState.East,2))
property real home_eta: Math.round(home_distance/current_velocity)
property real home_eta_h: Math.floor(home_eta / 3600)
property real home_eta_m: Math.floor((home_eta - home_eta_h*3600)/60)
property real home_eta_s: Math.floor(home_eta - home_eta_h*3600 - home_eta_m*60)
function formatTime(time) {
if (time === 0)
return "00"
if (time < 10)
return "0" + time;
else
return time.toString();
}
SvgElementImage { SvgElementImage {
id: info_bg id: info_bg
sceneSize: info.sceneSize sceneSize: info.sceneSize
@ -231,6 +247,23 @@ Item {
} }
} }
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "home-eta-text"
visible: TakeOffLocation.Status == 0
Text {
text: formatTime(home_eta_h) + ":" + formatTime(home_eta_m) + ":" + formatTime(home_eta_s)
anchors.fill: parent
color: "cyan"
font {
family: "Arial"
pixelSize: Math.floor(parent.height * 1.2)
}
}
}
SvgElementImage { SvgElementImage {
id: info_border id: info_border