diff --git a/msg/CMakeLists.txt b/msg/CMakeLists.txt index 24f70e12a6ca..5c877cb936b6 100644 --- a/msg/CMakeLists.txt +++ b/msg/CMakeLists.txt @@ -37,233 +37,233 @@ cmake_policy(SET CMP0057 NEW) include(px4_list_make_absolute) set(msg_files - ActionRequest.msg - ActuatorArmed.msg - ActuatorControlsStatus.msg - ActuatorMotors.msg - ActuatorOutputs.msg - ActuatorServos.msg - ActuatorServosTrim.msg - ActuatorTest.msg - AdcReport.msg - Airspeed.msg - AirspeedValidated.msg - AirspeedWind.msg - ArmingCheckReply.msg - ArmingCheckRequest.msg - AutotuneAttitudeControlStatus.msg - BatteryStatus.msg - Buffer128.msg - ButtonEvent.msg - CameraCapture.msg - CameraStatus.msg - CameraTrigger.msg - CanInterfaceStatus.msg - CellularStatus.msg - CollisionConstraints.msg - CollisionReport.msg - ConfigOverrides.msg - ControlAllocatorStatus.msg - Cpuload.msg - DatamanRequest.msg - DatamanResponse.msg - DebugArray.msg - DebugKeyValue.msg - DebugValue.msg - DebugVect.msg - DifferentialPressure.msg - DistanceSensor.msg - DistanceSensorModeChangeRequest.msg - Ekf2Timestamps.msg - EscReport.msg - EscStatus.msg - EstimatorAidSource1d.msg - EstimatorAidSource2d.msg - EstimatorAidSource3d.msg - EstimatorBias.msg - EstimatorBias3d.msg - EstimatorEventFlags.msg - EstimatorGpsStatus.msg - EstimatorInnovations.msg - EstimatorSelectorStatus.msg - EstimatorSensorBias.msg - EstimatorStates.msg - EstimatorStatus.msg - EstimatorStatusFlags.msg - Event.msg - FigureEightStatus.msg - FailsafeFlags.msg - FailureDetectorStatus.msg - FlightPhaseEstimation.msg - FollowTarget.msg - FollowTargetEstimator.msg - FollowTargetStatus.msg - FuelTankStatus.msg - GeneratorStatus.msg - GeofenceResult.msg - GeofenceStatus.msg - GimbalControls.msg - GimbalDeviceAttitudeStatus.msg - GimbalDeviceInformation.msg - GimbalDeviceSetAttitude.msg - GimbalManagerInformation.msg - GimbalManagerSetAttitude.msg - GimbalManagerSetManualControl.msg - GimbalManagerStatus.msg - GotoSetpoint.msg - GpioConfig.msg - GpioIn.msg - GpioOut.msg - GpioRequest.msg - GpsDump.msg - GpsInjectData.msg - Gripper.msg - HealthReport.msg - HeaterStatus.msg - HomePosition.msg - HoverThrustEstimate.msg - InputRc.msg - InternalCombustionEngineStatus.msg - IridiumsbdStatus.msg - IrlockReport.msg - LandingGear.msg - LandingGearWheel.msg - LandingTargetInnovations.msg - LandingTargetPose.msg - LaunchDetectionStatus.msg - LedControl.msg - LoggerStatus.msg - LogMessage.msg - MagnetometerBiasEstimate.msg - MagWorkerData.msg - ManualControlSetpoint.msg - ManualControlSwitches.msg - MavlinkLog.msg - MavlinkTunnel.msg - MessageFormatRequest.msg - MessageFormatResponse.msg - Mission.msg - MissionResult.msg - MountOrientation.msg - ModeCompleted.msg - NavigatorMissionItem.msg - NavigatorStatus.msg - NormalizedUnsignedSetpoint.msg - NpfgStatus.msg - ObstacleDistance.msg - OffboardControlMode.msg - OnboardComputerStatus.msg - OpenDroneIdArmStatus.msg - OpenDroneIdOperatorId.msg - OpenDroneIdSelfId.msg - OpenDroneIdSystem.msg - OrbitStatus.msg - OrbTest.msg - OrbTestLarge.msg - OrbTestMedium.msg - ParameterResetRequest.msg - ParameterSetUsedRequest.msg - ParameterSetValueRequest.msg - ParameterSetValueResponse.msg - ParameterUpdate.msg - Ping.msg - PositionControllerLandingStatus.msg - PositionControllerStatus.msg - PositionSetpoint.msg - PositionSetpointTriplet.msg - PowerButtonState.msg - PowerMonitor.msg - PpsCapture.msg - PwmInput.msg - Px4ioStatus.msg - QshellReq.msg - QshellRetval.msg - RadioStatus.msg - RateCtrlStatus.msg - RcChannels.msg - RcParameterMap.msg - RegisterExtComponentReply.msg - RegisterExtComponentRequest.msg - RoverAckermannGuidanceStatus.msg - RoverAckermannStatus.msg - RoverDifferentialGuidanceStatus.msg - RoverDifferentialSetpoint.msg - RoverDifferentialStatus.msg - RoverMecanumGuidanceStatus.msg - RoverMecanumSetpoint.msg - RoverMecanumStatus.msg - Rpm.msg - RtlStatus.msg - RtlTimeEstimate.msg - SatelliteInfo.msg - SensorAccel.msg - SensorAccelFifo.msg - SensorBaro.msg - SensorCombined.msg - SensorCorrection.msg - SensorGnssRelative.msg - SensorGps.msg - SensorGyro.msg - SensorGyroFft.msg - SensorGyroFifo.msg - SensorHygrometer.msg - SensorMag.msg - SensorOpticalFlow.msg - SensorPreflightMag.msg - SensorSelection.msg - SensorsStatus.msg - SensorsStatusImu.msg - SensorUwb.msg - SensorAirflow.msg - SystemPower.msg - TakeoffStatus.msg - TaskStackInfo.msg - TecsStatus.msg - TelemetryStatus.msg - TiltrotorExtraControls.msg - TimesyncStatus.msg - TrajectoryBezier.msg - TrajectorySetpoint.msg - TrajectoryWaypoint.msg - TransponderReport.msg - TuneControl.msg - UavcanParameterRequest.msg - UavcanParameterValue.msg - UlogStream.msg - UlogStreamAck.msg - UnregisterExtComponent.msg - VehicleAcceleration.msg - VehicleAirData.msg - VehicleAngularAccelerationSetpoint.msg - VehicleAngularVelocity.msg - VehicleAttitude.msg - VehicleAttitudeSetpoint.msg - VehicleCommand.msg - VehicleCommandAck.msg - VehicleConstraints.msg - VehicleControlMode.msg - VehicleGlobalPosition.msg - VehicleImu.msg - VehicleImuStatus.msg - VehicleLandDetected.msg - VehicleLocalPosition.msg - VehicleLocalPositionSetpoint.msg - VehicleMagnetometer.msg - VehicleOdometry.msg - VehicleOpticalFlow.msg - VehicleOpticalFlowVel.msg - VehicleRatesSetpoint.msg - VehicleRoi.msg - VehicleStatus.msg - VehicleThrustSetpoint.msg - VehicleTorqueSetpoint.msg - VehicleTrajectoryBezier.msg - VehicleTrajectoryWaypoint.msg - VelocityLimits.msg - VtolVehicleStatus.msg - WheelEncoders.msg - Wind.msg - YawEstimatorStatus.msg + aux/ActionRequest.msg + aux/ActuatorArmed.msg + aux/ActuatorControlsStatus.msg + aux/ActuatorOutputs.msg + aux/ActuatorServosTrim.msg + aux/ActuatorTest.msg + aux/AdcReport.msg + aux/Airspeed.msg + aux/AirspeedValidated.msg + aux/AirspeedWind.msg + aux/AutotuneAttitudeControlStatus.msg + aux/BatteryStatus.msg + aux/Buffer128.msg + aux/ButtonEvent.msg + aux/CameraCapture.msg + aux/CameraStatus.msg + aux/CameraTrigger.msg + aux/CanInterfaceStatus.msg + aux/CellularStatus.msg + aux/CollisionConstraints.msg + aux/CollisionReport.msg + aux/ControlAllocatorStatus.msg + aux/Cpuload.msg + aux/DatamanRequest.msg + aux/DatamanResponse.msg + aux/DebugArray.msg + aux/DebugKeyValue.msg + aux/DebugValue.msg + aux/DebugVect.msg + aux/DifferentialPressure.msg + aux/DistanceSensorModeChangeRequest.msg + aux/DistanceSensor.msg + aux/Ekf2Timestamps.msg + aux/EscReport.msg + aux/EscStatus.msg + aux/EstimatorAidSource1d.msg + aux/EstimatorAidSource2d.msg + aux/EstimatorAidSource3d.msg + aux/EstimatorBias3d.msg + aux/EstimatorBias.msg + aux/EstimatorEventFlags.msg + aux/EstimatorGpsStatus.msg + aux/EstimatorInnovations.msg + aux/EstimatorSelectorStatus.msg + aux/EstimatorSensorBias.msg + aux/EstimatorStates.msg + aux/EstimatorStatusFlags.msg + aux/EstimatorStatus.msg + aux/Event.msg + aux/FailsafeFlags.msg + aux/FailureDetectorStatus.msg + aux/FigureEightStatus.msg + aux/FlightPhaseEstimation.msg + aux/FollowTargetEstimator.msg + aux/FollowTarget.msg + aux/FollowTargetStatus.msg + aux/FuelTankStatus.msg + aux/GeneratorStatus.msg + aux/GeofenceResult.msg + aux/GeofenceStatus.msg + aux/GimbalControls.msg + aux/GimbalDeviceAttitudeStatus.msg + aux/GimbalDeviceInformation.msg + aux/GimbalDeviceSetAttitude.msg + aux/GimbalManagerInformation.msg + aux/GimbalManagerSetAttitude.msg + aux/GimbalManagerSetManualControl.msg + aux/GimbalManagerStatus.msg + aux/GpioConfig.msg + aux/GpioIn.msg + aux/GpioOut.msg + aux/GpioRequest.msg + aux/GpsDump.msg + aux/GpsInjectData.msg + aux/Gripper.msg + aux/HealthReport.msg + aux/HeaterStatus.msg + aux/HomePosition.msg + aux/HoverThrustEstimate.msg + aux/InputRc.msg + aux/InternalCombustionEngineStatus.msg + aux/IridiumsbdStatus.msg + aux/IrlockReport.msg + aux/LandingGear.msg + aux/LandingGearWheel.msg + aux/LandingTargetInnovations.msg + aux/LandingTargetPose.msg + aux/LaunchDetectionStatus.msg + aux/LedControl.msg + aux/LoggerStatus.msg + aux/LogMessage.msg + aux/MagnetometerBiasEstimate.msg + aux/MagWorkerData.msg + aux/ManualControlSwitches.msg + aux/MavlinkLog.msg + aux/MavlinkTunnel.msg + aux/MessageFormatRequest.msg + aux/MessageFormatResponse.msg + aux/Mission.msg + aux/MissionResult.msg + aux/MountOrientation.msg + aux/NavigatorMissionItem.msg + aux/NavigatorStatus.msg + aux/NormalizedUnsignedSetpoint.msg + aux/NpfgStatus.msg + aux/ObstacleDistance.msg + aux/OffboardControlMode.msg + aux/OnboardComputerStatus.msg + aux/OpenDroneIdArmStatus.msg + aux/OpenDroneIdOperatorId.msg + aux/OpenDroneIdSelfId.msg + aux/OpenDroneIdSystem.msg + aux/OrbitStatus.msg + aux/OrbTestLarge.msg + aux/OrbTestMedium.msg + aux/OrbTest.msg + aux/ParameterResetRequest.msg + aux/ParameterSetUsedRequest.msg + aux/ParameterSetValueRequest.msg + aux/ParameterSetValueResponse.msg + aux/ParameterUpdate.msg + aux/Ping.msg + aux/PositionControllerLandingStatus.msg + aux/PositionControllerStatus.msg + aux/PositionSetpoint.msg + aux/PositionSetpointTriplet.msg + aux/PowerButtonState.msg + aux/PowerMonitor.msg + aux/PpsCapture.msg + aux/PwmInput.msg + aux/Px4ioStatus.msg + aux/QshellReq.msg + aux/QshellRetval.msg + aux/RadioStatus.msg + aux/RateCtrlStatus.msg + aux/RcChannels.msg + aux/RcParameterMap.msg + aux/RoverAckermannGuidanceStatus.msg + aux/RoverAckermannStatus.msg + aux/RoverDifferentialGuidanceStatus.msg + aux/RoverDifferentialSetpoint.msg + aux/RoverDifferentialStatus.msg + aux/RoverMecanumGuidanceStatus.msg + aux/RoverMecanumSetpoint.msg + aux/RoverMecanumStatus.msg + aux/Rpm.msg + aux/RtlStatus.msg + aux/RtlTimeEstimate.msg + aux/SatelliteInfo.msg + aux/SensorAccelFifo.msg + aux/SensorAccel.msg + aux/SensorAirflow.msg + aux/SensorBaro.msg + aux/SensorCombined.msg + aux/SensorCorrection.msg + aux/SensorGnssRelative.msg + aux/SensorGps.msg + aux/SensorGyroFft.msg + aux/SensorGyroFifo.msg + aux/SensorGyro.msg + aux/SensorHygrometer.msg + aux/SensorMag.msg + aux/SensorOpticalFlow.msg + aux/SensorPreflightMag.msg + aux/SensorSelection.msg + aux/SensorsStatusImu.msg + aux/SensorsStatus.msg + aux/SensorUwb.msg + aux/SystemPower.msg + aux/TakeoffStatus.msg + aux/TaskStackInfo.msg + aux/TecsStatus.msg + aux/TelemetryStatus.msg + aux/TiltrotorExtraControls.msg + aux/TimesyncStatus.msg + aux/TrajectoryBezier.msg + aux/TrajectoryWaypoint.msg + aux/TransponderReport.msg + aux/TuneControl.msg + aux/UavcanParameterRequest.msg + aux/UavcanParameterValue.msg + aux/UlogStreamAck.msg + aux/UlogStream.msg + aux/VehicleAcceleration.msg + aux/VehicleAirData.msg + aux/VehicleAngularAccelerationSetpoint.msg + aux/VehicleConstraints.msg + aux/VehicleImu.msg + aux/VehicleImuStatus.msg + aux/VehicleLandDetected.msg + aux/VehicleLocalPositionSetpoint.msg + aux/VehicleMagnetometer.msg + aux/VehicleOpticalFlow.msg + aux/VehicleOpticalFlowVel.msg + aux/VehicleRoi.msg + aux/VehicleThrustSetpoint.msg + aux/VehicleTorqueSetpoint.msg + aux/VehicleTrajectoryBezier.msg + aux/VehicleTrajectoryWaypoint.msg + aux/VelocityLimits.msg + aux/VtolVehicleStatus.msg + aux/WheelEncoders.msg + aux/Wind.msg + aux/YawEstimatorStatus.msg + core/ActuatorMotors.msg + core/ActuatorServos.msg + core/ArmingCheckReply.msg + core/ArmingCheckRequest.msg + core/ConfigOverrides.msg + core/GotoSetpoint.msg + core/ManualControlSetpoint.msg + core/ModeCompleted.msg + core/RegisterExtComponentReply.msg + core/RegisterExtComponentRequest.msg + core/TrajectorySetpoint.msg + core/UnregisterExtComponent.msg + core/VehicleAngularVelocity.msg + core/VehicleAttitude.msg + core/VehicleAttitudeSetpoint.msg + core/VehicleCommandAck.msg + core/VehicleCommand.msg + core/VehicleControlMode.msg + core/VehicleGlobalPosition.msg + core/VehicleLocalPosition.msg + core/VehicleOdometry.msg + core/VehicleRatesSetpoint.msg + core/VehicleStatus.msg ) list(SORT msg_files) @@ -315,7 +315,7 @@ add_custom_command( COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/msg/px_generate_uorb_topic_files.py --headers -f ${msg_files} - -i ${CMAKE_CURRENT_SOURCE_DIR} + -i ${CMAKE_CURRENT_SOURCE_DIR}/aux ${CMAKE_CURRENT_SOURCE_DIR}/core -o ${msg_out_path} -e ${PX4_SOURCE_DIR}/Tools/msg/templates/uorb DEPENDS @@ -336,7 +336,7 @@ add_custom_command( COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/msg/px_generate_uorb_topic_files.py --json -f ${msg_files} - -i ${CMAKE_CURRENT_SOURCE_DIR} + -i ${CMAKE_CURRENT_SOURCE_DIR}/aux ${CMAKE_CURRENT_SOURCE_DIR}/core -o ${msg_source_out_path} -e ${PX4_SOURCE_DIR}/Tools/msg/templates/uorb DEPENDS @@ -374,7 +374,7 @@ add_custom_command( COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/msg/px_generate_uorb_topic_files.py --headers -f ${msg_files} - -i ${CMAKE_CURRENT_SOURCE_DIR} + -i ${CMAKE_CURRENT_SOURCE_DIR}/aux ${CMAKE_CURRENT_SOURCE_DIR}/core -o ${ucdr_out_path} -e ${PX4_SOURCE_DIR}/Tools/msg/templates/ucdr DEPENDS @@ -396,7 +396,7 @@ add_custom_command( COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/msg/px_generate_uorb_topic_files.py --sources -f ${msg_files} - -i ${CMAKE_CURRENT_SOURCE_DIR} + -i ${CMAKE_CURRENT_SOURCE_DIR}/aux ${CMAKE_CURRENT_SOURCE_DIR}/core -o ${msg_source_out_path} -e ${PX4_SOURCE_DIR}/Tools/msg/templates/uorb DEPENDS @@ -447,7 +447,9 @@ if(CONFIG_LIB_CDRSTREAM) # Copy .msg files foreach(msg_file ${msg_files}) get_filename_component(msg ${msg_file} NAME_WE) - configure_file(${PX4_SOURCE_DIR}/msg/${msg}.msg ${idl_out_path}/${msg}.msg COPYONLY) + get_filename_component(type ${msg_file} DIRECTORY) + get_filename_component(type ${type} NAME) + configure_file(${PX4_SOURCE_DIR}/msg/${type}/${msg}.msg ${idl_out_path}/${msg}.msg COPYONLY) list(APPEND uorb_cdr_idl ${idl_out_path}/${msg}.idl) list(APPEND uorb_cdr_msg ${idl_out_path}/${msg}.msg) list(APPEND uorb_cdr_idl_uorb ${idl_uorb_path}/${msg}.h) @@ -492,7 +494,7 @@ if(CONFIG_LIB_CDRSTREAM) COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/msg/px_generate_uorb_topic_files.py --uorb-idl-header -f ${msg_files} - -i ${CMAKE_CURRENT_SOURCE_DIR} + -i ${CMAKE_CURRENT_SOURCE_DIR}/aux ${CMAKE_CURRENT_SOURCE_DIR}/core -o ${idl_uorb_path} -e ${PX4_SOURCE_DIR}/Tools/msg/templates/cdrstream DEPENDS diff --git a/msg/ActionRequest.msg b/msg/aux/ActionRequest.msg similarity index 100% rename from msg/ActionRequest.msg rename to msg/aux/ActionRequest.msg diff --git a/msg/ActuatorArmed.msg b/msg/aux/ActuatorArmed.msg similarity index 100% rename from msg/ActuatorArmed.msg rename to msg/aux/ActuatorArmed.msg diff --git a/msg/ActuatorControlsStatus.msg b/msg/aux/ActuatorControlsStatus.msg similarity index 100% rename from msg/ActuatorControlsStatus.msg rename to msg/aux/ActuatorControlsStatus.msg diff --git a/msg/ActuatorOutputs.msg b/msg/aux/ActuatorOutputs.msg similarity index 100% rename from msg/ActuatorOutputs.msg rename to msg/aux/ActuatorOutputs.msg diff --git a/msg/ActuatorServosTrim.msg b/msg/aux/ActuatorServosTrim.msg similarity index 100% rename from msg/ActuatorServosTrim.msg rename to msg/aux/ActuatorServosTrim.msg diff --git a/msg/ActuatorTest.msg b/msg/aux/ActuatorTest.msg similarity index 100% rename from msg/ActuatorTest.msg rename to msg/aux/ActuatorTest.msg diff --git a/msg/AdcReport.msg b/msg/aux/AdcReport.msg similarity index 100% rename from msg/AdcReport.msg rename to msg/aux/AdcReport.msg diff --git a/msg/Airspeed.msg b/msg/aux/Airspeed.msg similarity index 100% rename from msg/Airspeed.msg rename to msg/aux/Airspeed.msg diff --git a/msg/AirspeedValidated.msg b/msg/aux/AirspeedValidated.msg similarity index 100% rename from msg/AirspeedValidated.msg rename to msg/aux/AirspeedValidated.msg diff --git a/msg/AirspeedWind.msg b/msg/aux/AirspeedWind.msg similarity index 100% rename from msg/AirspeedWind.msg rename to msg/aux/AirspeedWind.msg diff --git a/msg/AutotuneAttitudeControlStatus.msg b/msg/aux/AutotuneAttitudeControlStatus.msg similarity index 100% rename from msg/AutotuneAttitudeControlStatus.msg rename to msg/aux/AutotuneAttitudeControlStatus.msg diff --git a/msg/Buffer128.msg b/msg/aux/Buffer128.msg similarity index 100% rename from msg/Buffer128.msg rename to msg/aux/Buffer128.msg diff --git a/msg/ButtonEvent.msg b/msg/aux/ButtonEvent.msg similarity index 100% rename from msg/ButtonEvent.msg rename to msg/aux/ButtonEvent.msg diff --git a/msg/CameraCapture.msg b/msg/aux/CameraCapture.msg similarity index 100% rename from msg/CameraCapture.msg rename to msg/aux/CameraCapture.msg diff --git a/msg/CameraStatus.msg b/msg/aux/CameraStatus.msg similarity index 100% rename from msg/CameraStatus.msg rename to msg/aux/CameraStatus.msg diff --git a/msg/CameraTrigger.msg b/msg/aux/CameraTrigger.msg similarity index 100% rename from msg/CameraTrigger.msg rename to msg/aux/CameraTrigger.msg diff --git a/msg/CanInterfaceStatus.msg b/msg/aux/CanInterfaceStatus.msg similarity index 100% rename from msg/CanInterfaceStatus.msg rename to msg/aux/CanInterfaceStatus.msg diff --git a/msg/CellularStatus.msg b/msg/aux/CellularStatus.msg similarity index 100% rename from msg/CellularStatus.msg rename to msg/aux/CellularStatus.msg diff --git a/msg/CollisionConstraints.msg b/msg/aux/CollisionConstraints.msg similarity index 100% rename from msg/CollisionConstraints.msg rename to msg/aux/CollisionConstraints.msg diff --git a/msg/CollisionReport.msg b/msg/aux/CollisionReport.msg similarity index 100% rename from msg/CollisionReport.msg rename to msg/aux/CollisionReport.msg diff --git a/msg/ControlAllocatorStatus.msg b/msg/aux/ControlAllocatorStatus.msg similarity index 100% rename from msg/ControlAllocatorStatus.msg rename to msg/aux/ControlAllocatorStatus.msg diff --git a/msg/Cpuload.msg b/msg/aux/Cpuload.msg similarity index 100% rename from msg/Cpuload.msg rename to msg/aux/Cpuload.msg diff --git a/msg/DatamanRequest.msg b/msg/aux/DatamanRequest.msg similarity index 100% rename from msg/DatamanRequest.msg rename to msg/aux/DatamanRequest.msg diff --git a/msg/DatamanResponse.msg b/msg/aux/DatamanResponse.msg similarity index 100% rename from msg/DatamanResponse.msg rename to msg/aux/DatamanResponse.msg diff --git a/msg/DebugArray.msg b/msg/aux/DebugArray.msg similarity index 100% rename from msg/DebugArray.msg rename to msg/aux/DebugArray.msg diff --git a/msg/DebugKeyValue.msg b/msg/aux/DebugKeyValue.msg similarity index 100% rename from msg/DebugKeyValue.msg rename to msg/aux/DebugKeyValue.msg diff --git a/msg/DebugValue.msg b/msg/aux/DebugValue.msg similarity index 100% rename from msg/DebugValue.msg rename to msg/aux/DebugValue.msg diff --git a/msg/DebugVect.msg b/msg/aux/DebugVect.msg similarity index 100% rename from msg/DebugVect.msg rename to msg/aux/DebugVect.msg diff --git a/msg/DifferentialPressure.msg b/msg/aux/DifferentialPressure.msg similarity index 100% rename from msg/DifferentialPressure.msg rename to msg/aux/DifferentialPressure.msg diff --git a/msg/DistanceSensor.msg b/msg/aux/DistanceSensor.msg similarity index 100% rename from msg/DistanceSensor.msg rename to msg/aux/DistanceSensor.msg diff --git a/msg/DistanceSensorModeChangeRequest.msg b/msg/aux/DistanceSensorModeChangeRequest.msg similarity index 100% rename from msg/DistanceSensorModeChangeRequest.msg rename to msg/aux/DistanceSensorModeChangeRequest.msg diff --git a/msg/Ekf2Timestamps.msg b/msg/aux/Ekf2Timestamps.msg similarity index 100% rename from msg/Ekf2Timestamps.msg rename to msg/aux/Ekf2Timestamps.msg diff --git a/msg/EscReport.msg b/msg/aux/EscReport.msg similarity index 100% rename from msg/EscReport.msg rename to msg/aux/EscReport.msg diff --git a/msg/EscStatus.msg b/msg/aux/EscStatus.msg similarity index 100% rename from msg/EscStatus.msg rename to msg/aux/EscStatus.msg diff --git a/msg/EstimatorAidSource1d.msg b/msg/aux/EstimatorAidSource1d.msg similarity index 100% rename from msg/EstimatorAidSource1d.msg rename to msg/aux/EstimatorAidSource1d.msg diff --git a/msg/EstimatorAidSource2d.msg b/msg/aux/EstimatorAidSource2d.msg similarity index 100% rename from msg/EstimatorAidSource2d.msg rename to msg/aux/EstimatorAidSource2d.msg diff --git a/msg/EstimatorAidSource3d.msg b/msg/aux/EstimatorAidSource3d.msg similarity index 100% rename from msg/EstimatorAidSource3d.msg rename to msg/aux/EstimatorAidSource3d.msg diff --git a/msg/EstimatorBias.msg b/msg/aux/EstimatorBias.msg similarity index 100% rename from msg/EstimatorBias.msg rename to msg/aux/EstimatorBias.msg diff --git a/msg/EstimatorBias3d.msg b/msg/aux/EstimatorBias3d.msg similarity index 100% rename from msg/EstimatorBias3d.msg rename to msg/aux/EstimatorBias3d.msg diff --git a/msg/EstimatorEventFlags.msg b/msg/aux/EstimatorEventFlags.msg similarity index 100% rename from msg/EstimatorEventFlags.msg rename to msg/aux/EstimatorEventFlags.msg diff --git a/msg/EstimatorGpsStatus.msg b/msg/aux/EstimatorGpsStatus.msg similarity index 100% rename from msg/EstimatorGpsStatus.msg rename to msg/aux/EstimatorGpsStatus.msg diff --git a/msg/EstimatorInnovations.msg b/msg/aux/EstimatorInnovations.msg similarity index 100% rename from msg/EstimatorInnovations.msg rename to msg/aux/EstimatorInnovations.msg diff --git a/msg/EstimatorSelectorStatus.msg b/msg/aux/EstimatorSelectorStatus.msg similarity index 100% rename from msg/EstimatorSelectorStatus.msg rename to msg/aux/EstimatorSelectorStatus.msg diff --git a/msg/EstimatorSensorBias.msg b/msg/aux/EstimatorSensorBias.msg similarity index 100% rename from msg/EstimatorSensorBias.msg rename to msg/aux/EstimatorSensorBias.msg diff --git a/msg/EstimatorStates.msg b/msg/aux/EstimatorStates.msg similarity index 100% rename from msg/EstimatorStates.msg rename to msg/aux/EstimatorStates.msg diff --git a/msg/EstimatorStatus.msg b/msg/aux/EstimatorStatus.msg similarity index 100% rename from msg/EstimatorStatus.msg rename to msg/aux/EstimatorStatus.msg diff --git a/msg/EstimatorStatusFlags.msg b/msg/aux/EstimatorStatusFlags.msg similarity index 100% rename from msg/EstimatorStatusFlags.msg rename to msg/aux/EstimatorStatusFlags.msg diff --git a/msg/Event.msg b/msg/aux/Event.msg similarity index 100% rename from msg/Event.msg rename to msg/aux/Event.msg diff --git a/msg/FailsafeFlags.msg b/msg/aux/FailsafeFlags.msg similarity index 100% rename from msg/FailsafeFlags.msg rename to msg/aux/FailsafeFlags.msg diff --git a/msg/FailureDetectorStatus.msg b/msg/aux/FailureDetectorStatus.msg similarity index 100% rename from msg/FailureDetectorStatus.msg rename to msg/aux/FailureDetectorStatus.msg diff --git a/msg/FigureEightStatus.msg b/msg/aux/FigureEightStatus.msg similarity index 100% rename from msg/FigureEightStatus.msg rename to msg/aux/FigureEightStatus.msg diff --git a/msg/FlightPhaseEstimation.msg b/msg/aux/FlightPhaseEstimation.msg similarity index 100% rename from msg/FlightPhaseEstimation.msg rename to msg/aux/FlightPhaseEstimation.msg diff --git a/msg/FollowTarget.msg b/msg/aux/FollowTarget.msg similarity index 100% rename from msg/FollowTarget.msg rename to msg/aux/FollowTarget.msg diff --git a/msg/FollowTargetEstimator.msg b/msg/aux/FollowTargetEstimator.msg similarity index 100% rename from msg/FollowTargetEstimator.msg rename to msg/aux/FollowTargetEstimator.msg diff --git a/msg/FollowTargetStatus.msg b/msg/aux/FollowTargetStatus.msg similarity index 100% rename from msg/FollowTargetStatus.msg rename to msg/aux/FollowTargetStatus.msg diff --git a/msg/FuelTankStatus.msg b/msg/aux/FuelTankStatus.msg similarity index 100% rename from msg/FuelTankStatus.msg rename to msg/aux/FuelTankStatus.msg diff --git a/msg/GeneratorStatus.msg b/msg/aux/GeneratorStatus.msg similarity index 100% rename from msg/GeneratorStatus.msg rename to msg/aux/GeneratorStatus.msg diff --git a/msg/GeofenceResult.msg b/msg/aux/GeofenceResult.msg similarity index 100% rename from msg/GeofenceResult.msg rename to msg/aux/GeofenceResult.msg diff --git a/msg/GeofenceStatus.msg b/msg/aux/GeofenceStatus.msg similarity index 100% rename from msg/GeofenceStatus.msg rename to msg/aux/GeofenceStatus.msg diff --git a/msg/GimbalControls.msg b/msg/aux/GimbalControls.msg similarity index 100% rename from msg/GimbalControls.msg rename to msg/aux/GimbalControls.msg diff --git a/msg/GimbalDeviceAttitudeStatus.msg b/msg/aux/GimbalDeviceAttitudeStatus.msg similarity index 100% rename from msg/GimbalDeviceAttitudeStatus.msg rename to msg/aux/GimbalDeviceAttitudeStatus.msg diff --git a/msg/GimbalDeviceInformation.msg b/msg/aux/GimbalDeviceInformation.msg similarity index 100% rename from msg/GimbalDeviceInformation.msg rename to msg/aux/GimbalDeviceInformation.msg diff --git a/msg/GimbalDeviceSetAttitude.msg b/msg/aux/GimbalDeviceSetAttitude.msg similarity index 100% rename from msg/GimbalDeviceSetAttitude.msg rename to msg/aux/GimbalDeviceSetAttitude.msg diff --git a/msg/GimbalManagerInformation.msg b/msg/aux/GimbalManagerInformation.msg similarity index 100% rename from msg/GimbalManagerInformation.msg rename to msg/aux/GimbalManagerInformation.msg diff --git a/msg/GimbalManagerSetAttitude.msg b/msg/aux/GimbalManagerSetAttitude.msg similarity index 100% rename from msg/GimbalManagerSetAttitude.msg rename to msg/aux/GimbalManagerSetAttitude.msg diff --git a/msg/GimbalManagerSetManualControl.msg b/msg/aux/GimbalManagerSetManualControl.msg similarity index 100% rename from msg/GimbalManagerSetManualControl.msg rename to msg/aux/GimbalManagerSetManualControl.msg diff --git a/msg/GimbalManagerStatus.msg b/msg/aux/GimbalManagerStatus.msg similarity index 100% rename from msg/GimbalManagerStatus.msg rename to msg/aux/GimbalManagerStatus.msg diff --git a/msg/GpioConfig.msg b/msg/aux/GpioConfig.msg similarity index 100% rename from msg/GpioConfig.msg rename to msg/aux/GpioConfig.msg diff --git a/msg/GpioIn.msg b/msg/aux/GpioIn.msg similarity index 100% rename from msg/GpioIn.msg rename to msg/aux/GpioIn.msg diff --git a/msg/GpioOut.msg b/msg/aux/GpioOut.msg similarity index 100% rename from msg/GpioOut.msg rename to msg/aux/GpioOut.msg diff --git a/msg/GpioRequest.msg b/msg/aux/GpioRequest.msg similarity index 100% rename from msg/GpioRequest.msg rename to msg/aux/GpioRequest.msg diff --git a/msg/GpsDump.msg b/msg/aux/GpsDump.msg similarity index 100% rename from msg/GpsDump.msg rename to msg/aux/GpsDump.msg diff --git a/msg/GpsInjectData.msg b/msg/aux/GpsInjectData.msg similarity index 100% rename from msg/GpsInjectData.msg rename to msg/aux/GpsInjectData.msg diff --git a/msg/Gripper.msg b/msg/aux/Gripper.msg similarity index 100% rename from msg/Gripper.msg rename to msg/aux/Gripper.msg diff --git a/msg/HealthReport.msg b/msg/aux/HealthReport.msg similarity index 100% rename from msg/HealthReport.msg rename to msg/aux/HealthReport.msg diff --git a/msg/HeaterStatus.msg b/msg/aux/HeaterStatus.msg similarity index 100% rename from msg/HeaterStatus.msg rename to msg/aux/HeaterStatus.msg diff --git a/msg/HoverThrustEstimate.msg b/msg/aux/HoverThrustEstimate.msg similarity index 100% rename from msg/HoverThrustEstimate.msg rename to msg/aux/HoverThrustEstimate.msg diff --git a/msg/InputRc.msg b/msg/aux/InputRc.msg similarity index 100% rename from msg/InputRc.msg rename to msg/aux/InputRc.msg diff --git a/msg/InternalCombustionEngineStatus.msg b/msg/aux/InternalCombustionEngineStatus.msg similarity index 100% rename from msg/InternalCombustionEngineStatus.msg rename to msg/aux/InternalCombustionEngineStatus.msg diff --git a/msg/IridiumsbdStatus.msg b/msg/aux/IridiumsbdStatus.msg similarity index 100% rename from msg/IridiumsbdStatus.msg rename to msg/aux/IridiumsbdStatus.msg diff --git a/msg/IrlockReport.msg b/msg/aux/IrlockReport.msg similarity index 100% rename from msg/IrlockReport.msg rename to msg/aux/IrlockReport.msg diff --git a/msg/LandingGear.msg b/msg/aux/LandingGear.msg similarity index 100% rename from msg/LandingGear.msg rename to msg/aux/LandingGear.msg diff --git a/msg/LandingGearWheel.msg b/msg/aux/LandingGearWheel.msg similarity index 100% rename from msg/LandingGearWheel.msg rename to msg/aux/LandingGearWheel.msg diff --git a/msg/LandingTargetInnovations.msg b/msg/aux/LandingTargetInnovations.msg similarity index 100% rename from msg/LandingTargetInnovations.msg rename to msg/aux/LandingTargetInnovations.msg diff --git a/msg/LandingTargetPose.msg b/msg/aux/LandingTargetPose.msg similarity index 100% rename from msg/LandingTargetPose.msg rename to msg/aux/LandingTargetPose.msg diff --git a/msg/LaunchDetectionStatus.msg b/msg/aux/LaunchDetectionStatus.msg similarity index 100% rename from msg/LaunchDetectionStatus.msg rename to msg/aux/LaunchDetectionStatus.msg diff --git a/msg/LedControl.msg b/msg/aux/LedControl.msg similarity index 100% rename from msg/LedControl.msg rename to msg/aux/LedControl.msg diff --git a/msg/LogMessage.msg b/msg/aux/LogMessage.msg similarity index 100% rename from msg/LogMessage.msg rename to msg/aux/LogMessage.msg diff --git a/msg/LoggerStatus.msg b/msg/aux/LoggerStatus.msg similarity index 100% rename from msg/LoggerStatus.msg rename to msg/aux/LoggerStatus.msg diff --git a/msg/MagWorkerData.msg b/msg/aux/MagWorkerData.msg similarity index 100% rename from msg/MagWorkerData.msg rename to msg/aux/MagWorkerData.msg diff --git a/msg/MagnetometerBiasEstimate.msg b/msg/aux/MagnetometerBiasEstimate.msg similarity index 100% rename from msg/MagnetometerBiasEstimate.msg rename to msg/aux/MagnetometerBiasEstimate.msg diff --git a/msg/ManualControlSwitches.msg b/msg/aux/ManualControlSwitches.msg similarity index 100% rename from msg/ManualControlSwitches.msg rename to msg/aux/ManualControlSwitches.msg diff --git a/msg/MavlinkLog.msg b/msg/aux/MavlinkLog.msg similarity index 100% rename from msg/MavlinkLog.msg rename to msg/aux/MavlinkLog.msg diff --git a/msg/MavlinkTunnel.msg b/msg/aux/MavlinkTunnel.msg similarity index 100% rename from msg/MavlinkTunnel.msg rename to msg/aux/MavlinkTunnel.msg diff --git a/msg/MessageFormatRequest.msg b/msg/aux/MessageFormatRequest.msg similarity index 100% rename from msg/MessageFormatRequest.msg rename to msg/aux/MessageFormatRequest.msg diff --git a/msg/MessageFormatResponse.msg b/msg/aux/MessageFormatResponse.msg similarity index 100% rename from msg/MessageFormatResponse.msg rename to msg/aux/MessageFormatResponse.msg diff --git a/msg/Mission.msg b/msg/aux/Mission.msg similarity index 100% rename from msg/Mission.msg rename to msg/aux/Mission.msg diff --git a/msg/MissionResult.msg b/msg/aux/MissionResult.msg similarity index 100% rename from msg/MissionResult.msg rename to msg/aux/MissionResult.msg diff --git a/msg/MountOrientation.msg b/msg/aux/MountOrientation.msg similarity index 100% rename from msg/MountOrientation.msg rename to msg/aux/MountOrientation.msg diff --git a/msg/NavigatorMissionItem.msg b/msg/aux/NavigatorMissionItem.msg similarity index 100% rename from msg/NavigatorMissionItem.msg rename to msg/aux/NavigatorMissionItem.msg diff --git a/msg/NavigatorStatus.msg b/msg/aux/NavigatorStatus.msg similarity index 100% rename from msg/NavigatorStatus.msg rename to msg/aux/NavigatorStatus.msg diff --git a/msg/NormalizedUnsignedSetpoint.msg b/msg/aux/NormalizedUnsignedSetpoint.msg similarity index 100% rename from msg/NormalizedUnsignedSetpoint.msg rename to msg/aux/NormalizedUnsignedSetpoint.msg diff --git a/msg/NpfgStatus.msg b/msg/aux/NpfgStatus.msg similarity index 100% rename from msg/NpfgStatus.msg rename to msg/aux/NpfgStatus.msg diff --git a/msg/ObstacleDistance.msg b/msg/aux/ObstacleDistance.msg similarity index 100% rename from msg/ObstacleDistance.msg rename to msg/aux/ObstacleDistance.msg diff --git a/msg/OffboardControlMode.msg b/msg/aux/OffboardControlMode.msg similarity index 100% rename from msg/OffboardControlMode.msg rename to msg/aux/OffboardControlMode.msg diff --git a/msg/OnboardComputerStatus.msg b/msg/aux/OnboardComputerStatus.msg similarity index 100% rename from msg/OnboardComputerStatus.msg rename to msg/aux/OnboardComputerStatus.msg diff --git a/msg/OpenDroneIdArmStatus.msg b/msg/aux/OpenDroneIdArmStatus.msg similarity index 100% rename from msg/OpenDroneIdArmStatus.msg rename to msg/aux/OpenDroneIdArmStatus.msg diff --git a/msg/OpenDroneIdOperatorId.msg b/msg/aux/OpenDroneIdOperatorId.msg similarity index 100% rename from msg/OpenDroneIdOperatorId.msg rename to msg/aux/OpenDroneIdOperatorId.msg diff --git a/msg/OpenDroneIdSelfId.msg b/msg/aux/OpenDroneIdSelfId.msg similarity index 100% rename from msg/OpenDroneIdSelfId.msg rename to msg/aux/OpenDroneIdSelfId.msg diff --git a/msg/OpenDroneIdSystem.msg b/msg/aux/OpenDroneIdSystem.msg similarity index 100% rename from msg/OpenDroneIdSystem.msg rename to msg/aux/OpenDroneIdSystem.msg diff --git a/msg/OrbTest.msg b/msg/aux/OrbTest.msg similarity index 100% rename from msg/OrbTest.msg rename to msg/aux/OrbTest.msg diff --git a/msg/OrbTestLarge.msg b/msg/aux/OrbTestLarge.msg similarity index 100% rename from msg/OrbTestLarge.msg rename to msg/aux/OrbTestLarge.msg diff --git a/msg/OrbTestMedium.msg b/msg/aux/OrbTestMedium.msg similarity index 100% rename from msg/OrbTestMedium.msg rename to msg/aux/OrbTestMedium.msg diff --git a/msg/OrbitStatus.msg b/msg/aux/OrbitStatus.msg similarity index 100% rename from msg/OrbitStatus.msg rename to msg/aux/OrbitStatus.msg diff --git a/msg/ParameterResetRequest.msg b/msg/aux/ParameterResetRequest.msg similarity index 100% rename from msg/ParameterResetRequest.msg rename to msg/aux/ParameterResetRequest.msg diff --git a/msg/ParameterSetUsedRequest.msg b/msg/aux/ParameterSetUsedRequest.msg similarity index 100% rename from msg/ParameterSetUsedRequest.msg rename to msg/aux/ParameterSetUsedRequest.msg diff --git a/msg/ParameterSetValueRequest.msg b/msg/aux/ParameterSetValueRequest.msg similarity index 100% rename from msg/ParameterSetValueRequest.msg rename to msg/aux/ParameterSetValueRequest.msg diff --git a/msg/ParameterSetValueResponse.msg b/msg/aux/ParameterSetValueResponse.msg similarity index 100% rename from msg/ParameterSetValueResponse.msg rename to msg/aux/ParameterSetValueResponse.msg diff --git a/msg/ParameterUpdate.msg b/msg/aux/ParameterUpdate.msg similarity index 100% rename from msg/ParameterUpdate.msg rename to msg/aux/ParameterUpdate.msg diff --git a/msg/Ping.msg b/msg/aux/Ping.msg similarity index 100% rename from msg/Ping.msg rename to msg/aux/Ping.msg diff --git a/msg/PositionControllerLandingStatus.msg b/msg/aux/PositionControllerLandingStatus.msg similarity index 100% rename from msg/PositionControllerLandingStatus.msg rename to msg/aux/PositionControllerLandingStatus.msg diff --git a/msg/PositionControllerStatus.msg b/msg/aux/PositionControllerStatus.msg similarity index 100% rename from msg/PositionControllerStatus.msg rename to msg/aux/PositionControllerStatus.msg diff --git a/msg/PositionSetpoint.msg b/msg/aux/PositionSetpoint.msg similarity index 100% rename from msg/PositionSetpoint.msg rename to msg/aux/PositionSetpoint.msg diff --git a/msg/PositionSetpointTriplet.msg b/msg/aux/PositionSetpointTriplet.msg similarity index 100% rename from msg/PositionSetpointTriplet.msg rename to msg/aux/PositionSetpointTriplet.msg diff --git a/msg/PowerButtonState.msg b/msg/aux/PowerButtonState.msg similarity index 100% rename from msg/PowerButtonState.msg rename to msg/aux/PowerButtonState.msg diff --git a/msg/PowerMonitor.msg b/msg/aux/PowerMonitor.msg similarity index 100% rename from msg/PowerMonitor.msg rename to msg/aux/PowerMonitor.msg diff --git a/msg/PpsCapture.msg b/msg/aux/PpsCapture.msg similarity index 100% rename from msg/PpsCapture.msg rename to msg/aux/PpsCapture.msg diff --git a/msg/PwmInput.msg b/msg/aux/PwmInput.msg similarity index 100% rename from msg/PwmInput.msg rename to msg/aux/PwmInput.msg diff --git a/msg/Px4ioStatus.msg b/msg/aux/Px4ioStatus.msg similarity index 100% rename from msg/Px4ioStatus.msg rename to msg/aux/Px4ioStatus.msg diff --git a/msg/QshellReq.msg b/msg/aux/QshellReq.msg similarity index 100% rename from msg/QshellReq.msg rename to msg/aux/QshellReq.msg diff --git a/msg/QshellRetval.msg b/msg/aux/QshellRetval.msg similarity index 100% rename from msg/QshellRetval.msg rename to msg/aux/QshellRetval.msg diff --git a/msg/RadioStatus.msg b/msg/aux/RadioStatus.msg similarity index 100% rename from msg/RadioStatus.msg rename to msg/aux/RadioStatus.msg diff --git a/msg/RateCtrlStatus.msg b/msg/aux/RateCtrlStatus.msg similarity index 100% rename from msg/RateCtrlStatus.msg rename to msg/aux/RateCtrlStatus.msg diff --git a/msg/RcChannels.msg b/msg/aux/RcChannels.msg similarity index 100% rename from msg/RcChannels.msg rename to msg/aux/RcChannels.msg diff --git a/msg/RcParameterMap.msg b/msg/aux/RcParameterMap.msg similarity index 100% rename from msg/RcParameterMap.msg rename to msg/aux/RcParameterMap.msg diff --git a/msg/RoverAckermannGuidanceStatus.msg b/msg/aux/RoverAckermannGuidanceStatus.msg similarity index 100% rename from msg/RoverAckermannGuidanceStatus.msg rename to msg/aux/RoverAckermannGuidanceStatus.msg diff --git a/msg/RoverAckermannStatus.msg b/msg/aux/RoverAckermannStatus.msg similarity index 100% rename from msg/RoverAckermannStatus.msg rename to msg/aux/RoverAckermannStatus.msg diff --git a/msg/RoverDifferentialGuidanceStatus.msg b/msg/aux/RoverDifferentialGuidanceStatus.msg similarity index 100% rename from msg/RoverDifferentialGuidanceStatus.msg rename to msg/aux/RoverDifferentialGuidanceStatus.msg diff --git a/msg/RoverDifferentialSetpoint.msg b/msg/aux/RoverDifferentialSetpoint.msg similarity index 100% rename from msg/RoverDifferentialSetpoint.msg rename to msg/aux/RoverDifferentialSetpoint.msg diff --git a/msg/RoverDifferentialStatus.msg b/msg/aux/RoverDifferentialStatus.msg similarity index 100% rename from msg/RoverDifferentialStatus.msg rename to msg/aux/RoverDifferentialStatus.msg diff --git a/msg/RoverMecanumGuidanceStatus.msg b/msg/aux/RoverMecanumGuidanceStatus.msg similarity index 100% rename from msg/RoverMecanumGuidanceStatus.msg rename to msg/aux/RoverMecanumGuidanceStatus.msg diff --git a/msg/RoverMecanumSetpoint.msg b/msg/aux/RoverMecanumSetpoint.msg similarity index 100% rename from msg/RoverMecanumSetpoint.msg rename to msg/aux/RoverMecanumSetpoint.msg diff --git a/msg/RoverMecanumStatus.msg b/msg/aux/RoverMecanumStatus.msg similarity index 100% rename from msg/RoverMecanumStatus.msg rename to msg/aux/RoverMecanumStatus.msg diff --git a/msg/Rpm.msg b/msg/aux/Rpm.msg similarity index 100% rename from msg/Rpm.msg rename to msg/aux/Rpm.msg diff --git a/msg/RtlStatus.msg b/msg/aux/RtlStatus.msg similarity index 100% rename from msg/RtlStatus.msg rename to msg/aux/RtlStatus.msg diff --git a/msg/RtlTimeEstimate.msg b/msg/aux/RtlTimeEstimate.msg similarity index 100% rename from msg/RtlTimeEstimate.msg rename to msg/aux/RtlTimeEstimate.msg diff --git a/msg/SatelliteInfo.msg b/msg/aux/SatelliteInfo.msg similarity index 100% rename from msg/SatelliteInfo.msg rename to msg/aux/SatelliteInfo.msg diff --git a/msg/SensorAccel.msg b/msg/aux/SensorAccel.msg similarity index 100% rename from msg/SensorAccel.msg rename to msg/aux/SensorAccel.msg diff --git a/msg/SensorAccelFifo.msg b/msg/aux/SensorAccelFifo.msg similarity index 100% rename from msg/SensorAccelFifo.msg rename to msg/aux/SensorAccelFifo.msg diff --git a/msg/SensorAirflow.msg b/msg/aux/SensorAirflow.msg similarity index 100% rename from msg/SensorAirflow.msg rename to msg/aux/SensorAirflow.msg diff --git a/msg/SensorBaro.msg b/msg/aux/SensorBaro.msg similarity index 100% rename from msg/SensorBaro.msg rename to msg/aux/SensorBaro.msg diff --git a/msg/SensorCombined.msg b/msg/aux/SensorCombined.msg similarity index 100% rename from msg/SensorCombined.msg rename to msg/aux/SensorCombined.msg diff --git a/msg/SensorCorrection.msg b/msg/aux/SensorCorrection.msg similarity index 100% rename from msg/SensorCorrection.msg rename to msg/aux/SensorCorrection.msg diff --git a/msg/SensorGnssRelative.msg b/msg/aux/SensorGnssRelative.msg similarity index 100% rename from msg/SensorGnssRelative.msg rename to msg/aux/SensorGnssRelative.msg diff --git a/msg/SensorGps.msg b/msg/aux/SensorGps.msg similarity index 100% rename from msg/SensorGps.msg rename to msg/aux/SensorGps.msg diff --git a/msg/SensorGyro.msg b/msg/aux/SensorGyro.msg similarity index 100% rename from msg/SensorGyro.msg rename to msg/aux/SensorGyro.msg diff --git a/msg/SensorGyroFft.msg b/msg/aux/SensorGyroFft.msg similarity index 100% rename from msg/SensorGyroFft.msg rename to msg/aux/SensorGyroFft.msg diff --git a/msg/SensorGyroFifo.msg b/msg/aux/SensorGyroFifo.msg similarity index 100% rename from msg/SensorGyroFifo.msg rename to msg/aux/SensorGyroFifo.msg diff --git a/msg/SensorHygrometer.msg b/msg/aux/SensorHygrometer.msg similarity index 100% rename from msg/SensorHygrometer.msg rename to msg/aux/SensorHygrometer.msg diff --git a/msg/SensorMag.msg b/msg/aux/SensorMag.msg similarity index 100% rename from msg/SensorMag.msg rename to msg/aux/SensorMag.msg diff --git a/msg/SensorOpticalFlow.msg b/msg/aux/SensorOpticalFlow.msg similarity index 100% rename from msg/SensorOpticalFlow.msg rename to msg/aux/SensorOpticalFlow.msg diff --git a/msg/SensorPreflightMag.msg b/msg/aux/SensorPreflightMag.msg similarity index 100% rename from msg/SensorPreflightMag.msg rename to msg/aux/SensorPreflightMag.msg diff --git a/msg/SensorSelection.msg b/msg/aux/SensorSelection.msg similarity index 100% rename from msg/SensorSelection.msg rename to msg/aux/SensorSelection.msg diff --git a/msg/SensorUwb.msg b/msg/aux/SensorUwb.msg similarity index 100% rename from msg/SensorUwb.msg rename to msg/aux/SensorUwb.msg diff --git a/msg/SensorsStatus.msg b/msg/aux/SensorsStatus.msg similarity index 100% rename from msg/SensorsStatus.msg rename to msg/aux/SensorsStatus.msg diff --git a/msg/SensorsStatusImu.msg b/msg/aux/SensorsStatusImu.msg similarity index 100% rename from msg/SensorsStatusImu.msg rename to msg/aux/SensorsStatusImu.msg diff --git a/msg/SystemPower.msg b/msg/aux/SystemPower.msg similarity index 100% rename from msg/SystemPower.msg rename to msg/aux/SystemPower.msg diff --git a/msg/TakeoffStatus.msg b/msg/aux/TakeoffStatus.msg similarity index 100% rename from msg/TakeoffStatus.msg rename to msg/aux/TakeoffStatus.msg diff --git a/msg/TaskStackInfo.msg b/msg/aux/TaskStackInfo.msg similarity index 100% rename from msg/TaskStackInfo.msg rename to msg/aux/TaskStackInfo.msg diff --git a/msg/TecsStatus.msg b/msg/aux/TecsStatus.msg similarity index 100% rename from msg/TecsStatus.msg rename to msg/aux/TecsStatus.msg diff --git a/msg/TelemetryStatus.msg b/msg/aux/TelemetryStatus.msg similarity index 100% rename from msg/TelemetryStatus.msg rename to msg/aux/TelemetryStatus.msg diff --git a/msg/TiltrotorExtraControls.msg b/msg/aux/TiltrotorExtraControls.msg similarity index 100% rename from msg/TiltrotorExtraControls.msg rename to msg/aux/TiltrotorExtraControls.msg diff --git a/msg/TimesyncStatus.msg b/msg/aux/TimesyncStatus.msg similarity index 100% rename from msg/TimesyncStatus.msg rename to msg/aux/TimesyncStatus.msg diff --git a/msg/TrajectoryBezier.msg b/msg/aux/TrajectoryBezier.msg similarity index 100% rename from msg/TrajectoryBezier.msg rename to msg/aux/TrajectoryBezier.msg diff --git a/msg/TrajectoryWaypoint.msg b/msg/aux/TrajectoryWaypoint.msg similarity index 100% rename from msg/TrajectoryWaypoint.msg rename to msg/aux/TrajectoryWaypoint.msg diff --git a/msg/TransponderReport.msg b/msg/aux/TransponderReport.msg similarity index 100% rename from msg/TransponderReport.msg rename to msg/aux/TransponderReport.msg diff --git a/msg/TuneControl.msg b/msg/aux/TuneControl.msg similarity index 100% rename from msg/TuneControl.msg rename to msg/aux/TuneControl.msg diff --git a/msg/UavcanParameterRequest.msg b/msg/aux/UavcanParameterRequest.msg similarity index 100% rename from msg/UavcanParameterRequest.msg rename to msg/aux/UavcanParameterRequest.msg diff --git a/msg/UavcanParameterValue.msg b/msg/aux/UavcanParameterValue.msg similarity index 100% rename from msg/UavcanParameterValue.msg rename to msg/aux/UavcanParameterValue.msg diff --git a/msg/UlogStream.msg b/msg/aux/UlogStream.msg similarity index 100% rename from msg/UlogStream.msg rename to msg/aux/UlogStream.msg diff --git a/msg/UlogStreamAck.msg b/msg/aux/UlogStreamAck.msg similarity index 100% rename from msg/UlogStreamAck.msg rename to msg/aux/UlogStreamAck.msg diff --git a/msg/VehicleAcceleration.msg b/msg/aux/VehicleAcceleration.msg similarity index 100% rename from msg/VehicleAcceleration.msg rename to msg/aux/VehicleAcceleration.msg diff --git a/msg/VehicleAirData.msg b/msg/aux/VehicleAirData.msg similarity index 100% rename from msg/VehicleAirData.msg rename to msg/aux/VehicleAirData.msg diff --git a/msg/VehicleAngularAccelerationSetpoint.msg b/msg/aux/VehicleAngularAccelerationSetpoint.msg similarity index 100% rename from msg/VehicleAngularAccelerationSetpoint.msg rename to msg/aux/VehicleAngularAccelerationSetpoint.msg diff --git a/msg/VehicleConstraints.msg b/msg/aux/VehicleConstraints.msg similarity index 100% rename from msg/VehicleConstraints.msg rename to msg/aux/VehicleConstraints.msg diff --git a/msg/VehicleImu.msg b/msg/aux/VehicleImu.msg similarity index 100% rename from msg/VehicleImu.msg rename to msg/aux/VehicleImu.msg diff --git a/msg/VehicleImuStatus.msg b/msg/aux/VehicleImuStatus.msg similarity index 100% rename from msg/VehicleImuStatus.msg rename to msg/aux/VehicleImuStatus.msg diff --git a/msg/VehicleLocalPositionSetpoint.msg b/msg/aux/VehicleLocalPositionSetpoint.msg similarity index 100% rename from msg/VehicleLocalPositionSetpoint.msg rename to msg/aux/VehicleLocalPositionSetpoint.msg diff --git a/msg/VehicleMagnetometer.msg b/msg/aux/VehicleMagnetometer.msg similarity index 100% rename from msg/VehicleMagnetometer.msg rename to msg/aux/VehicleMagnetometer.msg diff --git a/msg/VehicleOpticalFlow.msg b/msg/aux/VehicleOpticalFlow.msg similarity index 100% rename from msg/VehicleOpticalFlow.msg rename to msg/aux/VehicleOpticalFlow.msg diff --git a/msg/VehicleOpticalFlowVel.msg b/msg/aux/VehicleOpticalFlowVel.msg similarity index 100% rename from msg/VehicleOpticalFlowVel.msg rename to msg/aux/VehicleOpticalFlowVel.msg diff --git a/msg/VehicleRoi.msg b/msg/aux/VehicleRoi.msg similarity index 100% rename from msg/VehicleRoi.msg rename to msg/aux/VehicleRoi.msg diff --git a/msg/VehicleThrustSetpoint.msg b/msg/aux/VehicleThrustSetpoint.msg similarity index 100% rename from msg/VehicleThrustSetpoint.msg rename to msg/aux/VehicleThrustSetpoint.msg diff --git a/msg/VehicleTorqueSetpoint.msg b/msg/aux/VehicleTorqueSetpoint.msg similarity index 100% rename from msg/VehicleTorqueSetpoint.msg rename to msg/aux/VehicleTorqueSetpoint.msg diff --git a/msg/VehicleTrajectoryBezier.msg b/msg/aux/VehicleTrajectoryBezier.msg similarity index 100% rename from msg/VehicleTrajectoryBezier.msg rename to msg/aux/VehicleTrajectoryBezier.msg diff --git a/msg/VehicleTrajectoryWaypoint.msg b/msg/aux/VehicleTrajectoryWaypoint.msg similarity index 100% rename from msg/VehicleTrajectoryWaypoint.msg rename to msg/aux/VehicleTrajectoryWaypoint.msg diff --git a/msg/VelocityLimits.msg b/msg/aux/VelocityLimits.msg similarity index 100% rename from msg/VelocityLimits.msg rename to msg/aux/VelocityLimits.msg diff --git a/msg/VtolVehicleStatus.msg b/msg/aux/VtolVehicleStatus.msg similarity index 100% rename from msg/VtolVehicleStatus.msg rename to msg/aux/VtolVehicleStatus.msg diff --git a/msg/WheelEncoders.msg b/msg/aux/WheelEncoders.msg similarity index 100% rename from msg/WheelEncoders.msg rename to msg/aux/WheelEncoders.msg diff --git a/msg/Wind.msg b/msg/aux/Wind.msg similarity index 100% rename from msg/Wind.msg rename to msg/aux/Wind.msg diff --git a/msg/YawEstimatorStatus.msg b/msg/aux/YawEstimatorStatus.msg similarity index 100% rename from msg/YawEstimatorStatus.msg rename to msg/aux/YawEstimatorStatus.msg diff --git a/msg/ActuatorMotors.msg b/msg/core/ActuatorMotors.msg similarity index 95% rename from msg/ActuatorMotors.msg rename to msg/core/ActuatorMotors.msg index e74566f1f75e..da63a388bb04 100644 --- a/msg/ActuatorMotors.msg +++ b/msg/core/ActuatorMotors.msg @@ -1,4 +1,7 @@ # Motor control message + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp the data this control response is based on was sampled diff --git a/msg/ActuatorServos.msg b/msg/core/ActuatorServos.msg similarity index 92% rename from msg/ActuatorServos.msg rename to msg/core/ActuatorServos.msg index 2c7900e8116a..e740f39c8c7d 100644 --- a/msg/ActuatorServos.msg +++ b/msg/core/ActuatorServos.msg @@ -1,4 +1,7 @@ # Servo control message + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp the data this control response is based on was sampled diff --git a/msg/ArmingCheckReply.msg b/msg/core/ArmingCheckReply.msg similarity index 96% rename from msg/ArmingCheckReply.msg rename to msg/core/ArmingCheckReply.msg index 589ad1b1cd7d..1a1aaa518379 100644 --- a/msg/ArmingCheckReply.msg +++ b/msg/core/ArmingCheckReply.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint8 request_id diff --git a/msg/ArmingCheckRequest.msg b/msg/core/ArmingCheckRequest.msg similarity index 84% rename from msg/ArmingCheckRequest.msg rename to msg/core/ArmingCheckRequest.msg index 69e7e85f351b..17c6e4bacd98 100644 --- a/msg/ArmingCheckRequest.msg +++ b/msg/core/ArmingCheckRequest.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) # broadcast message to request all registered arming checks to be reported diff --git a/msg/BatteryStatus.msg b/msg/core/BatteryStatus.msg similarity index 99% rename from msg/BatteryStatus.msg rename to msg/core/BatteryStatus.msg index e8651616152f..9838786f3fce 100644 --- a/msg/BatteryStatus.msg +++ b/msg/core/BatteryStatus.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) bool connected # Whether or not a battery is connected, based on a voltage threshold float32 voltage_v # Battery voltage in volts, 0 if unknown diff --git a/msg/ConfigOverrides.msg b/msg/core/ConfigOverrides.msg similarity index 95% rename from msg/ConfigOverrides.msg rename to msg/core/ConfigOverrides.msg index 09b87253a8f3..b274adfbecd7 100644 --- a/msg/ConfigOverrides.msg +++ b/msg/core/ConfigOverrides.msg @@ -1,4 +1,7 @@ # Configurable overrides by (external) modes or mode executors + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) bool disable_auto_disarm # Prevent the drone from automatically disarming after landing (if configured) diff --git a/msg/GotoSetpoint.msg b/msg/core/GotoSetpoint.msg similarity index 97% rename from msg/GotoSetpoint.msg rename to msg/core/GotoSetpoint.msg index 5fe3ab8a7916..4871a3cb7d56 100644 --- a/msg/GotoSetpoint.msg +++ b/msg/core/GotoSetpoint.msg @@ -5,6 +5,8 @@ # Unset optional setpoints are not controlled # Unset optional constraints default to vehicle specifications +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) # setpoints diff --git a/msg/HomePosition.msg b/msg/core/HomePosition.msg similarity index 96% rename from msg/HomePosition.msg rename to msg/core/HomePosition.msg index e6a517285fe4..a25bf241636e 100644 --- a/msg/HomePosition.msg +++ b/msg/core/HomePosition.msg @@ -1,5 +1,7 @@ # GPS home position in WGS84 coordinates. +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) float64 lat # Latitude in degrees diff --git a/msg/ManualControlSetpoint.msg b/msg/core/ManualControlSetpoint.msg similarity index 98% rename from msg/ManualControlSetpoint.msg rename to msg/core/ManualControlSetpoint.msg index 95fa62228344..ddf902f00f7d 100644 --- a/msg/ManualControlSetpoint.msg +++ b/msg/core/ManualControlSetpoint.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp of the raw data (microseconds) diff --git a/msg/ModeCompleted.msg b/msg/core/ModeCompleted.msg similarity index 94% rename from msg/ModeCompleted.msg rename to msg/core/ModeCompleted.msg index 0a20b0294e53..1022df36d364 100644 --- a/msg/ModeCompleted.msg +++ b/msg/core/ModeCompleted.msg @@ -2,6 +2,9 @@ # The possible values of nav_state are defined in the VehicleStatus msg. # Note that this is not always published (e.g. when a user switches modes or on # failsafe activation) + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) diff --git a/msg/RegisterExtComponentReply.msg b/msg/core/RegisterExtComponentReply.msg similarity index 93% rename from msg/RegisterExtComponentReply.msg rename to msg/core/RegisterExtComponentReply.msg index 7cd7eef07b2b..4495bcdb90b5 100644 --- a/msg/RegisterExtComponentReply.msg +++ b/msg/core/RegisterExtComponentReply.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 request_id # ID from the request diff --git a/msg/RegisterExtComponentRequest.msg b/msg/core/RegisterExtComponentRequest.msg similarity index 97% rename from msg/RegisterExtComponentRequest.msg rename to msg/core/RegisterExtComponentRequest.msg index 46ab0cb0a15d..b0798705ca30 100644 --- a/msg/RegisterExtComponentRequest.msg +++ b/msg/core/RegisterExtComponentRequest.msg @@ -1,4 +1,7 @@ # Request to register an external component + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 request_id # ID, set this to a random value diff --git a/msg/TrajectorySetpoint.msg b/msg/core/TrajectorySetpoint.msg similarity index 95% rename from msg/TrajectorySetpoint.msg rename to msg/core/TrajectorySetpoint.msg index 4a88c86769a6..150be404b94f 100644 --- a/msg/TrajectorySetpoint.msg +++ b/msg/core/TrajectorySetpoint.msg @@ -3,6 +3,8 @@ # Needs to be kinematically consistent and feasible for smooth flight. # setting a value to NaN means the state should not be controlled +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) # NED local world frame diff --git a/msg/UnregisterExtComponent.msg b/msg/core/UnregisterExtComponent.msg similarity index 92% rename from msg/UnregisterExtComponent.msg rename to msg/core/UnregisterExtComponent.msg index 2ad78d4b6836..8f85aaebfe4c 100644 --- a/msg/UnregisterExtComponent.msg +++ b/msg/core/UnregisterExtComponent.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) char[25] name # either the mode name, or component name diff --git a/msg/VehicleAngularVelocity.msg b/msg/core/VehicleAngularVelocity.msg similarity index 94% rename from msg/VehicleAngularVelocity.msg rename to msg/core/VehicleAngularVelocity.msg index db3767c0aa80..6c91f3c0703e 100644 --- a/msg/VehicleAngularVelocity.msg +++ b/msg/core/VehicleAngularVelocity.msg @@ -1,3 +1,4 @@ +uint32 MESSAGE_VERSION = 0 uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # timestamp of the data sample on which this message is based (microseconds) diff --git a/msg/VehicleAttitude.msg b/msg/core/VehicleAttitude.msg similarity index 96% rename from msg/VehicleAttitude.msg rename to msg/core/VehicleAttitude.msg index 99e6f25c2e42..fde3a85546c7 100644 --- a/msg/VehicleAttitude.msg +++ b/msg/core/VehicleAttitude.msg @@ -1,6 +1,8 @@ # This is similar to the mavlink message ATTITUDE_QUATERNION, but for onboard use # The quaternion uses the Hamilton convention, and the order is q(w, x, y, z) +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp of the raw data (microseconds) diff --git a/msg/VehicleAttitudeSetpoint.msg b/msg/core/VehicleAttitudeSetpoint.msg similarity index 96% rename from msg/VehicleAttitudeSetpoint.msg rename to msg/core/VehicleAttitudeSetpoint.msg index 74a753023df5..28aa780699dc 100644 --- a/msg/VehicleAttitudeSetpoint.msg +++ b/msg/core/VehicleAttitudeSetpoint.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) float32 yaw_sp_move_rate # rad/s (commanded by user) diff --git a/msg/VehicleCommand.msg b/msg/core/VehicleCommand.msg similarity index 99% rename from msg/VehicleCommand.msg rename to msg/core/VehicleCommand.msg index 2970410a886e..96162e9f89f9 100644 --- a/msg/VehicleCommand.msg +++ b/msg/core/VehicleCommand.msg @@ -1,6 +1,8 @@ # Vehicle Command uORB message. Used for commanding a mission / action / etc. # Follows the MAVLink COMMAND_INT / COMMAND_LONG definition +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint16 VEHICLE_CMD_CUSTOM_0 = 0 # test command diff --git a/msg/VehicleCommandAck.msg b/msg/core/VehicleCommandAck.msg similarity index 98% rename from msg/VehicleCommandAck.msg rename to msg/core/VehicleCommandAck.msg index 6f54fa46315b..c11a5f8c5dfd 100644 --- a/msg/VehicleCommandAck.msg +++ b/msg/core/VehicleCommandAck.msg @@ -2,6 +2,8 @@ # Used for acknowledging the vehicle command being received. # Follows the MAVLink COMMAND_ACK message definition +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) # Result cases. This follows the MAVLink MAV_RESULT enum definition diff --git a/msg/VehicleControlMode.msg b/msg/core/VehicleControlMode.msg similarity index 97% rename from msg/VehicleControlMode.msg rename to msg/core/VehicleControlMode.msg index 9b33f9b8cad3..0a1fdedfbf14 100644 --- a/msg/VehicleControlMode.msg +++ b/msg/core/VehicleControlMode.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) bool flag_armed # synonym for actuator_armed.armed diff --git a/msg/VehicleGlobalPosition.msg b/msg/core/VehicleGlobalPosition.msg similarity index 98% rename from msg/VehicleGlobalPosition.msg rename to msg/core/VehicleGlobalPosition.msg index 30aaf5652a96..387576d8c792 100644 --- a/msg/VehicleGlobalPosition.msg +++ b/msg/core/VehicleGlobalPosition.msg @@ -5,6 +5,8 @@ # e.g. control inputs of the vehicle in a Kalman-filter implementation. # +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp of the raw data (microseconds) diff --git a/msg/VehicleLandDetected.msg b/msg/core/VehicleLandDetected.msg similarity index 96% rename from msg/VehicleLandDetected.msg rename to msg/core/VehicleLandDetected.msg index fc0ca4a6d81c..1cbf54571360 100644 --- a/msg/VehicleLandDetected.msg +++ b/msg/core/VehicleLandDetected.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) bool freefall # true if vehicle is currently in free-fall diff --git a/msg/VehicleLocalPosition.msg b/msg/core/VehicleLocalPosition.msg similarity index 99% rename from msg/VehicleLocalPosition.msg rename to msg/core/VehicleLocalPosition.msg index 0e74ac0f4bfc..aec6311ab383 100644 --- a/msg/VehicleLocalPosition.msg +++ b/msg/core/VehicleLocalPosition.msg @@ -1,6 +1,8 @@ # Fused local position in NED. # The coordinate system origin is the vehicle position at the time when the EKF2-module was started. +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample # the timestamp of the raw data (microseconds) diff --git a/msg/VehicleOdometry.msg b/msg/core/VehicleOdometry.msg similarity index 97% rename from msg/VehicleOdometry.msg rename to msg/core/VehicleOdometry.msg index fbdd1920e1b4..f4d600d2b81e 100644 --- a/msg/VehicleOdometry.msg +++ b/msg/core/VehicleOdometry.msg @@ -1,4 +1,7 @@ # Vehicle odometry data. Fits ROS REP 147 for aerial vehicles + +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 timestamp_sample diff --git a/msg/VehicleRatesSetpoint.msg b/msg/core/VehicleRatesSetpoint.msg similarity index 95% rename from msg/VehicleRatesSetpoint.msg rename to msg/core/VehicleRatesSetpoint.msg index 35a06c35aa5f..a4c169e4123c 100644 --- a/msg/VehicleRatesSetpoint.msg +++ b/msg/core/VehicleRatesSetpoint.msg @@ -1,3 +1,5 @@ +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) # body angular rates in FRD frame diff --git a/msg/VehicleStatus.msg b/msg/core/VehicleStatus.msg similarity index 99% rename from msg/VehicleStatus.msg rename to msg/core/VehicleStatus.msg index 6756da812977..a347dfce3d9d 100644 --- a/msg/VehicleStatus.msg +++ b/msg/core/VehicleStatus.msg @@ -1,5 +1,7 @@ # Encodes the system state of the vehicle published by commander +uint32 MESSAGE_VERSION = 0 + uint64 timestamp # time since system start (microseconds) uint64 armed_time # Arming timestamp (microseconds) diff --git a/src/modules/commander/failsafe/CMakeLists.txt b/src/modules/commander/failsafe/CMakeLists.txt index 0d7b3bd366c5..90075b3b7b84 100644 --- a/src/modules/commander/failsafe/CMakeLists.txt +++ b/src/modules/commander/failsafe/CMakeLists.txt @@ -32,7 +32,7 @@ ############################################################################ # Extract information from failsafe msg file -set(failsafe_flags_msg_file ${PX4_SOURCE_DIR}/msg/FailsafeFlags.msg) +set(failsafe_flags_msg_file ${PX4_SOURCE_DIR}/msg/aux/FailsafeFlags.msg) set(generated_uorb_struct_field_mapping_header ${PX4_BINARY_DIR}/generated_uorb_struct_field_mapping.h) set(html_template_file ${CMAKE_CURRENT_SOURCE_DIR}/emscripten_template.html) set(html_output_file ${PX4_BINARY_DIR}/failsafe_html_template.html)