1
0
Fork 0
Commit graph

283 commits

Author SHA1 Message Date
curt
5ea9c04c64 SG_ namespace. 2001-03-24 04:56:46 +00:00
curt
17c96ae69e SG_ namespace 2001-03-24 04:48:44 +00:00
curt
92443d36a4 FG_ to SG_ namespace changes. 2001-03-24 03:10:40 +00:00
curt
17f3d48e03 FG_ to SG_ namespace changes. 2001-03-24 02:36:45 +00:00
curt
1bf3001749 FG_ to SG_ namespace changes. 2001-03-24 00:18:01 +00:00
curt
5958389026 FG_ to SG_ namespace changes. 2001-03-23 22:59:18 +00:00
curt
8497f9b1ac FG_ to SG_ name changes. 2001-03-23 22:42:49 +00:00
curt
945163b540 FG_HAVE_STD_INCLUDES -> SG_HAVE_STD_INCLUDES 2001-03-23 22:15:19 +00:00
curt
4162c808bd David Luff: I've put Phil's temperature correction back in since I'm not
implicitly correcting for that yet.  The plane now makes it to 11000ft on
autopilot *slowly*.  I think I'll have to look at the prop parameters
next - altering the diameter and blade angle just slightly can have
quite an effect.  If you want to play then try changing the values
prop_diameter and blade_angle in FGNewEngine::init.  Keep blade
angle between 20 and 25 (since those are the only values for which
I've entered data and I interpolate between them) and ignore
FGProp1_Blade_Angle since that's an old variable that isn't used.  I
really ought to read all the engine and prop parameters from file to
avoid recompilation when tweaking !
2001-03-22 23:42:16 +00:00
curt
80ff1af457 David Luff: Here is an update to the engine model. It now takes
the actual air pressure and temperature from the LaRCSim model
instead of assuming that it is at sea level as before.  This has
reduced the ceiling from over 60000 ft to about 9000 ft.  This is a bit
low (should be around 13 - 14000 ft I think) but I still have some
stuff to do with the engine power correlation and its ignoring the
temperature at the moment so I'm not panicking yet :-)

I've also changed the mixture-power correlation to one from a
published paper since the curve from the IO360 manual seemed to
be a load of rubbish, and didn't have any numbers on the mixture
axis anyway.

I've also knocked the full rich mixture down a touch in line with
Riley Rainey's recommendation, and cleaned up the code a bit.
2001-03-22 16:27:16 +00:00
curt
2b45761f56 Fixes from Erik Hofman for Mips Irix. 2001-03-10 20:58:47 +00:00
curt
0262c56059 Fixes to initial position for JSBSim. 2001-03-03 00:03:42 +00:00
curt
e9591422f3 Added a first pass at a C++ sound manager class. 2001-03-02 22:37:01 +00:00
curt
5d423a94b0 Contributed by Dave Luff:
Added fuel-flow and total fuel to the LaRCSim model.  Its still a bit
rough for now but it works, except the engine dosn't stop when fuel runs
out at the moment since there's no refuelling capability in the sim just
now.  It takes about 4 gallons use before you see the fuel guages begin
to drop since there's 28 gal per tank but the guages go to 26.
2001-03-01 16:32:29 +00:00
curt
a5d1970007 David Luff writes:
Basically I've rewritten the prop model along similar lines to how
Jon has done his - using published efficiency and coefficient of
power data.  It works *much* better - try pulling the throttle back
to idle and putting the plane into a dive before and after updating
and you'll see what I mean.  It doesn't require a fudge factor either
:-)
2001-02-02 20:55:41 +00:00
curt
f023440a5f Bug fix/typo fix submitted by Tony. 2001-01-29 04:47:16 +00:00
curt
a5e4e6be11 Working on setting initial altitude correctly after a reset. 2001-01-17 20:32:02 +00:00
curt
26dca37028 More "delta-t" and fdm interface timing tweaks. 2001-01-17 02:37:12 +00:00
curt
d346e53aee Tweaking the FGInterface interface so we can move it towards a more consistant
fgSubsystem init() and update() interface.
2001-01-16 21:41:28 +00:00
curt
f7b844f4d6 More property manager interface updates. 2001-01-16 20:21:03 +00:00
curt
576432ec75 David Megginson writes:
FGOptions is history, and the modules are (starting) to use the property
manager directly.  Let me know if I left any files out.

