From 2f63d819904d2174091456bf78859f7f25102bb1 Mon Sep 17 00:00:00 2001
From: amilcarlucas <24453563+amilcarlucas@users.noreply.github.com>
Date: Mon, 18 May 2026 10:19:48 +0000
Subject: [PATCH 1/2] chore(templates): Update vehicle templates with latest
 parameters

---
 .../vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param | 1 -
 .../ArduCopter/AirCar_v1/14_logging.param                 | 2 +-
 .../ArduCopter/AirCar_v1/vehicle_components.json          | 2 +-
 .../vehicle_templates/ArduCopter/Big_Owl/14_logging.param | 2 +-
 .../ArduCopter/Big_Owl/vehicle_components.json            | 2 +-
 .../vehicle_templates/ArduCopter/Chimera7/08_batt1.param  | 1 -
 .../ArduCopter/Chimera7/14_logging.param                  | 2 +-
 .../ArduCopter/Chimera7/vehicle_components.json           | 2 +-
 .../ArduCopter/Demo32Motor_PeterHall/14_logging.param     | 2 +-
 .../Demo32Motor_PeterHall/vehicle_components.json         | 2 +-
 .../vehicle_templates/ArduCopter/FETtec-5/08_batt1.param  | 1 -
 .../ArduCopter/FETtec-5/14_logging.param                  | 2 +-
 .../ArduCopter/FETtec-5/vehicle_components.json           | 2 +-
 .../ArduCopter/GazeboIrisWithTargetFollow/08_batt1.param  | 1 -
 .../GazeboIrisWithTargetFollow/14_logging.param           | 2 +-
 .../GazeboIrisWithTargetFollow/vehicle_components.json    | 2 +-
 .../ArduCopter/Holybro_X500/14_logging.param              | 2 +-
 .../ArduCopter/Holybro_X500/vehicle_components.json       | 2 +-
 .../ArduCopter/Holybro_X500_V2/08_batt1.param             | 1 -
 .../ArduCopter/Holybro_X500_V2/14_logging.param           | 2 +-
 .../ArduCopter/Holybro_X500_V2/vehicle_components.json    | 2 +-
 .../ArduCopter/Holybro_X650_LTE/08_batt1.param            | 1 -
 .../ArduCopter/Holybro_X650_LTE/14_logging.param          | 2 +-
 .../ArduCopter/Holybro_X650_LTE/vehicle_components.json   | 2 +-
 .../ArduCopter/Hoverit_X11+/08_batt1.param                | 4 +---
 .../ArduCopter/Hoverit_X11+/10_gnss.param                 | 1 +
 .../ArduCopter/Hoverit_X11+/14_logging.param              | 8 ++++----
 .../ArduCopter/Hoverit_X11+/vehicle_components.json       | 2 +-
 .../ArduCopter/Hoverit_X13/08_batt1.param                 | 2 --
 .../ArduCopter/Hoverit_X13/14_logging.param               | 2 +-
 .../ArduCopter/Hoverit_X13/vehicle_components.json        | 2 +-
 .../ArduCopter/Marmotte5v2/08_batt1.param                 | 1 -
 .../ArduCopter/Marmotte5v2/14_logging.param               | 2 +-
 .../ArduCopter/Marmotte5v2/vehicle_components.json        | 2 +-
 .../ArduCopter/ReadyToSkyZD550/08_batt1.param             | 1 -
 .../ArduCopter/ReadyToSkyZD550/14_logging.param           | 2 +-
 .../ArduCopter/ReadyToSkyZD550/vehicle_components.json    | 2 +-
 .../ArduCopter/TarotFY680Hexacopter/08_batt1.param        | 1 -
 .../ArduCopter/TarotFY680Hexacopter/14_logging.param      | 2 +-
 .../TarotFY680Hexacopter/vehicle_components.json          | 2 +-
 .../ArduCopter/Tarot_X4/14_logging.param                  | 2 +-
 .../ArduCopter/Tarot_X4/vehicle_components.json           | 2 +-
 .../vehicle_templates/ArduCopter/X11_plus/07_esc.param    | 1 +
 .../ArduCopter/X11_plus/14_logging.param                  | 2 +-
 .../ArduCopter/X11_plus/vehicle_components.json           | 2 +-
 .../diatone_taycan_mxc/4.3.8-params/08_batt1.param        | 1 -
 .../diatone_taycan_mxc/4.3.8-params/14_logging.param      | 2 +-
 .../4.3.8-params/vehicle_components.json                  | 2 +-
 .../diatone_taycan_mxc/4.4.4-params/08_batt1.param        | 1 -
 .../diatone_taycan_mxc/4.4.4-params/14_logging.param      | 2 +-
 .../4.4.4-params/vehicle_components.json                  | 2 +-
 .../diatone_taycan_mxc/4.5.x-params/08_batt1.param        | 1 -
 .../diatone_taycan_mxc/4.5.x-params/14_logging.param      | 2 +-
 .../4.5.x-params/vehicle_components.json                  | 2 +-
 .../diatone_taycan_mxc/4.6.x-params/08_batt1.param        | 1 -
 .../diatone_taycan_mxc/4.6.x-params/14_logging.param      | 2 +-
 .../4.6.x-params/vehicle_components.json                  | 2 +-
 .../ArduCopter/empty_4.5.x/08_batt1.param                 | 3 ---
 .../ArduCopter/empty_4.5.x/14_logging.param               | 2 +-
 .../ArduCopter/empty_4.5.x/vehicle_components.json        | 2 +-
 .../ArduCopter/empty_4.6.x/08_batt1.param                 | 3 ---
 .../ArduCopter/empty_4.6.x/14_logging.param               | 2 +-
 .../ArduCopter/empty_4.6.x/vehicle_components.json        | 2 +-
 .../ArduPlane/normal_plane/vehicle_components.json        | 2 +-
 .../vehicle_templates/Heli/OMP_M4/vehicle_components.json | 2 +-
 .../Rover/AION_R1/vehicle_components.json                 | 2 +-
 .../Rover/Carisma_SCA-1E/vehicle_components.json          | 2 +-
 67 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param
