diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml index 67a053917..091fbb6d9 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml @@ -966,6 +966,99 @@ Item { } } + SvgElementPositionItem { + id: system_fusion_algo + elementName: "system-attitude-estimation-algo" + sceneSize: panels.sceneSize + y: Math.floor(scaledBounds.y * sceneItem.height) + z: system_bg.z+1 + + states: State { + name: "fading" + when: show_panels !== true + PropertyChanges { target: system_fusion_algo; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); } + } + + transitions: Transition { + SequentialAnimation { + PropertyAnimation { property: "x"; duration: 800 } + } + } + + Text { + text: ["None", "Complementary", "CompMag", "Comp+Mag+GPS", "EKFIndoor", "EKFOutdoor"][RevoSettings.FusionAlgorithm] + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 1.2) + weight: Font.DemiBold + } + } + } + + SvgElementPositionItem { + id: system_mag_used + elementName: "system-mag-used" + sceneSize: panels.sceneSize + y: Math.floor(scaledBounds.y * sceneItem.height) + z: system_bg.z+1 + + states: State { + name: "fading" + when: show_panels !== true + PropertyChanges { target: system_mag_used; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); } + } + + transitions: Transition { + SequentialAnimation { + PropertyAnimation { property: "x"; duration: 800 } + } + } + + Text { + text: ["Invalid", "OnBoard", "External"][MagState.Source] + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 1.4) + weight: Font.DemiBold + } + } + } + + SvgElementPositionItem { + id: system_gpstype + elementName: "system-gps-type" + sceneSize: panels.sceneSize + y: Math.floor(scaledBounds.y * sceneItem.height) + z: system_bg.z+1 + + states: State { + name: "fading" + when: show_panels !== true + PropertyChanges { target: system_gpstype; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); } + } + + transitions: Transition { + SequentialAnimation { + PropertyAnimation { property: "x"; duration: 800 } + } + } + + Text { + text: ["Unknown", "NMEA", "UBX", "UBX7", "UBX8"][GPSPositionSensor.SensorType] + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 1.4) + weight: Font.DemiBold + } + } + } + SvgElementImage { id: system_mousearea elementName: "system-panel-mousearea" diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index efb330d7a..3f5cc4f83 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -281,11 +281,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.140049" - inkscape:cx="179.9755" - inkscape:cy="32.445148" + inkscape:zoom="3.0264863" + inkscape:cx="102.91059" + inkscape:cy="69.619044" inkscape:document-units="px" - inkscape:current-layer="svg2" + inkscape:current-layer="layer76" showgrid="false" fit-margin-top="0" fit-margin-left="0" @@ -298,8 +298,8 @@ inkscape:window-maximized="1" showguides="false" inkscape:guide-bbox="true" - inkscape:object-nodes="true" - inkscape:object-paths="true" + inkscape:object-nodes="false" + inkscape:object-paths="false" inkscape:snap-bbox="true" inkscape:bbox-nodes="false" inkscape:snap-bbox-midpoints="true" @@ -311,7 +311,7 @@ inkscape:snap-intersection-paths="true" inkscape:snap-object-midpoints="false" inkscape:snap-center="false" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="false"> image/svg+xml - + @@ -1405,7 +1405,7 @@ transform="matrix(0.86009397,0,0,0.86009397,0.18825858,65.744733)"> + style="display:inline"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="system-attitude-estimation-algo" + transform="matrix(0.95014749,0,0,0.95014749,12.173664,-35.081741)"> @@ -2429,7 +2452,7 @@ id="path11380" inkscape:connector-curvature="0" /> @@ -2444,7 +2467,7 @@ id="path11386" inkscape:connector-curvature="0" /> @@ -2455,7 +2478,8 @@ inkscape:connector-curvature="0" /> + id="system-mag-used" + transform="translate(10,-52)"> + id="system-gps-type" + transform="matrix(0.79929009,0,0,0.79929009,32.11488,36.677279)"> getObject();