diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
index ce634c9602..c4de5a4c3e 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-Ottano/defaults.parm
@@ -3,37 +3,41 @@
 AIRSPEED_CRUISE,26
 AIRSPEED_MAX,36
 AIRSPEED_MIN,23
-BATT_ARM_MAH,10000
-BATT_ARM_VOLT,24
-BATT_CAPACITY,30600
-BATT_CRT_MAH,7000
-BATT_CRT_VOLT,21
-BATT_FS_CRT_ACT,4
-BATT_FS_LOW_ACT,1
-BATT_FS_VOLTSRC,1
-BATT_LOW_MAH,10000
-BATT_LOW_VOLT,23
-BATT_MONITOR,10
-BATT_OPTIONS,64
-BATT_SUM_MASK,6
-BATT2_AMP_OFFSET,0.002314
-BATT2_AMP_PERVLT,29.86658
-BATT2_CAPACITY,0
-BATT2_CURR_PIN,51
-BATT2_MONITOR,28
-BATT2_VOLT_MULT,16.66666
-BATT2_VOLT_PIN,50
-BATT3_AMP_OFFSET,0.005901
-BATT3_AMP_PERVLT,30.09855
-BATT3_CAPACITY,0
-BATT3_CURR_PIN,52
-BATT3_MONITOR,28
-BATT3_VOLT_MULT,16.66666
-BATT3_VOLT_PIN,50
-BATT4_CAPACITY,0
-BATT4_MONITOR,9
-BATT5_MONITOR,8
-BATT6_MONITOR,8
+# Battery 1: VTOL Battery (Combined)
+BATT_CAPACITY,30000 # Sum of BATT4_CAPACITY and BATT5_CAPACITY
+BATT_MONITOR,10 # Sum
+BATT_OPTIONS,576 # 6:Send resistance compensated voltage to GCS, 9:Sum monitor measures minimum voltage instead of average
+BATT_SUM_MASK,24 # Sum of BATT4 and BATT5
+# Battery 2: Avionics Battery
+BATT2_CAPACITY,5100
+BATT2_CRT_VOLT,22
+BATT2_FS_CRT_ACT,1 # RTL
+BATT2_LOW_VOLT,23
+BATT2_MONITOR,8 # DroneCAN
+BATT2_SERIAL_NUM,2 # DroneCAN Battery index to listen to
+# Battery 3: Fuel Level Sensor
+BATT3_MONITOR,8 # DroneCAN
+BATT3_SERIAL_NUM,1 # DroneCAN Battery index to listen to
+# Battery 4: VTOL Battery (Left)
+BATT4_CAPACITY,15000 # matches BATT5_CAPACITY
+BATT4_CRT_VOLT,42
+BATT4_ESC_MASK,6 # ESC 2 and 3
+BATT4_FS_VOLTSRC,1 # Failsafe on sag-compensated voltage
+BATT4_LOW_VOLT,43
+BATT4_MONITOR,9 # ESC
+BATT4_OPTIONS,64 # 6:Send resistance compensated voltage to GCS
+# Battery 5: VTOL Battery (Right)
+BATT5_CAPACITY,15000 # matches BATT4_CAPACITY
+BATT5_CRT_VOLT,42
+BATT5_ESC_MASK,9 # ESC 1 and 4
+BATT5_FS_VOLTSRC,1 # Failsafe on sag-compensated voltage
+BATT5_LOW_VOLT,43
+BATT5_MONITOR,9 # ESC
+BATT5_OPTIONS,64 # 6:Send resistance compensated voltage to GCS
+# Battery 6: PDB Volt/Current Sensor 1
+BATT6_MONITOR,28
+# Battery 7: PDB Volt/Current Sensor 2
+BATT7_MONITOR,28
 BRD_SAFETY_MASK,2016
 CAN_D1_UC_ESC_BM,9
 CAN_D2_UC_ESC_BM,6