1
0
Fork 0
Commit graph

592 commits

Author SHA1 Message Date
mfranz
f4704aed46 ac3d syntax 2006-01-30 19:43:18 +00:00
curt
c16aa2cd25 Syd Adams:
3d instrument updates, especailly the primus-1000.
2006-01-30 19:33:23 +00:00
ehofman
97752847ef Dave Perry:
I have modeled N7764P, the comanche 250 I co-own with 2 other Seagate engineers.
In the process of doing this model, I have also improved, worked on, or added
instruments, etc. to Instruments-3d.

* I fixed the adf so the azimuth card is tied to the correct property
* Added TO, From, and out-of range indicators to the 3d vor.
* Also added a manifold pressure gage and a pa24-250 asi (using digital photos
  of the actual asi as the starting textures.

Affects on other AC.  As far as I know, this will add to-from to the vor and
correct the adf behavior for pa28-161.  It would be a trivial edit to the
pa28-161.xml to give the same vor performance to that AC.
Now both VORs act as one.
2006-01-24 10:26:16 +00:00
ehofman
f6cd3d54d8 sync. with JSBSim v. 2.0 2006-01-12 15:03:25 +00:00
curt
601366f717 Syd Adams:
3d instruments for Piper Aerostar.
2006-01-09 15:45:12 +00:00
curt
eb783b46aa Syd Adams:
Initial revision.
2006-01-09 14:55:52 +00:00
ehofman
7f11bb92db Stuart Buchanan:
- Provide generic Nasal code to check if a pilot is abusing their aircraft
  by extending their gear/flaps above the maximum allowed speed, exceeding
  Vne, or pulling excessive G-forces.
- Implement limits within the C182.
2006-01-06 09:47:58 +00:00
ehofman
fef63c1b05 Stuart Buchanan:
Updates to the generic yoke and added a generic set of pedals and a throttle
quadrant.
2005-12-27 13:14:49 +00:00
daveluff
c765031835 And following on from the last bug, I need to revert the actual texture to the one I tested with for the indicies into it to be correct... 2005-11-30 02:00:48 +00:00
daveluff
46268bbf56 Melchior found the first bug... 2005-11-30 01:49:48 +00:00
daveluff
a08c2e07c7 Rearrange the 2d c172 panel to add a kln89 GPS unit and md41 annunciator and gps/nav switch 2005-11-30 01:10:31 +00:00
daveluff
b4dc9ca967 KLN89 GPS instrument - this only handles the switches, dials and providing a background - the logic and display is handled by a special c++ instrument 2005-11-30 01:05:40 +00:00
daveluff
7b875227e1 KLN89 background - could probably do with adding a lower res version of this as well 2005-11-30 01:04:38 +00:00
mfranz
36a69cd891 /instrumentation/adf/heading-deg doesn't exist any more; use the
"heading-indicator" instrument
2005-11-12 18:24:06 +00:00
ehofman
4440f87a3b Add the missing generic instruments that are required by the new C182. 2005-11-10 17:23:10 +00:00
ehofman
fec91079ae Harald JOHNSEN: Add a (test) WxRadar instrument. 2005-10-08 12:13:43 +00:00
daveluff
4e27c93836 MD41 GPS annunciator and NAV-GPS switch unit 2005-10-02 18:08:49 +00:00
ehofman
f2fe8fbe39 Vivian Meazza:
This adds a TACAN instrument to the inventory. Range and bearing are calculated
to the TACAN or VORTAC beacon selected by means of the Channel Selector in the E
quipment/Radio pull-down menu.

A TACAN beacon has also been added to the aircraft carrier Nimitz (channel #029Y
).
2005-10-01 09:56:18 +00:00
curt
08e0ffece0 Off indicator when volts drop below 20. 2005-08-23 02:34:03 +00:00
ehofman
801edaf448 Torsten Dreyer:
Add a radar altimeter (like the King KRA-10A)
2005-07-31 08:31:08 +00:00
curt
72e1e46116 Convert the c172p and c172r to use the new nasal electrical system. 2005-06-14 20:58:07 +00:00
curt
c77949a11d Specify a default generic electrical system model here rather than in the
aircraft-set.xml files.
2005-06-14 18:01:34 +00:00
ehofman
ec8742bd65 Melchior FRANZ:
Implement simple help system with global and aircraft specific dialogs:

The gui.nas changes have been discussed with Andy. All ac have a help dialog,
but some are empty. (This wouldn't have been necessary, as the system falls
back to the "Common Aircraft Keys" if an aircraft has no help defined, but an
empty dialog is less confusing and encourages to be filled with interesting
information.   :-)    I scanned all aircraft files for interesting performance
data and added some to the dialogs (stall speed, etc.) The Concorde and the
p51d have (over?)complete dialogs and can serve as examples. The format is
documented in $FG_ROOT/Nasa/gui.nas.

There is also a couple of other, minor fixes.

The following files have ugly MSDOS line endings:

  $FG_ROOT/Aircraft/Hunter/hunter{-2tanks,}-set.xml
  $FG_ROOT/Aircraft/A380/A380-set.xml


The Concorde-jsbsim.nas file is a useless copy of the real */nas file, which is
in Nasal/. I'was debugging the Concorde and wondered why changes to this file
had no effect ...
(Fixed Concorde in the help-ac.diff patch: don't use "interpol" keyword as
variable.)
2005-04-19 13:43:44 +00:00
ehofman
34648bb1f9 Remove some unused texures and re-install the 2d panel. 2005-02-22 18:25:00 +00:00
ehofman
5999a302a9 Reference Aircraft/Generic instead of Aircraft/c172 2005-02-19 12:58:39 +00:00
ehofman
8cc903dfe6 Reinstall the c172p, 3d cokcpit only for now 2005-02-19 10:51:46 +00:00
ehofman
2c8aaa35ee Remove the c172p, there will be an updated version shortly. 2005-02-19 10:48:48 +00:00
ehofman
d71f743d62 First step towards untiing the c172/c182 knot 2005-02-19 10:03:53 +00:00
ehofman
cc51e4b9eb Melchior FRANZ:
The comm radio knobs are screwed. Left half increase, right half decrease.
Fixed that. (I wonder since when this is broken. Does nobody use it?)

To reproduce:  $ fgfs --aircraft=c310
2005-02-11 15:33:21 +00:00
ehofman
3e168d205c Melchior FRANZ:
The c310's adf needle (HSI) doesn't work. The hsi.xml instrument does
still use the old property. The fix didn't have negative effects on
other a/c that I had tested.
2005-01-28 15:11:56 +00:00
jimw
144eef5ce7 Thumbnail 2005-01-18 06:05:24 +00:00
jimw
7b3b826042 Author tags 2005-01-18 03:11:34 +00:00
curt
abb934ebdb Initial revision. 2005-01-18 01:42:35 +00:00
curt
57ab0333db Updates to author tags. 2005-01-18 01:27:18 +00:00
curt
0a1edc2d53 Add a missing texture file. 2004-12-29 20:03:35 +00:00
curt
73a9cb2849 Dave Martin:
Changes made 19/12/2004

Panel re-oriented
3d Compass shows through windows.
Wing-tips slightly altered.

Changes made 18/12/2004

Prop spinner shortened and widened
Nose area slightly remodelled to fit silouette
Nose texture altered to place lower intake correctly

Nose wheel reduced in size.
Nose leg Oleo guide added (does not rotate - is this correct with real ac?)
Nose wheel Axle added.
Nose wheel fixed to rotate about it's shaft axis.

Windscreen / panel mesh changed so that panel no longer protrudes thru dash
Panel instruments moved to represent the geometries of the real cockpit.
Pilot / Copilot Yokes moved inboard to represent the geometries of the real cockpit.
Alpha layer added to interior texture to prevent panel showing through seats / yokes.
Interior texture duplicated and mapped to panel only to allow panel to show.
Front seats moved slightly inboard.

Landing light pair added to port wing texture.
Alpah layer added to wing texture to prevent panel showing through.
Texture remapped to Flaps (no shows ribs again).
Wing strut outer joins brought inboard to point of wing taper to match real aircraft geometries.
Wing struts thinned in front profile and thickened in side profile.
VHF aerials moved aft to their usual position.
Maingear legs altered so they now join with the fusealage (previously, 20cm gap)
Rear window altered slightly to match silouette.

Rear (white) Navigation Light made to translate with the rudder.


Not yet done: independant landing and taxi lights on port wing
2004-12-25 16:47:14 +00:00
curt
a355aa410d More /radios -> /instrumentation property name changes. However, we are still
missing something because the nav1 and nav2 are still inop.
2004-12-04 20:37:04 +00:00
curt
69956c445c Missed some instrumentation overall changes. 2004-12-04 20:08:37 +00:00
curt
789560ea22 Roy Vegard Ovesen:
I've finished the emigration of the radiostack, and I've also removed it
completely. It turned out that the comm radio is completely implemented in
the ATC subsystem. I've changed the affected ATC files to point
to /instrumentation/com, but I guess that the maintainer of the ATC code
should decide wether to make it configureable, and how.

I also had to change some files in Network and Main. The changes in network
should be obvious, but the changes in Main were a bit suspect. The files
included radiostack.hxx, but they weren't directly depending on
radiostack-hxx. They were depending on other files that were included by
radiostack.hxx. I got it to compile, but I'm not sure if I included the
correct directly depending file.

For the data directory I changed every occurrence of /radios/
with /instrumentation/ with this simple one-liner that I found on the net:

find -name '*.xml' -type f | xargs perl -pi -e
's/\/radios\//\/instrumentation\//g'

Instead of me sending all the files that got changed by this I suggest that
you execute the one-liner yourself. Of course I can not guarantee that this
will work perfectly, but I considered hand editing to be not an option (I'm
lazy). I don't want to test every aircraft to see if everything still works,
I think it's better to wait and see if anyone complaints about broken nav
radios/instruments.
2004-12-03 21:25:48 +00:00
curt
71bfe3a4db Move the kr-87 adf from /radios to /instrumentation 2004-11-19 23:56:47 +00:00
curt
c93544468d Changes to match Roy Ovesen's instrumentation code and property name changes. 2004-11-19 23:05:07 +00:00
ehofman
93433d7c56 Roy Vegard Ovesen:
The KAP140 Autopilot is now fairly complete. I've added altitude arm, moved
the FPM number display and cleaned up the code a bit.
2004-11-01 09:34:16 +00:00
ehofman
a942ce005a Add some status levels 2004-10-28 11:44:46 +00:00
ehofman
661617a94e Roy Vegard Ovesen:
I've made an encoder and a transponder. The transponder gets C-Mode altitude
information from the encoder. These two might not be very usefull right now,
but I think they might come in handy when the ATC network gets going.
2004-10-26 12:06:13 +00:00
ehofman
8ee606eea8 Roy Vegard Ovesen:
Here are some updates to the KAP140 autopilot in the default c172. It now uses
ailerons and elevator instead of aileron-trim and elevator-trim. I've started
to "upgrade" it to the "two axis altitude preselect" version. Vertical speed
select rounds to nearest 100 fpm.

I've also modified the c172 electrical configuration to turn on the gps
instrument.

Perhaps the most important change is that the nasal script for the KAP140 has
moved from data/Nasal to the c172p aircraft subdir. So it is important that
you delete data/Nasal/kap140.nas. Having the kap140.nas script as a global
script was not a good solution. Now it is aircraft specific, and thus
included in the c172p-set.xml file. Ideally I would like it to be instrument
specific, so that it would be included whenever the KAP140*.xml instruments
where included on the panel.
2004-10-17 17:41:05 +00:00
ehofman
ff4e599eb0 Roy Vegard Ovesen:
Instrumentation and systems are now configureable from xml files. The two
generic configurations generic-systems.xml and generic-instrumentation.xml
configures the systems and instrumentation as it was hardcoded. You can
override the generic configurations in a similar way as you override the
autopilot configuration.
2004-10-16 12:37:46 +00:00
ehofman
f6891e780a Frederic Bouvier:
the crease patch by Mathias has a negative impact on the adf present in the piper pa28-161 and the bo105.
2004-10-14 09:24:34 +00:00
ehofman
d57e589fde Melchior FRANZ:
All necessary elements for an ADF gauge had been migrated from
Cockpit/kr_87.cxx to Instrumentation/adf.cxx. Migrating the sound
related elements was apparently planned, but not done yet. This
intermediate state broke the ident morse sound: it couldn't get
turned off and it always indicated "SF", regardless of the tuned-in
frequency. The following patches continue the migration:


adf-radio.diff     => Base/Aircraft/Instruments/adf-radio.xml:
---------------------------------------------------------------
* sets maximum volume to 1 (rather than 2); Not only is 1
  loud enough (and 2 unpleasantly noisy), it also prevents
  the knob from being turned to non-existant positions.  :-)