index 78dca49c5..f1632674e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,78.1  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,0
 BATT_LOW_VOLT,79.2  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/14_logging.param
index 8658f1c90..20ba91188 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024  # the default of 1024 causes some problems with https://fi
 INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
index f2cac1b1f..b4ccdc435 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/AirCar_v1/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/14_logging.param
index e666d8258..456fc075a 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big pro
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 LOG_BACKEND_TYPE,1  # we want to log data to the SDCard
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
index 3f6ed41da..b6f52ecdc 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Big_Owl/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "Tarot_X4"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/08_batt1.param
index 95d7c88aa..df00e4c08 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,21.3  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,600  # When only 600mAh out of the total 3000mAh remain, trigger low failsafe
 BATT_LOW_VOLT,21.6  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
index b73ecf472..7cae1b165 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Chimera7/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/14_logging.param
index a3b836803..eca991234 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/vehicle_components.json
index 72a64044f..7bcfc8ae1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Demo32Motor_PeterHall/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/08_batt1.param
index 5c7c98a3a..ecc027197 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/08_batt1.param
@@ -5,7 +5,6 @@ BATT_CRT_VOLT,19.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,900  # trigger low failsafe just below 33% remaining
 BATT_LOW_VOLT,21  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,9  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
index 807e99372..4d3c55d8b 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/FETtec-5/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "ReadyToSkyZD550"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/08_batt1.param
index 81326488d..98b269faa 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,10.65  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,0  # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
 BATT_LOW_VOLT,10.8  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
index a028c8126..49d73a3f2 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/GazeboIrisWithTargetFollow/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "4.5.x-params"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/14_logging.param
index 1678b99e3..73b3b2446 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/14_logging.param
@@ -2,6 +2,6 @@ INS_LOG_BAT_CNT,1024  # the default of 1024 causes some problems with https://fi
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_BUFSIZE,50  # We have a F7 processor, so be a bit conservative
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
index 4ae789c69..3abd13363 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/08_batt1.param
index ff4d951c5..b53059a0c 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,13.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,1000  # Fail-safe needs to be responsive at 1000 mAh, no risk taking
 BATT_LOW_VOLT,13.6  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/14_logging.param
index 045647a63..efb2fa7dc 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,992  # the default of 1024 causes some problems with https://fir
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
index beca2abc4..49ee53023 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X500_V2/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": "100mW at 433MHz, 13.6g without antenna + \n7.4g for 433MHz antenna"
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "X11_plus"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/08_batt1.param
index 3eb7aaf3a..8cef76e49 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/08_batt1.param
@@ -7,7 +7,6 @@ BATT_CURR_PIN,4  # from https://ardupilot.org/copter/docs/common-holybro-pixhawk
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0  # no current monitor
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,0  # No capacity based failsafes, no current monitor
 BATT_LOW_VOLT,20.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,3  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/14_logging.param
