From 9c189172970fafa658a59c6fd65d227913864710 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh>
Date: Sat, 20 Sep 2014 02:01:05 +0200
Subject: [PATCH] OP-1435 Small fixes. Common background color for Volt/Amp,
 display Lipo alarm if NbCells is defined.

---
 .../share/openpilotgcs/pfd/default/Info.qml   |  25 +++--
 .../share/openpilotgcs/pfd/default/pfd.svg    | 100 +++++++++++-------
 .../src/plugins/pfdqml/pfdqmlgadgetwidget.cpp |   3 +-
 3 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
index ab54c6b1f..96897fc38 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
@@ -262,6 +262,23 @@ Item {
     // Battery Info (Top)
     // Only visible when PathPlan not active and Battery module enabled
 
+    SvgElementPositionItem {
+        id: topbattery_voltamp_bg
+        sceneSize: info.sceneSize
+        elementName: "topbattery-label-voltamp-bg"
+        
+        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:  FlightBatterySettings.NbCells > 0 ? info.batColors[SystemAlarms.Alarm_Battery] : "black"
+
+        }
+    }
+
     SvgElementImage  {
         sceneSize: info.sceneSize
         elementName: "topbattery-labels"
@@ -283,9 +300,7 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            color: info.batColors[SystemAlarms.Alarm_Battery]
-            border.color: info.batColors[SystemAlarms.Alarm_Battery]
-            border.width: topbattery_volt.width * 0.02
+            color: "transparent"
 
             Text {
                text: FlightBatteryState.Voltage.toFixed(2)
@@ -312,9 +327,7 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            color: info.batColors[SystemAlarms.Alarm_Battery]
-            border.color: info.batColors[SystemAlarms.Alarm_Battery]
-            border.width: topbattery_volt.width * 0.02
+            color: "transparent"
 
             Text {
                text: FlightBatteryState.Current.toFixed(2)
diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
index a07ff5d78..6c5ba3b8c 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
@@ -22,6 +22,18 @@
    inkscape:export-ydpi="72">
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient12805">
+      <stop
+         style="stop-color:#191919;stop-opacity:1;"
+         offset="0"
+         id="stop12807" />
+      <stop
+         style="stop-color:#191919;stop-opacity:0;"
+         offset="1"
+         id="stop12809" />
+    </linearGradient>
     <marker
        inkscape:stockid="Arrow2Send"
        orient="auto"
@@ -299,6 +311,15 @@
        x2="197.19637"
        y2="303.79398"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12805"
+       id="linearGradient12811"
+       x1="182.40804"
+       y1="378.5622"
+       x2="187.44969"
+       y2="378.5622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -307,11 +328,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.0375"
-     inkscape:cx="345.75598"
-     inkscape:cy="354.61232"
+     inkscape:zoom="3.8015741"
+     inkscape:cx="435.95735"
+     inkscape:cy="386.51298"
      inkscape:document-units="px"
-     inkscape:current-layer="layer98"
+     inkscape:current-layer="layer48"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -322,16 +343,16 @@
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     showguides="false"
+     showguides="true"
      inkscape:guide-bbox="true"
      inkscape:object-nodes="true"
      inkscape:object-paths="false"
      inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="false"
+     inkscape:bbox-nodes="true"
      inkscape:snap-bbox-midpoints="true"
      inkscape:snap-grids="false"
      inkscape:snap-to-guides="false"
-     inkscape:snap-nodes="true"
+     inkscape:snap-nodes="false"
      inkscape:bbox-paths="true"
      inkscape:snap-global="true"
      inkscape:snap-intersection-paths="true"
@@ -421,15 +442,13 @@
      inkscape:groupmode="layer"
      id="layer69"
      inkscape:label="foreground_layer"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <rect
+     style="display:inline">
+    <path
        style="fill:url(#radialGradient4865);fill-opacity:1;stroke:none"
+       d="M -0.5,-0.5 L 642,-0.5 L 642,481 L -0.5,481 z"
        id="foreground"
-       width="641.5"
-       height="481.5"
-       x="-0.5"
-       y="-0.5" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -3337,19 +3356,17 @@
        id="layer48"
        inkscape:label="info-bg"
        style="display:inline"
-       transform="translate(0,4)"
-       sodipodi:insensitive="true">
+       transform="translate(0,4)">
       <g
          id="info-bg"
          inkscape:label="#g4460"
          transform="matrix(1.1653043,0,0,1,-0.25937667,-0.19161584)">
-        <rect
+        <path
            style="fill:#000000;fill-opacity:1;stroke:none"
+           d="M -0.5,-2.1167679 L 551.15164,-2.1167679 L 551.15164,57.883232 L -0.5,57.883232 z"
            id="rect4615"
-           width="550.5"
-           height="60"
-           x="-0.5"
-           y="-2.1167679" />
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
         <g
            transform="matrix(0.89658208,0,0,1.0166066,0.62788103,-5.1809092)"
            style="display:inline"
@@ -3904,7 +3921,7 @@
       <g
          style="display:inline"
          id="topbattery-amp-text"
-         transform="matrix(0.7,0,0,0.7,345.2216,-202)">
+         transform="matrix(0.7,0,0,0.725,345.2216,-211.375)">
         <rect
            style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
            id="top-warning-high-current"
@@ -3945,7 +3962,7 @@
       <g
          style="display:inline"
          id="topbattery-volt-text"
-         transform="matrix(0.7,0,0,0.7,345.2216,-202)">
+         transform="matrix(0.7,0,0,0.725,345.2216,-211.375)">
         <rect
            y="295"
            x="12"
@@ -4018,29 +4035,25 @@
          id="topbattery-total-distance-label"
          style="display:inline">
         <g
-           id="g6812"
-           transform="matrix(1.4653007,0,0,1.4653007,-90.892136,61.318534)">
+           id="g12760"
+           transform="translate(-1.07066,4.962966)">
           <path
              inkscape:connector-curvature="0"
              id="path3913-8"
-             d="M 188.80254,-33.140573 L 188.80254,-31.86879 C 188.22579,-32.105492 187.68162,-32.28195 187.17009,-32.398162 C 186.6585,-32.514357 186.16451,-32.572458 185.68807,-32.572466 C 184.86054,-32.572458 184.2211,-32.434721 183.76971,-32.1593 C 183.32335,-31.883846 183.10017,-31.492197 183.10019,-30.984352 C 183.10017,-30.558266 183.24809,-30.235479 183.54402,-30.015991 C 183.84495,-29.800793 184.41167,-29.626489 185.24419,-29.493075 L 186.16201,-29.331697 C 187.29544,-29.146626 188.1305,-28.819537 188.66712,-28.350423 C 189.20877,-27.885604 189.4796,-27.26155 189.4796,-26.478255 C 189.4796,-25.544323 189.11348,-24.836342 188.38126,-24.354315 C 187.65404,-23.872284 186.5858,-23.631271 185.1765,-23.631271 C 184.64489,-23.631271 184.07816,-23.682915 183.47633,-23.786203 C 182.87951,-23.889491 182.26012,-24.042282 181.61817,-24.244562 L 181.61817,-25.587358 C 182.23504,-25.290392 182.83938,-25.066592 183.43119,-24.91596 C 184.02299,-24.765324 184.60477,-24.690008 185.1765,-24.69001 C 186.04415,-24.690008 186.71367,-24.836332 187.18513,-25.129 C 187.65654,-25.421659 187.89226,-25.839129 187.89228,-26.381415 C 187.89226,-26.854832 187.72165,-27.224961 187.38073,-27.491803 C 187.04468,-27.758637 186.49051,-27.958765 185.71815,-28.092189 L 184.79283,-28.247121 C 183.65938,-28.440788 182.83938,-28.744209 182.33283,-29.157382 C 181.82629,-29.570544 181.57303,-30.145105 181.57303,-30.881066 C 181.57303,-31.733218 181.92158,-32.404613 182.61872,-32.895261 C 183.32086,-33.385886 184.28628,-33.631205 185.51502,-33.631215 C 186.04163,-33.631205 186.57827,-33.590313 187.12495,-33.508558 C 187.67158,-33.42677 188.23079,-33.304117 188.80254,-33.140579"
+             d="M 189.05254,9.7946662 L 189.05254,11.658211 C 188.20743,11.311371 187.41005,11.052807 186.66051,10.882522 C 185.91088,10.712261 185.18703,10.627125 184.4889,10.627114 C 183.27632,10.627125 182.33935,10.828952 181.67793,11.232526 C 181.02388,11.636149 180.69685,12.210033 180.69688,12.954178 C 180.69685,13.578522 180.9136,14.051502 181.34723,14.373118 C 181.78818,14.688448 182.61859,14.943856 183.83849,15.139348 L 185.18337,15.375815 C 186.84418,15.647 188.0678,16.126283 188.85411,16.813676 C 189.64779,17.494776 190.04464,18.409203 190.04464,19.556965 C 190.04464,20.925457 189.50816,21.962862 188.43524,22.669176 C 187.36964,23.375497 185.80435,23.728653 183.7393,23.728653 C 182.96033,23.728653 182.1299,23.652979 181.24804,23.501631 C 180.37352,23.350283 179.46593,23.126398 178.52528,22.829997 L 178.52528,20.862397 C 179.42918,21.297542 180.31472,21.625476 181.1819,21.846197 C 182.04906,22.066924 182.90154,22.177285 183.7393,22.177282 C 185.01067,22.177285 185.99172,21.962876 186.68255,21.53403 C 187.3733,21.105196 187.71871,20.493477 187.71873,19.698865 C 187.71871,19.005167 187.46871,18.462817 186.96916,18.071813 C 186.47675,17.680821 185.66472,17.387573 184.53298,17.192067 L 183.17711,16.965045 C 181.51626,16.681264 180.31472,16.236661 179.57247,15.631239 C 178.83024,15.025832 178.45913,14.183928 178.45913,13.105523 C 178.45913,11.856864 178.96986,10.873069 179.99138,10.154122 C 181.02023,9.4352089 182.43486,9.0757428 184.23533,9.0757281 C 185.00698,9.0757428 185.79331,9.1356618 186.59437,9.2554575 C 187.39534,9.3753015 188.21475,9.555025 189.05254,9.7946574"
              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" />
           <path
              inkscape:connector-curvature="0"
              id="path3915-2"
-             d="M 191.58717,-33.456048 L 193.08515,-33.456048 L 193.08515,-27.71249 C 193.08515,-26.69929 193.29916,-25.968946 193.72715,-25.521452 C 194.15514,-25.078179 194.84879,-24.856542 195.80811,-24.856542 C 196.76249,-24.856542 197.45368,-25.078179 197.88167,-25.521452 C 198.30966,-25.968946 198.52367,-26.69929 198.52367,-27.71249 L 198.52367,-33.456048 L 200.02167,-33.456048 L 200.02167,-27.554178 C 200.02165,-26.321453 199.66499,-25.39058 198.95168,-24.761555 C 198.24326,-24.13253 197.19539,-23.818016 195.80811,-23.818016 C 194.41587,-23.818016 193.3631,-24.13253 192.64978,-24.761555 C 191.94136,-25.39058 191.58717,-26.321453 191.58717,-27.554178 L 191.58717,-33.456048"
+             d="M 193.13286,9.3324004 L 195.32785,9.3324004 L 195.32785,17.74844 C 195.32785,19.233083 195.64144,20.303256 196.26857,20.95897 C 196.89571,21.608498 197.91211,21.933263 199.31781,21.933263 C 200.71626,21.933263 201.72906,21.608498 202.35619,20.95897 C 202.98333,20.303256 203.29692,19.233083 203.29692,17.74844 L 203.29692,9.3324004 L 205.49194,9.3324004 L 205.49194,17.980415 C 205.49191,19.786727 204.96929,21.150736 203.92408,22.072447 C 202.88603,22.994158 201.35059,23.455015 199.31781,23.455015 C 197.27776,23.455015 195.73513,22.994158 194.6899,22.072447 C 193.65185,21.150736 193.13286,19.786727 193.13286,17.980415 L 193.13286,9.3324004"
              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" />
           <path
              inkscape:connector-curvature="0"
              id="path3917-4"
-             d="M 202.65296,-33.456048 L 204.91727,-33.456048 L 207.78338,-26.89728 L 210.66452,-33.456048 L 212.92883,-33.456048 L 212.92883,-23.818016 L 211.44688,-23.818016 L 211.44688,-32.28115 L 208.55067,-25.670739 L 207.02359,-25.670739 L 204.12739,-32.28115 L 204.12739,-23.818016 L 202.65296,-23.818016 L 202.65296,-33.456048"
+             d="M 209.34757,9.3324004 L 212.66546,9.3324004 L 216.86518,18.942968 L 221.08691,9.3324004 L 224.40481,9.3324004 L 224.40481,23.455015 L 222.23331,23.455015 L 222.23331,11.053979 L 217.98949,20.740219 L 215.75186,20.740219 L 211.50805,11.053979 L 211.50805,23.455015 L 209.34757,23.455015 L 209.34757,9.3324004"
              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" />
-        </g>
-        <g
-           id="g6806"
-           transform="matrix(1.4653007,0,0,1.4653007,-143.64744,81.823921)">
           <path
-             d="M 218.2657,-32.384898 L 218.2657,-24.890044 L 220.10123,-24.890044 C 221.65088,-24.890044 222.78429,-25.1913 223.50145,-25.793816 C 224.22363,-26.396328 224.58471,-27.34744 224.58471,-28.647154 C 224.58471,-29.938251 224.22363,-30.882907 223.50145,-31.481126 C 222.78429,-32.083632 221.65088,-32.384889 220.10123,-32.384898 L 218.2657,-32.384898 M 216.74613,-33.456512 L 219.86802,-33.456512 C 222.04457,-33.456502 223.64188,-33.067022 224.65995,-32.288065 C 225.67801,-31.513395 226.18703,-30.299759 226.18703,-28.647154 C 226.18703,-26.985932 225.67548,-25.76584 224.65242,-24.986877 C 223.62934,-24.207912 222.03454,-23.818429 219.86802,-23.818429 L 216.74613,-23.818429 L 216.74613,-33.456512"
+             d="M 179.46962,31.407344 L 179.46962,42.389559 L 182.15923,42.389559 C 184.42993,42.389559 186.09072,41.948128 187.14157,41.065261 C 188.19978,40.1824 188.72887,38.788735 188.72887,36.884263 C 188.72887,34.992418 188.19978,33.608213 187.14157,32.731642 C 186.09072,31.84879 184.42993,31.407357 182.15923,31.407344 L 179.46962,31.407344 M 177.243,29.837108 L 181.8175,29.837108 C 185.0068,29.837122 187.34734,30.407828 188.83912,31.549234 C 190.33089,32.684358 191.07675,34.4627 191.07675,36.884263 C 191.07675,39.318453 190.32718,41.106255 188.82809,42.24767 C 187.32897,43.389088 184.99211,43.959797 181.8175,43.959797 L 177.243,43.959797 L 177.243,29.837108"
              style="font-size:8px;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="path3900-2"
              inkscape:connector-curvature="0" />
@@ -4048,14 +4061,14 @@
              inkscape:connector-curvature="0"
              id="path6379-2"
              style="font-size:8px;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"
-             d="M 241.36773,-33.456512 L 250.86882,-33.456512 L 250.86882,-32.359076 L 246.88182,-32.359076 L 246.88182,-23.818429 L 245.35473,-23.818429 L 245.35473,-32.359076 L 241.36773,-32.359076 L 241.36773,-33.456512" />
+             d="M 213.32104,29.837108 L 227.243,29.837108 L 227.243,31.445181 L 221.40084,31.445181 L 221.40084,43.959797 L 219.1632,43.959797 L 219.1632,31.445181 L 213.32104,31.445181 L 213.32104,29.837108" />
           <path
-             d="M 228.60181,-33.456512 L 230.12137,-33.456512 L 230.12137,-23.818429 L 228.60181,-23.818429 L 228.60181,-33.456512"
+             d="M 194.61513,29.837108 L 196.84174,29.837108 L 196.84174,43.959797 L 194.61513,43.959797 L 194.61513,29.837108"
              style="font-size:8px;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="path3902-7"
              inkscape:connector-curvature="0" />
           <path
-             d="M 239.87824,-33.140193 L 239.87824,-31.868457 C 239.30151,-32.10515 238.75735,-32.281601 238.24582,-32.397808 C 237.73429,-32.514003 237.24029,-32.572099 236.76387,-32.572107 C 235.93637,-32.572099 235.29695,-32.434379 234.8456,-32.158954 C 234.39926,-31.88351 234.17608,-31.491876 234.17608,-30.98405 C 234.17608,-30.55798 234.32398,-30.235205 234.61992,-30.015723 C 234.92082,-29.800534 235.48753,-29.626234 236.32003,-29.492827 L 237.23781,-29.331433 C 238.37119,-29.14637 239.20622,-28.819292 239.74284,-28.350195 C 240.28445,-27.885394 240.55528,-27.261362 240.55528,-26.478096 C 240.55528,-25.544197 240.18916,-24.836243 239.45698,-24.354232 C 238.72978,-23.87222 237.66156,-23.631215 236.25234,-23.631215 C 235.72072,-23.631215 235.15402,-23.682859 234.55221,-23.786147 C 233.95542,-23.889435 233.33605,-24.042214 232.69412,-24.244487 L 232.69412,-25.587234 C 233.31097,-25.29028 233.91529,-25.06649 234.50709,-24.915861 C 235.09886,-24.765225 235.68061,-24.689917 236.25234,-24.689919 C 237.11993,-24.689917 237.78945,-24.836241 238.26088,-25.128894 C 238.73228,-25.421542 238.968,-25.838998 238.968,-26.381263 C 238.968,-26.854665 238.79757,-27.224781 238.45647,-27.491612 C 238.12046,-27.758436 237.56629,-27.958557 236.79397,-28.091974 L 235.86868,-28.246907 C 234.73525,-28.440568 233.91529,-28.743977 233.40877,-29.157135 C 232.90224,-29.570282 232.64898,-30.144822 232.64898,-30.880757 C 232.64898,-31.732878 232.99753,-32.40425 233.69463,-32.894877 C 234.39674,-33.385488 235.36216,-33.630797 236.59085,-33.630807 C 237.11742,-33.630797 237.65405,-33.589905 238.2007,-33.50815 C 238.74734,-33.426362 239.30651,-33.303717 239.87824,-33.140186"
+             d="M 211.13849,30.30061 L 211.13849,32.164086 C 210.29341,31.817259 209.49605,31.558705 208.74651,31.388427 C 207.99696,31.218167 207.2731,31.133039 206.575,31.133027 C 205.36247,31.133039 204.42553,31.33484 203.76416,31.73842 C 203.11014,32.142028 202.78311,32.71589 202.78311,33.460008 C 202.78311,34.084329 202.99983,34.557291 203.43347,34.878898 C 203.87438,35.194215 204.70478,35.449617 205.92465,35.645098 L 207.26947,35.881589 C 208.93021,36.152762 210.15378,36.632029 210.94009,37.319397 C 211.73371,38.000471 212.13056,38.914865 212.13056,40.062585 C 212.13056,41.431028 211.59408,42.468394 210.52122,43.174685 C 209.45565,43.880977 207.89039,44.234122 205.82546,44.234122 C 205.04648,44.234122 204.21609,44.158448 203.33426,44.0071 C 202.45978,43.855752 201.55222,43.631885 200.6116,43.335494 L 200.6116,41.367966 C 201.51547,41.803093 202.40098,42.131013 203.26814,42.351729 C 204.13526,42.572456 204.9877,42.682805 205.82546,42.682802 C 207.09674,42.682805 208.07779,42.468397 208.76857,42.039572 C 209.45932,41.610755 209.80472,40.999056 209.80472,40.204475 C 209.80472,39.510799 209.55499,38.968467 209.05517,38.57748 C 208.56282,38.186502 207.75079,37.893265 206.61911,37.697769 L 205.26328,37.470745 C 203.60247,37.186974 202.40098,36.742388 201.65877,36.136988 C 200.91656,35.531603 200.54545,34.689729 200.54545,33.611363 C 200.54545,32.36275 201.05618,31.378988 202.07764,30.660072 C 203.10645,29.941179 204.52108,29.581728 206.32148,29.581713 C 207.09306,29.581728 207.87939,29.641647 208.68039,29.761442 C 209.48138,29.881286 210.30074,30.060998 211.13849,30.30062"
              style="font-size:8px;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="path3904-3"
              inkscape:connector-curvature="0" />
@@ -4087,7 +4100,7 @@
              d="M 626.46764,52 L 628.70735,46.168 L 629.53879,46.168 L 631.92569,52 L 631.04652,52 L 630.36625,50.233692 L 627.92763,50.233692 L 627.28714,52 L 626.46764,52 M 628.15041,49.605141 L 630.12756,49.605141 L 629.5189,47.990003 C 629.33325,47.499366 629.19534,47.096245 629.10517,46.780639 C 629.03087,47.154592 628.92615,47.525887 628.79089,47.894527 L 628.15041,49.605141" />
         </g>
         <g
-           transform="matrix(1.9483514,0,0,2.0215039,-792.43111,-12.843583)"
+           transform="matrix(1.9483514,0,0,2.0215039,-801.18111,-13.343583)"
            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;display:inline;font-family:Sans"
            id="top-battery-amp-label">
           <path
@@ -4097,7 +4110,7 @@
              inkscape:connector-curvature="0" />
         </g>
         <g
-           transform="matrix(1.8265794,0,0,1.8951599,-705.20685,-2.6763355)"
+           transform="matrix(1.8265794,0,0,1.8951599,-713.95685,-4.1763355)"
            id="top-battery-volt-label"
            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;display:inline;font-family:Sans">
           <path
@@ -4118,7 +4131,7 @@
              height="23.048584"
              width="10.563934"
              id="rect8252-6"
-             style="fill:#191919;fill-opacity:1;stroke:#ffffff;stroke-width:0.599971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+             style="fill:#373737;fill-opacity:1;stroke:#ffffff;stroke-width:0.59997100000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <rect
              ry="0.37989542"
              rx="0.3369644"
@@ -4127,7 +4140,7 @@
              height="2.4008942"
              width="4.4416542"
              id="rect8254-0"
-             style="fill:#191919;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+             style="fill:url(#linearGradient12811);fill-opacity:1;stroke:#ffffff;stroke-width:0.60000001999999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
              sodipodi:nodetypes="ccccccc"
              inkscape:connector-curvature="0"
@@ -4136,6 +4149,13 @@
              style="fill:#fcc100;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.98506242;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="topbattery-label-voltamp-bg"
+         width="90"
+         height="59.014935"
+         x="354.7511"
+         y="2.1841474" />
     </g>
     <g
        inkscape:groupmode="layer"
diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
index 8f93caecc..6a0c650ea 100644
--- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
@@ -76,7 +76,8 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
         "ManualControlCommand" <<
         "SystemSettings" <<
         "RevoSettings" <<
-        "MagState";
+        "MagState" <<
+        "FlightBatterySettings";
 
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();