* fixes wrong use of /instrumentation/adf/ident
* the voice/ident selector(?) remains unchanged, but as it's
  not switched to "IDENT", there'll be no ident sound by default
  this is consistent with other sounds and DME.


radiostack.diff    => src/Cockpit/radiostack.[ch]xx:
---------------------------------------------------------------
* comment out use of FGKR_87 class. kr_87.[ch]xx is now no
  longer used. kr-87adf.xml would no longer work, either, but
  isn't used anywhere, anyway. Future adf radios have to use
  the adf instrument, using xml/Nasal for specific hardware
  implementation details.


adf.diff           => src/Instrumentation/adf.[ch]xx:
---------------------------------------------------------------
* adds ident morse sound capability using two new input
  properties:
  - /instrumentation/adf/volume-norm  (double)
  - /instrumentation/adf/ident-audible  (bool)
2004-08-19 11:55:18 +00:00
ehofman
0b4ffa7117 Reorganize the 172 types a bit so they all reside in the proper directory. This solves some problems for JSBSim which couldn't find it's configuration files in the right places (which was temporarely solved by duplicating the file) and fixes some refferences to other files (at least, that's the idea). 2004-08-17 09:23:52 +00:00
ehofman
0e228261dc Some updated files per request of David Culp. 2004-07-03 11:13:09 +00:00
curt
db86fe1efd Slightly enlarge annunciator background size. 2004-06-23 16:18:46 +00:00
ehofman
e8adb7d0c8 Sync w. JSBSim CVS 2004-06-14 11:41:36 +00:00
ehofman
d6467f3ad4 Okay, maybe it was a good idea to assume that not all targets are target[0]. 2004-06-11 17:19:59 +00:00
ehofman
36abb08074 Revert to the previous version, after one target disappeared, they all disappeared. This version doesn't have that problem. 2004-06-11 13:59:40 +00:00
ehofman
ec8b3e7c14 Make use of the new radar/in-range property 2004-06-10 19:14:42 +00:00
curt
5f3a956f82 Electrical system output to hsi is a floating point value, not a boolean. 2004-06-05 03:51:33 +00:00
ehofman
f1a61549a5 David Culp:
Here's some new AI stuff.

1)  AI objects must now be defined in a scenario file, not in preferences.xml
or a *-set file.  (Of course this doesn't prevent objects from being created
dynamically, as with Durk's traffic manager).

2)  A new demo_scenario file is attached.  It creates 3 aircraft, a sailboat,
and a thunderstorm.

