1
0
Fork 0
Commit graph

183 commits

Author SHA1 Message Date
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
curt
5f2d105e3b Lee Elliott:
Fix the AoA intruments to point to /orientation/alpha-deg instead of the
old /velocities/alpha-deg
2003-03-07 14:40:21 +00:00
curt
dafcf3416d Revert to original RPM gauge. If you want to use the new one on a panel,
refer to rpm-c172s.xml.

Curt.
2003-02-16 20:48:33 +00:00
curt
002b4be49e Missed one instrument. 2003-02-16 20:42:02 +00:00
jimw
0ca7d15aef Fixed texture mapping for needle 2003-02-16 16:46:14 +00:00
curt
4f55e5e810 Updates to the C172-S instruments and some renaming. 2003-02-10 18:45:56 +00:00
curt
7ca3a97f3d Paul Mccann:
I did simple gear handle for the c310-ifr panel if you or any-one want to use
it.  It should work on any of the 2d panels.
2003-02-07 17:33:28 +00:00
curt
bdf0f8a5af Fixes from Lee Elliott. 2003-02-06 20:42:06 +00:00
curt
02b4b4a3f0 Lee Elliott:
Here're some updates for some of the instruments, the TSR2 and the B52.

The instruments are just parameterised/non-specific versions of the engine
and fuel gauges.  The old gauges will still be used by the a10s and the sea
hawks until I get them done.

There're a couple of tweaks to the tsr2 yasim config and amendments to the
model file to change the angle at which the airbrakes operate, correct the
direction that the nose gear retracts/extends and to rotate the main-gear
carts during retraction/extention.  There're also new panels, using the new
instruments.

The b52 yasim config has some big changes due to finding some more info i.e.
wing incidence of 6 degrees, fuel capacities and aileron changes (removed
from G & H versions!).  It's now based on an 'F' model and I've put some
comments in the yasim config about it.  The b52-readme.txt includes a
suggested method on getting airborne;).   I've included an amended model -
B52-F.3ds, which is the default in the new model file, and a couple of panels.

I'm quite pleased with the b52 - the take-offs resemble the photographs I've
seen and I think I've got reasonable values where I've had to guess at stuff,
but the results from the yasim solver look as through the model is
approaching the limits of acceptability for yasim.  By this I mean that the
model is probably a bit dodgy, not that the yasim solver is limited.
2003-02-06 17:32:55 +00:00
david
d7150e30b5 Improve viewpoint on Cessna 310.
Add ASI with decals for 310-specific airspeeds.
2003-02-03 16:48:15 +00:00
curt
f1e0041875 Added Hi-res C172-S DG, VSI, and RPM gauges. 2003-02-01 02:30:16 +00:00
curt
4fb07113e3 Updated instruments from Martin. 2003-01-30 21:28:15 +00:00
curt
41ec7fcd84 New hi-res attitude indicator and turn coordinator instruments based on
C172-S photos by Martin Dressler.
2003-01-29 15:03:29 +00:00
j4strngs
31b961fd2c Tidy up the hotspots a bit. 2003-01-27 01:32:46 +00:00
david
c4af6e3ccc Replaced /steam properties with new /instrumentation properties. 2003-01-26 16:45:41 +00:00
david
5875d5b063 Use the /instrumentation properties instead of /steam. 2003-01-25 21:15:27 +00:00
curt
191433e9b4 Lee Elliott:
Updated these instruments to point to the correct texture.
2003-01-22 19:56:51 +00:00
david
f026a4db74 Patch from Julian Foad:
OK -- thanks.  I have now fixed up all the other XML files in the base
package that use "max" and "wrap".  Those affected are all in
Aircraft/Instruments/.  In these files I have also corrected the
indentation in some places, and corrected the frequency controls in
nav3.xml (which does not seem to be in use), and corrected a few obvious
hotspot position bugs.  Where the radios used wrapping to toggle the
ident button between 0 and 1, I have changed this to use
"property-toggle" instead.
2003-01-19 22:00:08 +00:00
curt
3c779c032d Lee Elliott:
[ In support of the TSR2, SeaHawk and A-10 ]

