From d37bdf3ea80541b0cbc2e22532bb99df31c0e2c8 Mon Sep 17 00:00:00 2001
From: Loki077 <loki077@gmail.com>
Date: Mon, 16 Dec 2024 17:12:09 +1100
Subject: [PATCH] Rename and update aircraft configuration files for
 Volanti/Ottano models, adding new AC_1 configuration and enhancing
 descriptions and firmware details.

---
 .../aircraft_configuration/Ottano_AC_1.xml    | 107 ++++++++++++++++++
 .../aircraft_configuration/Ottano_AC_2.xml    | 107 ++++++++++++++++++
 .../aircraft_configuration/Volanti_AC_1.xml   |  81 +++++++++++++
 .../{Volanti_A.xml => Volanti_AC_2.xml}       |  22 +++-
 .../{Volanti_B.xml => Volanti_AC_3.xml}       |  22 +++-
 5 files changed, 327 insertions(+), 12 deletions(-)
 create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_1.xml
 create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_2.xml
 create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_1.xml
 rename libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/{Volanti_A.xml => Volanti_AC_2.xml} (78%)
 rename libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/{Volanti_B.xml => Volanti_AC_3.xml} (78%)

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_1.xml b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_1.xml
new file mode 100644
index 0000000000..1d90935c92
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_1.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!-- "cx_pilot_commit_id" will be replaced by the actual commit id during the build process -->
+<data>
+    <aircraft>
+        <model>Ottano</model>
+        <model_version>AC_1</model_version>
+        <model_description>This is split CAN Architecture with CubeOrange</model_description>
+        <configuration_version>1</configuration_version>
+    </aircraft>
+    <flight_controler>
+        <firmware_name>CubeOrange-Ottano</firmware_name>
+        <firmware_commit>cx_pilot_commit_id</firmware_commit>
+        <firmware_path>arduplane.apj</firmware_path>
+    </flight_controler>
+    <cpn_list>
+        <cpn id="11">
+            <bus>1</bus>
+            <firmware_name>Ottano-M1_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="15">
+            <bus>1</bus>
+            <firmware_name>Ottano-M5_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="16">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:010</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="17">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:006</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="18">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:011</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="19">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="24">
+            <bus>1</bus>
+            <firmware_name>Ottano-M4_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="30">
+            <bus>1</bus>
+            <firmware_name>batt_mon_io.p-systems.power-monitor</firmware_name>
+            <firmware_commit>108b4bb7</firmware_commit>
+        </cpn>
+        <cpn id="101">
+            <bus>1</bus>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
+        </cpn>
+        <cpn id="105">
+            <bus>1</bus>
+            <firmware_name>adsb_org.ardupilot.MatekL431-ADSB</firmware_name>
+            <firmware_commit>9c6f307f</firmware_commit>
+        </cpn>
+        <cpn id="23">
+            <bus>2</bus>
+            <firmware_name>Ottano-M3_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="12">
+            <bus>2</bus>
+            <firmware_name>Ottano-M2_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="26">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:010</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="27">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:006</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="28">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:011</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="29">
+            <bus>2</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="102">
+            <bus>2</bus>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
+        </cpn>
+    </cpn_list>
+</data>
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_2.xml b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_2.xml
new file mode 100644
index 0000000000..c558ad45f5
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_2.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<!-- "cx_pilot_commit_id" will be replaced by the actual commit id during the build process -->
+<data>
+    <aircraft>
+        <model>Ottano</model>
+        <model_version>AC_2</model_version>
+        <model_description>This is split CAN Architecture with CubeOrangePlus</model_description>
+        <configuration_version>1</configuration_version>
+    </aircraft>
+    <flight_controler>
+        <firmware_name>CubeOrangePlus-Ottano</firmware_name>
+        <firmware_commit>cx_pilot_commit_id</firmware_commit>
+        <firmware_path>arduplane.apj</firmware_path>
+    </flight_controler>
+    <cpn_list>
+        <cpn id="11">
+            <bus>1</bus>
+            <firmware_name>Ottano-M1_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="15">
+            <bus>1</bus>
+            <firmware_name>Ottano-M5_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="16">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:010</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="17">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:006</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="18">
+            <bus>1</bus>
+            <firmware_name>servo_.MKS-HBL6625:011</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="19">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="24">
+            <bus>1</bus>
+            <firmware_name>Ottano-M4_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="30">
+            <bus>1</bus>
+            <firmware_name>batt_mon_io.p-systems.power-monitor</firmware_name>
+            <firmware_commit>108b4bb7</firmware_commit>
+        </cpn>
+        <cpn id="101">
+            <bus>1</bus>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
+        </cpn>
+        <cpn id="105">
+            <bus>1</bus>
+            <firmware_name>adsb_org.ardupilot.MatekL431-ADSB</firmware_name>
+            <firmware_commit>9c6f307f</firmware_commit>
+        </cpn>
+        <cpn id="23">
+            <bus>2</bus>
+            <firmware_name>Ottano-M3_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="12">
+            <bus>2</bus>
+            <firmware_name>Ottano-M2_CarbonixF405</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="26">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:010</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="27">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:006</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="28">
+            <bus>2</bus>
+            <firmware_name>servo_.MKS-HBL6625:011</firmware_name>
+            <firmware_commit>b120233</firmware_commit>
+        </cpn>
+        <cpn id="29">
+            <bus>2</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="102">
+            <bus>2</bus>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
+        </cpn>
+    </cpn_list>
+</data>
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_1.xml b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_1.xml
new file mode 100644
index 0000000000..e790bd422e
--- /dev/null
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_1.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!-- "cx_pilot_commit_id" will be replaced by the actual commit id during the build process -->
+<data>
+    <aircraft>
+        <model>Volanti</model>
+        <model_version>AC_1</model_version>
+        <model_description>This is CubOrange, Diagonal CAN Architecture with Non Crystal CPN</model_description>
+        <configuration_version>1</configuration_version>
+    </aircraft>
+    <flight_controler>
+        <firmware_name>CubeOrange-Volanti</firmware_name>
+        <firmware_commit>cx_pilot_commit_id</firmware_commit>
+        <firmware_path>arduplane.apj</firmware_path>
+    </flight_controler>
+    <cpn_list>
+        <cpn id="11">
+            <bus>1</bus>
+            <firmware_name>Volanti-M1_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="12">
+            <bus>1</bus>
+            <firmware_name>Volanti-M2_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="15">
+            <bus>1</bus>
+            <firmware_name>Volanti-M5_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="16">
+            <bus>1</bus>
+            <firmware_name>Volanti-RWing_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="17">
+            <bus>1</bus>
+            <firmware_name>Volanti-LTail_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="101">
+            <bus>1</bus>
+            <firmware_name>arspd</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+        </cpn>
+        <cpn id="23">
+            <bus>2</bus>
+            <firmware_name>Volanti-M3_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="24">
+            <bus>2</bus>
+            <firmware_name>Volanti-M4_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="26">
+            <bus>2</bus>
+            <firmware_name>Volanti-LWing_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="27">
+            <bus>2</bus>
+            <firmware_name>Volanti-RTail_CarbonixF405-no-crystal</firmware_name>
+            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_path>AP_Periph.bin</firmware_path>
+        </cpn>
+        <cpn id="102">
+            <bus>2</bus>
+            <firmware_name>arspd</firmware_name>
+            <firmware_commit />
+        </cpn>
+    </cpn_list>
+</data>
\ No newline at end of file
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_A.xml b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_2.xml
similarity index 78%
rename from libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_A.xml
rename to libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_2.xml
index d8638ea9f2..d18b8076a2 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_A.xml
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_2.xml
@@ -3,8 +3,8 @@
 <data>
     <aircraft>
         <model>Volanti</model>