3)  Objects without flightplans live forever.

4)  FGAIShip::ProcessFlightplan() is not yet implemented.

5)  preferences.xml should now define only <enabled> and <scenario>
2004-05-29 11:41:20 +00:00
curt
2af0a69765 Property /sim/sound/audible renamed to /sim/sound/pause
Individual aircraft -set.xml files shouldn't set global sound/volume
properties for the entire application.
2004-05-14 15:54:22 +00:00
david
72777e70cc Light AI (again). 2004-05-08 02:17:38 +00:00
curt
8ab947db84 Roy Vegard Ovesen:
Here is the KAP140 Two Axis Autopilot update.

I think it's fairly complete now, all the modes are working. I tested the
localizer and glideslope hold and it was pretty stable all the way down to
the middle marker.

In the pilot guide for backcourse hold (REV) mode it says to reset the heading
bug to the _front course_. I haven't figured out how to implement this so for
the time beeing one should reset the heading bug to the _backcourse_. Apart
from this the panel should operate identical to the way the pilot guide
describes.
2004-04-16 22:14:00 +00:00
curt
0dda4feaa0 Roy Vegard Ovesen:
Here is the KAP140 Two Axis Autopilot.

Aircraft/Instruments/KAP140TwoAxis.xml
Is of course the instrument config file.

