Merge pull request #1372 from dogmaphobic/fixBattery

Advanced Power Config

src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml

@@ -30,6 +30,7 @@
             <short_desc>Battery capacity</short_desc>
             <long_desc>Defines the capacity of the attached battery.</long_desc>
             <default>-1.0</default>
+            <unit>mA</unit>
         </parameter>
         <parameter name="BAT_V_SCALE_IO" type="INT32">
             <short_desc>Scaling factor for battery voltage sensor on PX4IO</short_desc>

src/AutoPilotPlugins/PX4/PowerComponent.qml

@@ -44,7 +44,7 @@ Rectangle {
     color:  palette.window
 
     property int firstColumnWidth: 220
-    property int textEditWidth:    60
+    property int textEditWidth:    80
     property ScreenTools screenTools: ScreenTools { }
 
     property Fact battNumCells: Fact { name: "BAT_N_CELLS" }
@@ -109,7 +109,7 @@ Rectangle {
 
         Rectangle {
             width: parent.width
-            height: 160
+            height: 120
             color: palette.windowShade
 
             Column {
@@ -155,17 +155,6 @@ Rectangle {
                                 showUnits: true
                             }
                         }
-                        Row {
-                            spacing: 10
-                            visible: showAdvanced.checked
-                            QGCLabel { text: "Voltage Drop on Full Load (per cell)"; width: firstColumnWidth; anchors.baseline: battDropField.baseline}
-                            FactTextField {
-                                id: battDropField
-                                width: textEditWidth
-                                fact: Fact { name: "BAT_V_LOAD_DROP" }
-                                showUnits: true
-                            }
-                        }
                     }
                     Canvas {
                         id: arrows
@@ -276,5 +265,33 @@ Rectangle {
             id: showAdvanced
             text: "Show Advanced Settings"
         }
+        QGCLabel {
+            text: "Advanced Power Settings"
+            color: palette.text
+            font.pointSize: screenTools.dpiAdjustedPointSize(20);
+            visible: showAdvanced.checked
+        }
+        Rectangle {
+            width: parent.width
+            height: 40
+            color: palette.windowShade
+            visible: showAdvanced.checked
+            Column {
+                id: advBatteryColumn
+                spacing: 10
+                anchors.verticalCenter: parent.verticalCenter
+                x: (parent.x + 20)
+                Row {
+                    spacing: 10
+                    QGCLabel { text: "Voltage Drop on Full Load (per cell)"; width: firstColumnWidth; anchors.baseline: battDropField.baseline}
+                    FactTextField {
+                        id: battDropField
+                        width: textEditWidth
+                        fact: Fact { name: "BAT_V_LOAD_DROP" }
+                        showUnits: true
+                    }
+                }
+            }
+        }
     }
 }