Inevitably, there will be some problems with broken options, etc.,
that I haven't found in my tests, but I'll try to fix them quickly.
We also need to stress that the property names currently in use are
not stable -- we need to reorganize them a bit for clarity.
2001-01-13 22:06:39 +00:00
curt
cff0022a16 Miscellaneous MSVC porting fixes by Christian Mayer. 2001-01-11 05:04:17 +00:00
curt
dc7b762a12 Minor MSVC porting tweaks. 2001-01-11 04:54:33 +00:00
curt
e9d12ee586 Tweaks from Tony to JSBSim.cxx jsbsim interface to flightgear.
Added ls_trim.c to the LaRCsim library.
2001-01-09 18:35:23 +00:00
curt
7a235abecd Tweaks to the LaRCsim interface to get wind working.
Corresponding tweaks to bfi.[ch]xx and options.cxx.
2001-01-08 17:59:54 +00:00
curt
e333080388 MacOS changes contributed by Darrell Walisser (12/13/2000) 2000-12-13 23:02:02 +00:00
curt
57a4c79eb5 Moved Time/timestamp.hxx into simgear/timing/timestamp.hxx 2000-11-30 18:43:31 +00:00
curt
0f98d21dd7 Nov. 14, 2000 JSBSim updates 2000-11-14 20:31:58 +00:00
curt
aa9fece628 Rearranged includes a touch. 2000-11-13 16:37:38 +00:00
curt
407dcaff62 Sync with current JSBSim devel code. 2000-11-03 23:02:47 +00:00
curt
a6f1e938cd Here are updated IO360.cxx and IO360.hxx files with an alteration to
bring EGT down to a more reasonable range.  EGT is now returned in
deg Fahrenheit (yuk!!) by the accessor function since that is what
the guage is calibrated in, and the absolute max value that can be
output (max power mixture at max power) is about 750 deg F.  Dave, I
suggest that you set the guage to run from 450 - 750 deg F between
the four big marker ticks.  What do the offset and scale actually
refer to in the .xml config file BTW?

Fuel flow, better handling of manifold pressure wrt engine speed, and
proper consideration of altitude effects next, hopefully.
2000-11-02 17:01:09 +00:00
curt
11a68e55d4 Updates by Tony working on the FDM interface bus. 2000-10-28 16:30:30 +00:00
curt
b83ad15313 Added CHT (cylinder head temp) to BFI and property manager. 2000-10-27 22:00:43 +00:00
curt
b5b0ba5eba This is a somewhat rough first attempt at modelling cylinder head
temperature.  The cylinder head is assumed to be at uniform
temperature.  Obviously this is incorrect, but it simplifies things a
lot, and we're just looking for the behaviour of CHT to be correct.
Energy transfer to the cylinder head is assumed to be one third of the
energy released by combustion at all conditions.  This is a reasonable
estimate, although obviously in real life it varies with different
conditions and possibly with CHT itself.  I've split energy transfer
from the cylinder head into 2 terms - free convection - ie convection
to stationary air, and forced convection, ie convection into flowing
air.  The basic free convection equation is: dqdt = -hAdT   Since we
don't know A and are going to set h quite arbitarily anyway I've
knocked A out and just wrapped it up in h - the only real significance
is that the units of h will be different but that dosn't really matter
to us anyway.  In addition, we have the problem that the prop model
I'm currently using dosn't model the backwash from the prop which will
add to the velocity of the cooling air when the prop is turning, so
I've added an extra term to try and cope with this.