-        <model_version>A</model_version>
-        <model_description>Volanti A</model_description>
+        <model_version>AC_2</model_version>
+        <model_description>This is CubOrange, Diagonal CAN Architecture with Crystal CPN</model_description>
         <configuration_version>1</configuration_version>
     </aircraft>
     <flight_controler>
@@ -43,10 +43,20 @@
             <firmware_commit>cx_pilot_commit_id</firmware_commit>
             <firmware_path>AP_Periph.bin</firmware_path>
         </cpn>
+        <cpn id="19">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="29">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
         <cpn id="101">
             <bus>1</bus>
-            <firmware_name>arspd</firmware_name>
-            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
         </cpn>
         <cpn id="23">
             <bus>2</bus>
@@ -74,8 +84,8 @@
         </cpn>
         <cpn id="102">
             <bus>2</bus>
-            <firmware_name>arspd</firmware_name>
-            <firmware_commit />
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
         </cpn>
     </cpn_list>
 </data>
\ No newline at end of file
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_B.xml b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_3.xml
similarity index 78%
rename from libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_B.xml
rename to libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_3.xml
index 076a1f985b..d40383bfee 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_B.xml
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_3.xml
@@ -3,8 +3,8 @@
 <data>
     <aircraft>
         <model>Volanti</model>
-        <model_version>B</model_version>
-        <model_description>Volanti A</model_description>
+        <model_version>AC_3</model_version>
+        <model_description>This is CubOrange, Diagonal CAN Architecture with Crystal CPN</model_description>
         <configuration_version>1</configuration_version>
     </aircraft>
     <flight_controler>
@@ -43,10 +43,20 @@
             <firmware_commit>cx_pilot_commit_id</firmware_commit>
             <firmware_path>AP_Periph.bin</firmware_path>
         </cpn>
+        <cpn id="19">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
+        <cpn id="29">
+            <bus>1</bus>
+            <firmware_name>gps_org.ardupilot.HolybroG4_GPS</firmware_name>
+            <firmware_commit>6e519848</firmware_commit>
+        </cpn>
         <cpn id="101">
             <bus>1</bus>
-            <firmware_name>arspd</firmware_name>
-            <firmware_commit>cx_pilot_commit_id</firmware_commit>
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
         </cpn>
         <cpn id="23">
             <bus>2</bus>
@@ -74,8 +84,8 @@
         </cpn>
         <cpn id="102">
             <bus>2</bus>
-            <firmware_name>arspd</firmware_name>
-            <firmware_commit />
+            <firmware_name>arspd_org.ardupilot.f405_MatekGPS</firmware_name>
+            <firmware_commit>158c7c49</firmware_commit>
         </cpn>
     </cpn_list>
 </data>
\ No newline at end of file