Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion AirLib/AirLib.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AirSim.props))\AirSim.props" />
<PropertyGroup>
Expand Down Expand Up @@ -178,6 +178,28 @@
<ClInclude Include="include\vehicles\multirotor\MultiRotorParamsFactory.hpp" />
<ClInclude Include="include\vehicles\multirotor\RotorActuator.hpp" />
<ClInclude Include="include\vehicles\multirotor\RotorParams.hpp" />
<ClInclude Include="include\vehicles\rov\AeroParams.hpp" />
<ClInclude Include="include\vehicles\rov\AeroVertex.hpp" />
<ClInclude Include="include\vehicles\rov\RotorActuator.hpp" />
<ClInclude Include="include\vehicles\rov\RotorTiltable.hpp" />
<ClInclude Include="include\vehicles\rov\RotorTiltableParams.hpp" />
<ClInclude Include="include\vehicles\rov\RovBodyParams.hpp" />
<ClInclude Include="include\vehicles\rov\RovParamsFactory.hpp" />
<ClInclude Include="include\vehicles\rov\RovPhysicsBody.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovApiBase.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovCommon.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibAdaptors.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibClient.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibServer.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\MavLinkOutputMappings.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\MavLinkRovApi.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\Px4RovParams.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleApi.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleBoard.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleCommLink.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleCommon.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleEstimator.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleParams.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\api\RpcLibClientBase.cpp" />
Expand All @@ -190,6 +212,9 @@
<ClCompile Include="src\vehicles\car\api\CarRpcLibServer.cpp" />
<ClCompile Include="src\vehicles\multirotor\api\MultirotorRpcLibClient.cpp" />
<ClCompile Include="src\vehicles\multirotor\api\MultirotorRpcLibServer.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovApiBase.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovRpcLibClient.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovRpcLibServer.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MavLinkCom\MavLinkCom.vcxproj">
Expand Down
11 changes: 10 additions & 1 deletion AirLib/AirLib.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
Expand Down Expand Up @@ -488,5 +488,14 @@
<ClCompile Include="src\vehicles\multirotor\api\MultirotorApiBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\vehicles\rov\api\RovApiBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\vehicles\rov\api\RovRpcLibClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\vehicles\rov\api\RovRpcLibServer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
27 changes: 26 additions & 1 deletion AirLib/AirLib_VS2019.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AirSim.props))\AirSim.props" />
<PropertyGroup>
Expand Down Expand Up @@ -178,6 +178,28 @@
<ClInclude Include="include\vehicles\multirotor\MultiRotorParamsFactory.hpp" />
<ClInclude Include="include\vehicles\multirotor\RotorActuator.hpp" />
<ClInclude Include="include\vehicles\multirotor\RotorParams.hpp" />
<ClInclude Include="include\vehicles\rov\AeroParams.hpp" />
<ClInclude Include="include\vehicles\rov\AeroVertex.hpp" />
<ClInclude Include="include\vehicles\rov\RotorActuator.hpp" />
<ClInclude Include="include\vehicles\rov\RotorTiltable.hpp" />
<ClInclude Include="include\vehicles\rov\RotorTiltableParams.hpp" />
<ClInclude Include="include\vehicles\rov\RovBodyParams.hpp" />
<ClInclude Include="include\vehicles\rov\RovParamsFactory.hpp" />
<ClInclude Include="include\vehicles\rov\RovPhysicsBody.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovApiBase.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovCommon.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibAdaptors.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibClient.hpp" />
<ClInclude Include="include\vehicles\rov\api\RovRpcLibServer.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\MavLinkOutputMappings.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\MavLinkRovApi.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\mavlink\Px4RovParams.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleApi.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleBoard.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleCommLink.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleCommon.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleEstimator.hpp" />
<ClInclude Include="include\vehicles\rov\firmwares\rov_simple\RovSimpleParams.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\api\RpcLibClientBase.cpp" />
Expand All @@ -190,6 +212,9 @@
<ClCompile Include="src\vehicles\car\api\CarRpcLibServer.cpp" />
<ClCompile Include="src\vehicles\multirotor\api\MultirotorRpcLibClient.cpp" />
<ClCompile Include="src\vehicles\multirotor\api\MultirotorRpcLibServer.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovApiBase.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovRpcLibClient.cpp" />
<ClCompile Include="src\vehicles\rov\api\RovRpcLibServer.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MavLinkCom\MavLinkCom.vcxproj">
Expand Down
8 changes: 8 additions & 0 deletions AirLib/include/api/VehicleSimApiBase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ namespace airlib

