Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-28 19:48:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: use AP_SIM_ENABLED define more

Browse Source
This commit is contained in:
Iampete1 2022-04-22 17:25:41 +01:00 committed by Andrew Tridgell
parent c58404beac
commit f0c17f0e49
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/SITL/SIM_Aircraft.h
View File

@ -18,6 +18,8 @@
#pragma once #pragma once
#if AP_SIM_ENABLED
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include "SITL.h" #include "SITL.h"
@ -343,3 +345,5 @@ private:
}; };
} // namespace SITL } // namespace SITL
#endif // AP_SIM_ENABLED

2
libraries/SITL/SIM_Frame.cpp
View File

@ -471,6 +471,7 @@ void Frame::parse_vector3(picojson::value val, const char* label, Vector3f &para
/* /*
initialise the frame initialise the frame
*/ */
#if AP_SIM_ENABLED
void Frame::init(const char *frame_str, Battery *_battery) void Frame::init(const char *frame_str, Battery *_battery)
{ {
model = default_model; model = default_model;
@ -671,3 +672,4 @@ void Frame::current_and_voltage(float &voltage, float &current)
current += motors[i].get_current(); current += motors[i].get_current();
} }
} }
#endif // AP_SIM_ENABLED

7
libraries/SITL/SIM_Frame.h
View File

@ -44,7 +44,7 @@ public:
num_motors(_num_motors), num_motors(_num_motors),
motors(_motors) {} motors(_motors) {}
#if AP_SIM_ENABLED
// find a frame by name // find a frame by name
static Frame *find_frame(const char *name); static Frame *find_frame(const char *name);
@ -56,6 +56,7 @@ public:
const struct sitl_input &input, const struct sitl_input &input,
Vector3f &rot_accel, Vector3f &body_accel, float* rpm, Vector3f &rot_accel, Vector3f &body_accel, float* rpm,
bool use_drag=true); bool use_drag=true);
#endif // AP_SIM_ENABLED
float terminal_velocity; float terminal_velocity;
float terminal_rotation_rate; float terminal_rotation_rate;
@ -147,8 +148,10 @@ private:
float areaCd; float areaCd;
float mass; float mass;
float thrust_max; float thrust_max;
Battery *battery;
float last_param_voltage; float last_param_voltage;
#if AP_SIM_ENABLED
Battery *battery;
#endif
// get air density in kg/m^3 // get air density in kg/m^3
float get_air_density(float alt_amsl) const; float get_air_density(float alt_amsl) const;

1
libraries/SITL/SIM_Motor.h
View File

@ -19,6 +19,7 @@
#pragma once #pragma once
#include "SIM_Aircraft.h" #include "SIM_Aircraft.h"
#include <AP_Math/AP_Math.h>
namespace SITL { namespace SITL {