ConfigBatteryMonitor: Add Pixhawk 6C/Pix32 v6 (#2947)

* Change 'Holybro Pixhawk 4 PM' to 'Holybro Power Module' , add holybro Pixhawk 6C/Pix32 v6 * update Pixhawk 6C CMB_HWVersion.SelectedIndex
ArduPilot · Sep 15, 2022 · 2c336fe · 2c336fe
1 parent f3a9e40
commit 2c336fe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs b/GCSViews/ConfigurationView/ConfigBatteryMonitoring.Designer.cs
diff --git a/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs b/GCSViews/ConfigurationView/ConfigBatteryMonitoring.cs
@@ -156,6 +156,11 @@ public void Activate()
                     // durandal
                     CMB_HWVersion.SelectedIndex = 9;
                 }
+                 else if (value == 8)
+                {
+                    // Pixhawk 6C/Pix32 v6
+                    CMB_HWVersion.SelectedIndex = 10;
+                }
             }
             else
             {
@@ -544,6 +549,12 @@ private void CMB_apmversion_SelectedIndexChanged(object sender, EventArgs e)
                     MainV2.comPort.setParam((byte)MainV2.comPort.sysidcurrent, (byte)MainV2.comPort.compidcurrent, "BATT_VOLT_PIN", 16);
                     MainV2.comPort.setParam((byte)MainV2.comPort.sysidcurrent, (byte)MainV2.comPort.compidcurrent, "BATT_CURR_PIN", 17);
                 }
+                else if (selection == 10)
+                {
+                    //Pixhawk 6C/Pix32 v6
+                    MainV2.comPort.setParam((byte)MainV2.comPort.sysidcurrent, (byte)MainV2.comPort.compidcurrent, "BATT_VOLT_PIN", 8);
+                    MainV2.comPort.setParam((byte)MainV2.comPort.sysidcurrent, (byte)MainV2.comPort.compidcurrent, "BATT_CURR_PIN", 4);
+                }
             }
             catch
             {

diff --git a/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx b/GCSViews/ConfigurationView/ConfigBatteryMonitoring.resx
@@ -175,7 +175,7 @@
     <value>8: CUAV HV PM</value>
   </data>
   <data name="CMB_batmonsensortype.Items9" xml:space="preserve">
-    <value>9: Holybro Pixhawk4 PM</value>
+    <value>9: Holybro Power Module</value>
   </data>
   <data name="CMB_batmonsensortype.Location" type="System.Drawing.Point, System.Drawing">
     <value>160, 68</value>
@@ -684,6 +684,9 @@
   <data name="CMB_HWVersion.Items9" xml:space="preserve">
     <value>9: Durandal/ZealotH743</value>
   </data>
+  <data name="CMB_HWVersion.Items10" xml:space="preserve">
+    <value>10: Pixhawk 6C/Pix32 v6</value>
+  </data>
   <data name="CMB_HWVersion.Location" type="System.Drawing.Point, System.Drawing">
     <value>160, 95</value>
   </data>