virtual Pose getPose() const = 0;
virtual void setPose(const Pose& pose, bool ignore_collision) = 0;
virtual void setPoseCustom(const Pose& pose, const std::vector<float>& tilt_angles, bool ignore_collision, bool spin_props)
{
unused(pose);
unused(tilt_angles);
unused(ignore_collision);
unused(spin_props);
throw std::runtime_error("setPoseCustom is not supported on this vehicle");
}
virtual const Kinematics::State* getGroundTruthKinematics() const = 0;
virtual void setKinematics(const Kinematics::State& state, bool ignore_collision) = 0;
virtual const msr::airlib::Environment* getGroundTruthEnvironment() const = 0;
Expand Down
23 changes: 16 additions & 7 deletions AirLib/include/common/AirSimSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ namespace airlib
static constexpr char const* kVehicleTypePhysXCar = "physxcar";
static constexpr char const* kVehicleTypeArduRover = "ardurover";
static constexpr char const* kVehicleTypeComputerVision = "computervision";
static constexpr char const* kVehicleTypeRovSimple = "rovsimple";
static constexpr char const* kVehicleTypePX4Rov = "px4rov";

static constexpr char const* kVehicleInertialFrame = "VehicleInertialFrame";
static constexpr char const* kSensorLocalFrame = "SensorLocalFrame";

static constexpr char const* kSimModeTypeMultirotor = "Multirotor";
static constexpr char const* kSimModeTypeCar = "Car";
static constexpr char const* kSimModeTypeComputerVision = "ComputerVision";
static constexpr char const* kSimModeTypeRov = "Rov";

