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

LP-230 PFD : Missed Uninitialized state for Gps and Attitude alarms.

Browse Source
This commit is contained in:
Laurent Lalanne 2016-02-22 00:28:40 +01:00
parent 35612b41f3
commit 0d43a030de
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/src/share/qml/EarthView.qml
View File

@ -2,7 +2,7 @@ import QtQuick 2.4
import Pfd 1.0
import OsgQtQuick 1.0
import "../common.js" as Utils
import "common.js" as Utils
Item {
OSGViewport {

4
ground/gcs/src/share/qml/pfd/Warnings.qml
View File

@ -198,7 +198,7 @@ Item {
elementName: "warning-gps"
sceneSize: warnings.sceneSize
visible: !UAV.isGpsValid()
visible: UAV.isGpsNotInitialised() ? false : !UAV.isGpsValid()
}
SvgElementImage {
@ -206,6 +206,6 @@ Item {
elementName: "warning-attitude"
sceneSize: warnings.sceneSize
anchors.centerIn: background.centerIn
visible: !UAV.isAttitudeValid()
visible: UAV.isAttitudeNotInitialised() ? false : !UAV.isAttitudeValid()
}
}

8
ground/gcs/src/share/qml/uav.js
View File

@ -186,10 +186,18 @@ function isAttitudeValid() {
return (systemAlarms.alarmAttitude == SystemAlarms.Alarm.OK);
}
function isAttitudeNotInitialised() {
return (systemAlarms.alarmAttitude == SystemAlarms.Alarm.Uninitialised);
}
function isGpsValid() {
return (systemAlarms.alarmGPS == SystemAlarms.Alarm.OK);
}
function isGpsNotInitialised() {
return (systemAlarms.alarmGPS == SystemAlarms.Alarm.Uninitialised);
}
function isGpsStatusFix3D() {
return (gpsPositionSensor.status == GPSPositionSensor.Status.Fix3D);
}