Skip to content

Commit

Permalink
Rename and update aircraft configuration files for Volanti/Ottano mod…
Browse files Browse the repository at this point in the history 
…els, adding new AC_1 configuration and enhancing descriptions and firmware details.
  • Loading branch information
@loki077
loki077 committed Dec 16, 2024
1 parent da5dff0 commit d37bdf3
Show file tree
Hide file tree
Showing 5 changed files with 327 additions and 12 deletions.
107 changes: 107 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_1.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
107 changes: 107 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Ottano_AC_2.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
81 changes: 81 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CarbonixCommon/aircraft_configuration/Volanti_AC_1.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
22 changes: 16 additions & 6 deletions ...mmon/aircraft_configuration/Volanti_A.xml → ...n/aircraft_configuration/Volanti_AC_2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
22 changes: 16 additions & 6 deletions ...mmon/aircraft_configuration/Volanti_B.xml → ...n/aircraft_configuration/Volanti_AC_3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

0 comments on commit d37bdf3

Please sign in to comment.