diff --git a/conf/conf_example.xml b/conf/conf_example.xml
index fcf01f2dd9..2b284b0b34 100644
--- a/conf/conf_example.xml
+++ b/conf/conf_example.xml
@@ -40,7 +40,7 @@
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml"
-   settings_modules="modules/infrared_adc.xml"
+   settings_modules="modules/air_data.xml modules/infrared_adc.xml"
    gui_color="red"
   />
   <aircraft
@@ -95,7 +95,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/nav_modules.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/control/ctl_dash_loiter_trim.xml"
-   settings_modules="modules/nav_smooth.xml"
+   settings_modules="modules/air_data.xml modules/nav_smooth.xml"
    gui_color="blue"
   />
   <aircraft
@@ -106,7 +106,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/estimation/ahrs_float_mlkf.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml"
    gui_color="blue"
   />
   <aircraft
@@ -139,7 +139,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
-   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml"
+   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml modules/digital_cam.xml"
    gui_color="white"
   />
   <aircraft
@@ -150,7 +150,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/direct_memory_logger.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/airspeed_ms45xx_i2c.xml modules/direct_memory_logger.xml"
    gui_color="#710080"
   />
   <aircraft
@@ -172,7 +172,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_energyadaptive.xml"
-   settings_modules="modules/digital_cam.xml"
+   settings_modules="modules/air_data.xml modules/digital_cam.xml"
    gui_color="blue"
   />
   <aircraft
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 9808b0f09e..9d87646fe6 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -40,7 +40,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/versatile.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml modules/nav_catapult.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml modules/nav_catapult.xml modules/air_data.xml"
    gui_color="blue"
   />
   <aircraft
@@ -51,7 +51,7 @@
    telemetry="telemetry/default_fixedwing.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml"
-   settings_modules="modules/infrared_adc.xml"
+   settings_modules="modules/air_data.xml modules/infrared_adc.xml"
    gui_color="red"
   />
   <aircraft
@@ -205,7 +205,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/estimation/ahrs_float_mlkf.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml"
    gui_color="blue"
   />
   <aircraft
@@ -227,7 +227,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
-   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml"
+   settings_modules="modules/servo_switch.xml modules/rotorcraft_cam.xml modules/digital_cam.xml"
    gui_color="white"
   />
   <aircraft
@@ -238,7 +238,7 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml settings/estimation/ahrs_int_cmpl_quat.xml"
-   settings_modules="modules/gps_ubx_ucenter.xml modules/direct_memory_logger.xml"
+   settings_modules="modules/gps_ubx_ucenter.xml modules/airspeed_ms45xx_i2c.xml modules/direct_memory_logger.xml"
    gui_color="#710080"
   />
   <aircraft
@@ -260,7 +260,7 @@
    telemetry="telemetry/default_fixedwing_imu.xml"
    flight_plan="flight_plans/basic.xml"
    settings="settings/fixedwing_basic.xml settings/control/ctl_energyadaptive.xml"
-   settings_modules="modules/digital_cam.xml"
+   settings_modules="modules/air_data.xml modules/digital_cam.xml"
    gui_color="blue"
   />
   <aircraft