index 8658f1c90..20ba91188 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024  # the default of 1024 causes some problems with https://fi
 INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
index 6000bf1e1..ffba6e43e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Holybro_X650_LTE/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "Holybro_X500_V2"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/08_batt1.param
index a0314088a..b5985b699 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/08_batt1.param
@@ -1,5 +1,4 @@
-BATT_AMP_PERVLT,0  # WE TAKE DATA FROM ESC TELEMETRY, so this can stay at 0
-BATT_ARM_VOLT,55.2  # Only arm above this voltage, to avoid taking off with insufficient battery capacity
+BATT_ARM_VOLT,55.2006  # Only arm above this voltage, to avoid taking off with insufficient battery capacity
 BATT_CAPACITY,80000  # Total battery capacity specified in the component editor
 BATT_CRT_MAH,0  # Datalink V2 ESC telemetry does provide current measurement, but we do not want to use it
 BATT_CRT_VOLT,49.7  # Critical failsafe voltage x nr. of cells
@@ -9,6 +8,5 @@ BATT_FS_VOLTSRC,0
 BATT_LOW_MAH,0  # Datalink V2 ESC telemetry does provide current measurement, but we do not want to use it
 BATT_LOW_VOLT,50.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,9  # Selected in component editor window
-BATT_VOLT_MULT,0  # WE TAKE DATA FROM ESC TELEMETRY, so this can stay at 0
 MOT_BAT_VOLT_MAX,58.8  # Scale the PIDs up when battery voltage is below this threshold
 MOT_BAT_VOLT_MIN,46.2  # Scale the PIDs up when battery voltage is above this threshold
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/10_gnss.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/10_gnss.param
index 344886fd0..b25ba1f12 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/10_gnss.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/10_gnss.param
@@ -2,6 +2,7 @@ BRD_BOOT_DELAY,7000  # Make sure the Here4 GNSS receivers fully boot before the
 BRD_SAFETY_DEFLT,1  # Use a safety switch
 CAN_D2_PROTOCOL,1
 CAN_P2_DRIVER,1
+GPS_TYPE,9  # Defined in component editor
 GPS1_GNSS_MODE,69
 GPS1_POS_X,0
 GPS1_POS_Y,0
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/14_logging.param
index b32f17b33..b28c92cf7 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/14_logging.param
@@ -1,6 +1,6 @@
 INS_LOG_BAT_CNT,512  # the default of 1024 causes some problems with https://firmware.ardupilot.org/Tools/WebTools/FilterReview/
-INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors, gyro raw logging on others
-INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors, pre-post gyro raw logging on others
-INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
+INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
+INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
index 79795c55c..7c298ba19 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X11+/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": "mk32 COMBO RADIO"
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "Hoverit_X11+"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/08_batt1.param
index 1f8502c50..1a6701bab 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/08_batt1.param
@@ -1,4 +1,3 @@
-BATT_AMP_PERVLT,0  # WE TAKE DATA FROM ESC TELEMETRY, so this can stay at 0
 BATT_ARM_VOLT,55.2006  # Only arm above this voltage, to avoid taking off with insufficient battery capacity
 BATT_CAPACITY,160000  # Total battery capacity specified in the component editor
 BATT_CRT_MAH,0  # Datalink V2 ESC telemetry does provide current measurement, but we do not want to use it
@@ -9,6 +8,5 @@ BATT_FS_VOLTSRC,0
 BATT_LOW_MAH,0  # Datalink V2 ESC telemetry does provide current measurement, but we do not want to use it
 BATT_LOW_VOLT,50.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,9  # Selected in component editor window
-BATT_VOLT_MULT,0  # WE TAKE DATA FROM ESC TELEMETRY, so this can stay at 0
 MOT_BAT_VOLT_MAX,58.8  # Scale the PIDs up when battery voltage is below this threshold
 MOT_BAT_VOLT_MIN,46.2  # Scale the PIDs up when battery voltage is above this threshold
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/14_logging.param
index 5ff66d36a..b28c92cf7 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,512  # the default of 1024 causes some problems with https://fir
 INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
index 68ec81f15..172a3711e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Hoverit_X13/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": "mk32 COMBO RADIO"
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "Hoverit_X11+"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/08_batt1.param
index e95e12679..8f2551a16 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,21.3  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,300  # When only 300mAh out of the total 1400mAh remain, trigger low failsafe
 BATT_LOW_VOLT,21.6  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
