fly/flightgear
1
0
Fork 0
Code Activity

LaRCSim / UIUC fixes to make the Wright flier work

Browse source 
We had missed some places which needed a config.h include, to ensure
ENABLE_UIUC is set.
This commit is contained in:
James Turner 2021-01-04 10:56:42 +00:00
parent 34d4462327
commit 984e88bddd
4 changed files with 25 additions and 19 deletions

32
src/FDM/LaRCsim/LaRCsim.cxx
View file

@ -20,9 +20,7 @@
// //
// $Id$ // $Id$
#ifdef HAVE_CONFIG_H #include "config.h"
# include "config.h"
#endif
#include <cmath> #include <cmath>
#include <cfloat> #include <cfloat>
@ -931,26 +929,24 @@ void FGLaRCsim::set_Velocities_Local_Airmass (double wnorth,
} }
*/ */
void FGLaRCsim::set_Static_pressure(double p) { void FGLaRCsim::set_Static_pressure(double p) {
SG_LOG( SG_FLIGHT, SG_INFO, SG_LOG(SG_FLIGHT, SG_BULK,
"FGLaRCsim::set_Static_pressure: " << p ); "FGLaRCsim::set_Static_pressure: " << p);
SG_LOG( SG_FLIGHT, SG_INFO, SG_LOG(SG_FLIGHT, SG_BULK,
"LaRCsim does not support externally supplied atmospheric data" ); "LaRCsim does not support externally supplied atmospheric data");
} }
void FGLaRCsim::set_Static_temperature(double T) { void FGLaRCsim::set_Static_temperature(double T) {
SG_LOG( SG_FLIGHT, SG_INFO, SG_LOG(SG_FLIGHT, SG_BULK,
"FGLaRCsim::set_Static_temperature: " << T ); "FGLaRCsim::set_Static_temperature: " << T);
SG_LOG( SG_FLIGHT, SG_INFO, SG_LOG(SG_FLIGHT, SG_BULK,
"LaRCsim does not support externally supplied atmospheric data" ); "LaRCsim does not support externally supplied atmospheric data");
} }
void FGLaRCsim::set_Density(double rho) { void FGLaRCsim::set_Density(double rho) {
SG_LOG( SG_FLIGHT, SG_INFO, "FGLaRCsim::set_Density: " << rho ); SG_LOG(SG_FLIGHT, SG_BULK, "FGLaRCsim::set_Density: " << rho);
SG_LOG( SG_FLIGHT, SG_INFO, SG_LOG(SG_FLIGHT, SG_BULK,
"LaRCsim does not support externally supplied atmospheric data" ); "LaRCsim does not support externally supplied atmospheric data");
} }

8
src/FDM/LaRCsim/ls_model.c
View file

@ -159,6 +159,9 @@ Initial Flight Gear revision.
OUTPUTS: OUTPUTS:
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include "ls_types.h" #include "ls_types.h"
@ -209,7 +212,10 @@ void ls_model( SCALAR dt, int Initialize ) {
subsystems( dt, Initialize ); subsystems( dt, Initialize );
// During initialization period, re-initialize velocities // During initialization period, re-initialize velocities
// and euler angles // and euler angles
if (Initialize !=0) uiuc_init_2_wrapper(); if (Initialize != 0) {
uiuc_init_2_wrapper();
}
uiuc_network_recv_2_wrapper(); uiuc_network_recv_2_wrapper();
uiuc_engine_2_wrapper( dt, Initialize ); uiuc_engine_2_wrapper( dt, Initialize );
uiuc_wind_2_wrapper( dt, Initialize ); uiuc_wind_2_wrapper( dt, Initialize );

2
src/FDM/LaRCsim/ls_step.c
View file

@ -297,6 +297,8 @@ Initial Flight Gear revision.
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#include "config.h"
#include "ls_types.h" #include "ls_types.h"
#include "ls_constants.h" #include "ls_constants.h"
#include "ls_generic.h" #include "ls_generic.h"

2
src/FDM/LaRCsim/uiuc_aero.c
View file

@ -53,6 +53,8 @@
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#include "config.h"
#ifdef ENABLE_UIUC_MODEL #ifdef ENABLE_UIUC_MODEL
#include <math.h> #include <math.h>