Aircraft/Instruments/Textures/KAP140.rgb
The texture.

Nasal/kap140.nas
Most of the work is done here. Without Nasal I don't see how I could implement
the NAV-ARM modes and the flashing annunciators.

Aircraft/c172p/Systems/KAP140.xml
The autopilot PID controllers configuration file. Maybe this file should be in
a more accessible directory and not hidden deep inside c172p!?

I've also attached the changes to the default C172 to include this autopilot
in the 3d-cockpit panel and the 2d vfr panel. Or at least I hope that I've
managed to include all that is needed.
2004-04-16 21:59:51 +00:00
ehofman
a3381b7e41 Oops, follow the default naming convention 2004-04-07 11:56:33 +00:00
ehofman
82addb59e1 Move the switches to the controls subdirectory and add some default knobs 2004-04-07 11:54:11 +00:00
ehofman
41eb331912 Frederic: Real ufo are spinning, aren't they? I am sure they are. 2004-04-03 09:01:45 +00:00
curt
dc1197e2b2 Update various electrical system configurations to reflect code changes
supporting a per engine master alt/bat switch.
2004-04-02 16:22:55 +00:00
ehofman
85cb214a18 Frederic Bouvier:
this one missed the release  The right aileron animation of the
c172p is inverted.
2004-03-30 08:32:42 +00:00
ehofman
61b688906f Add a missing file. 2004-03-22 10:04:48 +00:00
jimw
882c740c8f Add a generic vertical speed control. Power up the gps. 2004-03-21 22:17:09 +00:00
ehofman
c789b13e23 David Culp:
Add a "minimize" button to the radar screen.  It will default maximized.
2004-03-20 22:34:30 +00:00
david
c85990a796 Fix the AI a bit, and move it forward in the Warrior panel. 2004-03-20 16:40:17 +00:00
ehofman
05125e7a38 Add a bunch of 3d switches. 2004-03-19 09:57:01 +00:00
david
c425703651 Use only two top-level configuration files:
--aircraft=c172p
  --aircraft=c172p-2dpanel