In real life, forced convection equations are genarally empirically
derived, and are quite complicated and generally contain such things
as the Reynolds and Nusselt numbers to various powers.  The best
course of action would probably to find an empirical correlation from
the literature for a similar situation and try and get it to fit well.
 However, for now I am using my own made up very simple correlation
for the energy transfer from the cylinder head:

dqdt = -(h1.dT) -(h2.m_dot.dT) -(h3.rpm.dT)

where dT is the temperature different between the cylinder head and
the surrounding air, m_dot is the mass flow rate of cooling air
through an arbitary volume, rpm is the engine speed in rpm (this is
the backwash term), and h1, h2, h3 are co-efficients which we can play
with to attempt to get the CHT behaviour to match real life.

In order to change the values of CHT that the engine settles down at
at various conditions, have a play with h1, h2 and h3.  In order to
change the rate of heating/cooling without affecting equilibrium
values alter the cylinder head mass, which is really quite arbitary.
Bear in mind that altering h1, h2 and h3 will also alter the rate of
heating or cooling as well as equilibrium values, but altering the
cylinder head mass will only alter the rate.  It would I suppose be
better to read the values from file to avoid the necessity for
re-compilation every time I change them.
2000-10-27 21:33:07 +00:00
curt
d85d899244 Started integrating Jon's doc++ comments. 2000-10-24 21:43:37 +00:00
curt
d475a0c002 Updates to fix a network communication problem. 2000-10-24 17:15:32 +00:00
curt
7cc98ad15f I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG.   I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back.  I
suspect this is no worse than before.

I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet  (needs work yet)
External (don't know how)

known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present).   The FDM inits to
about 50 feet AGL and the model falls to the ground.  It does stay
upright, however, and seems to be fine once it settles out, FWIW.

To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup

The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's  all the bus data when called,
useful for diagnostics.

src/FDM/ADA.cxx
-- bus data members now directly assigned to

src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts

src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.

src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation.  The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().

src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class

src/FDM/MagicCarpet.cxx
 -- bus data members now directly assigned to

src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx

src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus

src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC

src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module

src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()

src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components.  They
are no longer needed and confuse the new bus.

src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values.   The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim).  A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for.  Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.

src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()

src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.

src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude).  The bus now updates itself when the setters are
called (for LaRCsim and JSBSim).  A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts.  set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)

src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
curt
152a5902c8 Moved winWidth and winHeight out of FGViewer since these are set on a
per-application level.  We can have multiple viewers ...
Cleaned up fov mistake on startup with panel activated.
2000-10-19 23:09:33 +00:00
curt
01c44cbb99 Code clean ups relating to FGOptions ... and moved it into globals-> space. 2000-10-19 21:24:43 +00:00
curt
ce574d59f5 The following changes were made to flightgear-0.7.5 code to implement the follow
ing features:

a) ADA Flight model - ADA.cxx, ADA.hxx, flight.hxx
b) Fighter a/c HUD       - flight.hxx, hud.hxx, hud.cxx, cockpit.cxx, hud_ladr.c
xx, hud_card.cxx
c) 3-window display      - options.hxx, options.cxx, viewer.cxx
d) Moving objects (ship) - main.cxx
e) Patches               - main.cxx

ADA.cxx, ADA.hxx
--------------------------
Interface to the external ADA flight dynamics package.

flight.hxx
----------
Included prototypes for accepting additional data fron the External flight
model for fighter aircraft HUD

Hud.hxx
-------
Included prototypes for accepting additional data for fighter HUD from Exernal F
light model.
Defined FIGHTER_HUD pre-processor directive to enable compilation of fighter hud
 code.

hud.cxx, cockpit.cxx, hud_ladr.cxx, hud_card.cxx
---------------------------------------
Included code to initialise additional reticles/text for fighter HUD which is co
nditionally
compiled if FIGHTER_HUD is defined.

