From d31c8bff9ce4af8ccfc7fb8431cf29562344e488 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 19 Sep 2014 22:45:53 +0200 Subject: [PATCH] OP-1435 V/A/Consumed displayed on top if Battery module enabled and no PathPlan --- .../share/openpilotgcs/pfd/default/Info.qml | 167 +- .../share/openpilotgcs/pfd/default/pfd.svg | 1594 ++++++++++------- 2 files changed, 1119 insertions(+), 642 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml index d2df20e31..ab54c6b1f 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml @@ -4,6 +4,9 @@ Item { id: info property variant sceneSize + // Uninitialised, Ok, Warning, Critical, Error + property variant batColors : ["black", "green", "orange", "red", "red"] + // // Waypoint functions // @@ -11,6 +14,8 @@ Item { property real posEast_old property real posNorth_old property real total_distance + property real total_distance_km + property bool init_dist: false property real home_heading: 180/3.1415 * Math.atan2(TakeOffLocation.East - PositionState.East, @@ -44,7 +49,8 @@ Item { function compute_distance(posEast,posNorth) { if (total_distance == 0 && !init_dist){init_dist = "true"; posEast_old = posEast; posNorth_old = posNorth;} if (posEast > posEast_old+3 || posEast < posEast_old-3 || posNorth > posNorth_old+3 || posNorth < posNorth_old-3) { - total_distance += Math.sqrt(Math.pow((posEast - posEast_old ),2) + Math.pow((posNorth - posNorth_old),2)); + total_distance += Math.sqrt(Math.pow((posEast - posEast_old ),2) + Math.pow((posNorth - posNorth_old),2)); + total_distance_km = total_distance / 1000; posEast_old = posEast; posNorth_old = posNorth; @@ -107,7 +113,16 @@ Item { // // Waypoint Info (Top) - // + // Only visible when PathPlan is active (WP loaded) + + SvgElementImage { + sceneSize: info.sceneSize + elementName: "waypoint-labels" + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: Math.floor(scaledBounds.y * sceneItem.height) + visible: SystemAlarms.Alarm_PathPlan == 1 + } SvgElementPositionItem { sceneSize: info.sceneSize @@ -157,6 +172,7 @@ Item { width: scaledBounds.width * sceneItem.width height: scaledBounds.height * sceneItem.height y: Math.floor(scaledBounds.y * sceneItem.height) + visible: SystemAlarms.Alarm_PathPlan == 1 MouseArea { id: total_dist_mouseArea; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: reset_distance()} @@ -242,6 +258,153 @@ Item { } } + // + // Battery Info (Top) + // Only visible when PathPlan not active and Battery module enabled + + SvgElementImage { + sceneSize: info.sceneSize + elementName: "topbattery-labels" + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: Math.floor(scaledBounds.y * sceneItem.height) + visible: (SystemAlarms.Alarm_PathPlan != 1) && (HwSettings.OptionalModules_Battery == 1) + } + + SvgElementPositionItem { + id: topbattery_volt + sceneSize: info.sceneSize + elementName: "topbattery-volt-text" + + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: scaledBounds.y * sceneItem.height + visible: (SystemAlarms.Alarm_PathPlan != 1) && (HwSettings.OptionalModules_Battery == 1) + + Rectangle { + anchors.fill: parent + color: info.batColors[SystemAlarms.Alarm_Battery] + border.color: info.batColors[SystemAlarms.Alarm_Battery] + border.width: topbattery_volt.width * 0.02 + + Text { + text: FlightBatteryState.Voltage.toFixed(2) + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 0.6) + weight: Font.DemiBold + } + } + } + } + + SvgElementPositionItem { + id: topbattery_amp + sceneSize: info.sceneSize + elementName: "topbattery-amp-text" + + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: scaledBounds.y * sceneItem.height + visible: (SystemAlarms.Alarm_PathPlan != 1) && (HwSettings.OptionalModules_Battery == 1) + + Rectangle { + anchors.fill: parent + color: info.batColors[SystemAlarms.Alarm_Battery] + border.color: info.batColors[SystemAlarms.Alarm_Battery] + border.width: topbattery_volt.width * 0.02 + + Text { + text: FlightBatteryState.Current.toFixed(2) + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 0.6) + weight: Font.DemiBold + } + } + } + } + + SvgElementPositionItem { + id: topbattery_milliamp + sceneSize: info.sceneSize + elementName: "topbattery-milliamp-text" + + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: scaledBounds.y * sceneItem.height + visible: (SystemAlarms.Alarm_PathPlan != 1) && (HwSettings.OptionalModules_Battery == 1) + + Rectangle { + anchors.fill: parent + + // Alarm based on FlightBatteryState.EstimatedFlightTime < 120s orange, < 60s red + color: (FlightBatteryState.EstimatedFlightTime <= 120 && FlightBatteryState.EstimatedFlightTime > 60 ? "orange" : + (FlightBatteryState.EstimatedFlightTime <= 60 ? "red": info.batColors[SystemAlarms.Alarm_Battery])) + + border.color: "white" + border.width: topbattery_volt.width * 0.01 + radius: border.width * 4 + + Text { + text: FlightBatteryState.ConsumedEnergy.toFixed(0) + anchors.centerIn: parent + color: "white" + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 0.6) + weight: Font.DemiBold + } + } + } + } + + // + // Default counter + // Only visible when PathPlan not active + + SvgElementImage { + sceneSize: info.sceneSize + elementName: "topbattery-total-distance-label" + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: Math.floor(scaledBounds.y * sceneItem.height) + visible: SystemAlarms.Alarm_PathPlan != 1 + } + + SvgElementPositionItem { + sceneSize: info.sceneSize + elementName: "topbattery-total-distance-text" + width: scaledBounds.width * sceneItem.width + height: scaledBounds.height * sceneItem.height + y: Math.floor(scaledBounds.y * sceneItem.height) + visible: SystemAlarms.Alarm_PathPlan != 1 + + MouseArea { id: total_dist_mouseArea2; anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: reset_distance()} + + Text { + text: total_distance > 1000 ? total_distance_km.toFixed(2) +" Km" : total_distance.toFixed(0)+" m" + anchors.right: parent.right + color: "cyan" + + font { + family: "Arial" + pixelSize: Math.floor(parent.height * 1) + weight: Font.DemiBold + } + } + + Timer { + interval: 1000; running: true; repeat: true; + onTriggered: {if (GPSPositionSensor.Status == 3) compute_distance(PositionState.East,PositionState.North)} + } + } + + SvgElementImage { id: mask_SatBar elementName: "satbar-mask" diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index c01428733..a07ff5d78 100644 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -22,6 +22,32 @@ inkscape:export-ydpi="72"> + + + + + + @@ -440,11 +466,11 @@ @@ -466,37 +492,37 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label10R"> @@ -505,36 +531,36 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label20R"> @@ -543,12 +569,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-20R"> @@ -556,23 +582,23 @@ @@ -581,37 +607,37 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-10R"> @@ -620,12 +646,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label30R"> @@ -633,7 +659,7 @@ @@ -659,12 +685,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label40R"> @@ -672,11 +698,11 @@ @@ -698,37 +724,37 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label50R"> @@ -737,37 +763,37 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label60R"> @@ -776,12 +802,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label70R"> @@ -789,23 +815,23 @@ @@ -814,25 +840,25 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label80R"> @@ -854,12 +880,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label90R"> @@ -867,23 +893,23 @@ @@ -892,36 +918,36 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-40R"> @@ -930,36 +956,36 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-30R"> @@ -968,12 +994,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-60R"> @@ -981,23 +1007,23 @@ @@ -1006,12 +1032,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-50R"> @@ -1019,23 +1045,23 @@ @@ -1044,36 +1070,36 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-80R"> @@ -1082,24 +1108,24 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-70R"> @@ -1107,12 +1133,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-90L"> @@ -1121,12 +1147,12 @@ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" id="pitch_label-90R"> @@ -1718,7 +1744,8 @@ inkscape:groupmode="layer" id="layer85" inkscape:label="battery-bg" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:none" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> + style="display:inline" + sodipodi:insensitive="true"> @@ -2571,11 +2602,6 @@ id="path11442" inkscape:connector-curvature="0" /> - @@ -4211,7 +4525,7 @@ id="g4945"> @@ -4288,7 +4602,7 @@ transform="translate(0,78)"> @@ -4315,12 +4629,12 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path6065" - d="m 241.40244,372.02206 l -8.50092,0" + d="M 241.40244,372.02206 L 232.90152,372.02206" style="fill:none;stroke:#ffffff;stroke-width:1.69943166;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> @@ -4379,11 +4693,11 @@ inkscape:transform-center-y="-85.40481" inkscape:connector-curvature="0" id="path4980" - d="m 319.99877,294.64611 l 0.16778,9.61226" + d="M 319.99877,294.64611 L 320.16655,304.25837" style="fill:none;stroke:#ffffff;stroke-width:1.69943166;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> @@ -5149,12 +5463,12 @@ id="compass330" inkscape:label="#compass330"> @@ -5167,12 +5481,12 @@ id="compass300" inkscape:label="#compass300"> @@ -5184,7 +5498,7 @@ id="compass270" inkscape:label="#compass270"> @@ -5197,12 +5511,12 @@ id="compass240" inkscape:label="#compass240"> @@ -5215,12 +5529,12 @@ id="compass210" inkscape:label="#compass210"> @@ -5232,7 +5546,7 @@ id="compass180" inkscape:label="#compass180"> @@ -5244,12 +5558,12 @@ style="font-size:33.9886322px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans" id="compass150"> @@ -5262,12 +5576,12 @@ id="compass120" inkscape:label="#compass120"> @@ -5279,7 +5593,7 @@ id="compass90" inkscape:label="#compass90"> @@ -5291,7 +5605,7 @@ style="font-size:33.9886322px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans" id="compass60"> @@ -5304,7 +5618,7 @@ id="compass30" inkscape:label="#compass-30"> @@ -5324,7 +5638,7 @@ inkscape:label="#g4651"> @@ -5352,11 +5666,11 @@ sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path5472" - d="m 319.99619,305.5318 l -8.52371,8.73614 l 6.87739,-0.0531 l -4.3e-4,27.16436 l 3.29307,0 l 0,-27.16436 l 6.85084,0.0531 z" + d="M 319.99619,305.5318 L 311.47248,314.26794 L 318.34987,314.21484 L 318.34944,341.3792 L 321.64251,341.3792 L 321.64251,314.21484 L 328.49335,314.26794 z" style="fill:#bf00bf;fill-opacity:1;stroke:none" /> @@ -5373,17 +5687,17 @@ id="compass-text" transform="translate(0,78)"> @@ -5402,13 +5716,13 @@ inkscape:transform-center-y="-72.71875" inkscape:connector-curvature="0" id="path4626" - d="m 320,372.78125 l -3.78125,4.5 l 3.78125,4.5 l 3.78125,-4.5 l -3.78125,-4.5 z" + d="M 320,372.78125 L 316.21875,377.28125 L 320,381.78125 L 323.78125,377.28125 L 320,372.78125 z" style="fill:#00ffff;stroke:none" /> @@ -5420,7 +5734,7 @@ @@ -5429,7 +5743,7 @@ inkscape:groupmode="layer" id="layer17" inkscape:label="speed" - style="display:none" + style="display:inline" transform="translate(0,-4)" sodipodi:insensitive="true"> @@ -5503,17 +5817,17 @@ @@ -5667,27 +5981,27 @@ id="speed-text" transform="translate(0,42)"> @@ -5712,7 +6026,7 @@ id="altitude-unit" transform="translate(0,42)"> @@ -5760,23 +6074,23 @@ style="display:inline"> @@ -5892,7 +6206,7 @@ inkscape:connector-curvature="0" id="path10043" transform="translate(0,4)" - d="m 506.5,144.4375 l 0,12.75 l -9.525,6.5625 l 0,2.5 l 9.525,6.5625 l 0,12.75 l 43,0 L 549.5,165 l 0,-20.5625 z" + d="M 506.5,144.4375 L 506.5,157.1875 L 496.975,163.75 L 496.975,166.25 L 506.5,172.8125 L 506.5,185.5625 L 549.5,185.5625 L 549.5,165 L 549.5,144.4375 z" style="fill:#000000;stroke:#ffffff" /> @@ -5969,7 +6283,7 @@ sodipodi:insensitive="true"> @@ -5997,11 +6311,11 @@ sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="rect4893" - d="m 593.03211,212.93018 l 85.3661,0 l 0,7.977 l -85.3661,0 l -4,-3.9885 z" + d="M 593.03211,212.93018 L 678.39821,212.93018 L 678.39821,220.90718 L 593.03211,220.90718 L 589.03211,216.91868 z" style="fill:#c8c8c8;fill-opacity:1;stroke:#111413;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none" /> @@ -6026,7 +6340,7 @@ sodipodi:insensitive="true"> @@ -6042,7 +6356,7 @@ transform="translate(-18,0)"> @@ -6187,7 +6501,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5087"> @@ -6196,7 +6510,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5099"> @@ -6205,7 +6519,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5103"> @@ -6213,7 +6527,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5137"> @@ -6222,7 +6536,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5129"> @@ -6231,7 +6545,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5133"> @@ -6240,7 +6554,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5125"> @@ -6249,7 +6563,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" id="text5121"> @@ -6275,7 +6589,7 @@ sodipodi:nodetypes="csssscc" inkscape:connector-curvature="0" id="path4655" - d="m 640.50296,463.50296 l 0,14.99408 c 0,1.108 -0.892,2 -2,2 l -636.9999976,0 c -1.10800005,0 -2.00000005,-0.892 -2.00000005,-2 l 3e-8,-14.99408 c 0,-1.108 640.99999762,0 640.99999762,0 z" + d="M 640.50296,463.50296 L 640.50296,478.49704 C 640.50296,479.60504 639.61096,480.49704 638.50296,480.49704 L 1.5029624,480.49704 C 0.39496235,480.49704 -0.49703765,479.60504 -0.49703765,478.49704 L -0.49703762,463.50296 C -0.49703762,462.39496 640.50296,463.50296 640.50296,463.50296 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;display:inline" /> @@ -6373,23 +6687,23 @@ + d="M 404.79999,473.51954 L 405.89558,473.42374 C 405.94748,473.86277 406.0672,474.22398 406.25479,474.50735 C 406.44636,474.78674 406.74171,475.01424 407.14083,475.18985 C 407.53995,475.36147 407.98896,475.44728 408.48787,475.44728 C 408.93089,475.44728 409.32202,475.38138 409.66128,475.24972 C 410.00053,475.11801 410.25197,474.9384 410.41562,474.7109 C 410.58324,474.47942 410.66706,474.22797 410.66706,473.95657 C 410.66706,473.68118 410.58726,473.4417 410.42759,473.23815 C 410.26794,473.03061 410.00452,472.85699 409.63733,472.7173 C 409.40185,472.6255 408.881,472.48381 408.07478,472.29223 C 407.26855,472.09667 406.7038,471.91307 406.38051,471.74145 C 405.96143,471.52194 405.64812,471.25053 405.44058,470.92724 C 405.23703,470.59997 405.13525,470.23477 405.13525,469.83166 C 405.13525,469.38864 405.26098,468.97555 405.51242,468.59239 C 405.76387,468.20525 406.13106,467.91189 406.614,467.71233 C 407.09693,467.51277 407.63374,467.41299 408.22445,467.41299 C 408.87501,467.41299 409.44775,467.51876 409.94266,467.73029 C 410.44155,467.93784 410.82471,468.24516 411.09213,468.65225 C 411.35953,469.05936 411.50321,469.52035 411.52318,470.03521 L 410.40963,470.11901 C 410.34973,469.56424 410.14621,469.14517 409.79898,468.86178 C 409.45573,468.57841 408.94685,468.43673 408.27234,468.43672 C 407.56989,468.43673 407.05702,468.56644 406.73373,468.82586 C 406.41443,469.08131 406.25479,469.39062 406.25479,469.75382 C 406.25479,470.06913 406.36853,470.32856 406.59604,470.5321 C 406.81954,470.73566 407.40226,470.9452 408.34418,471.16072 C 409.29009,471.37226 409.93866,471.55785 410.2899,471.71749 C 410.80076,471.95298 411.17793,472.25232 411.4214,472.61551 C 411.66486,472.97472 411.78659,473.38981 411.7866,473.86077 C 411.78659,474.32774 411.65288,474.76877 411.38548,475.18385 C 411.11806,475.59495 410.73291,475.91624 410.23003,476.14773 C 409.73112,476.37523 409.16836,476.48897 408.54175,476.48898 C 407.74749,476.48897 407.08096,476.37323 406.54215,476.14174 C 406.00733,475.91025 405.58626,475.56302 405.27894,475.10004 C 404.97561,474.63307 404.81596,474.10623 404.79999,473.51952" /> + d="M 415.61815,476.33932 L 415.61815,468.59838 L 412.72653,468.59838 L 412.72653,467.56267 L 419.6832,467.56267 L 419.6832,468.59838 L 416.77959,468.59838 L 416.77959,476.33932 L 415.61815,476.33932" /> + d="M 419.05458,476.33932 L 422.42515,467.56267 L 423.6764,467.56267 L 427.26848,476.33932 L 425.9454,476.33932 L 424.92165,473.68118 L 421.25174,473.68118 L 420.28786,476.33932 L 419.05458,476.33932 M 421.587,472.73527 L 424.56244,472.73527 L 423.64646,470.30462 C 423.36707,469.56626 423.15953,468.95959 423.02384,468.48463 C 422.91208,469.0474 422.75443,469.60617 422.55088,470.16094 L 421.587,472.73527" /> + d="M 428.16052,476.33932 L 428.16052,467.56267 L 431.45326,467.56267 C 432.12378,467.56267 432.66059,467.65247 433.06371,467.83207 C 433.47081,468.00769 433.78811,468.28109 434.01561,468.65226 C 434.2471,469.01946 434.36284,469.40461 434.36285,469.80772 C 434.36284,470.1829 434.26107,470.53612 434.05752,470.86738 C 433.85396,471.19866 433.54664,471.46607 433.13555,471.66962 C 433.66638,471.82528 434.07348,472.09069 434.35686,472.46586 C 434.64422,472.84104 434.7879,473.28406 434.78791,473.79493 C 434.7879,474.20603 434.70011,474.58918 434.52449,474.9444 C 434.35286,475.29563 434.13933,475.56703 433.8839,475.7586 C 433.62846,475.95018 433.30717,476.09586 432.92003,476.19564 C 432.53687,476.29144 432.06591,476.33932 431.50714,476.33932 L 428.16052,476.33932 M 429.32196,471.25054 L 431.21977,471.25054 C 431.73464,471.25054 432.10382,471.21664 432.32733,471.14876 C 432.62268,471.06096 432.84419,470.91528 432.99187,470.71173 C 433.14353,470.50818 433.21936,470.25274 433.21937,469.94541 C 433.21936,469.65406 433.14947,469.39863 433.00983,469.1791 C 432.87013,468.9556 432.67057,468.80394 432.41115,468.72411 C 432.15172,468.64031 431.7067,468.59839 431.07609,468.59838 L 429.32196,468.59838 L 429.32196,471.25054 M 429.32196,475.30361 L 431.50714,475.30361 C 431.88231,475.30361 432.14573,475.28961 432.2974,475.26171 C 432.56481,475.21381 432.78831,475.13399 432.96792,475.02224 C 433.14752,474.91049 433.2952,474.74884 433.41095,474.53731 C 433.52668,474.32178 433.58456,474.07433 433.58456,473.79494 C 433.58456,473.46767 433.50076,473.18429 433.33312,472.94482 C 433.16548,472.70136 432.932,472.53173 432.63266,472.43594 C 432.33731,472.33614 431.91025,472.28627 431.35148,472.28627 L 429.32196,472.28627 L 429.32196,475.30362" /> + d="M 443.42089,476.33932 L 442.34326,476.33932 L 442.34326,469.47246 C 442.08383,469.71992 441.74258,469.96737 441.31952,470.21482 C 440.90044,470.46228 440.52327,470.64787 440.18801,470.77159 L 440.18801,469.72989 C 440.79068,469.44652 441.31752,469.10328 441.76853,468.70016 C 442.21953,468.29706 442.53883,467.90592 442.72642,467.52674 L 443.42089,467.52674 L 443.42089,476.33932" /> @@ -6417,47 +6731,47 @@ id="warning-autopilot-label" transform="matrix(1.1017863,0,0,1.1017863,-42.744908,-48.294497)"> @@ -6486,67 +6800,67 @@ inkscape:label="#warning-master-caution-label" transform="matrix(1.1017863,0,0,1.1017863,-33.088618,-48.971446)"> @@ -6576,37 +6890,37 @@ id="warning-rc-input-label" transform="matrix(1.1017863,0,0,1.1017863,-23.124025,-49.099088)"> @@ -6637,15 +6951,15 @@ + d="M 121,476.58899 L 124.48553,467.51299 L 125.77945,467.51299 L 129.49404,476.58899 L 128.12583,476.58899 L 127.06717,473.84019 L 123.27209,473.84019 L 122.27534,476.58899 L 121,476.58899 M 123.61879,472.86201 L 126.69571,472.86201 L 125.74849,470.34847 C 125.45957,469.58492 125.24495,468.95756 125.10463,468.4664 C 124.98906,469.04836 124.82603,469.62619 124.61554,470.19988 L 123.61879,472.86201" /> + d="M 130.4846,476.58899 L 130.4846,467.51299 L 134.50875,467.51299 C 135.3177,467.513 135.93267,467.59559 136.35367,467.76063 C 136.77465,467.9216 137.11102,468.20845 137.3628,468.62118 C 137.61456,469.03392 137.74044,469.48999 137.74045,469.98939 C 137.74044,470.63326 137.53201,471.176 137.11516,471.61762 C 136.69829,472.05925 136.05443,472.33991 135.18357,472.4596 C 135.50137,472.61231 135.74282,472.76296 135.90791,472.91154 C 136.25873,473.23347 136.59098,473.63589 136.90466,474.11878 L 138.48337,476.58899 L 136.97277,476.58899 L 135.77171,474.70074 C 135.42088,474.15593 135.13197,473.73907 134.90497,473.45015 C 134.67796,473.16124 134.47366,472.95901 134.29206,472.84344 C 134.11458,472.72788 133.93298,472.64739 133.74726,472.60199 C 133.61105,472.57309 133.38818,472.55869 133.07863,472.55869 L 131.68566,472.55869 L 131.68566,476.58903 L 130.4846,476.58903 M 131.68566,471.5186 L 134.2673,471.5186 C 134.81623,471.51861 135.24547,471.4629 135.55503,471.35145 C 135.86457,471.23589 136.09983,471.05428 136.2608,470.80664 C 136.42176,470.55488 136.50224,470.28247 136.50225,469.98943 C 136.50224,469.56019 136.3454,469.20731 136.03173,468.93077 C 135.72218,468.65424 135.23103,468.51598 134.55828,468.51597 L 131.68566,468.51597 L 131.68566,471.5186" /> + d="M 139.59156,476.58899 L 139.59156,467.51299 L 141.39933,467.51299 L 143.5476,473.93924 C 143.74571,474.53771 143.89017,474.98552 143.98097,475.28269 C 144.08415,474.9525 144.24512,474.46754 144.46387,473.82781 L 146.63691,467.51299 L 148.25276,467.51299 L 148.25276,476.58899 L 147.09504,476.58899 L 147.09504,468.99264 L 144.45768,476.58899 L 143.37426,476.58899 L 140.74927,468.86263 L 140.74927,476.58899 L 139.59156,476.58899" /> @@ -6760,7 +7074,7 @@ inkscape:groupmode="layer" id="layer13" inkscape:label="pfd-window" - style="display:none" + style="display:inline" transform="translate(0,-4)" sodipodi:insensitive="true">