2004-03-18 03:37:14 +00:00
ehofman
b3600801da The result of being bored for 15 minutes. Lets call it an easter ufo. 2004-03-17 15:32:53 +00:00
david
b5006ad7c6 Convert from grayscale to RGB so that alpha transparency will work
with plib.
2004-03-13 02:44:32 +00:00
ehofman
217dcb38fa David Culp:
Add clickable range selection for the radar and wxradar.  Right
now it is clickable only between 20 and 40 mile ranges, which should work for
most uses.
2004-03-12 15:06:04 +00:00
ehofman
b8eebf3e0c David Culp:
OV10-jsbsim-set.xml  has many changes.  It creates a thunderstorm over
woodside VOR.  It removes the lowest cloud layer so that the storm can be
seen.  It sets the surface wind speed to zero, which may help stop the
"drifting left" complaints. It sets the radar range to 40 miles.


The weather radar instrument is corrected.
2004-03-12 10:15:51 +00:00
david
c706eedf11 Illuminate the VOR heads and the ADF needle. 2004-03-11 14:37:03 +00:00
david
5f815ff011 Added a 3D EGT gauge, calibrated from 0 to 500 degF (for now).
Lightly lit.
2004-03-04 22:22:53 +00:00
ehofman
26761349ae Restore the pa28-fuel-oil directory again 2004-03-03 22:32:33 +00:00
ehofman
b1f694cec0 Add a weather radar display instrument which treats every AIAircraft as a thunderstorm right now. 2004-02-28 12:17:00 +00:00
david
779116ab4f Lower the resolution of the textures (they were gratuitously high,
sometimes up to 512x512).
2004-02-27 18:49:08 +00:00
ehofman
b5b60a65d7 Add support for a storm blib 2004-02-27 13:48:24 +00:00
ehofman
e4faabff78 David Culp:
The radar instrument uses the above three items, and applies a scale factor to
the x-shift and y-shift in order to match the instrument's scale.  Changing
the display scale can be done entirely in the XML code for the instrument.
Right now it's set up only to display a 40 mile scale.

