1
0
Fork 0
Commit graph

135 commits

Author SHA1 Message Date
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
curt
f7c276944e Attempt #1 to sort out confusion between left / right / parking brake
controls in the cockpit vs. which wheels they apply to.  FlightGear now
sets /controls/gear/brake-left, /controls/gear/brake-right, and
/controls/gear/brake-parking.  It should be up to the FDM to sort out
which wheels under which circumstances are affected by these controls
and ultimately what happens to the physical motion of the aircraft.
2004-01-12 17:49:33 +00:00
curt
f38dc5c544 Remove several unneeded files. 2004-01-05 16:02:03 +00:00
david
24fe2ef1e6 Use the new ADF radio logic (unfortunately, it does not yet support
ident).
2003-11-25 19:38:57 +00:00
curt
251ce01019 Omit a couple more items when "omit-knobs" is activated. 2003-11-25 01:53:08 +00:00
ehofman
98b45006b8 Updated for the new hotspots by paul mccann 2003-09-22 08:27:30 +00:00
curt
9dc782de3d Revert to previous version. 2003-09-15 21:16:03 +00:00
curt
a059fa0119 Paul Mcann:
Also I made some changes to the nav-com radio because I could not change
frequencies with it?
2003-09-15 15:39:48 +00:00
ehofman
8d592cb9cc Sharpen a bit for readability 2003-09-12 21:46:24 +00:00
ehofman
c300d98fc8 Use the right property 2003-06-28 21:46:15 +00:00
ehofman
4d4fef591b Melchior FRANZ:
These patches add a clock instrument, which allows to model failure ("serviceable") and to adjust the time independently of the system time (defaults to GMT). The main incentive is to make the p51d clock work and adjustable via the knob.

 o Offers a time string ("12:03:15") for the LCD or for LED
   clocks, or an empty string in case of failure/power off. The
   instrument assumes that digital clocks are battery buffered,
   so they will be updated even if there's nothing on the display.

 o Offers the number of seconds since midnight for analog
   clocks, like in the p51d. This number is not increased
   if !serviceable. So the clock will stand still and continue
   where it stopped when it's serviceable again.

I did not consider voltage yet, because the Mustang's clock will need a lot more current than the LCD clock. The instrument is updated 4 times per second but returns immediately if neither time nor offset changed. The function getGMTString() in fg_props.cxx could be removed after applying these patches.
2003-06-27 08:45:35 +00:00
ehofman
c9ab961f68 The current heading mark is severely off. The AP's HDG Lock doesn't fly in this direction. 2003-06-22 08:29:40 +00:00
ehofman
c18a2b580a The reported breakage of the hsi was caused by wrong lower limits. 2003-06-22 08:14:32 +00:00
ehofman
54d29a4a4f Fix the marker control light 2003-06-22 08:08:49 +00:00
ehofman
e367da16d2 Fix the path 2003-06-22 08:07:13 +00:00
curt
1b107b3530 Point vacamp.xml at new suction model. 2003-05-28 21:06:30 +00:00
curt
4667e2f9f1 - Make hi-res c172s instrument knobs drawn conditionally.
- HSI GS needles shouldn't disappear when they hit their limits, only when
  there is no GS signal.
- Make vac/amp gauge driven by new minimalistic amp model.
- Update digital clock face color to look more "LCD-ish" based on a real
  C172-S cockpit photo.
- Add an OAT gauge to the old C172 2d panel.
2003-05-27 19:58:52 +00:00
ehofman
6e4c38213e paul mccann wrote:
Hi I fixed the heading bug on the hsi2 and made some changes to the c310-ifr so the adf and dme work.  Just temp fix for those.
2003-04-20 10:05:20 +00:00
ehofman
7c3394b167 Some additional updates for the controls change 2003-04-01 17:51:22 +00:00
david
8118e6a482 Fix to use renamed /control properties. 2003-04-01 15:46:50 +00:00
ehofman
759d86d947 Updates to refelect the controls update of FlightGear. It could be there are a few unupdated controls left. To simplify the transisition there is a file called README.properties in the docs-mini directory of FlightGear that explains the new controls layout. 2003-04-01 12:41:12 +00:00
curt
a39895565d Tweaks to the c172 egt and hsi instruments. 2003-03-29 02:25:58 +00:00
curt
99010b1a22 Martin Dressler:
Added a new hi res bendix-king HSI.
2003-03-21 15:52:01 +00:00
j4strngs
c3500b4db9 Updated HSI from Paul Mcann 2003-03-20 01:36:52 +00:00
david
426631620a Use the new DME support under /instrumentation/ instead of the old
support under /radios/.

The display now goes dark when the switch is turned off.

The switch position is now handled entirely within the XML -- the C++
code is generic, so that other DME receiver types can also be
modelled.
2003-03-09 04:13:18 +00:00
david
b6d3f56829 Modified to work with changed "switch" layer. 2003-03-09 03:41:48 +00:00
curt
f506ea3fc3 Oops, fixed the "on" indicator to be driven electrically as well as the "off"
indicator.
2003-03-07 17:16:11 +00:00
curt
9ef922266e Martin Dressler:
New *high* fidelity C172-S ADF and VOR1 and VOR2 instruments.
2003-03-07 15:06:00 +00:00
curt
bbcd133e9a Martin Dressler:
Hi-res C172-S ADF and VOR textures.
2003-03-07 15:05:10 +00:00