Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SITL: SIM_Frame: load_frame_params and model to protected, allow USE_PICOJSON override

This commit is contained in:
Iampete1 2022-04-22 17:26:52 +01:00 committed by Andrew Tridgell
parent f0c17f0e49
commit 1111ca4867
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/SITL/SIM_Frame.h
View File

@ -21,7 +21,10 @@
#include "SIM_Aircraft.h"
#include "SIM_Motor.h"
#ifndef USE_PICOJSON
#define USE_PICOJSON (CONFIG_HAL_BOARD == HAL_BOARD_SITL)
#endif
#if USE_PICOJSON
#include "picojson.h"
#endif
@ -142,8 +145,15 @@ private:
} default_model;
protected:
#if USE_PICOJSON
// load frame parameters from a json model file
void load_frame_params(const char *model_json);
#endif
struct Model model;
private:
// exposed area times coefficient of drag
float areaCd;
float mass;
@ -156,9 +166,8 @@ private:
// get air density in kg/m^3
float get_air_density(float alt_amsl) const;
// json parsing helpers
#if USE_PICOJSON
// load frame parameters from a json model file
void load_frame_params(const char *model_json);
void parse_float(picojson::value val, const char* label, float &param);
void parse_vector3(picojson::value val, const char* label, Vector3f &param);
#endif