options.hxx
-----------
Added window_offset, and function to retrieve its value for 3 windows

options.cxx
-----------
Changed few options to suit ADA/CEF projection system/screens and checks for win
dow offset.

views.cxx
---------
Added code to retrieve view offset for window.

Main.cxx
--------
Added code to load and move an aircraft carrier.
Patch to enable clouds from command line until Curtis fixes it. By default cloud
s are disabled.
2000-10-19 19:46:13 +00:00
curt
ae1028b795 Added #include <math.h> for fabs() 2000-10-16 20:47:47 +00:00
curt
0750b9d34f Renamed new FGEngine to FGNewEngine to avoid conflict with stuff in JSBSim. 2000-10-16 20:01:23 +00:00
curt
47c3f41828 Check return value of FDM::init().
Updated other return values to be bool instead of int.
2000-10-16 14:54:41 +00:00
curt
972bf22630 Friday the 13th JSBSim update ... :-0 !!! 2000-10-14 02:10:10 +00:00
curt
5018278831 Panel tweaks to support "shaped" panels.
Additional HUD support for waypoints.
JSBSim updates.
2000-10-13 23:34:54 +00:00
curt
72a09d198c Updates to track current JSBSim cvs. 2000-10-12 01:06:31 +00:00
curt
7c38f172d9 Some tweaks relating to engines and the various LaRCsim related fdm's 2000-10-10 20:31:20 +00:00
curt
6caf599f2b Oct. 10, 2000 sync with JSBSim master repository. 2000-10-10 17:44:35 +00:00
curt
b85ea575a3 Oct. 9, 2000 - synced with latest JSBsim code. 2000-10-09 21:16:21 +00:00
curt
f6fac40a11 David Megginson writes:
I have a scrollable panel working (it didn't take long in the end).  A
panel can now be much wider or higher than the available area, and the
user can scroll around using [Shift]F5, [Shift]F6, [Shift]F7, and
[Shift]F8.  The user can also scroll the panel down to get a bigger
external view.  Mouse clicks seem still to be working correctly.

To set the panel's (virtual) height and width, use the panel file's /w
and /h properties in a panel XML file; to set the initial x- and y-
offsets (untested), use the panel file's /x-offset and /y-offset
properties; to set the initial height of the external view (untested
and optional), use the panel file's /view-height property.  Note that
none of these show up in the regular FGFS property manager.

Unfortunately, these patches will not affect your initialization
problems with the property manager -- I'm having a hard time tracking
them down because I cannot reproduce them.

I have also made some patches to main.cxx and views.cxx to do two
things:

1. Expand or shrink the external view as the panel moves up and down.

2. Set the window ratio correctly, so that we don't get an oval sun
   and flat clouds when the panel is visible (the problem before was
   integer division, so I added casts).

Unfortunately, the window ratio is not set properly at start-up --
there are too many dependencies, and I haven't figured that part out
yet.  As soon as you hide and redisplay the panel or move it
vertically (i.e. force fgReshape to be called), you'll see the correct
ratio.
2000-10-06 21:16:01 +00:00
curt
981d4dbd7d Properties:
- /engines/engine0/rpm changed to read-only
- /engines/engine0/egt added (read-only)
- /controls/mixture added
- /controls/propellor-pitch added (not used for C172)

BFI:

- getEGT() added
- getMixture() and setMixture() added
- getPropAdvance() and setPropAdvance() added (= pitch)
- cleaned up reinit function a bit
- force reinit only when values are actually changed; for example,
  setting the flight model to the current flight model will not cause
  a reinit

LaRCSim:

- hook up mixture and pitch to FGControls (they were hard-coded
  before)
2000-10-04 22:52:34 +00:00
curt
b6d0402074 Properties:
- /engines/engine0/rpm changed to read-only
- /engines/engine0/egt added (read-only)
- /controls/mixture added
- /controls/propellor-pitch added (not used for C172)

BFI:

- getEGT() added
- getMixture() and setMixture() added
- getPropAdvance() and setPropAdvance() added (= pitch)
- cleaned up reinit function a bit
- force reinit only when values are actually changed; for example,
  setting the flight model to the current flight model will not cause
  a reinit

LaRCSim:

- hook up mixture and pitch to FGControls (they were hard-coded
  before)
2000-10-04 22:22:21 +00:00
curt
21a5886bcb Oct 2, 2000 JSBSim sync. 2000-10-02 23:07:30 +00:00
curt
1dc35581f5 MSVC compatibility changes and code tweaks for minor nits caught by the
MSVC compiler.
2000-10-02 21:49:04 +00:00
curt
137da58a70 Working on putting engine data on "the bus" 2000-09-29 03:27:21 +00:00
curt
6d4e03361a Updates to IO360 engine model: Added a couple of guestimates for engine
and prop inertia and passed the timestep from LaRCsim in order to have
the engine rpm behaving according to the applied torque and the laws of
physics.
2000-09-28 22:49:33 +00:00
curt
32528d0cd6 A bit of fg->sg namespace changing. 2000-09-27 20:16:22 +00:00
curt
2c59508156 Renamed fg_types.hxx -> sg_types.hxx
Started work on an interactive property manager traverser/setter.
2000-09-26 23:39:29 +00:00
curt
75c77d9e53 Initial revision. 2000-09-26 23:37:26 +00:00
curt
4b6b2bc06d Minor changes to several includes to allow out of source tree builds. 2000-09-26 21:44:52 +00:00
curt
bf14bb1151 Fixes for MSVC++ issues. 2000-09-21 22:59:27 +00:00
curt
e891774a8c builddir -> srcdir so builds can be done outside the master source directory. 2000-09-20 23:27:25 +00:00
curt
68d96bfcb1 Added .h flags so the they are included in the distribution. 2000-09-15 19:25:18 +00:00
curt
13bba6c88d Tweaks to ground steering sensitivity. 2000-09-14 17:36:25 +00:00
curt
be88681d69 MacOS changes by Darrell Walisser. 2000-09-13 21:51:07 +00:00
curt
655ce0e20d MACOS -> macintosh 2000-09-10 00:04:50 +00:00
curt
a2cd367ab5 Sep 8, 2000 panel updates from David Megginson. 2000-09-08 20:47:18 +00:00
curt
b4b46df9a8 Ooops, shouldn't call a program "ps". 2000-09-08 14:35:23 +00:00
curt
517d111c5c Sep 1 2000 updates from the UIUC team. 2000-09-06 19:52:37 +00:00
curt
64719b3da1 Initial revision. 2000-09-06 15:45:43 +00:00
curt
50b74acd95 Default to not using new engine code ... 2000-09-06 00:09:02 +00:00
curt
ed9fcb74b7 Updates to trial engine model. 2000-08-29 03:15:51 +00:00
curt
306f01c41a Updates to test the 10520 engine code. 2000-08-28 21:31:28 +00:00
curt
fa000a3447 Starting to play around with an engine model. 2000-08-28 20:39:55 +00:00
curt
f89d86d4af Updates and tweaks for Oliver's multi-player networking code. 2000-08-14 20:12:17 +00:00
curt
342842537d Fixes to jsbsim. 2000-08-04 16:08:55 +00:00
curt
120b26cc88 20000803 updates. 2000-08-04 03:20:09 +00:00
curt
76b4de7f1f Updates to JSBSim. 2000-07-31 15:05:08 +00:00
curt
6a98486375 JSBSim updates.
Updates to put more internal JSBSim values on the "bus".
2000-07-25 21:41:59 +00:00
curt
64d6f149e0 Sync the JSBSim code with the Jon & Tony's devel version.
Renamed JSBsim -> the official JSBSim.
2000-07-24 17:26:05 +00:00
curt
7a2ef1d57c Merged some of Alex's code changes.
Updates for better windows support in the Joystick module.
2000-07-20 04:16:59 +00:00
curt
9d47a64a09 Updates from Jon's official CVS tree. 2000-07-06 21:02:46 +00:00
curt
ca3fd98b5c Tony Peden: fixed Mach number for LaRCsim. 2000-06-14 21:52:22 +00:00
curt
dcdd61c590 Added differential braking (Alex and David). 2000-06-12 20:52:36 +00:00
curt
0786793f42 05/30/2000 updates from Jon Berdnt. Landing gear code now is beginning to
work.
2000-05-30 16:48:52 +00:00
curt
febc9cf0b2 First quick hack at panel shading. 2000-05-27 06:40:55 +00:00
curt
e12e81dd23 5/26/2000 updated from Jon and Tony. 2000-05-27 05:48:14 +00:00
curt
b074559216 MSVC5 portability changes contributed by Bruce Finney. 2000-05-24 06:10:01 +00:00
curt
d423fa9337 MSVC5 Compatibility tweaks. 2000-05-24 04:27:28 +00:00
curt
b543d8291e Fixes to uiuc includes and initialization.
Fixes to fg_io.cxx periodic scheduler.
2000-05-23 22:08:00 +00:00
curt
9835072241 From Tony Peden:
This set of changes cleans up my previous ones quite a bit:
[tony@valkyrie FlightGear]$ tar -ztf tp_changes.tgz
src/Controls/controls.cxx
src/Controls/controls.hxx
src/FDM/JSBsim.cxx
src/Main/fg_init.cxx
src/Main/options.cxx
src/Main/options.hxx
src/Joystick/joystick.cxx

controls.[ch]xx:  removed the trimmed_throttle stuff.  This undoes the
                  changes I submitted last time.

JSBsim.cxx:       updates for the removal of the trimmed_throttle stuff

fg_init.cxx:      removed the autothrottle logic.  The autothrottle is now
off
                  by default.

options.[ch]xx:   Sets trim_mode to false by default.  It is enabled only
                  when --notrim is not used and JSBsim is the FDM.

joystick.cxx:     Added logic for syncing the throttle lever.  This is
                  only enabled when trim_mode is enabled.   The way I
                  did it is, I hope, a good way of going about it.

I tested:
fgfs --fdm=larcsim
fgfs --fdm=jsb --aircraft=c172 --vc=100 --altitude=500
fgfs --notrim --fdm=jsb --aircraft=c172 --vc=100 --altitude=500

All work as intended, at least for me.

Make sure your joystick is calibrated and give:
fgfs --fdm=jsb --aircraft=c172 --vc=100 --altitude=500
a try, I think you just might be impressed.

I am. ;-)
2000-05-19 16:29:23 +00:00
curt
fb2a4f6909 Updates from Jon (addendum to previous changes). 2000-05-16 22:43:58 +00:00
curt
c4a1cc047e Updates from the Jon and Tony show.
Tony submitted:

