1
0
Fork 0
Commit graph

163 commits

Author SHA1 Message Date
mfranz
66e53fb67f Csaba "Jester" HALASZ: radar fix & extension
- fix breakage due to former commit (AIManager.cxx, r1.72)
- make AI properties available in AIBase
- add <valid> property for animations/nasal scripts
- support more MP and AI targets
- add target select and altitude display
2007-04-04 09:51:39 +00:00
mfranz
813988f718 Csaba HALASZ: fix dme property name 2007-03-01 17:39:52 +00:00
mfranz
10efd065c4 Dave Perry & Roy Vegard Ovesen:
"This patch allows all the AC using the kap140 to use one kap140.nas
which includes Roy's move to "bool" values as well as the check for
power used by the pa24-250." (dp)
2007-02-04 12:55:28 +00:00
mfranz
0be35251ba add note about new dependency $FG_ROOT/Aircraft/Generic/annunciator.nas 2007-01-29 22:45:41 +00:00
curt
e7ba2d6a4b Properly line everything up visually so standard rate turns end up taking
the right amount of time.
2006-10-22 12:51:50 +00:00
vmmeazza
d6684074a3 Radar enhancement - now 'detects' the first 2 multiplayer targets. This is a temporary fix only pending a better implementation of radar. There is a known limitation: when a multiplayer conatact is dropped it will probably not be re-detected. 2006-05-16 16:37:57 +00:00
david
6e5e59be23 Updates from Dave Perry:
I missed a few things in the last patch.
1.  prop size did not match prop disc size.
2.  rescaled yoke to match measured yoke.
3.  messed up hot spots for heading indicator knobs when I tweaked the
panel last patch.
The fix that could not wait was #3, so I also re-textured the pilot head
with outdoor face photos.  Yep, that's my face.  The hair is now
textured also which looks better close up.
2006-03-27 11:50:57 +00:00
curt
a335e72a59 Fix the glideslope needles so they peg at +/- 0.7 degrees off course. 2006-03-13 20:19:06 +00:00
mfranz
a51165f775 This code was correct (apart from the doubled binding). The problem is
that the --dme option sets the switch position correctly, but the
preferences.xml file is read after that and sets the switch back to 1.
And then we do *correctly* get nav1. Ideally, we would only let
preferences set the switch position if it wasn't set before, but
for now lets just comment that out there.
2006-03-10 15:36:17 +00:00
david
ff83826bfc Remove setup action -- it overwrites a DME frequency specified on the
command line.
2006-03-10 14:41:50 +00:00
curt
947b816042 Lee Elliott:
Remove spam trap contact address.
2006-03-02 22:40:56 +00:00
david
5da3e4c18b Changes from Dave Perry:
Here is a patch that included the changes in my 2/22/06 posting plus the
3d-instrument light "emission" animations.  I also added a magnetic
compas mount and moved it forward and down to better match the real ac
and make it easier to read when adjusting the hi.  Ignore the "?" flaged
files at the beginning.  none are required.  I noticed that there is a
backup copy of pa24-250.ac in the pa24-250 folder in cvs.  It can be
deleted.  The only copy of that file required is in pa24-25/Models.

I "flew" a shake down instrument XC from 2v2 (Longmont, CO) to KLVN
(Airlake, just south of Minneapolis, MN).  Even the fuel management is
realistic.  The autopilot on the menu bar works well.  Give the changes
a try and enjoy!
2006-02-25 18:16:54 +00:00
david
be1a0a1c9e I made a minor change to one file in the c172p that accommodates a
feature I added to the navcom-kx155.xml and the dme.xml in the
Instruments folder.  I wanted to leave the frequencies, etc. on these
dark until there was voltage applied to
/systems/electrical/outputs/nav.  This was accomplished by adding a
param and property alias  pointing to the appropriate value.  Since the
c172p "always" applies 28 volts, this made no change in the c172p, but
allowed me to model the avionics master and battery master realisticly
in pa24-electrical.nas.  I put in comments explaining this at the change
points.

There is a useful  "help > aircraft help" that walks you through the
start procedure and lists the key bindings as well as the key to "light
up" the hot spots.
2006-02-12 17:31:21 +00:00
daveluff
674539a3cf Use middle click to pull/push the pull-to-scan middle knob 2006-02-03 20:58:47 +00:00
mfranz
5a12cd5d22 before the big instrumentation rewrite dme.cxx cared for the initial
mode according to the switch position. Now dme.cxx is more generic
and can't make these settings any more -- and doesn't. So the dme
didn't display anything even if the knob was on.

The initialization has now to be done in the dme.xml file.
(Button-less actions are fired at init time and then thrown away.)
2006-02-02 00:07:11 +00:00
mfranz
12b58fa989 fix "from" flag 2006-02-01 22:16:53 +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
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
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
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
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
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
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
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
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
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
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
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
61b688906f Add a missing file. 2004-03-22 10:04:48 +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
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
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
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
ehofman
6abd14667a Updates the the kr-87 ADF. Could someone confirm this is actually correct? 2004-01-24 10:09:54 +00:00