index 8be09c7d9..6b2d88322 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Marmotte5v2/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/08_batt1.param
index b257663fd..a3f774528 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,21.3  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,2000  # trigger low failsafe just below 33% remaining
 BATT_LOW_VOLT,21.6  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
index e1b776135..30229ec1a 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/ReadyToSkyZD550/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/08_batt1.param
index 975b664c9..b56ef8b9b 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,20.7  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,100  # Fail-safe needs to be responsive at 1000 mAh, no risk taking
 BATT_LOW_VOLT,21  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/14_logging.param
index d58db52dc..0c2d7927f 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,2048  # more samples per batch
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
index eb012573b..fb66d6079 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/TarotFY680Hexacopter/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": "UART1 For Telemetry Module. Bluetooth Telem is UART8."
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "Holybro_X500_V2"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/14_logging.param
index 61e0bd27f..d6d665f7e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
index 115c149f7..dc89414fd 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/Tarot_X4/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap ESP Now based alternative to the more commonly used 3DR and RFDesigns telemetry modems. Custom developed firmware."
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/07_esc.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/07_esc.param
index 7d852a235..c911aeef3 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/07_esc.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/07_esc.param
@@ -14,6 +14,7 @@ PSC_ACCZ_SMAX,2500  # limit the slew rate to prevent possible ESC desync - https
 SCR_ENABLE,1  # Scripting Enable to run Hobbywing_DataLink.lua
 SERIAL2_BAUD,115  # Baud rate of data link
 SERIAL2_PROTOCOL,28  # Serial port setup for data link
+SERVO_BLH_POLES,14  # Specified in component editor window
 SERVO1_MAX,1950  # Operating Pulse Width:1050-1950us(Fixed or cannot be Programmed)
 SERVO1_MIN,1050  # Operating Pulse Width:1050-1950us(Fixed or cannot be Programmed)
 SERVO1_TRIM,1500  # Operating Pulse Width:1050-1950us(Fixed or cannot be Programmed)
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/14_logging.param
index dbb4a03b0..d65c100c8 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024
 INS_LOG_BAT_MASK,1  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,4  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
index c32fb431b..26489de8b 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/X11_plus/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "High range and strength telemetry."
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/08_batt1.param
index 8a8997f9c..f54b47081 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,14.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,600  # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
 BATT_LOW_VOLT,14.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
index 569f31d6b..9d02ed18b 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.3.8-params/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/08_batt1.param
index 8a8997f9c..f54b47081 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,14.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,600  # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
 BATT_LOW_VOLT,14.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
index 4485a3728..c52a8e1b8 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.4.4-params/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/08_batt1.param
index 8a8997f9c..f54b47081 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,14.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,600  # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
 BATT_LOW_VOLT,14.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
index f247d1689..33b58d6c4 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.5.x-params/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/08_batt1.param
index 8a8997f9c..f54b47081 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/08_batt1.param
@@ -6,7 +6,6 @@ BATT_CRT_VOLT,14.2  # Critical failsafe voltage x nr. of cells
 BATT_FS_CRT_ACT,1  # Land ASAP
 BATT_FS_LOW_ACT,2  # Return and land at home or rally point
 BATT_FS_VOLTSRC,1  # Let the firmware handle the nasty business of variable and battery dependent internal resistance
-BATT_I2C_BUS,0  # Selected in component editor window
 BATT_LOW_MAH,600  # When only 450mAh out of the total 1800mAh remain, trigger low failsafe
 BATT_LOW_VOLT,14.4  # Low failsafe voltage x nr. of cells
 BATT_MONITOR,4  # Selected in component editor window
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/14_logging.param
index e380c91e7..bba43c6e1 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/14_logging.param
@@ -1,5 +1,5 @@
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
index e3e72ba79..86e938b2c 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/diatone_taycan_mxc/4.6.x-params/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "A cheap WiFi alternative to the more commonly used 3DR and RFDesigns telemetry modems"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/08_batt1.param
index fee1109f2..ca5ef67f3 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/08_batt1.param
@@ -1,4 +1,3 @@
-BATT_AMP_PERVLT,0
 BATT_ARM_VOLT,0
 BATT_CAPACITY,0
 BATT_CRT_MAH,0
@@ -6,10 +5,8 @@ BATT_CRT_VOLT,0
 BATT_FS_CRT_ACT,1
 BATT_FS_LOW_ACT,2
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0
 BATT_LOW_MAH,0
 BATT_LOW_VOLT,0
 BATT_MONITOR,0  # Selected in component editor window
