Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: Frame and Motor changes to allow motor example

Browse Source
This commit is contained in:
Iampete1 2022-04-30 14:13:16 +01:00 committed by Andrew Tridgell
parent 6a8fff67f7
commit f864d93140
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/SITL/SIM_Frame.h
View File

@ -152,6 +152,9 @@ protected:
void load_frame_params(const char *model_json); void load_frame_params(const char *model_json);
#endif #endif
// get air density in kg/m^3
float get_air_density(float alt_amsl) const;
struct Model model; struct Model model;
private: private:
@ -163,9 +166,6 @@ private:
Battery *battery; Battery *battery;
#endif #endif
// get air density in kg/m^3
float get_air_density(float alt_amsl) const;
// json parsing helpers // json parsing helpers
#if USE_PICOJSON #if USE_PICOJSON
void parse_float(picojson::value val, const char* label, float &param); void parse_float(picojson::value val, const char* label, float &param);

2
libraries/SITL/SIM_Motor.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "SIM_Aircraft.h"
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#include <SITL/SITL_Input.h>
namespace SITL { namespace SITL {