I've set up some panels, based on the c310 vfr and mini panels.  The
vfr panels have a lot of additional instruments on them but impose quite a
high frame-rate hit on my system.  The mini panels also have some additional
instruments but seem to work without noticable penalty here.  I've set these
panels as the defaults for these aircraft but I'm not sure it's a good idea
to have the vfr panels by default due to the performance hit.  Using them as
default will should give some feedback though;)

To go with the new panels are a number of rough and ready instruments I
hacked, mostly out of one of the rpm gauges, but I've adapted the throttle
quadrent (jet-throttle-quadrant) to funstion for throttle, flaps and reheat.
All the gauge faces were based on an existing ffgfs instrument texture, so
there's no problem with copyright there.  All the other bits that I've done
may be distributed under the same conditions as fgfs.
2003-01-19 03:31:36 +00:00
david
1452df9210 Patch from Julian Foad to fix wrapping behaviour for property-adjust
and property-multiply.
2003-01-04 18:54:25 +00:00
j4strngs
7038d5dd13 . 2002-12-30 21:59:43 +00:00
david
f051bfcc49 Modified so that the integer and decimal parts of frequencies are
controlled separately, and COM uses the correct range.
2002-12-30 19:48:04 +00:00
david
754cca868d Changed to use the new mod-up support for panel mouse actions. Now,
you simply click with the left mouse button to advance to 'both';
after that, if you click again, the start engages until you let go of
the mouse button, at which point the knob snaps back to 'both'.
2002-12-28 19:10:41 +00:00
j4strngs
84d494fa94 New HSI from Paul McCann 2002-12-28 00:48:31 +00:00
j4strngs
056dff7dee Fixes from Julian Foad:
- makes instrument knobs turn at a realistic rate
- removes redundant <min> and <max> specifications*
- corrects the indentation to reflect nesting depth
- corrects some descriptive names

* E.g. if the gyro compass heading is 365, there's no point clamping the
value to 360 before drawing it.  Just using the given value is more
likely to be right - or, if it's wrong, at least we won't hide the bug.
2002-11-10 20:44:17 +00:00
j4strngs
4da258be05 The adjusting knob has slow (left mouse button) and fast (right mouse
button) modes.  Due to a typo in altimeter.xml, one direction of
adjustment with the left mouse button was giving fast changes.

Simple patch attached.

