diff --git a/ground/gcs/src/share/qml/pfd/common.js b/ground/gcs/src/share/qml/common.js similarity index 99% rename from ground/gcs/src/share/qml/pfd/common.js rename to ground/gcs/src/share/qml/common.js index 502e726a0..bc0a41816 100644 --- a/ground/gcs/src/share/qml/pfd/common.js +++ b/ground/gcs/src/share/qml/common.js @@ -15,4 +15,3 @@ function formatTime(time) { else return time.toString(); } - diff --git a/ground/gcs/src/share/qml/pfd/Compass.qml b/ground/gcs/src/share/qml/pfd/Compass.qml index f858db835..04d95eb3d 100644 --- a/ground/gcs/src/share/qml/pfd/Compass.qml +++ b/ground/gcs/src/share/qml/pfd/Compass.qml @@ -5,8 +5,6 @@ import UAVTalk.PositionState 1.0 import UAVTalk.PathDesired 1.0 import UAVTalk.TakeOffLocation 1.0 -import "common.js" as Utils - Item { id: sceneItem property variant sceneSize diff --git a/ground/gcs/src/share/qml/pfd/Info.qml b/ground/gcs/src/share/qml/pfd/Info.qml index e7ef5a02c..e4615be05 100644 --- a/ground/gcs/src/share/qml/pfd/Info.qml +++ b/ground/gcs/src/share/qml/pfd/Info.qml @@ -11,7 +11,7 @@ import UAVTalk.GPSSatellites 1.0 import UAVTalk.FlightBatterySettings 1.0 import UAVTalk.FlightBatteryState 1.0 -import "common.js" as Utils +import "../common.js" as Utils Item { id: info diff --git a/ground/gcs/src/share/qml/pfd/Panels.qml b/ground/gcs/src/share/qml/pfd/Panels.qml index 8bfb27800..4ec6d0020 100644 --- a/ground/gcs/src/share/qml/pfd/Panels.qml +++ b/ground/gcs/src/share/qml/pfd/Panels.qml @@ -10,7 +10,7 @@ import UAVTalk.MagState 1.0 import UAVTalk.ReceiverStatus 1.0 import UAVTalk.OPLinkStatus 1.0 -import "common.js" as Utils +import "../common.js" as Utils Item { id: panels diff --git a/ground/gcs/src/share/qml/pfd/VsiScale.qml b/ground/gcs/src/share/qml/pfd/VsiScale.qml index c6c1ee344..3c0c3a986 100644 --- a/ground/gcs/src/share/qml/pfd/VsiScale.qml +++ b/ground/gcs/src/share/qml/pfd/VsiScale.qml @@ -3,8 +3,6 @@ import QtQuick 2.4 import UAVTalk.FlightStatus 1.0 import UAVTalk.VelocityDesired 1.0 -import "common.js" as Utils - Item { id: sceneItem property variant sceneSize diff --git a/ground/gcs/src/share/qml/pfd/Warnings.qml b/ground/gcs/src/share/qml/pfd/Warnings.qml index d9754a7d9..b3431dc99 100644 --- a/ground/gcs/src/share/qml/pfd/Warnings.qml +++ b/ground/gcs/src/share/qml/pfd/Warnings.qml @@ -5,7 +5,7 @@ import UAVTalk.SystemAlarms 1.0 import UAVTalk.FlightStatus 1.0 import UAVTalk.VtolPathFollowerSettings 1.0 -import "common.js" as Utils +import "../common.js" as Utils Item { id: warnings @@ -193,6 +193,8 @@ Item { Rectangle { anchors.fill: parent color: warnings.flightmodeColors[flightStatus.flightMode] + // Manual,Stabilized1,Stabilized2,Stabilized3,Stabilized4,Stabilized5,Stabilized6,PositionHold,CourseLock, + // VelocityRoam,HomeLeash,AbsolutePosition,ReturnToBase,Land,PathPlanner,POI,AutoCruise,AutoTakeoff Text { anchors.centerIn: parent