JSBsim:
Added trimming routine, it is longitudinal & in-air only at this point
Added support for taking wind & weather data from external source
Added support for flaps.
Added independently settable pitch trim
Added alphamin and max to config file, stall modeling and warning to
follow

c172.cfg:
Flaps!
Adjusted Cmo, model should be speed stable now

FG:
Hooked up Christian's weather code, should be using it soon.
Hooked up the trimming routine.  Note that the X-15 will not trim.
  This is not a model or trimming routine deficiency, just the
  nature of the X-15
The trimming routine sets the pitch trim and and throttle at startup.
The throttle is set using Norman's code for the autothrottle so the
autothrottle is on by default.  --notrim will turn it off.
Added --vc, --mach, and --notrim switches
      (vc is airspeed in knots)
uBody, vBody, and wBody are still supported, last one entered
on the command line counts, i.e. you can set vc or mach or u,v,
and w but any combination will be ignored.
2000-05-16 21:35:11 +00:00
curt
519996f34d Changes contributed by Tony Peden to put wind data "on the bus". 2000-05-11 19:17:33 +00:00
curt
292c97fa43 Propogate colocated dme flag. 2000-05-04 15:53:03 +00:00
curt
4f6ed28a17 Instrument panel / steam updates for more realistic modeling of various
instruments (contributed by Alex Perry)
2000-05-02 19:41:35 +00:00
curt
ea80ed959e Partial JSBsim update. 2000-05-02 18:25:30 +00:00
curt
1868e44ee4 0429 updates from Jon. 2000-04-28 19:59:46 +00:00
curt
949fc00815 MacOS build updates. 2000-04-27 21:57:08 +00:00
curt
f7891be922 Initial revision. 2000-04-26 00:35:14 +00:00
curt
e9b2b521ca April 25, 2000 updates from Jon. 2000-04-25 17:43:40 +00:00
curt
8f71890c08 April 25 updates to JSBsim by Jon. 2000-04-25 17:42:11 +00:00
curt
c7cac5893f Added new section of JSBsim. 2000-04-24 23:49:37 +00:00
curt
ad4416e143 Updated JSBsim code. 2000-04-24 23:49:06 +00:00
curt
336aee09c4 Added one more missing include file. 2000-04-13 17:42:09 +00:00
curt
4139964eb2 Fixed a syntax error (stray space). 2000-04-12 19:05:41 +00:00
curt
6660bb4788 Added all .h files to Makefile.am so they can be included in the distribution. 2000-04-12 17:43:58 +00:00
curt
12168687cb Changes by Tony Peden to get pitch, roll, and yaw rates onto the "bus." 2000-04-11 21:45:42 +00:00
curt
1f1b2bab50 David Megginson made a few (mostly minor) mods to the LaRCsim files, and
it's now possible to choose the LaRCsim model at runtime, as in

  fgfs --aircraft=c172