struct SubwindowSetting
{
Expand Down Expand Up @@ -598,7 +601,7 @@ namespace airlib

physics_engine_name = settings_json.getString("PhysicsEngineName", "");
if (physics_engine_name == "") {
if (simmode_name == kSimModeTypeMultirotor)
if (simmode_name == kSimModeTypeMultirotor || simmode_name == kSimModeTypeRov)
physics_engine_name = "FastPhysicsEngine";
else
physics_engine_name = "PhysX"; //this value is only informational for now
Expand Down Expand Up @@ -811,7 +814,7 @@ namespace airlib
auto vehicle_type = Utils::toLower(settings_json.getString("VehicleType", ""));

std::unique_ptr<VehicleSetting> vehicle_setting;
if (vehicle_type == kVehicleTypePX4 || vehicle_type == kVehicleTypeArduCopterSolo || vehicle_type == kVehicleTypeArduCopter || vehicle_type == kVehicleTypeArduRover)
if (vehicle_type == kVehicleTypePX4 || vehicle_type == kVehicleTypeArduCopterSolo || vehicle_type == kVehicleTypeArduCopter || vehicle_type == kVehicleTypeArduRover || vehicle_type == kVehicleTypePX4Rov)
vehicle_setting = createMavLinkVehicleSetting(settings_json);
//for everything else we don't need derived class yet
else {
Expand Down Expand Up @@ -883,6 +886,12 @@ namespace airlib
cv_setting->sensors = sensor_defaults;
vehicles[cv_setting->vehicle_name] = std::move(cv_setting);
}
else if (simmode_name == kSimModeTypeRov) {
// create default rov vehicle
auto rov_setting = std::unique_ptr<VehicleSetting>(new VehicleSetting("RovSimple", kVehicleTypeRovSimple));
rov_setting->sensors = sensor_defaults;
vehicles[rov_setting->vehicle_name] = std::move(rov_setting);
}
else {
throw std::invalid_argument(Utils::stringf(
"Unknown SimMode: %s, failed to set default vehicle settings", simmode_name.c_str())
Expand Down Expand Up @@ -1251,16 +1260,16 @@ namespace airlib
//default value
clock_type = "ScalableClock";

//override if multirotor simmode with simple_flight
if (simmode_name == kSimModeTypeMultirotor) {
//override if multirotor or rov simmode with simple_flight or rov_simple
if (simmode_name == kSimModeTypeMultirotor || simmode_name == kSimModeTypeRov) {
//TODO: this won't work if simple_flight and PX4 is combined together!

//for multirotors we select steppable fixed interval clock unless we have
//for multirotors and rovs we select steppable fixed interval clock unless we have
//PX4 enabled vehicle
clock_type = "SteppableClock";
for (auto const& vehicle : vehicles) {
if (vehicle.second->auto_create &&
vehicle.second->vehicle_type == kVehicleTypePX4) {
(vehicle.second->vehicle_type == kVehicleTypePX4 || vehicle.second->vehicle_type == kVehicleTypePX4Rov)) {
clock_type = "ScalableClock";
break;
}
Expand Down Expand Up @@ -1359,7 +1368,7 @@ namespace airlib
static void createDefaultSensorSettings(const std::string& simmode_name,
std::map<std::string, std::shared_ptr<SensorSetting>>& sensors)
{
if (simmode_name == kSimModeTypeMultirotor) {
if (simmode_name == kSimModeTypeMultirotor || simmode_name == kSimModeTypeRov) {
sensors["imu"] = createSensorSetting(SensorBase::SensorType::Imu, "imu", true);
sensors["magnetometer"] = createSensorSetting(SensorBase::SensorType::Magnetometer, "magnetometer", true);
sensors["gps"] = createSensorSetting(SensorBase::SensorType::Gps, "gps", true);
Expand Down
6 changes: 6 additions & 0 deletions AirLib/include/common/VectorMath.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ namespace airlib
};

public:
template <typename T>
static int sgn(T val)
{
return (val > T(0)) - (val < T(0));
}

static float magnitude(const Vector2f& v)
{
return v.norm();
Expand Down
109 changes: 109 additions & 0 deletions AirLib/include/vehicles/rov/AeroParams.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#ifndef msr_airlib_AeroParams_hpp
#define msr_airlib_AeroParams_hpp

#include "common/Common.hpp"

namespace msr
{
namespace airlib
{

//contains air params necessary for calculating aerodynamic forces and moments
struct AirState
{
real_T Va;
real_T alpha;
real_T beta;
real_T rho;

void zero()
{
Va = 0.f;
alpha = 0.f;
beta = 0.f;
rho = 0.f;
}

void setAirspeedState(Vector3r airspeed)
{
Va = airspeed.norm();

if (airspeed(0) == 0.f) {
alpha = VectorMath::sgn(airspeed(2)) * M_PI / 2.0;
}
else {
alpha = std::atan2(airspeed(2), airspeed(0));
}
if (Va == 0.f) {
beta = VectorMath::sgn(airspeed(1)) * M_PI / 2.0;
}
else {
beta = std::asin(airspeed(1) / Va);
}
}

void setAirDensity(real_T air_density)
{
rho = air_density;
}
};

struct AeroParams
{
//flap parameters
real_T flap_rise_time = 0.05f;
real_T flap_max_angle = 0.0f;

//wing parameters
real_T S = 0.0;
real_T b = 0.0;
real_T c = 0.0;
real_T aspect_ratio = 0.0;
real_T epsilon = 0.0;
real_T alpha0 = 0.0;
real_T M = 0.0;
real_T e = 0.0;

struct AeroCoefficient
{
AeroCoefficient(real_T O_in, real_T alpha_in, real_T beta_in, real_T p_in, real_T q_in, real_T r_in,
real_T delta_a_in, real_T delta_e_in, real_T delta_r_in)
: O{ O_in }, alpha{ alpha_in }, beta{ beta_in }, p{ p_in }, q{ q_in }, r{ r_in }, delta_a{ delta_a_in }, delta_e{ delta_e_in }, delta_r{ delta_r_in }
{
}

real_T O;
real_T alpha;
real_T beta;
real_T p;
real_T q;
real_T r;
real_T delta_a;
real_T delta_e;
real_T delta_r;
};

// //aerodynamic coefficients
AeroCoefficient CL{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
AeroCoefficient CD{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
AeroCoefficient CY{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
AeroCoefficient Cl{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
AeroCoefficient Cm{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
AeroCoefficient Cn{ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };

//control mixer
//This is for mixing of control flap inputs for fixedwing aircraft that don't
//have a standard flap congiguration (elevator, aileron, rudder) such as aircraft
//with elevons or ruddervators. Default is identity, but must be set for other
//types of aircraft.
//Additional note: this can also be used for flipping the sign of control flap inputs
Matrix3x3r aero_control_mixer = Matrix3x3r::Identity();
};

}
} //namespace

#endif
Loading
Loading