-BATT_VOLT_MULT,0
 MOT_BAT_VOLT_MAX,0  # Scale the PIDs up when battery voltage is below this threshold
 MOT_BAT_VOLT_MIN,0  # Scale the PIDs up when battery voltage is above this threshold
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/14_logging.param
index a3b836803..eca991234 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
index 2e8310d61..aa912d1da 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.5.x/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/08_batt1.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/08_batt1.param
index fee1109f2..ca5ef67f3 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/08_batt1.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/08_batt1.param
@@ -1,4 +1,3 @@
-BATT_AMP_PERVLT,0
 BATT_ARM_VOLT,0
 BATT_CAPACITY,0
 BATT_CRT_MAH,0
@@ -6,10 +5,8 @@ BATT_CRT_VOLT,0
 BATT_FS_CRT_ACT,1
 BATT_FS_LOW_ACT,2
 BATT_FS_VOLTSRC,0
-BATT_I2C_BUS,0
 BATT_LOW_MAH,0
 BATT_LOW_VOLT,0
 BATT_MONITOR,0  # Selected in component editor window
-BATT_VOLT_MULT,0
 MOT_BAT_VOLT_MAX,0  # Scale the PIDs up when battery voltage is below this threshold
 MOT_BAT_VOLT_MIN,0  # Scale the PIDs up when battery voltage is above this threshold
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/14_logging.param b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/14_logging.param
index a3b836803..eca991234 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/14_logging.param
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/14_logging.param
@@ -2,5 +2,5 @@ INS_LOG_BAT_CNT,1024
 INS_LOG_BAT_MASK,0  # Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others
 INS_LOG_BAT_OPT,0  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
 INS_RAW_LOG_OPT,9  # Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others
-LOG_BITMASK,145118  # Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now
+LOG_BITMASK,2242525  # Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems
 LOG_FILE_DSRMROT,1  # One .bin log file per flight, not per battery/reboot
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
index 5053626a5..47aa3cf2b 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduCopter/empty_4.6.x/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
index ff6960162..b1414972e 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/ArduPlane/normal_plane/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/Heli/OMP_M4/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Heli/OMP_M4/vehicle_components.json
index aeef3c672..bd11ad69d 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/Heli/OMP_M4/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/Heli/OMP_M4/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "No telemetry installed."
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
index 028142d4c..3c9e2d4c3 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/Rover/AION_R1/vehicle_components.json
@@ -190,5 +190,5 @@
             "Notes": "Integrated in the herelink controller and airunit"
         }
     },
-    "Program version": "2.11.0"
+    "Program version": "3.0.3"
 }
diff --git a/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json b/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
index 949a35cd7..c44d51bc6 100644
--- a/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
+++ b/ardupilot_methodic_configurator/vehicle_templates/Rover/Carisma_SCA-1E/vehicle_components.json
@@ -190,6 +190,6 @@
             "Notes": ""
         }
     },
-    "Program version": "2.11.0",
+    "Program version": "3.0.3",
     "Configuration template": "AION_R1"
 }

From b87fb2cf065a39b0d1088636c3b622cf2d4a0d2b Mon Sep 17 00:00:00 2001
From: amilcarlucas <24453563+amilcarlucas@users.noreply.github.com>
Date: Mon, 18 May 2026 01:37:59 +0000
Subject: [PATCH 2/2] chore(configuration steps): Auto-update configuration
 steps translatable strings

---
 ardupilot_methodic_configurator/configuration_steps_strings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ardupilot_methodic_configurator/configuration_steps_strings.py b/ardupilot_methodic_configurator/configuration_steps_strings.py
index 386162a00..5b7d040bc 100644
--- a/ardupilot_methodic_configurator/configuration_steps_strings.py
+++ b/ardupilot_methodic_configurator/configuration_steps_strings.py
@@ -269,6 +269,7 @@ def configuration_steps_strings() -> None:  # noqa: PLR0915 # pylint: disable=to
     _config_steps_strings = _("Land ASAP")
     _config_steps_strings = _("Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now")
     _config_steps_strings = _("Log disarmed was only required for offline IMU temperature calibration")
+    _config_steps_strings = _("Log relevant data for attitude PID and notch filter tuning. Later on we'll change this to other subsystems")
     _config_steps_strings = _("Logs measured data both before and after the filters for Filter Review Webtool usage")
     _config_steps_strings = _("Low failsafe voltage x nr. of cells")
     _config_steps_strings = _("No more system identification chip injections")