or

  fgfs --aircraft=uiuc --aircraft-dir=Aircraft-uiuc/Boeing747

I did this so that I could play with the UIUC stuff without losing
Tony's C172 with its flaps, etc.  I did my best to respect the design
of the LaRCsim code by staying in C, making only minimal changes, and
not introducing any dependencies on the rest of FlightGear.  The
modified files are attached.
2000-04-10 20:09:40 +00:00
curt
0b69d5a107 Initial revision. 2000-03-22 22:08:16 +00:00
curt
8f3aa1bebd UIUC flight model contribution. This is based on LaRCsim, but can read
the aircraft parameters from a file.  It still uses Tony's <crappy> (and I
mean that in a constructive way) gear model. :-)
2000-03-22 22:01:33 +00:00
curt
3b0cf518bc MSVC++ tweaks contributed by Christian Mayer. 2000-03-21 22:06:05 +00:00
curt
1294aed465 One more pass at a reorg. 2000-02-16 23:01:03 +00:00
curt
485230b443 Code reorganization. 2000-02-15 03:30:01 +00:00
curt
9a207fb4e1 MacOS fixes contributed by Darrell Walisser on 1/26/2000. 2000-02-10 23:37:56 +00:00
curt
095c069b39 Updated for plib-1.1.x 2000-02-04 22:50:04 +00:00
curt
0e1c43e8e5 Jan 11, 2000 changes from Jon. 2000-01-11 17:26:43 +00:00
curt
58e1bc7698 Updates to propogate V_calibrated_kts and Mach from all FDM codes. 2000-01-10 21:07:26 +00:00
curt
c722481805 Updates from Jon and Tony. 2000-01-10 21:07:00 +00:00
curt
226b8a8971 Here is a wrap-up of the latest changes to JSBSim. It still is flaky, but
much less so due to returning the aero reference point stuff to the config
files. Don't know what happened there ...

