From f864d9314090d6422d869513f3e87cd840dfc379 Mon Sep 17 00:00:00 2001 From: Iampete1 Date: Sat, 30 Apr 2022 14:13:16 +0100 Subject: [PATCH] SITL: Frame and Motor changes to allow motor example --- libraries/SITL/SIM_Frame.h | 6 +++--- libraries/SITL/SIM_Motor.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/SITL/SIM_Frame.h b/libraries/SITL/SIM_Frame.h index a353765932..eafb7ab2d0 100644 --- a/libraries/SITL/SIM_Frame.h +++ b/libraries/SITL/SIM_Frame.h @@ -152,6 +152,9 @@ protected: void load_frame_params(const char *model_json); #endif + // get air density in kg/m^3 + float get_air_density(float alt_amsl) const; + struct Model model; private: @@ -163,9 +166,6 @@ private: Battery *battery; #endif - // get air density in kg/m^3 - float get_air_density(float alt_amsl) const; - // json parsing helpers #if USE_PICOJSON void parse_float(picojson::value val, const char* label, float ¶m); diff --git a/libraries/SITL/SIM_Motor.h b/libraries/SITL/SIM_Motor.h index 64de298672..f63e206763 100644 --- a/libraries/SITL/SIM_Motor.h +++ b/libraries/SITL/SIM_Motor.h @@ -18,8 +18,8 @@ #pragma once -#include "SIM_Aircraft.h" #include +#include namespace SITL {