Initial plan

Simplify bug report issue template to reduce clutter
- Reduced from 11 fields to 2 consolidated fields - Enabled blank issues for flexibility - Combined optional fields into single "Flight Log / Additional Information" section - Added helpful tips at top instead of separate required fields - Eliminates empty field clutter in submitted issues while maintaining guidance
2026-06-05 08:20:05 +08:00 · 2026-01-14 05:13:13 +00:00 · 2026-01-13 17:36:30 -05:00
174 changed files with 599 additions and 3589 deletions
@@ -29,19 +29,19 @@ body:
    attributes:
      label: Flight Log / Additional Information
      description: |
-        **Flight log** (highly recommended for flight-related issues):
-        - Upload to [PX4 Flight Review](http://logs.px4.io/) and paste the link
+          **Flight log** (highly recommended for flight-related issues):
+          - Upload to [PX4 Flight Review](http://logs.px4.io/) and paste the link

-        **Additional details** (if relevant):
-        - PX4 version (output of `ver all` in MAVLink Shell)
-        - Flight controller model
-        - Vehicle type (multicopter, fixed-wing, VTOL, etc.)
-        - Screenshots or media
+          **Additional details** (if relevant):
+          - PX4 version (output of `ver all` in MAVLink Shell)
+          - Flight controller model
+          - Vehicle type (multicopter, fixed-wing, VTOL, etc.)
+          - Screenshots or media
      placeholder: |
-        Flight log link:
+          Flight log link:

-        Version:
+          Version:

-        Hardware:
+          Hardware:
    validations:
      required: false
@@ -103,9 +103,3 @@
 [submodule "src/drivers/ins/sbgecom/sbgECom"]
 	path = src/drivers/ins/sbgecom/sbgECom
 	url = https://github.com/PX4/sbgECom.git
-[submodule "src/modules/mc_raptor/blob"]
-	path = src/modules/mc_raptor/blob
-	url = https://github.com/rl-tools/px4-blob
-[submodule "src/lib/rl_tools/rl_tools"]
-	path = src/lib/rl_tools/rl_tools
-	url = https://github.com/rl-tools/rl-tools.git
@@ -6,16 +6,6 @@ CONFIG:
      buildType: RelWithDebInfo
      settings:
        CONFIG: px4_sitl_default
-    px4_sitl_raptor:
-      short: px4_sitl_raptor
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_raptor
-    px4_sitl_raptor_debug:
-      short: px4_sitl_raptor_debug
-      buildType: Debug
-      settings:
-        CONFIG: px4_sitl_raptor
    px4_sitl_spacecraft:
      short: px4_sitl_spacecraft
      buildType: RelWithDebInfo
@@ -146,11 +146,6 @@ add_custom_command(
 		${romfs_copy_stamp}
 	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/*
 	COMMAND ${CMAKE_COMMAND} -E tar xf ${romfs_tar_file}
-	# Preprocess ROMFS files with KConfig definitions
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_romfs_preprocess.py
-		--romfs-dir ${romfs_gen_root_dir}
-		--kconfig-header ${PX4_BINARY_DIR}/px4_boardconfig.h
-		--cpp ${CMAKE_C_COMPILER}
 	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
 		--airframes-path ${romfs_gen_root_dir}/init.d
 		--start-script ${romfs_gen_root_dir}/init.d/rc.autostart
@@ -164,10 +159,8 @@ add_custom_command(
 		--params-file ${CONFIG_BOARD_PARAM_FILE}
 	COMMAND ${CMAKE_COMMAND} -E touch ${romfs_copy_stamp}
 	WORKING_DIRECTORY ${romfs_gen_root_dir}
-	DEPENDS
-		${romfs_tar_file}
-		${PX4_BINARY_DIR}/px4_boardconfig.h
-	COMMENT "ROMFS: copying, preprocessing, generating airframes"
+	DEPENDS ${romfs_tar_file}
+	COMMENT "ROMFS: copying, generating airframes"
 	)

 # copy extras into ROMFS
@@ -19,6 +19,5 @@ param set-default MNT_MAN_PITCH 2
 param set-default MNT_MAN_YAW 3

 param set-default MNT_RANGE_ROLL 180
-param set-default MNT_MAX_PITCH 45
-param set-default MNT_MIN_PITCH -135
+param set-default MNT_RANGE_PITCH 180
 param set-default MNT_RANGE_YAW 720
@@ -41,9 +41,3 @@ if param compare -s MC_NN_EN 1
 then
 	mc_nn_control start
 fi
-
-
-if param compare -s MC_RAPTOR_ENABLE 1
-then
-	mc_raptor start
-fi
@@ -8,24 +8,17 @@
 #                           Begin Optional drivers                            #
 ###############################################################################

-%ifdef CONFIG_DRIVERS_BATT_SMBUS
 if param compare -s SENS_EN_BATT 1
 then
 	batt_smbus start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_SMART_BATTERY_BATMON
 # Start batmon driver if enabled using BATMON_DRIVER_EN
 if param compare -s BATMON_DRIVER_EN 1
 then
 	batmon start -X  #start on external bus
 fi
-%endif

-
-%ifdef CONFIG_DRIVERS_PWM_INPUT
-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS
 # Sensors on the PWM interface bank
 if param compare -s SENS_EN_LL40LS 1
 then
@@ -34,121 +27,92 @@ then
 		ll40ls_pwm start
 	fi
 fi
-%endif

 # External automatic trigger system
 if param compare FD_EXT_ATS_EN 1
 then
 	pwm_input start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS
 # Lidar-Lite on I2C
 if param compare -s SENS_EN_LL40LS 2
 then
 	ll40ls start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_MAPPYDOT
 # mappydot lidar sensor
 if param compare -s SENS_EN_MPDT 1
 then
 	mappydot start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_MB12XX
 # mb12xx sonar sensor
 if param greater -s SENS_EN_MB12XX 0
 then
 	mb12xx start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_PGA460
 # pga460 sonar sensor
 if param greater -s SENS_EN_PGA460 0
 then
 	pga460 start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_I2C
 # Lightware i2c lidar sensor
 if param greater -s SENS_EN_SF1XX 0
 then
 	lightware_laser_i2c start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_SRF05
 # Sensor HY-SRF05 or HC-SR05 ultrasonic sensor
 if param compare -s SENS_EN_SR05 1
 then
 	srf05 start
 fi
-%endif


-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_TERARANGER
 # Teraranger one tof sensor
 if param greater -s SENS_EN_TRANGER 0
 then
 	teraranger start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_OPTICAL_FLOW_PAA3905
 # paa3905 optical flow sensor (external SPI)
 if param greater -s SENS_EN_PAA3905 0
 then
 	paa3905 -S start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_OPTICAL_FLOW_PAW3902
 # paw3902 optical flow sensor (external SPI)
 if param greater -s SENS_EN_PAW3902 0
 then
 	paw3902 -S start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_OPTICAL_FLOW_PMW3901
 # pmw3901 optical flow sensor (external SPI)
 if param greater -s SENS_EN_PMW3901 0
 then
 	pmw3901 -S start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L0X
 # vl53l0x i2c distance sensor
 if param compare -s SENS_EN_VL53L0X 1
 then
 	vl53l0x start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L1X
 # vl53l1x i2c distance sensor
 if param compare -s SENS_EN_VL53L1X 1
 then
 	vl53l1x start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DISTANCE_SENSOR_TF02PRO
 # tf02 pro i2c distance sensor
 if param compare -s SENS_EN_TF02PRO 1
 then
 	tf02pro start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448
 # ADIS16448 spi external IMU
 if param compare -s SENS_EN_ADIS164X 1
 then
@@ -161,33 +125,25 @@ then
 		adis16448 -S start -R 4
 	fi
 fi
-%endif

-%ifdef CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16507
 # ADIS16507 spi external IMU
 if param greater -s SENS_EN_ADIS165X 0
 then
 	adis16507 -S start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_IMU_MURATA_SCH16T
 # SCH16T spi external IMU
 if param compare -s SENS_EN_SCH16T 1
 then
 	sch16t -S start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ETS
 # Eagle Tree airspeed sensor external I2C
 if param compare -s SENS_EN_ETSASPD 1
 then
 	ets_airspeed start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_SDP3X
 # Sensirion SDP3X differential pressure sensor external I2C
 if param compare -s SENS_EN_SDP3X 1
 then
@@ -197,171 +153,116 @@ then
 		sdp3x start -X -a 0x22
 	fi
 fi
-%endif

-%ifdef CONFIG_DRIVERS_TEMPERATURE_SENSOR_MCP9808
 # Microchip MCP9808 temperature sensor external I2C
 if param compare -s SENS_EN_MCP9808 1
 then
 	mcp9808 start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4515
 # TE MS4515 differential pressure sensor external I2C
 if param compare -s SENS_EN_MS4515 1
 then
 	ms4515 start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4525DO
 # TE MS4525DO differential pressure sensor external I2C
 if param compare -s SENS_EN_MS4525DO 1
 then
 	ms4525do start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS5525DSO
 # TE MS5525DSO differential pressure sensor external I2C
 if param compare -s SENS_EN_MS5525DS 1
 then
 	ms5525dso start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ASP5033
 # TE ASP5033 differential pressure sensor external I2C
 if param compare -s SENS_EN_ASP5033 1
 then
 	asp5033 start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_AUAV
 # AUAV absolute/differential pressure sensor external I2C
 if param greater -s SENS_EN_AUAVX 0
 then
 	auav start -D -X
 	auav start -A -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_HYGROMETER_SHT3X
 # SHT3x temperature and hygrometer sensor, external I2C
 if param compare -s SENS_EN_SHT3X 1
 then
 	sht3x start -X
 	sht3x start -X -a 0x45
 fi
-%endif

-%ifdef CONFIG_DRIVERS_IRLOCK
 # IR-LOCK sensor external I2C
 if param compare -s SENS_EN_IRLOCK 1
 then
 	irlock start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_BAROMETER_GOERTEK_SPL06
 # SPL06 sensor external I2C
 if param compare -s SENS_EN_SPL06 1
 then
 	spl06 -X start
 	spl06 -X -a 0x77 start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_BAROMETER_GOERTEK_SPA06
 # SPA06 sensor external I2C
 if param compare -s SENS_EN_SPA06 1
 then
 	spa06 -X start
 	spa06 -X -a 0x77 start
 fi
-%endif

-%ifdef CONFIG_DRIVERS_RPM_PCF8583
 # PCF8583 counter (RPM sensor)
 if param compare -s SENS_EN_PCF8583 1
 then
 	pcf8583 start -X
 	pcf8583 start -X -a 0x51
 fi
-%endif

-%ifdef CONFIG_DRIVERS_ADC_ADS7953
 # ADC sensor ADS7953 external SPI
 if param compare -s ADC_ADS7953_EN 1
 then
 	ads7953 start -S
 fi
-%endif

-%ifdef CONFIG_DRIVERS_ADC_TLA2528
 # ADC sensor tla2528 external I2C
 if param compare -s ADC_TLA2528_EN 1
 then
 	tla2528 start -X
 fi
-%endif

-%ifdef CONFIG_DRIVERS_TEMPERATURE_SENSOR_TMP102
 # Start TMP102 temperature sensor
-if param compare -s SENS_EN_TMP102 1
+if param compare SENS_EN_TMP102 1
 then
 	tmp102 start -X
 fi
-%endif

-%ifdef COMMON_MAGNETOMETER
 # probe for optional external I2C devices
 if param compare SENS_EXT_I2C_PRB 1
 then
-%ifdef CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948
 	icm20948_i2c_passthrough -X -q start
-%endif

 	# compasses
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_HMC5883
 	hmc5883 -T -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_ST_IIS2MDC
 	iis2mdc -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8308
 	ist8308 -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310
 	ist8310 -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_LIS3MDL
 	if ! lis3mdl -X -q start
 	then
 		lis3mdl -X -q -a 0x1c start
 	fi
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_QMC5883L
 	qmc5883l -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_QMC5883P
 	qmc5883p -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_RM3100
 	rm3100 -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM350
 	bmm350 -X -q start
-%endif
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_ST_IIS2MDC
 	iis2mdc -X -q start
-%endif

 	# start last (wait for possible icm20948 passthrough mode)
-%ifdef CONFIG_DRIVERS_MAGNETOMETER_AKM_AK09916
 	ak09916 -X -q start
-%endif
 fi
-%endif
@@ -265,15 +265,12 @@ else
 	# Start the tone_alarm driver.
 	# Needs to be started after the parameters are loaded (for CBRK_BUZZER).
 	#
-%ifdef CONFIG_DRIVERS_TONE_ALARM
 	tone_alarm start
-%endif

 	#
 	# Waypoint storage.
 	# REBOOTWORK this needs to start in parallel.
 	#
-%ifdef CONFIG_MODULES_DATAMAN
 	if param compare -s SYS_DM_BACKEND 1
 	then
 		dataman start -r
@@ -284,14 +281,11 @@ else
 			dataman start
 		fi
 	fi
-%endif

 	#
 	# Start the socket communication send_event handler.
 	#
-%ifdef CONFIG_MODULES_SEND_EVENT
 	send_event start
-%endif

 	#
 	# Start the hardfault streamer.
@@ -304,25 +298,15 @@ else
 	#
 	# Start the resource load monitor.
 	#
-%ifdef CONFIG_MODULES_LOAD_MON
 	load_mon start
-%endif

 	#
 	# Start system state indicator.
 	#
-%ifdef CONFIG_DRIVERS_LIGHTS_RGBLED
 	rgbled start -X -q
-%endif
-%ifdef CONFIG_DRIVERS_LIGHTS_RGBLED_NCP5623C
 	rgbled_ncp5623c start -X -q
-%endif
-%ifdef CONFIG_DRIVERS_LIGHTS_RGBLED_LP5562
 	rgbled_lp5562 start -X -q
-%endif
-%ifdef CONFIG_DRIVERS_LIGHTS_RGBLED_IS31FL3195
 	rgbled_is31fl3195 start -X -q
-%endif

 	#
 	# Override parameters from user configuration file.
@@ -347,21 +331,11 @@ else
 		# start the simulator in hardware if needed
 		if param compare SYS_HITL 2
 		then
-%ifdef CONFIG_MODULES_SIMULATION_SIMULATOR_SIH
 			simulator_sih start
-%endif
-%ifdef CONFIG_MODULES_SIMULATION_SENSOR_BARO_SIM
 			sensor_baro_sim start
-%endif
-%ifdef CONFIG_MODULES_SIMULATION_SENSOR_MAG_SIM
 			sensor_mag_sim start
-%endif
-%ifdef CONFIG_MODULES_SIMULATION_SENSOR_GPS_SIM
 			sensor_gps_sim start
-%endif
-%ifdef CONFIG_MODULES_SIMULATION_SENSOR_AGP_SIM
 			sensor_agp_sim start
-%endif
 		fi

 	else
@@ -378,58 +352,43 @@ else

 		. ${R}etc/init.d/rc.sensors

-%ifdef CONFIG_MODULES_SENSORS
-%ifdef CONFIG_MODULES_ESC_BATTERY
 		if param compare -s BAT1_SOURCE 2
 		then
 			esc_battery start
 		fi
-%endif

-%ifdef CONFIG_MODULES_BATTERY_STATUS
 		if ! param compare BAT1_SOURCE 1
 		then
 			battery_status start
 		fi
-%endif
-%endif

-%ifdef CONFIG_MODULES_SENSORS
 		sensors start
-%endif
 	fi

 	#
 	# state estimator selection
 	#
-%ifdef CONFIG_MODULES_EKF2
 	if param compare -s EKF2_EN 1
 	then
 		ekf2 start &
 	fi
-%endif

-%ifdef CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR
 	if param compare -s LPE_EN 1
 	then
 		local_position_estimator start
 	fi
-%endif

-%ifdef CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q
 	if param compare -s ATT_EN 1
 	then
 		attitude_estimator_q start
 	fi
-%endif

-%ifdef CONFIG_DRIVERS_PX4IO
 	#
 	# px4io
 	#
 	if px4io supported
 	then
-		# Check if PX4IO present and update firmware if needed.
+	# Check if PX4IO present and update firmware if needed.
 		if [ -f $IOFW ]
 		then
 			if ! px4io checkcrc ${IOFW}
@@ -459,56 +418,40 @@ else
 			fi
 		fi
 	fi
-%endif

 	# Heater driver for temperature regulated IMUs.
 	# The heater needs to start after px4io.
-%ifdef CONFIG_DRIVERS_HEATER
 	if param compare -s SENS_EN_THERMAL 1
 	then
 		heater start
 	fi
-%endif


 	#
 	# RC update (map raw RC input to calibrate manual control)
 	#  start before commander
 	#
-%ifdef CONFIG_MODULES_RC_UPDATE
 	rc_update start
-%endif
-%ifdef CONFIG_MODULES_MANUAL_CONTROL
 	manual_control start
-%endif

 	# Start camera trigger, capture and PPS before pwm_out as they might access
 	# pwm pins
-%ifdef CONFIG_DRIVERS_CAMERA_TRIGGER
 	if param greater -s TRIG_MODE 0
 	then
 		camera_trigger start
-%ifdef CONFIG_MODULES_CAMERA_FEEDBACK
 		camera_feedback start
-%endif
 	fi
-%endif
 	# PPS capture driver
-%ifdef CONFIG_DRIVERS_PPS_CAPTURE
 	if param greater -s PPS_CAP_ENABLE 0
 	then
 		pps_capture start
 	fi
-%endif
 	# RPM capture driver
-%ifdef CONFIG_DRIVERS_RPM_CAPTURE
 	if param greater -s RPM_CAP_ENABLE 0
 	then
 		rpm_capture start
 	fi
-%endif
 	# Camera capture driver
-%ifdef CONFIG_DRIVERS_CAMERA_CAPTURE
 	if param greater -s CAM_CAP_FBACK 0
 	then
 		if camera_capture start
@@ -516,34 +459,25 @@ else
 			camera_capture on
 		fi
 	fi
-%endif

 	#
 	# Commander
 	#
-%ifdef CONFIG_MODULES_COMMANDER
 	if param greater SYS_HITL 0
 	then
 		commander start -h

-%ifdef CONFIG_MODULES_SIMULATION_PWM_OUT_SIM
 		if ! pwm_out_sim start -m hil
 		then
 			tune_control play error
 		fi
-%endif

 	else
 		commander start

-%ifdef CONFIG_DRIVERS_DSHOT
 		dshot start
-%endif
-%ifdef CONFIG_DRIVERS_PWM_OUT
 		pwm_out start
-%endif
 	fi
-%endif

 	#
 	# Configure vehicle type specific parameters.
@@ -551,12 +485,10 @@ else
 	. ${R}etc/init.d/rc.vehicle_setup

 	# Pre-takeoff continuous magnetometer calibration
-%ifdef CONFIG_MODULES_MAG_BIAS_ESTIMATOR
 	if param compare -s MBE_ENABLE 1
 	then
 		mag_bias_estimator start
 	fi
-%endif

 	#
 	# Optional board mavlink streams: rc.board_mavlink
@@ -601,67 +533,54 @@ else
 	#
 	# Start the navigator.
 	#
-%ifdef CONFIG_MODULES_NAVIGATOR
 	navigator start
-%endif

-%ifdef CONFIG_MODULES_TEMPERATURE_COMPENSATION
 	#
 	# Start a thermal calibration if required.
 	#
-	. ${R}etc/init.d/rc.thermal_cal
-%endif
+	set RC_THERMAL_CAL ${R}etc/init.d/rc.thermal_cal
+	if [ -f ${RC_THERMAL_CAL} ]
+	then
+		. ${RC_THERMAL_CAL}
+	fi
+	unset RC_THERMAL_CAL

 	#
 	# Start gimbal to control mounts such as gimbals, disabled by default.
 	#
-%ifdef CONFIG_MODULES_GIMBAL
 	if param greater -s MNT_MODE_IN -1
 	then
 		gimbal start
 	fi
-%endif

 	# Blacksheep telemetry
-%ifdef CONFIG_DRIVERS_TELEMETRY_BST
 	if param compare -s TEL_BST_EN 1
 	then
 		bst start -X
 	fi
-%endif

-%ifdef CONFIG_MODULES_GYRO_FFT
 	if param compare -s IMU_GYRO_FFT_EN 1
 	then
 		gyro_fft start
 	fi
-%endif

-%ifdef CONFIG_MODULES_GYRO_CALIBRATION
 	if param compare -s IMU_GYRO_CAL_EN 1
 	then
 		gyro_calibration start
 	fi
-%endif

 	# Check for px4flow sensor
-%ifdef CONFIG_DRIVERS_OPTICAL_FLOW_PX4FLOW
 	if param compare -s SENS_EN_PX4FLOW 1
 	then
 		px4flow start -X &
 	fi
-%endif

-%ifdef CONFIG_MODULES_PAYLOAD_DELIVERER
 	payload_deliverer start
-%endif

-%ifdef CONFIG_MODULES_INTERNAL_COMBUSTION_ENGINE_CONTROL
 	if param compare -s ICE_EN 1
 	then
 		internal_combustion_engine_control start
 	fi
-%endif

 	#
 	# Optional board supplied extras: rc.board_extras
@@ -683,12 +602,15 @@ else
 		. $FEXTRAS
 	fi

-%ifdef CONFIG_MODULES_LOGGER
 	#
 	# Start the logger.
 	#
-	. ${R}etc/init.d/rc.logging
-%endif
+	set RC_LOGGING ${R}etc/init.d/rc.logging
+	if [ -f ${RC_LOGGING} ]
+	then
+		. ${RC_LOGGING}
+	fi
+	unset RC_LOGGING

 	#
 	# Set additional parameters and env variables for selected AUTOSTART.
@@ -709,7 +631,6 @@ else
 	#
 	# Check if UAVCAN is enabled, default to it for ESCs.
 	#
-%ifdef CONFIG_DRIVERS_UAVCAN
 	if param greater -s UAVCAN_ENABLE 0
 	then
 		# Start core UAVCAN module.
@@ -718,27 +639,15 @@ else
 			tune_control play error
 		fi
 	else
-%ifdef CONFIG_DRIVERS_CYPHAL
 		if param greater -s CYPHAL_ENABLE 0
 		then
 			cyphal start
 		fi
-%endif
 	fi
-%else
-%ifdef CONFIG_DRIVERS_CYPHAL
-	if param greater -s CYPHAL_ENABLE 0
-	then
-		cyphal start
-	fi
-%endif
-%endif
-%ifdef CONFIG_MODULES_ZENOH
 	if param greater -s ZENOH_ENABLE 0
 	then
 		zenoh start
 	fi
-%endif

 #
 # End of autostart.
@@ -21,13 +21,11 @@ exec find boards msg src platforms test \
    -path src/lib/crypto/monocypher -prune -o \
    -path src/lib/events/libevents -prune -o \
    -path src/lib/parameters/uthash -prune -o \
-    -path src/lib/rl_tools/rl_tools -prune -o \
    -path src/lib/wind_estimator/python/generated -prune -o \
    -path src/modules/ekf2/EKF/python/ekf_derivation/generated -prune -o \
    -path src/modules/ekf2/EKF/yaw_estimator/derivation/generated -prune -o \
    -path src/modules/gyro_fft/CMSIS_5 -prune -o \
    -path src/modules/mavlink/mavlink -prune -o \
-    -path src/modules/mc_raptor/blob -prune -o \
    -path test/fuzztest -prune -o \
    -path test/mavsdk_tests/catch2 -prune -o \
    -path src/lib/crypto/monocypher -prune -o \
@@ -1,188 +0,0 @@
-#!/usr/bin/env python3
-"""
-Preprocesses ROMFS files with C preprocessor to enable KConfig support.
-
-This script processes all rc* files in the ROMFS directory through the C preprocessor,
-allowing use of #ifdef, #ifndef, #if, #else, #endif directives with KConfig definitions.
-"""
-
-import argparse
-import os
-import subprocess
-import sys
-import tempfile
-from pathlib import Path
-
-
-def preprocess_file(file_path, kconfig_header, cpp_command):
-    """
-    Preprocess a single file through the C preprocessor.
-
-    Uses % as the preprocessor directive symbol (instead of #) to avoid conflicts
-    with shell comments. Converts %ifdef, %ifndef, %if, %else, %endif to
-    #ifdef, #ifndef, #if, #else, #endif before preprocessing.
-
-    Args:
-        file_path: Path to the file to preprocess
-        kconfig_header: Path to the px4_boardconfig.h header
-        cpp_command: C preprocessor command (usually the C compiler)
-    """
-    # Read original file
-    with open(file_path, 'r') as f:
-        original_content = f.read()
-
-    # Process the file line by line:
-    # 1. Remove shell comment lines (to avoid conflicts with CPP)
-    # 2. Convert % preprocessor directives to # directives
-    lines = original_content.split('\n')
-    converted_lines = []
-
-    for line in lines:
-        stripped = line.lstrip()
-
-        # Check if line starts with % followed by a preprocessor keyword
-        if stripped.startswith('%ifdef ') or stripped.startswith('%ifdef\t'):
-            # Preserve leading whitespace, convert %ifdef to #ifdef
-            converted_lines.append(line.replace('%ifdef', '#ifdef', 1))
-        elif stripped.startswith('%ifndef ') or stripped.startswith('%ifndef\t'):
-            converted_lines.append(line.replace('%ifndef', '#ifndef', 1))
-        elif stripped.startswith('%if '):
-            converted_lines.append(line.replace('%if', '#if', 1))
-        elif stripped.startswith('%elif '):
-            converted_lines.append(line.replace('%elif', '#elif', 1))
-        elif stripped.startswith('%else'):
-            converted_lines.append(line.replace('%else', '#else', 1))
-        elif stripped.startswith('%endif'):
-            converted_lines.append(line.replace('%endif', '#endif', 1))
-        elif stripped.startswith('#') and not stripped.startswith('#!'):
-            # Remove shell comment lines (but keep shebang)
-            # This prevents "# if ..." comments from being interpreted as "#if" by CPP
-            continue
-        else:
-            converted_lines.append(line)
-    converted_content = '\n'.join(converted_lines)
-
-    # Create temporary file with include directive and converted content
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.in', delete=False) as tmp:
-        tmp.write(f'#include "{kconfig_header}"\n')
-        tmp.write(converted_content)
-        tmp_path = tmp.name
-
-    try:
-        # Run C preprocessor
-        # -P: don't generate #line directives
-        # -E: preprocess only
-        # -undef: don't predefine any non-standard macros
-        # -nostdinc: don't search standard include directories
-        # -x assembler-with-cpp: treat input as assembly (allows # comments to pass through)
-        result = subprocess.run(
-            [cpp_command, '-P', '-E', '-undef', '-nostdinc', '-x', 'assembler-with-cpp', tmp_path],
-            capture_output=True,
-            text=True,
-            check=True
-        )
-
-        preprocessed = result.stdout
-
-        # Clean up the output:
-        # 1. Remove empty lines at the beginning
-        # 2. Remove lines that are just whitespace
-        lines = preprocessed.split('\n')
-        cleaned_lines = []
-        started = False
-
-        for line in lines:
-            # Skip empty lines at the beginning
-            if not started and not line.strip():
-                continue
-            started = True
-            cleaned_lines.append(line)
-
-        # Remove trailing empty lines
-        while cleaned_lines and not cleaned_lines[-1].strip():
-            cleaned_lines.pop()
-
-        # Write preprocessed content back
-        with open(file_path, 'w') as f:
-            f.write('\n'.join(cleaned_lines))
-            if cleaned_lines:  # Add final newline if file is not empty
-                f.write('\n')
-
-        return True
-
-    except subprocess.CalledProcessError as e:
-        print(f"Error preprocessing {file_path}: {e}")
-        print(f"stderr: {e.stderr}")
-        return False
-    finally:
-        # Clean up temporary file
-        try:
-            os.unlink(tmp_path)
-        except:
-            pass
-
-
-def main():
-    parser = argparse.ArgumentParser(description='Preprocess ROMFS files with KConfig definitions')
-    parser.add_argument('--romfs-dir', required=True, help='ROMFS root directory')
-    parser.add_argument('--kconfig-header', required=True, help='Path to px4_boardconfig.h')
-    parser.add_argument('--cpp', required=True, help='C preprocessor command')
-    parser.add_argument('--pattern', default='rc*', help='File pattern to preprocess (default: rc*)')
-
-    args = parser.parse_args()
-
-    # Verify inputs
-    romfs_dir = Path(args.romfs_dir)
-    kconfig_header = Path(args.kconfig_header)
-
-    if not romfs_dir.exists():
-        print(f"Error: ROMFS directory not found: {romfs_dir}")
-        return 1
-
-    if not kconfig_header.exists():
-        print(f"Error: KConfig header not found: {kconfig_header}")
-        return 1
-
-    # Find all files to preprocess in init.d directory
-    init_d_dir = romfs_dir / 'init.d'
-    if not init_d_dir.exists():
-        print(f"Warning: init.d directory not found in {romfs_dir}")
-        return 0
-
-    # Find all rc* files (shell scripts)
-    files_to_process = []
-    for pattern in ['rc*', 'rcS']:
-        files_to_process.extend(init_d_dir.glob(pattern))
-
-    # Also check subdirectories like airframes
-    for subdir in init_d_dir.iterdir():
-        if subdir.is_dir():
-            for pattern in ['rc*']:
-                files_to_process.extend(subdir.glob(pattern))
-
-    # Remove duplicates and filter only files
-    files_to_process = list(set([f for f in files_to_process if f.is_file()]))
-
-    if not files_to_process:
-        print(f"Warning: No files matching pattern '{args.pattern}' found in {init_d_dir}")
-        return 0
-
-    print(f"Preprocessing {len(files_to_process)} ROMFS files with KConfig definitions...")
-
-    # Process each file
-    success_count = 0
-    for file_path in sorted(files_to_process):
-        rel_path = file_path.relative_to(romfs_dir)
-        print(f"  Processing: {rel_path}")
-        if preprocess_file(file_path, kconfig_header.absolute(), args.cpp):
-            success_count += 1
-        else:
-            print(f"  Warning: Failed to preprocess {rel_path}")
-
-    print(f"Successfully preprocessed {success_count}/{len(files_to_process)} files")
-
-    return 0 if success_count == len(files_to_process) else 1
-
-
-if __name__ == '__main__':
-    sys.exit(main())
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -34,6 +34,7 @@ CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_ST_LSM303D=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -1,17 +0,0 @@
-CONFIG_MODULES_AIRSPEED_SELECTOR=n
-CONFIG_MODULES_FLIGHT_MODE_MANAGER=n
-CONFIG_MODULES_FW_ATT_CONTROL=n
-CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n
-CONFIG_MODULES_FW_MODE_MANAGER=n
-CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=n
-CONFIG_MODULES_FW_RATE_CONTROL=n
-CONFIG_MODULES_MC_ATT_CONTROL=n
-CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=n
-CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
-CONFIG_MODULES_MC_POS_CONTROL=n
-CONFIG_MODULES_MC_RATE_CONTROL=n
-CONFIG_MODULES_VTOL_ATT_CONTROL=n
-CONFIG_DRIVERS_ROBOCLAW=y
-CONFIG_MODULES_ROVER_ACKERMANN=y
-CONFIG_MODULES_ROVER_DIFFERENTIAL=y
-CONFIG_MODULES_ROVER_MECANUM=y
@@ -22,7 +22,6 @@ CONFIG_COMMON_MAGNETOMETER=y
 CONFIG_DATAMAN_PERSISTENT_STORAGE=n
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_COMMON_RC=y
-CONFIG_DRIVERS_AUTERION_AUTOSTARTER=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
@@ -60,9 +60,6 @@ then
 	set INA_CONFIGURED yes
 fi

-# Auterion auto starter
-auterion_autostarter start
-
 if param compare BAT1_V_CHANNEL -2
 then
 	if [ "$INA_CONFIGURED" != "yes" ]
@@ -26,10 +26,10 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
-CONFIG_DRIVERS_AUTERION_AUTOSTARTER=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
@@ -55,8 +55,8 @@ then
 	set INA_CONFIGURED yes
 fi

-# Auterion auto starter
-auterion_autostarter start
+#Start Auterion Power Module selector for Skynode boards
+pm_selector_auterion start

 # Auterion's INA238 uses a shunt value of 0.0003 instead of 0.0005.
 param set-default INA238_SHUNT 0.0003
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -30,6 +30,7 @@ CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -27,6 +27,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -28,6 +28,7 @@ CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_DRIVERS_SAFETY_BUTTON=y
@@ -27,6 +27,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -25,6 +25,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM45686=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -23,6 +23,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU6500=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_DRIVERS_ROBOCLAW=y
@@ -23,6 +23,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20689=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM45686=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -25,6 +25,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -14,6 +14,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42605=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -17,6 +17,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42605=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -16,6 +16,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42605=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -26,11 +26,13 @@ CONFIG_COMMON_HYGROMETERS=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI270=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA220=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y
 CONFIG_DRIVERS_PPS_CAPTURE=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -24,10 +24,12 @@ CONFIG_DRIVERS_GNSS_SEPTENTRIO=y
 CONFIG_DRIVERS_GPS=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM45686=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA220=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y
 CONFIG_DRIVERS_PPS_CAPTURE=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -25,11 +25,13 @@ CONFIG_DRIVERS_GPS=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI270=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA220=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y
 CONFIG_DRIVERS_PPS_CAPTURE=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -27,11 +27,13 @@ CONFIG_COMMON_HYGROMETERS=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_BOSCH_BMI270=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA220=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_POWER_MONITOR_VOXLPM=y
 CONFIG_DRIVERS_PPS_CAPTURE=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
@@ -19,6 +19,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
@@ -23,6 +23,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -20,6 +20,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -26,6 +26,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -27,6 +27,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -23,6 +23,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_LIGHTS_RGBLED=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_NCP5623C=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -14,6 +14,7 @@ CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
 CONFIG_COMMON_DISTANCE_SENSOR=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_CYPHAL_BMS_SUBSCRIBER=y
 CONFIG_DRIVERS_ADC_BOARD_ADC=y
 CONFIG_DRIVERS_CYPHAL=y
@@ -29,6 +29,7 @@ CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
 CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM350=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
@@ -26,6 +26,7 @@ CONFIG_COMMON_INS=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
@@ -28,6 +28,7 @@ CONFIG_DRIVERS_IMU_ST_LSM303D=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -26,6 +26,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_INPUT=y
@@ -25,6 +25,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -27,6 +27,7 @@ CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_DRIVERS_LIGHTS_RGBLED_PWM=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
@@ -76,6 +77,8 @@ CONFIG_MODULES_RC_UPDATE=y
 CONFIG_MODULES_SENSORS=y
 CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
+CONFIG_MODULES_UUV_ATT_CONTROL=y
+CONFIG_MODULES_UUV_POS_CONTROL=y
 CONFIG_MODULES_UXRCE_DDS_CLIENT=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
 CONFIG_SYSTEMCMDS_ACTUATOR_TEST=y
@@ -34,11 +34,12 @@ CONFIG_DRIVERS_IMU_INVENSENSE_IIM42652=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
-CONFIG_DRIVERS_AUTERION_AUTOSTARTER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
@@ -72,8 +72,8 @@ then
 	# Internal magnetometer on I2c
 	bmm150 -I -R 6 start

-	# Auterion auto starter
-	auterion_autostarter start
+	# Auto start power monitors
+	pm_selector_auterion start

 	# Auterion's INA238 uses a shunt value of 0.0003 instead of 0.0005.
 	param set-default INA238_SHUNT 0.0003
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
@@ -1,94 +0,0 @@
-CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0"
-CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS6"
-CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS5"
-CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3"
-CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1"
-CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
-CONFIG_BOARD_UAVCAN_TIMER_OVERRIDE=2
-CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
-CONFIG_COMMON_DISTANCE_SENSOR=y
-CONFIG_COMMON_LIGHT=y
-CONFIG_COMMON_MAGNETOMETER=y
-CONFIG_COMMON_TELEMETRY=y
-CONFIG_DRIVERS_ACTUATORS_VERTIQ_IO=y
-CONFIG_DRIVERS_ADC_BOARD_ADC=y
-CONFIG_DRIVERS_BAROMETER_MS5611=y
-CONFIG_DRIVERS_BATT_SMBUS=y
-CONFIG_DRIVERS_CAMERA_CAPTURE=y
-CONFIG_DRIVERS_CAMERA_TRIGGER=y
-CONFIG_DRIVERS_CDCACM_AUTOSTART=y
-CONFIG_DRIVERS_DSHOT=y
-CONFIG_DRIVERS_GNSS_SEPTENTRIO=y
-CONFIG_DRIVERS_GPS=y
-CONFIG_DRIVERS_HEATER=y
-CONFIG_DRIVERS_IMU_BOSCH_BMI055=y
-CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
-CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
-CONFIG_DRIVERS_POWER_MONITOR_INA226=y
-CONFIG_DRIVERS_POWER_MONITOR_INA228=y
-CONFIG_DRIVERS_POWER_MONITOR_INA238=y
-CONFIG_DRIVERS_PWM_OUT=y
-CONFIG_DRIVERS_PX4IO=y
-CONFIG_DRIVERS_TONE_ALARM=y
-CONFIG_DRIVERS_UAVCAN=y
-CONFIG_LIB_RL_TOOLS=y
-CONFIG_MODULES_AIRSPEED_SELECTOR=y
-CONFIG_MODULES_BATTERY_STATUS=y
-CONFIG_MODULES_CAMERA_FEEDBACK=y
-CONFIG_MODULES_COMMANDER=y
-CONFIG_MODULES_CONTROL_ALLOCATOR=y
-CONFIG_MODULES_DATAMAN=y
-CONFIG_MODULES_EKF2=y
-CONFIG_MODULES_ESC_BATTERY=y
-CONFIG_MODULES_EVENTS=y
-CONFIG_MODULES_FLIGHT_MODE_MANAGER=y
-CONFIG_MODULES_FW_ATT_CONTROL=n
-CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=n
-CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=n
-CONFIG_MODULES_FW_MODE_MANAGER=n
-CONFIG_MODULES_FW_RATE_CONTROL=n
-CONFIG_MODULES_GIMBAL=y
-CONFIG_MODULES_GYRO_CALIBRATION=y
-CONFIG_MODULES_LAND_DETECTOR=y
-CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y
-CONFIG_MODULES_LOAD_MON=y
-CONFIG_MODULES_LOGGER=y
-CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
-CONFIG_MODULES_MANUAL_CONTROL=y
-CONFIG_MODULES_MAVLINK=y
-CONFIG_MODULES_MC_ATT_CONTROL=y
-CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
-CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
-CONFIG_MODULES_MC_POS_CONTROL=y
-CONFIG_MODULES_MC_RAPTOR=y
-CONFIG_MODULES_MC_RATE_CONTROL=y
-CONFIG_MODULES_NAVIGATOR=y
-CONFIG_MODULES_RC_UPDATE=y
-CONFIG_MODULES_SENSORS=y
-CONFIG_MODULES_SIMULATION_SIMULATOR_SIH=y
-CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
-CONFIG_MODULES_UXRCE_DDS_CLIENT=y
-CONFIG_MODULES_VTOL_ATT_CONTROL=n
-CONFIG_NUM_MISSION_ITMES_SUPPORTED=1000
-CONFIG_SYSTEMCMDS_ACTUATOR_TEST=y
-CONFIG_SYSTEMCMDS_BSONDUMP=y
-CONFIG_SYSTEMCMDS_DMESG=y
-CONFIG_SYSTEMCMDS_HARDFAULT_LOG=y
-CONFIG_SYSTEMCMDS_I2CDETECT=y
-CONFIG_SYSTEMCMDS_LED_CONTROL=y
-CONFIG_SYSTEMCMDS_MFT=y
-CONFIG_SYSTEMCMDS_MTD=y
-CONFIG_SYSTEMCMDS_NSHTERM=y
-CONFIG_SYSTEMCMDS_PARAM=y
-CONFIG_SYSTEMCMDS_PERF=y
-CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
-CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
-CONFIG_SYSTEMCMDS_TOP=y
-CONFIG_SYSTEMCMDS_TUNE_CONTROL=y
-CONFIG_SYSTEMCMDS_UORB=y
-CONFIG_SYSTEMCMDS_VER=y
-CONFIG_SYSTEMCMDS_WORK_QUEUE=y
-CONFIG_USE_IFCI_CONFIGURATION=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42605=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -16,6 +16,7 @@ CONFIG_DRIVERS_CAMERA_CAPTURE=y
 CONFIG_DRIVERS_CAMERA_TRIGGER=y
 CONFIG_DRIVERS_CDCACM_AUTOSTART=y
 CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_AUAV=y
 CONFIG_COMMON_DISTANCE_SENSOR=y
 CONFIG_DRIVERS_DSHOT=y
 CONFIG_DRIVERS_GNSS_SEPTENTRIO=y
@@ -189,7 +189,6 @@ CONFIG_PIPES=y
 CONFIG_PREALLOC_TIMERS=50
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_MUTEX_ROBUST=y
-CONFIG_PTHREAD_MUTEX_TYPES=y
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAMTRON_EMULATE_PAGE_SHIFT=5
 CONFIG_RAMTRON_EMULATE_SECTOR_SHIFT=5
@@ -1,89 +0,0 @@
-CONFIG_BOARD_ETHERNET=y
-CONFIG_BOARD_ROOT_PATH="."
-CONFIG_BOARD_TESTING=y
-CONFIG_COMMON_SIMULATION=y
-CONFIG_DRIVERS_CAMERA_TRIGGER=y
-CONFIG_DRIVERS_GNSS_SEPTENTRIO=y
-CONFIG_DRIVERS_GPS=y
-CONFIG_DRIVERS_OSD_MSP_OSD=y
-CONFIG_DRIVERS_TONE_ALARM=y
-CONFIG_EKF2_VERBOSE_STATUS=y
-CONFIG_EXAMPLES_DYN_HELLO=y
-CONFIG_EXAMPLES_FAKE_GPS=y
-CONFIG_EXAMPLES_FAKE_IMU=y
-CONFIG_EXAMPLES_FAKE_MAGNETOMETER=y
-CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_PX4_MAVLINK_DEBUG=y
-CONFIG_EXAMPLES_PX4_SIMPLE_APP=y
-CONFIG_EXAMPLES_WORK_ITEM=y
-CONFIG_FIGURE_OF_EIGHT=y
-CONFIG_LIB_RL_TOOLS=y
-CONFIG_MAVLINK_DIALECT="development"
-CONFIG_MODE_NAVIGATOR_VTOL_TAKEOFF=y
-CONFIG_MODULES_AIRSHIP_ATT_CONTROL=y
-CONFIG_MODULES_AIRSPEED_SELECTOR=y
-CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=y
-CONFIG_MODULES_CAMERA_FEEDBACK=y
-CONFIG_MODULES_COMMANDER=y
-CONFIG_MODULES_CONTROL_ALLOCATOR=y
-CONFIG_MODULES_DATAMAN=y
-CONFIG_MODULES_EKF2=y
-CONFIG_MODULES_EVENTS=y
-CONFIG_MODULES_FLIGHT_MODE_MANAGER=y
-CONFIG_MODULES_FW_ATT_CONTROL=y
-CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
-CONFIG_MODULES_FW_LATERAL_LONGITUDINAL_CONTROL=y
-CONFIG_MODULES_FW_MODE_MANAGER=y
-CONFIG_MODULES_FW_RATE_CONTROL=y
-CONFIG_MODULES_GIMBAL=y
-CONFIG_MODULES_GYRO_CALIBRATION=y
-CONFIG_MODULES_GYRO_FFT=y
-CONFIG_MODULES_LAND_DETECTOR=y
-CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y
-CONFIG_MODULES_LOAD_MON=y
-CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=y
-CONFIG_MODULES_LOGGER=y
-CONFIG_MODULES_MAG_BIAS_ESTIMATOR=y
-CONFIG_MODULES_MANUAL_CONTROL=y
-CONFIG_MODULES_MAVLINK=y
-CONFIG_MODULES_MC_ATT_CONTROL=y
-CONFIG_MODULES_MC_AUTOTUNE_ATTITUDE_CONTROL=y
-CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=y
-CONFIG_MODULES_MC_POS_CONTROL=y
-CONFIG_MODULES_MC_RAPTOR=y
-CONFIG_MODULES_MC_RATE_CONTROL=y
-CONFIG_MODULES_NAVIGATOR=y
-CONFIG_MODULES_PAYLOAD_DELIVERER=y
-CONFIG_MODULES_RC_UPDATE=y
-CONFIG_MODULES_REPLAY=y
-CONFIG_MODULES_ROVER_ACKERMANN=y
-CONFIG_MODULES_ROVER_DIFFERENTIAL=y
-CONFIG_MODULES_ROVER_MECANUM=y
-CONFIG_MODULES_SENSORS=y
-CONFIG_MODULES_SIMULATION_GZ_BRIDGE=y
-CONFIG_MODULES_SIMULATION_GZ_MSGS=y
-CONFIG_MODULES_SIMULATION_GZ_PLUGINS=y
-CONFIG_MODULES_SIMULATION_SENSOR_AGP_SIM=y
-CONFIG_MODULES_SPACECRAFT=n
-CONFIG_MODULES_TEMPERATURE_COMPENSATION=y
-CONFIG_MODULES_UUV_ATT_CONTROL=y
-CONFIG_MODULES_UUV_POS_CONTROL=y
-CONFIG_MODULES_UXRCE_DDS_CLIENT=y
-CONFIG_MODULES_VTOL_ATT_CONTROL=y
-CONFIG_NUM_MISSION_ITMES_SUPPORTED=10000
-CONFIG_PLATFORM_POSIX=y
-CONFIG_SYSTEMCMDS_ACTUATOR_TEST=y
-CONFIG_SYSTEMCMDS_BSONDUMP=y
-CONFIG_SYSTEMCMDS_DYN=y
-CONFIG_SYSTEMCMDS_FAILURE=y
-CONFIG_SYSTEMCMDS_LED_CONTROL=y
-CONFIG_SYSTEMCMDS_PARAM=y
-CONFIG_SYSTEMCMDS_PERF=y
-CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SHUTDOWN=y
-CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
-CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
-CONFIG_SYSTEMCMDS_TUNE_CONTROL=y
-CONFIG_SYSTEMCMDS_UORB=y
-CONFIG_SYSTEMCMDS_VER=y
-CONFIG_SYSTEMCMDS_WORK_QUEUE=y
@@ -24,6 +24,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
@@ -18,6 +18,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM20689=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
@@ -23,6 +23,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -13,6 +13,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -31,6 +31,7 @@ CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
 CONFIG_COMMON_RC=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y
 CONFIG_DRIVERS_IRLOCK=y
 CONFIG_COMMON_LIGHT=y
 CONFIG_COMMON_MAGNETOMETER=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
@@ -22,6 +22,7 @@ CONFIG_DRIVERS_LIGHTS_RGBLED_NCP5623C=y
 CONFIG_DRIVERS_MAGNETOMETER_BOSCH_BMM150=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_LIS3MDL=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -21,7 +21,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI270=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
-CONFIG_DRIVERS_MAGNETOMETER_QMC5883P=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
@@ -23,4 +23,4 @@ then
 fi

 # internal mag
-qmc5883p -I -R 2 start
+ist8310 -I -R 6 start
@@ -42,20 +42,20 @@
 #define DMAMAP_SPI2_RX    DMAMAP_DMA12_SPI2RX_0		/* DMA1:39 */
 #define DMAMAP_SPI2_TX    DMAMAP_DMA12_SPI2TX_0 	/* DMA1:40 */

-#define DMAMAP_SPI4_RX    DMAMAP_DMA12_SPI4RX_1		/* 3 DMA2:83 IMU */
-#define DMAMAP_SPI4_TX    DMAMAP_DMA12_SPI4TX_1		/* 4 DMA2:84 IMU */
+#define DMAMAP_SPI4_RX    DMAMAP_DMA12_SPI4RX_0		/* 3 DMA1:83 IMU */
+#define DMAMAP_SPI4_TX    DMAMAP_DMA12_SPI4TX_0		/* 4 DMA1:84 IMU */

-// #define DMAMAP_USART1_RX  DMAMAP_DMA12_USART1RX_0	/*  DMA1:41  GPS1 */
-// #define DMAMAP_USART1_TX  DMAMAP_DMA12_USART1TX_0	/*  DMA1:42  GPS1 */
+#define DMAMAP_USART1_RX  DMAMAP_DMA12_USART1RX_0	/*  DMA1:41  GPS1 */
+#define DMAMAP_USART1_TX  DMAMAP_DMA12_USART1TX_0	/*  DMA1:42  GPS1 */

-// #define DMAMAP_USART2_RX  DMAMAP_DMA12_USART2RX_0	/*  DMA1:43 GPS2 */
-// #define DMAMAP_USART2_TX  DMAMAP_DMA12_USART2TX_0	/*  DMA1:44 GPS2 */
+#define DMAMAP_USART2_RX  DMAMAP_DMA12_USART2RX_0	/*  DMA1:43 GPS2 */
+#define DMAMAP_USART2_TX  DMAMAP_DMA12_USART2TX_0	/*  DMA1:44 GPS2 */

 #define DMAMAP_USART3_RX  DMAMAP_DMA12_USART3RX_0	/*  DMA1:45 TELEM1 */
 #define DMAMAP_USART3_TX  DMAMAP_DMA12_USART3TX_0	/*  DMA1:46 TELEM1 */

-#define DMAMAP_UART4_RX    DMAMAP_DMA12_UART4RX_1	/*  DMA2:63 TELEM2 */
-#define DMAMAP_UART4_TX    DMAMAP_DMA12_UART4TX_1	/*  DMA2:64 TELEM2 */
+#define DMAMAP_UART4_RX    DMAMAP_DMA12_UART4RX_1	/*  DMA1:63 TELEM2 */
+#define DMAMAP_UART4_TX    DMAMAP_DMA12_UART4TX_1	/*  DMA1:64 TELEM2 */

 #define DMAMAP_USART6_RX  DMAMAP_DMA12_USART6RX_0	/*  DMA1:71 PX4IO */
 #define DMAMAP_USART6_TX  DMAMAP_DMA12_USART6TX_0	/*  DMA1:72 PX4IO */
@@ -247,10 +247,14 @@ CONFIG_UART8_SERIAL_CONSOLE=y
 CONFIG_UART8_TXBUFSIZE=3000
 CONFIG_USART1_BAUD=57600
 CONFIG_USART1_RXBUFSIZE=600
+CONFIG_USART1_RXDMA=y
 CONFIG_USART1_TXBUFSIZE=1500
+CONFIG_USART1_TXDMA=y
 CONFIG_USART2_BAUD=57600
 CONFIG_USART2_RXBUFSIZE=600
+CONFIG_USART2_RXDMA=y
 CONFIG_USART2_TXBUFSIZE=3000
+CONFIG_USART2_TXDMA=y
 CONFIG_USART3_BAUD=57600
 CONFIG_USART3_RXBUFSIZE=180
 CONFIG_USART3_RXDMA=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_COMMON_OSD=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -21,6 +21,7 @@ CONFIG_DRIVERS_IMU_BOSCH_BMI088=y
 CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y
 CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y
 CONFIG_DRIVERS_MAGNETOMETER_QMC5883L=y
+CONFIG_COMMON_OPTICAL_FLOW=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_RC_INPUT=y
 CONFIG_COMMON_TELEMETRY=y
@@ -29,6 +29,7 @@ CONFIG_DRIVERS_OSD_MSP_OSD=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
 CONFIG_DRIVERS_POWER_MONITOR_INA238=y
+CONFIG_DRIVERS_POWER_MONITOR_PM_SELECTOR_AUTERION=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PX4IO=y
 CONFIG_DRIVERS_RC_INPUT=y
@@ -822,11 +822,9 @@
    - [Camera Integration/Architecture](camera/camera_architecture.md)
    - [Computer Vision](advanced/computer_vision.md)
      - [Motion Capture (VICON, Optitrack, NOKOV)](tutorials/motion-capture.md)
-    - [Neural Networks](neural_networks/index.md)
-      - [MC NN Control Module (Generic)](neural_networks/mc_neural_network_control.md)
-        - [Neural Network Module Utilities](neural_networks/nn_module_utilities.md)
-        - [TensorFlow Lite Micro (TFLM)](neural_networks/tflm.md)
-      - [RAPTOR Adaptive RL NN Module](neural_networks/raptor.md)
+    - [Neural Networks](advanced/neural_networks.md)
+      - [Neural Network Module Utilities](advanced/nn_module_utilities.md)
+      - [TensorFlow Lite Micro (TFLM)](advanced/tflm.md)
    - [Installing driver for Intel RealSense R200](advanced/realsense_intel_driver.md)
    - [Switching State Estimators](advanced/switching_state_estimators.md)
    - [Out-of-Tree Modules](advanced/out_of_tree_modules.md)
@@ -1 +1,119 @@
-<Redirect to="../neural_networks/mc_neural_network_control" />
+# Neural Networks
+
+<Badge type="tip" text="PX4 v1.17" /> <Badge type="warning" text="Experimental" />
+
+::: warning
+This is an experimental module.
+Use at your own risk.
+:::
+
+The Multicopter Neural Network (NN) module ([mc_nn_control](../modules/modules_controller.md#mc-nn-control)) is an example module that allows you to experiment with using a pre-trained neural network on PX4.
+It might be used, for example, to experiment with controllers for non-traditional drone morphologies, computer vision tasks, and so on.
+
+The module integrates a pre-trained neural network based on the [TensorFlow Lite Micro (TFLM)](../advanced/tflm.md) module.
+The module is trained for the [X500 V2](../frames_multicopter/holybro_x500v2_pixhawk6c.md) multicopter frame.
+While the controller is fairly robust, and might work on other platforms, we recommend [Training your own Network](#training-your-own-network) if you use a different vehicle.
+Note that after training the network you will need to update and rebuild PX4.
+
+TLFM is a mature inference library intended for use on embedded devices.
+It has support for several architectures, so there is a high likelihood that you can build it for the board you want to use.
+If not, there are other possible NN frameworks, such as [Eigen](https://eigen.tuxfamily.org/index.php?title=Main_Page) and [Executorch](https://pytorch.org/executorch-overview).
+
+This document explains how you can include the module in your PX4 build, and provides a broad overview of how it works.
+The other documents in the section provide more information about the integration, allowing you to replace the NN with a version trained on different data, or even to replace the TLFM library altogether.
+
+If you are looking for more resources to learn about the module, a website has been created with links to a youtube video and a workshop paper. A full master's thesis will be added later. [A Neural Network Mode for PX4 on Embedded Flight Controllers](https://ntnu-arl.github.io/px4-nns/).
+
+## Neural Network PX4 Firmware
+
+::: warning
+This module requires Ubuntu 24.04 or newer (it is not supported in Ubuntu 22.04).
+:::
+
+The module has been tested on a number of configurations, which can be build locally using the commands:
+
+```sh
+make px4_sitl_neural
+```
+
+```sh
+make px4_fmu-v6c_neural
+```
+
+```sh
+make mro_pixracerpro_neural
+```
+
+You can add the module to other board configurations by modifying their `default.px4board file` configuration to include these lines:
+
+```sh
+CONFIG_LIB_TFLM=y
+CONFIG_MODULES_MC_NN_CONTROL=y
+```
+
+:::tip
+The `mc_nn_control` module takes up roughly 50KB, and many of the `default.px4board file` are already close to filling all the flash on their boards. To make room for the neural control module you can remove the include statements for other modules, such as FW, rover, VTOL and UUV.
+:::
+
+## Example Module Overview
+
+The example module replaces the entire controller structure as well as the control allocator, as shown in the diagram below:
+
+![neural_control](../../assets/advanced/neural_control.png)
+
+In the [controller diagram](../flight_stack/controller_diagrams.md) you can see the [uORB message](../middleware/uorb.md) flow.
+We hook into this flow by subscribing to messages at particular points, using our neural network to calculate outputs, and then publishing them into the next point in the flow.
+We also need to stop the module publishing the topic to be replaced, which is covered in [Neural Network Module: System Integration](nn_module_utilities.md)
+
+### Input
+
+The input can be changed to whatever you want.
+Set up the input you want to use during training and then provide the same input in PX4.
+In the Neural Control module the input is an array of 15 numbers, and consists of these values in this order:
+
+- [3] Local position error. (goal position - current position)
+- [6] The first 2 rows of a 3 dimensional rotation matrix.
+- [3] Linear velocity
+- [3] Angular velocity
+
+All the input values are collected from uORB topics and transformed into the correct representation in the `PopulateInputTensor()` function.
+PX4 uses the NED frame representation, while the Aerial Gym Simulator, in which the NN was trained, uses the ENU representation.
+Therefore two rotation matrices are created in the function and all the inputs are transformed from the NED representation to the ENU one.
+
+![ENU-NED](../../assets/advanced/ENU-NED.png)
+
+ENU and NED are just rotation representations, the translational difference is only there so both can be seen in the same figure.
+
+### Output
+
+The output consists of 4 values, the motor forces, one for each motor.
+These are transformed in the `RescaleActions()` function.
+This is done because PX4 expects normalized motor commands while the Aerial Gym Simulator uses physical values.
+So the output from the network needs to be normalized before they can be sent to the motors in PX4.
+
+The commands are published to the [ActuatorMotors](../msg_docs/ActuatorMotors.md) topic.
+The publishing is handled in `PublishOutput(float* command_actions)` function.
+
+:::tip
+If the neural control mode is too aggressive or unresponsive the [MC_NN_THRST_COEF](../advanced_config/parameter_reference.md#MC_NN_THRST_COEF) parameter can be tuned.
+Decrease it for more thrust.
+:::
+
+## Training your own Network
+
+The network is currently trained for the [X500 V2](../frames_multicopter/holybro_x500v2_pixhawk6c.md).
+But the controller is somewhat robust, so it could work directly on other platforms, but performing system identification and training a new network is recommended.
+
+Since the Aerial Gym Simulator is open-source you can download it and train your own networks as long as you have access to an NVIDIA GPU.
+If you want to train a control network optimized for your platform you can follow the instructions in the [Aerial Gym Documentation](https://ntnu-arl.github.io/aerial_gym_simulator/9_sim2real/).
+
+You should do one system identification flight for this and get an approximate inertia matrix for your platform.
+On the `sys-id` flight you need ESC telemetry, you can read more about that in [DSHOT](../peripherals/dshot.md).
+
+Then do the following steps:
+
+- Do a hover flight
+- Read of the logs what RPM is required for the drone to hover.
+- Use the weight of each motor, length of the motor arms, total weight of the platform with battery to calculate an approximate inertia matrix for the platform.
+- Insert these values into the Aerial Gym configuration and train your network.
+- Convert the network as explained in [TFLM](tflm.md).
@@ -2,7 +2,7 @@

 The neural control module ([mc_nn_control](../modules/modules_controller.md#mc-nn-control)) implements an end-to-end controller utilizing neural networks.

-The parts of the module directly concerned with generating the code for the trained neural network and integrating it into the module are covered in [TensorFlow Lite Micro (TFLM)](./tflm.md).
+The parts of the module directly concerned with generating the code for the trained neural network and integrating it into the module are covered in [TensorFlow Lite Micro (TFLM)](../advanced/tflm.md).
 This page covers the changes that were made to integrate the module into PX4, both within the module, and in larger system configuration.

 ::: tip
@@ -75,7 +75,7 @@ Which timing library is included and used is based on wether PX4 is built with N

 ## Changing the setpoint

-The module uses the [TrajectorySetpoint](../msg_docs/TrajectorySetpoint.md) message's position fields to define its target.
+The module uses the [TrajectorySetpoint](../msg_docs/TrajectorySetpoint.md) message’s position fields to define its target.
 To follow a trajectory, you can send updated setpoints.
 For an example of how to do this in a PX4 module, see the [mc_nn_testing](https://github.com/SindreMHegre/PX4-Autopilot-public/tree/main/src/modules/mc_nn_testing) module in this fork.
 Note that this is not included in upstream PX4.
@@ -1,6 +1,6 @@
 # TensorFlow Lite Micro (TFLM)

-The PX4 [MC Neural Networks Control](../neural_networks/mc_neural_network_control.md) module ([mc_nn_control](../modules/modules_controller.md#mc-nn-control)) integrates a neural network that uses the [TensorFlow Lite Micro (TFLM)](https://github.com/tensorflow/tflite-micro) inference library.
+The PX4 [Multicopter Neural Network](../advanced/neural_networks.md) module ([mc_nn_control](../modules/modules_controller.md#mc-nn-control)) integrates a neural network that uses the [TensorFlow Lite Micro (TFLM)](https://github.com/tensorflow/tflite-micro) inference library.

 This is a mature inference library intended for use on embedded devices, and is hence a suitable choice for PX4.

@@ -68,7 +68,7 @@ The `_input_tensor` is also defined, it is fetched from `_control_interpreter->i

 The `_input_tensor` is filled in the `PopulateInputTensor()` function.
 `_input_tensor` works by accessing the `->data.f` member array and fill in the required inputs for your network.
-The inputs used in the control network is covered in [MC Neural Networks Control](../neural_networks/mc_neural_network_control.md).
+The inputs used in the control network is covered in [Neural Networks](../advanced/neural_networks.md).

 ### Outputs

@@ -25,7 +25,7 @@ These flight controllers are [manufacturer supported](../flight_controller/autop
  - 32 Bit Arm® Cortex®-M3, 72MHz, 20KB SRAM
 - On-board sensors
  - Accel/Gyro: ICM-42688-P\*2(Version1), BMI270\*2(Version2)
-  - Mag: QMC5883P
+  - Mag: IST8310
  - Barometer: DPS310(Version1),SPL06(Version2)

 ### Interfaces
@@ -321,11 +321,9 @@ The configuration can be done using the [UXRCE-DDS parameters](../advanced_confi
  - [UXRCE_DDS_SYNCT](../advanced_config/parameter_reference.md#UXRCE_DDS_SYNCT): Bridge time synchronization enable.
    The uXRCE-DDS client module can synchronize the timestamp of the messages exchanged over the bridge.
    This is the default configuration. In certain situations, for example during [simulations](../ros2/user_guide.md#ros-gazebo-and-px4-time-synchronization), this feature may be disabled.
-  - [UXRCE_DDS_NS_IDX](../advanced_config/parameter_reference.md#UXRCE_DDS_NS_IDX) <Badge type="tip" text="PX4 v1.17" />: Index-based namespace definition.
+  - [UXRCE_DDS_NS_IDX](../advanced_config/parameter_reference.md#UXRCE_DDS_NS_IDX) <Badge type="tip" text="PX4 v1.17" />: Index-based namespace definition
    Setting this parameter to any value other than `-1` creates a namespace with the prefix `uav_` and the specified value, e.g. `uav_0`, `uav_1`, etc.
    See [namespace](#customizing-the-namespace) for methods to define richer or arbitrary namespaces.
-  - [`UXRCE_DDS_FLCTRL`](../advanced_config/parameter_reference.md#UXRCE_DDS_FLCTRL) <Badge type="tip" text="PX4 main" />: Serial port hardware flow control enable.
-    To use hardware flow control, a custom MicroXRCE Agent needs to be adopted. Please refer to [this PR](https://github.com/eProsima/Micro-XRCE-DDS-Agent/pull/407) for the required changes, cherry-pick them on top of the [agent version](#build-run-within-ros-2-workspace) you need to use and then run the agent with the additional `--flow-control` option.

 ::: info
 Many ports are already have a default configuration.
@@ -1,21 +0,0 @@
-# Neural Network Control
-
-PX4 supports the following mechanisms for using neural networks for multirotor control:
-
- [MC Neural Networks Control](../neural_networks/mc_neural_network_control.md)<Badge type="warning" text="Experimental" /> — A generic neural network module that you can modify to use different underlying neural network and training models and compile into the firmware.
- [RAPTOR: A Neural Network Module for Adaptive Quadrotor Control](../neural_networks/raptor.md)<Badge type="warning" text="Experimental" /> — An adaptive RL NN module that works well with different Quad configurations without additional training.
-
-Generally you will select the former if you wish to experiment with custom neural network architectures and train them using PyTorch or TensorFlow, and the latter if you want to use a pre-trained neural-network controller that works out-of-the-box (without training for your particular platform) or if you train your own policies using [RLtools](https://rl.tools).
-
-Note that both modules are experimental and provided for experimentation.
-The table below provides more detail on the differences.
-
-| Use Case                                                         | [`mc_raptor`](../neural_networks/raptor.md) | [`mc_nn_control`](../neural_networks/mc_neural_network_control.md) |
-| ---------------------------------------------------------------- | ------------------------------------------- | ------------------------------------------------------------------ |
-| Pre-trained policy that adapts to any quadrotor without training | ✓ RAPTOR                                    | ✘                                                                  |
-| Train policy in PyTorch/TF                                       | ✘                                           | ✓ TF Lite                                                          |
-| Train policy in RLtools                                          | ✓                                           | ✘                                                                  |
-| Use manual control (remote) with NN policy                       | ✘ GPS/MoCap                                 | ✓ Manual attitude commands                                         |
-| Load policy checkpoints from SD card                             | ✓ Upload via MAVLink FTP                    | ✘ Compiled into firmware                                           |
-| Offboard setpoints                                               | ✓ MAVLink                                   | ✘                                                                  |
-| Internal Trajectory Generator                                    | ✓ (Position, Lissajous)                     | ✘                                                                  |
@@ -1,119 +0,0 @@
-# MC Neural Networks Control
-
-<Badge type="tip" text="PX4 v1.17" /> <Badge type="warning" text="Experimental" />
-
-::: warning
-This is an experimental module.
-Use at your own risk.
-:::
-
-The Multicopter Neural Network (NN) module ([mc_nn_control](../modules/modules_controller.md#mc-nn-control)) is an example module that allows you to experiment with using a pre-trained neural network on PX4.
-It might be used, for example, to experiment with controllers for non-traditional drone morphologies, computer vision tasks, and so on.
-
-The module integrates a pre-trained neural network based on the [TensorFlow Lite Micro (TFLM)](./tflm.md) module.
-The module is trained for the [X500 V2](../frames_multicopter/holybro_x500v2_pixhawk6c.md) multicopter frame.
-While the controller is fairly robust, and might work on other platforms, we recommend [Training your own Network](#training-your-own-network) if you use a different vehicle.
-Note that after training the network you will need to update and rebuild PX4.
-
-TLFM is a mature inference library intended for use on embedded devices.
-It has support for several architectures, so there is a high likelihood that you can build it for the board you want to use.
-If not, there are other possible NN frameworks, such as [Eigen](https://eigen.tuxfamily.org/index.php?title=Main_Page) and [Executorch](https://pytorch.org/executorch-overview).
-
-This document explains how you can include the module in your PX4 build, and provides a broad overview of how it works.
-The other documents in the section provide more information about the integration, allowing you to replace the NN with a version trained on different data, or even to replace the TLFM library altogether.
-
-If you are looking for more resources to learn about the module, a website has been created with links to a youtube video and a workshop paper. A full master's thesis will be added later. [A Neural Network Mode for PX4 on Embedded Flight Controllers](https://ntnu-arl.github.io/px4-nns/).
-
-## Neural Network PX4 Firmware
-
-::: warning
-This module requires Ubuntu 24.04 or newer (it is not supported in Ubuntu 22.04).
-:::
-
-The module has been tested on a number of configurations, which can be build locally using the commands:
-
-```sh
-make px4_sitl_neural
-```
-
-```sh
-make px4_fmu-v6c_neural
-```
-
-```sh
-make mro_pixracerpro_neural
-```
-
-You can add the module to other board configurations by modifying their `default.px4board file` configuration to include these lines:
-
-```sh
-CONFIG_LIB_TFLM=y
-CONFIG_MODULES_MC_NN_CONTROL=y
-```
-
-:::tip
-The `mc_nn_control` module takes up roughly 50KB, and many of the `default.px4board file` are already close to filling all the flash on their boards. To make room for the neural control module you can remove the include statements for other modules, such as FW, rover, VTOL and UUV.
-:::
-
-## Example Module Overview
-
-The example module replaces the entire controller structure as well as the control allocator, as shown in the diagram below:
-
-![neural_control](../../assets/advanced/neural_control.png)
-
-In the [controller diagram](../flight_stack/controller_diagrams.md) you can see the [uORB message](../middleware/uorb.md) flow.
-We hook into this flow by subscribing to messages at particular points, using our neural network to calculate outputs, and then publishing them into the next point in the flow.
-We also need to stop the module publishing the topic to be replaced, which is covered in [Neural Network Module: System Integration](nn_module_utilities.md)
-
-### Input
-
-The input can be changed to whatever you want.
-Set up the input you want to use during training and then provide the same input in PX4.
-In the Neural Control module the input is an array of 15 numbers, and consists of these values in this order:
-
- [3] Local position error. (goal position - current position)
- [6] The first 2 rows of a 3 dimensional rotation matrix.
- [3] Linear velocity
- [3] Angular velocity
-
-All the input values are collected from uORB topics and transformed into the correct representation in the `PopulateInputTensor()` function.
-PX4 uses the NED frame representation, while the Aerial Gym Simulator, in which the NN was trained, uses the ENU representation.
-Therefore two rotation matrices are created in the function and all the inputs are transformed from the NED representation to the ENU one.
-
-![ENU-NED](../../assets/advanced/ENU-NED.png)
-
-ENU and NED are just rotation representations, the translational difference is only there so both can be seen in the same figure.
-
-### Output
-
-The output consists of 4 values, the motor forces, one for each motor.
-These are transformed in the `RescaleActions()` function.
-This is done because PX4 expects normalized motor commands while the Aerial Gym Simulator uses physical values.
-So the output from the network needs to be normalized before they can be sent to the motors in PX4.
-
-The commands are published to the [ActuatorMotors](../msg_docs/ActuatorMotors.md) topic.
-The publishing is handled in `PublishOutput(float* command_actions)` function.
-
-:::tip
-If the neural control mode is too aggressive or unresponsive the [MC_NN_THRST_COEF](../advanced_config/parameter_reference.md#MC_NN_THRST_COEF) parameter can be tuned.
-Decrease it for more thrust.
-:::
-
-## Training your own Network
-
-The network is currently trained for the [X500 V2](../frames_multicopter/holybro_x500v2_pixhawk6c.md).
-But the controller is somewhat robust, so it could work directly on other platforms, but performing system identification and training a new network is recommended.
-
-Since the Aerial Gym Simulator is open-source you can download it and train your own networks as long as you have access to an NVIDIA GPU.
-If you want to train a control network optimized for your platform you can follow the instructions in the [Aerial Gym Documentation](https://ntnu-arl.github.io/aerial_gym_simulator/9_sim2real/).
-
-You should do one system identification flight for this and get an approximate inertia matrix for your platform.
-On the `sys-id` flight you need ESC telemetry, you can read more about that in [DSHOT](../peripherals/dshot.md).
-
-Then do the following steps:
-
- Do a hover flight
- Read of the logs what RPM is required for the drone to hover.
- Use the weight of each motor, length of the motor arms, total weight of the platform with battery to calculate an approximate inertia matrix for the platform.
- Insert these values into the Aerial Gym configuration and train your network.
- Convert the network as explained in [TFLM](tflm.md).
@@ -1,221 +0,0 @@
-# RAPTOR: A Neural Network Module for Adaptive Quadrotor Control
-
-<Badge type="tip" text="main (planned for PX4 v1.18)" /> <Badge type="info" text="Multicopter" /> <Badge type="warning" text="Experimental" />
-
-::: warning
-This is an experimental module.
-Use at your own risk.
-:::
-
-RAPTOR is a tiny reinforcement-learning based neural network module for quadrotor control that can be used to control a wide variety of quadrotors without retuning.
-
-This topic provides an overview of the fundamental concepts, and explains how you can use the module in simulation and real hardware.
-
-## Overview
-
-![Visual Abstract](../../assets/advanced/neural_networks/raptor/visual_abstract.jpg)
-
-RAPTOR is an adaptive policy for end-to-end quadrotor control.
-It is motivated by the human ability to adapt learned behaviours to similar situations.
-For example, while humans may initially require many hours of driving experience to be able to smoothly control the car and blend into traffic, when faced with a new vehicle they do not need to re-learn how to drive — they only need to experience a few rough braking/acceleration/steering responses to adjust their previously learned behavior.
-
-Reinforcement Learning (RL) is a machine learning technique that uses trial and error to learn decision making/control behaviors, which is similar to the way that humans learn to drive.
-RL is interesting for controlling robots (and particularly UAVs) because it overcomes some fundamental limitations of classic, modular control architectures (information loss at module boundaries, requirement for expert tuning, etc).
-RL has been very successful in [high-performance quadrotor flight](https://doi.org/10.1038/s41586-023-06419-4), but previous designs have not been particularly adaptable to new frames and vehicle types.
-
-RAPTOR fills this gap and demonstrates a single, tiny neural-network control policy that can control a wide variety of quadrotors (tested on real quadrotors from 32 g to 2.4 kg).
-
-For more details please refer to this video:
-
-<lite-youtube videoid="hVzdWRFTX3k" title="RAPTOR: A Foundation Policy for Quadrotor Control"/>
-
-The method we developed for training the RAPTOR policy is called Meta-Imitation Learning:
-
-![Diagram showing the Method Overview](../../assets/advanced/neural_networks/raptor/method.jpg)
-
-You can torture test the RAPTOR policy in your browser at [https://raptor.rl.tools](https://raptor.rl.tools) or in the embedded app here:
-
-<iframe src="https://rl-tools.github.io/raptor.rl.tools?raptor=false" width="100%" height="1000" style="border: none;"></iframe>
-
-For more information please refer to the paper at [https://arxiv.org/abs/2509.11481](https://arxiv.org/abs/2509.11481).
-
-## Structure
-
-The RAPTOR control policy is an end-to-end policy that takes position, orientation, linear velocity and angular velocity as inputs and outputs motor commands (`actuator_motors`).
-To integrate it into PX4 we use the external mode registration facilities in PX4 (which also works well for internal modes as demonstrated in `mc_nn_control`).
-Because of this architecture the `mc_raptor` module is completely decoupled from all other PX4 logic.
-
-By default, the RAPTOR module expects setpoints via `trajectory_setpoint` messages.
-If no `trajectory_setpoint` messages are received or if no `trajectory_setpoint` is received within 200 ms, the current position and orientation (with zero velocity) is used as the setpoint.
-Since feeding setpoints reliably via telemetry is still a challenge, we also implement a simple option to generate internal reference trajectories (controlled through the `MC_RAPTOR_INTREF` parameter) for demonstration and benchmarking purposes.
-
-## Features
-
- Tiny neural network (just 2084 parameters) => minimal CPU usage
- Easily maintainable
-  - Simple CMake setup
-  - Self-contained (no interference with other modules)
-  - Single, simple and well-maintained dependency (RLtools)
- Loading neural network parameters from SD card
-  - Minimal flash usage (for possible inclusion into default build configurations)
-  - Easy development: Train new neural network and just upload it via MAVLink FTP without requiring to re-flash the firmware
- Tested on 10+ different real platforms (including flexible frames, brushed motors)
- Actively developed and maintained
-
-## Usage
-
-### SITL
-
-Build PX4 SITL with Raptor, disable QGC requirement, and adjust the `IMU_GYRO_RATEMAX` to match the simulation IMU rate
-
-```sh
-make px4_sitl_raptor gz_x500
-param set NAV_DLL_ACT 0
-param set COM_DISARM_LAND -1 # When taking off in offboard the landing detector can cause mid-air disarms
-param set IMU_GYRO_RATEMAX 250 # Just for SITL. Tested with IMU_GYRO_RATEMAX=400 on real FCUs
-param set MC_RAPTOR_ENABLE 1 # Enable the mc_raptor module
-param save
-```
-
-Upload the RAPTOR checkpoint to the "SD card": Separate terminal
-
-```bash
-mavproxy.py --master udp:127.0.0.1:14540
-ftp mkdir /raptor # for the real FMU use: /fs/microsd/raptor
-ftp put src/modules/mc_raptor/blob/policy.tar /raptor/policy.tar
-```
-
-Restart (<kbd>Ctrl+C</kbd>)
-
-```sh
-make px4_sitl_raptor gz_x500
-commander takeoff
-commander status
-```
-
-Note the external mode ID of `RAPTOR` in the status report
-
-```sh
-commander mode ext{RAPTOR_MODE_ID}
-```
-
-#### Internal Reference Trajectory Generation
-
-In our experience, feeding the `trajectory_setpoint` via MAVLink (even via WiFi telemetry) is unreliable.
-But we do not want to constrain this module to only platforms that have a companion board.
-
-For this reason we have integrated a simple internal reference trajectory generator for testing and benchmarking purposes.
-It supports position (constant position and yaw setpoint) as well as configurable [Lissajous trajectories](https://en.wikipedia.org/wiki/Lissajous_curve).
-
-The Lissajous generator can, for example, generate smooth figure-eight trajectories that contain interesting accelerations for benchmarking and testing purposes.
-Please refer to the embedded configurator later in this section to explore the Lissajous parameters and view the resulting trajectories.
-
-To use the internal reference generator, select the mode: `0`: Off/activation position tracking, `1`: Lissajous
-
-```sh
-param set MC_RAPTOR_INTREF 1
-```
-
-Restart (ctrl+c)
-
-```sh
-commander takeoff
-commander mode ext{RAPTOR_MODE_ID}
-mc_raptor intref lissajous 0.5 1 0 2 1 1 10 3
-```
-
-The trajectory is relative to the position and yaw of the vehicle at the point where the RAPTOR mode is activated (or the position and yaw where the parameters are changed if it is already activated).
-
-You can adjust the parameters of the trajectory with the following tool.
-Make sure to copy the generated CLI string at the end:
-
-<iframe src="https://rl-tools.github.io/mc-raptor-trajectory-tool" width="100%" height="1700" style="border: none;"></iframe>
-
-### Real-World
-
-#### Setup
-
-The `mc_raptor` module has been mostly tested with the Holybro X500 V2 but it should also work out-of-the-box with other platforms (see the [Other Platforms](#other-platforms) section).
-
-```sh
-make px4_fmu-v6c_raptor upload
-```
-
-We recommend initially testing the RAPTOR mode using a dead man's switch.
-For this we configure the mode selection to be connected to a push button or a switch with a spring that automatically switches back.
-In the default position we configure e.g. `Stabilized Mode` and in the pressed configuration we select `External Mode 1` (since the name of the external mode is only transmitted at runtime).
-This allows to take off manually and then just trigger the RAPTOR mode for a split-second to see how it behaves.
-In our experiments it has been exceptionally stable (zero crashes) but we still think progressively activating it for longer is the safest way to build confidence.
-
-::: warning
-Make sure that your platform uses the standard PX4 quadrotor motor layout:
-
-1: front-right, 2: back-left, 3: front-left, 4: back-right
-:::
-
-##### Other Platforms
-
-To enable the `mc_raptor` module in other platforms, just add `CONFIG_MODULES_MC_RAPTOR=y` and `CONFIG_LIB_RL_TOOLS=y`
-
-```diff
-+++ b/boards/px4/fmu-v6c/raptor.px4board
-@@ -35,2 +35,3 @@
- CONFIG_DRIVERS_UAVCAN=y
-+CONFIG_LIB_RL_TOOLS=y
- CONFIG_MODULES_AIRSPEED_SELECTOR=y
-@@ -64,2 +65,3 @@
- CONFIG_MODULES_MC_POS_CONTROL=y
-+CONFIG_MODULES_MC_RAPTOR=y
- CONFIG_MODULES_MC_RATE_CONTROL=y
-```
-
-#### Results
-
-Even though there were moderate winds (~ 5 m/s) during the test, we found good figure-eight tracking performance at velocities up to 12 m/s:
-
-![Lissajous](../../assets/advanced/neural_networks/raptor/results_figure_eight.svg)
-
-We also tested the linear velocity in a straight line and found that the RAPTOR policy can reliably fly at > 17 m/s (the wind direction was orthogonal to the line):
-
-![Linear Oscillation](../../assets/advanced/neural_networks/raptor/results_line.svg)
-
-### Troubleshooting
-
-#### Logging
-
-Use this logging configuration to log all relevant topics at maximum rate:
-
-```sh
-cat > logger_topics.txt << EOF
-raptor_status 0
-raptor_input 0
-trajectory_setpoint 0
-vehicle_local_position 0
-vehicle_angular_velocity 0
-vehicle_attitude 0
-vehicle_status 0
-actuator_motors 0
-EOF
-```
-
-Use mavproxy FTP to upload it:
-
-```sh
-mavproxy.py
-```
-
-##### Real
-
-```sh
-ftp mkdir /fs/microsd/etc
-ftp mkdir /fs/microsd/etc/logging
-ftp put logger_topics.txt /fs/microsd/etc/logging/logger_topics.txt
-```
-
-##### SITL
-
-```sh
-ftp mkdir etc
-ftp mkdir logging
-ftp put logger_topics.txt etc/logging/logger_topics.txt
-```
--- a/Show More
+++ b/Show More