Additionally, I have added a new field to the config file: CFG_VERSION. A
version number, currently 1.1, is assigned to the config file and a matching
definition is found in FGDefs.h. The two need to match. Tony has also added
code into FGAircraft.cpp to handle if aero reference point is not specified.
1999-12-30 18:01:59 +00:00
curt
871e4e8319 Updates to help work the kinks out of JSBsim. 1999-12-30 17:42:24 +00:00
curt
3cca59bf1f Allow aircraft model file to be specified from the command line. 1999-12-20 20:25:58 +00:00
curt
9892d4f03e Initial revisions. 1999-12-20 20:25:13 +00:00
curt
c319dac02a Updates from the Jon and Tony show. 1999-12-20 20:24:49 +00:00
curt
a872c40389 Updates from Tony. 1999-12-13 21:43:41 +00:00
curt
e340190916 Updates from Tony. 1999-12-08 19:48:54 +00:00
curt
d7d9403509 Cosmetic change. 1999-11-24 14:15:00 +00:00
curt
5fdede6f75 Revamped the "External" flight model. 1999-11-19 02:12:46 +00:00
curt
5bcd8c700b Updates from Tony, mostly to landing gear. 1999-11-15 23:54:07 +00:00
curt
021ee36a78 Tweaks to get rid of compiler warnings. 1999-11-09 19:51:07 +00:00
curt
212bf4a549 Cygwin32 build tweaks. 1999-11-09 18:22:55 +00:00
curt
0a97fc1dcc Tweaked with drag and thrust. 1999-11-04 22:53:34 +00:00
curt
5097ba0bf8 Patches from Tony to enable brakes. 1999-11-03 17:46:24 +00:00
curt
308e9d1ac5 Updates so that trim will work. 1999-11-02 15:59:13 +00:00
curt
43143ef358 c172 updates from Tony. Fix extra yaw when using ailerons. Flaps and elevator
tweaks.
1999-11-01 19:17:16 +00:00
curt
06b966ee53 Added flaps support to c172 model. 1999-10-29 18:08:31 +00:00
curt
ceaf93a11c Fix for MSVC++ 1999-10-27 00:44:29 +00:00
curt
3b5667ed39 Tweaks by David Megginson. 1999-10-27 00:44:16 +00:00
curt
0e48fe8ac4 Updates from Christian Mayer. 1999-10-20 22:15:41 +00:00
curt
802af70258 A couple MSVC++ portability tweaks. 1999-10-15 22:06:56 +00:00
curt
d707c00c13 Maybe fixed an altitude problem. 1999-10-15 05:35:50 +00:00
curt
b822efcf78 Use wgs_84 time and distance calc routines instead of pure spherical geometry. 1999-10-14 19:32:15 +00:00
curt
884dae9c57 Removing all the old vestiges of the original attempt at a slew FDM. Now
this functionality is implimented as a magic carpet mode.
1999-10-14 02:01:27 +00:00
curt
b5aaa84cc9 Initial revision. 1999-10-14 01:54:11 +00:00
curt
cecd5685ca Adding magic carpet FDM mode. 1999-10-14 01:53:43 +00:00
curt
c682dec898 Initial revision of balloon simulator code. 1999-10-12 03:27:06 +00:00
curt
74a337b91e Fixed a couple warning messages. 1999-10-11 23:09:51 +00:00
curt
b86e6ddc11 Updating FGFS <=> FDM interface. 1999-10-11 23:09:07 +00:00
curt
5bb9223dda Pass through ground speed for hud ETA calculation. 1999-10-10 16:48:21 +00:00
curt
5f5905f6e8 Updates by norman vine to controls.hxx.
Joystick auto-coordination tweaks.
Additional debuging output when pausing and resuming the sim.
Window resizing tweaks by David Megginson (and Norman Vine).
1999-10-09 13:09:16 +00:00