The radar is an AWACS view, which is not very realistic, but it is useful and
demonstrates the technology.  With just a little more work I can get a HUD
marker.  All I need to do there is make a bank angle adjustment to the
current values.

This works great with one target.  For two or more targets the radar
instrument will have to know the numbering of the aircraft model properties.
This isn't implemented yet.

David Culp:
I couldn't stop.  Here's a better radar instrument.  It has:

1)  range select knob 20 and 40 nm (not clickable.. yet)
2)  target altitude readout at lower right
3)  target disappears when range exceeds 43 nm
4)  range ring values now are read from instrumentation/radar/range
5)  instrumentation/radar/range is preset in the *-set.xml file to 40 nm

The next step would be a clickable range selection.  The problem here is that
the instrument currently displays the "blip" only if the target's range is
less then 43 nm.  If the range scale is decreased to 20 nm, then the "blip"
will show past the edges of the instrument.  I might need to make another
instrument for the 20 nm scale to make that work.
2004-02-27 10:22:23 +00:00
david
cb2acf8724 The VOR head is now mostly functional: the needles and the outer ring
move properly, but the flags are not yet implemented.  Currently, the
head is hardwired to the NAV1 radio.
2004-02-24 03:14:08 +00:00
curt
29dbe6d379 So far I haven't been able to make the new PID algorithm work well for
tasks that should be purely proportional.  So I added support for my old
ultra-simplistic PI controller.  This does wonders for stage #1 of the
altitude and AGL hold.
2004-02-23 02:05:21 +00:00
david
94efbd6fad Standalone internal 3d mag compass unit (may be fit into different
casings).
2004-02-22 19:30:34 +00:00
david
a45edc154d Fix alpha problems. 2004-02-22 17:50:23 +00:00
david
208f900de8 Fix texture name. 2004-02-21 22:25:17 +00:00
david
3df160072f Added a KX170B (King NavComm) faceplate; nothing else, yet. 2004-02-21 18:28:11 +00:00
david
0c6719165e Added more detail to the ADF, including face markings. 2004-02-21 18:27:38 +00:00
david
30dfcfe1e3 Animate the analog clock. 2004-02-20 17:39:41 +00:00
david
a251221a63 Add the tilting plane. Unfortunately, it is having some kind of alpha
problem.
2004-02-20 17:37:27 +00:00
david
39b7c1ddbd Start an analog clock (face only for now; not functional). 2004-02-20 03:00:42 +00:00
david
eb5c30bee5 Make instruments slightly emissive, for night flight. 2004-02-18 02:37:19 +00:00
david
9d0bba9848 Make instrument slightly emissive, for night flight.
Add front markings.
2004-02-18 02:36:54 +00:00
david
0644fdc4cd The AI is now fully function, except that the position bezel isn't
user-adjustable yet.
2004-02-16 18:29:51 +00:00
david
67da88632c Added altimeter needles (100's, 1,000's, and 10,000's).
TODO:

- Kollsman window and adjustment knob
- texture redesign
2004-02-15 13:46:48 +00:00
david
1f580c8abc Start on some basic 3D panel instruments. For now, just reuse
textures that are already sitting around for the 2D panel.

Many of the instruments are not yet functional.
2004-02-15 01:03:07 +00:00
ehofman
a724d92bd4 Add support for a Visual Reference Point 2004-02-14 10:19:25 +00:00
curt
a180a0d659 Default autopilot tweaks. 2004-02-07 21:48:39 +00:00