- Julian
2002-11-05 00:24:01 +00:00
j4strngs
7d224e6820 The new led font is now antialiased (`a la Andy) and has
twice the design size (character height) of the old one.
Advantages:
- displays . and : correctly with less space around, and digits
  with more space around (using Andy's improvements to plib)
- small text becomes much more legible (-> clock, AP-altitude)
- the font contains pretty much every character that can be
  displayed on a seven segment display, so it might be more
  useful for future instruments.
2002-11-02 00:23:46 +00:00
david
d1596cd80e Make knobs work on the standby frequency rather than the active
frequency.
2002-10-25 22:16:57 +00:00
curt
d4d5ad1d5d Set aileron trim to 0.0
Rescale TC ball movement for hi res instrument.
2002-10-16 03:17:19 +00:00
david
47ce58e5d4 New pitot system and airspeed indicator. 2002-09-28 20:49:56 +00:00
david
1d1770c43f Modifications to support new VSI and HI models in FlightGear. 2002-09-27 22:00:02 +00:00
david
3b85be3398 Modifications to support new altimeter and static port models in
FlightGear.
2002-09-27 18:26:42 +00:00
curt
da20738864 Update the hi-res attitude indicator to also use David's new vacuum driven
system.
2002-09-25 21:58:20 +00:00
david
9979de52f5 Support new attitude indicator with spin-down. 2002-09-24 16:39:53 +00:00
curt
a6eca0a3e9 Make adf power on/off a seperate property. 2002-08-29 02:18:36 +00:00
curt
c3c953a070 Hi-res versions of altimeter and airspeed indicators from Martin Dressler.
Use Martin's needle for hi-res rpm and vsi gauges.
2002-08-22 17:38:35 +00:00
curt
771cba4a0f Hi-res attitude indicator from Martin Dressler. 2002-08-22 16:57:36 +00:00
curt
1a7d04f303 Working on creating some hi-res version of the basic instruments. 2002-08-22 16:28:11 +00:00
j4strngs
e08a89a37c King KR-87 ADF radio markup
It's a little funky to use right now because
the FRQ and timer buttons should be momentary action.
As it stands you need to do 2 clicks to send on/off.
If anybody can think of a workaround, we could use one.

For now the ADF and BFO buttons just toggle the
annunciators. For ANT mode, I just need to wire up the
ADF needle.

Two clicks on FRQ flip flops the selected and standby
freqs.
Two clicks of FLT/ET will change the standby display
to timer mode and another two will flip between
FLT and ET. If you click and the annunciator flashes
briefly but the display does not change, you need
to click FRQ -one time- to get the button in phase.

ET mode has a count down mode, this is where it really gets tricky.
On the real thing, you hold the SET/RST button for 2 seconds.
Here you must click one time, wait for the display to flash then
click one more time. Now you can set the time to count down.
Right clicking the dial will set minutes, middle click (I know,
I'll make it a keyboard modifier later) sets hours. As usual
the left side decreases and right side increases.
Once you have the desired time set, click the SET/RST button
twice in rapid succession. Two rapid clicks will reset the
elapsed timer when it's counting down, but also while you are
setting it (when display is flashing).
When the count down timer reaches zero, it starts counting up again.
It -should- flash for 15 seconds and set off a warning tone, but
for now it doesn't.

The unit is also equipped with an on/off/volume knob. Whne the
unit is powered down the timers are reset.

TODO:

Add labeling
Wire up ADF needle
Prettier face
2002-07-30 04:03:36 +00:00
j4strngs
b0e9bebdfc King KR-87 ADF radio texture 2002-07-30 03:42:41 +00:00
curt
60e61d8cac Updated glide slope neede so full deflection corresponds to +/- 0.7 degrees
of the glide slope.
2002-07-09 22:41:12 +00:00
curt
e5a77ccdb5 Updated adf property name. 2002-07-03 21:39:56 +00:00
curt
f4fc7844df Various property name changes corresponding to adf overhaul in code. 2002-07-03 21:38:14 +00:00
curt
c4e573ec58 Updates to adf property names. 2002-07-03 19:53:30 +00:00
curt
142df2295c Minor property name changes reflecting changes on the source code side. 2002-06-30 20:48:53 +00:00
aross
911b2e15ef Added an AoA indexer to the A-4 cockpit 2002-06-29 06:58:00 +00:00
aross
497056c36d Added max L/D, approach, and stall indications to the gauge face, and
rotated the background to put the approach AoA at the 3 o'clock position,
where the Navy says it should go.
2002-06-20 04:09:28 +00:00
aross
e21cb8ee04 An N1 tachometer, accelerometer, and AoA indicator intended for the A-4 cockpit. 2002-06-20 02:05:59 +00:00
jimw
bd67394792 asi 590 knot for a4c using Andy Ross's face texture 2002-06-20 01:48:21 +00:00
jimw
72c3e59a3e fixed compass rose rotation. 2002-06-18 02:05:51 +00:00
david
0b5fc21dcc Renamed property /steam/vertical-speed-fpm to /steam/vertical-speed-fps. 2002-06-05 20:41:32 +00:00
j4strngs
2e34702365 bound brake indicator to parking brake 2002-04-11 23:47:08 +00:00
j4strngs
27591fed86 New c310u3a panel by Jim Wilson 2002-03-22 01:23:34 +00:00