Tim Moore
37d0cfd6be
Merge branch 'vivian/tachy' into next
2010-02-26 08:47:41 +01:00
V Meazza
f112fc4638
Revised bugfix for tachymetric gunsight
2010-02-26 08:46:15 +01:00
Tim Moore
4a14f8c107
Merge branch 'jmt/navradio' into next
2010-02-17 07:29:44 +01:00
jmt
3fb898643e
Bugfix: don't crash on localizers with no associated runway (due to inconsistent nav.dat/apt.dat). Reported by Jacob Burbach.
2010-02-17 07:29:30 +01:00
Tim Moore
f9bbf802e9
Merge branch 'jmt/gps' into next
2010-02-14 00:27:41 +01:00
jmt
5ed73d063c
Bugfix: ensure GPS WP1 Mag-bearing is normalised to [0..360]
2010-02-14 00:27:30 +01:00
Tim Moore
4027a92f88
Only draw tachymetric sight if appropriate inputs exist
...
This avoids triggering asserts for missing inputs.
2010-02-11 00:13:04 +01:00
Meazza@.(none)
aa8bccf93e
Add Tachymetric Gunsight
...
Signed-off-by: <V Meazza>
2010-02-10 16:19:06 +01:00
Tim Moore
988a6771aa
Merge branch 'durk/atcdcl-cond'
...
Conflicts:
src/ATC/trafficcontrol.cxx
src/Main/Makefile.am
2010-02-10 00:45:06 +01:00
Tim Moore
992b7ca8f4
Merge branch 'jmt/navradio'
2010-02-10 00:41:52 +01:00
jmt
49e477f6a7
Bugfix: ensure navradio nav-loc and has-gs properties clear to false when no valid station is tuned / radio is u/s.
2010-01-31 15:11:25 +01:00
Tim Moore
6044d929d4
eliminate some SGPropertyNode_ptr variables in classes
...
These were temporary variables that were being deleted explicitly, leading to
various corruption.
2010-01-26 17:19:17 +01:00
durk
546d3e265d
And this time, fix it more properly. :-)
2010-01-21 06:25:31 +01:00
durk
16dd34839f
Replacement code for ATCDCL functions are in ATC/atcutils.[ch]xx. Thanks to Alex Buzin for reporting.
2010-01-21 06:25:19 +01:00
Tim Moore
13ec36af42
Merge branch 'jmt/gps'
2010-01-17 10:52:48 +01:00
ehofman
8da2f1a31b
Use SGPropertyNode_ptr wherever possible
2010-01-17 00:03:06 +01:00
Tim Moore
c1bb4aec97
Merge branch 'vivian/trainz'
2010-01-17 00:02:51 +01:00
jmt
10d4799058
GPS: improve reliability (at the expense of some in-development features) for pending release.
...
- default to an invalid altitude in routes, instead of cruise altitude (temporarily)
- only set an altitude on the autopilot, if valid
- only add departure airport/runway to the route, if not airborne
2010-01-16 16:00:15 +01:00
jmt
21f1fcd17a
GPS:
...
- relaxed overflight sequencing threshold
- default to linear CDI deviation in the configuration
2010-01-16 16:00:15 +01:00
Tim Moore
cf9a520a9f
Merge branch 'curt/navradio'
...
Conflicts:
src/Instrumentation/navradio.cxx
2010-01-13 07:37:44 +01:00
Tim Moore
3836abcf4b
Merge branches 'jmt/spatial', 'jmt/ref_ptr', 'jmt/navradio' and 'jmt/gps'
2010-01-12 00:09:19 +01:00
durk
d8ae90801a
Some additional changes to ensure that FlightGear at least compiles after configuring with --disable-atcdcl. Some substitution code is added in ATC/atcutils.cxx and ATC/atcutils.hxx. Note that the new code doesn't run properly yet. Instead, it is just meant to identify which parts need replacement. Getting that to work will be the next step.
2010-01-05 22:21:49 +01:00
torsten
149c6acc85
purge gcc warnings:
...
- xxx will be initialized after yyy
- age_factor may be used uninitialized
2010-01-03 10:35:33 +01:00
jmt
38e76a175e
Navradio: constructor cleanup, tie/untie helper, and a new 'operable' property to make it clear when the radio is functioning.
2009-12-27 10:03:08 +01:00
jmt
7a007d9638
OSG ref_ptr fix: use .get() explicitly.
2009-12-27 09:32:18 +01:00
jmt
8cfdfb21a5
GPS / route-manager: only drive autopilot true-heading in LEG mode, for compatibility with the old behaviour.
2009-12-23 09:40:58 +01:00
jmt
053d405a5c
GPS: make 'loadRouteWaypoint' robust about bad scratch/index values.
2009-12-22 07:44:24 +01:00
jmt
d3d17d9ec0
Fix GPS SGPropertyNode tie() handling, as suggested by John Denker.
2009-12-22 07:42:14 +01:00
jmt
45d0e14cad
JSD: Make false courses work for more than one instance of navradio.
2009-12-22 07:41:30 +01:00
Csaba Halasz
41752bab57
Fix NaNs in TACAN::update
2009-12-22 07:16:44 +01:00
Tim Moore
b5c46a8d59
Merge branch 'ehofman/sound'
2009-12-20 11:11:16 +01:00
James Turner
34bbc6d974
Rewrite the spatial index to use a sparse octree on the cartesian coordinates of items.
...
* Fixes errors selecting 'nearest' items, including duplicates
* Stable behaviour around the poles and dateline
* Decently efficient, even for 'everything within 500nm' queries
2009-12-19 23:13:17 +01:00
curt
ea281051d8
Compute glide slope target rate of climb in fpm as well as fps.
2009-12-18 07:10:13 +01:00
jmt
35cb89626e
As discussed on the mailing list, make the 'nearest' GPS command use scratch lat/lon as the search origin if they are valid.
2009-12-12 00:11:41 +01:00
Tim Moore
582a95f0cb
small cleanup to vivian's patch
2009-12-09 09:23:20 +01:00
Tim Moore
3922c12163
Vivian Meazza: AI escorts
2009-12-09 09:04:23 +01:00
ehofman
fde1a925fe
Change of thoughts since it makes life easier:
...
/sim/sound/working enable/disable the use of OpenAL
/sin/sound/enabled master mute/unmute
2009-11-30 22:45:23 +01:00
Tim Moore
6fcd9f967b
Merge branch 'luff/kln89'
2009-11-27 06:41:43 +01:00
Tim Moore
e503591af4
Merge branch 'jmt/gps'
...
Conflicts:
src/Instrumentation/gps.cxx
2009-11-27 06:40:47 +01:00
jmt
33058511de
Dave Perry:
...
Allows using a nasal filter to smoothly park the gs needle when out
of range or frequency changes to a station w/o gs.
2009-11-15 01:31:42 +01:00
daveluff
e1af876a65
Enable correct DTO waypoint selection
2009-11-07 08:56:55 +01:00
daveluff
eb382545c5
Allow all approaches to be selected at airports with more than 3 approaches
2009-11-07 08:56:36 +01:00
Csaba Halasz
52c1061e24
Re-apply the reciprocal patch from cvs rev 1.3 and correct an order of magnitude regression in HeadingIndicatorFG
2009-11-07 07:53:49 +01:00
torsten
58f303e464
Ron Jensen:
...
This little patch makes the KT-70 read 888-8888 when in self-test mode.
This is the correct behavior, the current behavior, where it reads the
flight level and squawk code in self-test is incorrect.
2009-11-06 23:46:02 +01:00
daveluff
24b57ada09
Allow the DIR page to be exited properly using the inner knob
2009-11-04 23:15:48 +01:00
daveluff
00d9abef42
Make the comments about switching to the DIR page more useful
2009-11-04 23:15:41 +01:00
jmt
53b16caec0
Check for an empty search query in GPS searches, and fix test code.
2009-10-27 22:22:03 +01:00
daveluff
f696c541be
Remove the unecessary distinction between waypoints of the core approach and waypoints of the missed approach procedure
2009-10-27 22:21:52 +01:00
daveluff
0112b24540
Expand SIAP idents as found in FAA ARINC dataset to the full approach name as shown on the approach chart and possibly the GPS
2009-10-24 23:48:54 +02:00
ehofman
430fbe99fa
Use shared pointers for any reference to SGSoundSample
2009-10-24 19:52:09 +02:00
ehofman
f9445874a0
Don't make the SoundManager a memebr of the subsystem manager; It needs to be initialized very early and destroyed as late as possible. That doesn't work as a subsystem meber onless some sort of priority scheme gets implemented. Get rid of auto_ptr which doesn work for the samples either.
2009-10-24 19:51:39 +02:00
jmt
57d8dca176
Fix for an uninitialised value, reported by Dave Luff.
2009-10-22 23:21:34 +02:00
jmt
9495c2efdf
Route tweaks, especially in-flight activation and deactivation
...
* Don't require a valid departure and destination airport
* Handle in-air route activation cleanly
* Handle end-of-route situation cleanly
2009-10-22 23:21:25 +02:00
jmt
08039f1fa5
Tweak permitted indices for GPS route insert commands.
2009-10-21 16:28:14 +02:00
jmt
2a86384da7
GPS commands to edit the route manager route.
2009-10-21 16:28:01 +02:00
jmt
332e7fc59b
GPS data validity clean-up; it was a mess, now it's more robust. Thanks to Dave Luff for reporting.
2009-10-19 23:56:51 +02:00
daveluff
a2401ea94b
Add a hardwired instrument approach for testing. This will be removed and read from file shortly
2009-10-18 17:56:17 +02:00
daveluff
882f5b4deb
My non-precision approach model had been one or more IAFs and then a common core approach from the IF. In fact, there can be one or more initial approach routes from the IAFs to the IF, then the core approach. Replace the IAFs with initial approach routes. NOTE it is assumed in the code that there is a unique IAF per initial approach route.
2009-10-17 23:54:26 +02:00
daveluff
a01bee3817
Change one of the default flight plans to something more convenient for development. These will eventually all be removed from the code and read from preferences anyway.
2009-10-17 23:54:14 +02:00
daveluff
8de8a734a2
Fix a crash where there is only 1 IAF in an approach
2009-10-17 23:54:05 +02:00
jmt
afb1e7ffe9
Further GPS and route manager behavioural fixes
...
* When the nav-radio is slaved, calculated radial/target-hdg-deg
(needed by some autopilot logic)
* Handle editing (including deletion) of route waypoints correctly,
including deleting the active waypoint
* Add a signal to the route manager when the last wpt is reached, and
use it in the GPS to revert to OBS mode.
* Change the altitude handling to use the specified cruise altitude
* Fix a bug where autopilot/locks/altitude was treated as a boolean
2009-10-16 11:24:36 +02:00
ehofman
a9b3fc7a56
move some of the sound postion and orientation calculations over to the sample class which also makes the main code nice and clean
2009-10-16 11:24:10 +02:00
jmt
879531ce63
Make the GPS drive the autopilot directly (if configured), also update external course (OBS) source, and init at the current airport.
2009-10-14 00:42:37 +02:00
jmt
5aa51e5780
Ensure we always create a GPS instrument.
2009-10-14 00:42:37 +02:00
jmt
d4cc5f9c44
Change default airport search to exclude seaports and heliports, for the moment.
2009-10-14 00:42:36 +02:00
Tim Moore
40639d38a8
Merge branches 'jmt/xmlauto', 'luff/kln89' and 'curt/radial'
2009-10-12 11:03:35 +02:00
jmt
bde366e0e3
Make GPS slaved mode on the navradio slightly more robust. Not done yet.
2009-10-12 07:55:51 +02:00
ehofman
c56113d0dd
add the option to tie a SampleGroup to the listener position and orientation
2009-10-08 10:38:05 +02:00
jmt
72d9c254f4
Numerical robustness for the GPS code, when dt or last_speed_kts is zero.
2009-10-07 08:26:00 +02:00
Tim Moore
696007e503
include header for auto_ptr
2009-10-06 11:20:19 +02:00
jmt
d784810430
Land the GPS/route-manager re-write. Many things are better, many other things will be better, some things are no doubt broken. Please be patient and report problems on the mailing list.
2009-10-06 10:44:01 +02:00
ehofman
86f462933d
Initial commit of the new sound system, expect more updates to follow
2009-10-06 10:22:09 +02:00
Tim Moore
4023bdaf26
Merge branch 'jmt/navradio'
...
The previous merge claimed to have merged this branch; it didn't because
I had reset the branch to someplace weird.
2009-10-01 23:50:21 +02:00
Tim Moore
8b10bb12f5
Merge branches 'jmt/navradio', 'jmt/cleanup' and 'torsten/gps-fix'
2009-10-01 15:17:24 +02:00
curt
28b847da09
Smooth out the time-to-intercept radial computation so it's a bit more useful.
2009-10-01 00:16:30 +02:00
daveluff
57d5e18074
Remove the GPSPage base class, that only KLN89Page was derived from.
2009-09-28 23:56:23 +02:00
torsten
27d68533d7
Catch a possible NAN at insanely low but greater than zero speeds
2009-09-22 22:48:14 +02:00
jmt
59895306a5
Remove <plib/sg> includes.
2009-09-20 16:46:32 +02:00
jmt
956ecf1cf2
Remove use of plig/sg from render-area-2d.
2009-09-20 00:20:17 +02:00
jmt
0c8c8380b1
Break viewmgr.hxx dependency on on viewer.hxx.
2009-09-20 00:20:17 +02:00
jmt
a683b5e0ed
NavRadio: By way of an experiment, make false courses/lobes disable-able via a property.
2009-09-17 22:55:18 +02:00
jmt
5947f3fcd5
NavRadio DME in-range flag, and audio code improvements. By John Denker, adapted to current trunk by me.
2009-09-17 22:53:15 +02:00
jmt
bf830f681d
One more divide by zero fix from Torsten.
2009-09-17 22:48:10 +02:00
jmt
ebf5dcb828
Work around the penaltyForNav broken-ness, by ensuring GS behaves sanely even if non-matches LOC and GS transmitters are selected. Which happens. Yuck.
2009-09-17 22:47:57 +02:00
jmt
c1598361ca
navradio: fix crash spotted by Torsten, when nav range is unspecified.
2009-09-17 22:47:45 +02:00
jmt
a650cf4239
Fix the has-gs flag when switching to a VOR (thanks Torsten), and expose GS validity via a new gs-in-range boolean prop, as suggested by John Denker.
2009-09-17 22:47:32 +02:00
jmt
3c48943e81
Various LOC/GS improvements from John Denker, adapted to trunk by me (hopefully not introducing too many bugs along the way). Includes:
...
- false LOC courses and GS lobes
- LOC sensitivity based on runway dimensions
- GS cutoff based on range
- More accurate GS deviation computation, making final approach more stable
2009-09-12 15:47:52 +02:00
jmt
5f16e4da60
Add clamped degrees deviation for glideslope.
2009-09-12 15:47:52 +02:00
jmt
77a8b4db30
Add normalised heading deflection property to navradio.
2009-09-09 23:42:21 +02:00
jmt
6fa1b3dfd0
Add normalised glideslope deviation property to nav-radio.
2009-09-09 08:56:32 +02:00
jmt
e2f0d1960e
Further re-factoring of nav-radio code, again no functionality changed should occur. Radio reception / GPS slaving / Glideslope handling and CDI updating are all separate functions now.
2009-09-09 08:56:32 +02:00
frohlich
ccb9e64caf
Avoid division by zero.
...
Modified Files:
src/Instrumentation/dme.cxx
2009-09-09 08:56:31 +02:00
frohlich
8676c2bbd8
Replace the SGVec*::sg() methods with the equivalent SGVec*::data() calls.
...
Modified Files:
src/Traffic/Schedule.cxx src/Sound/fg_fx.cxx src/Main/main.cxx
src/Instrumentation/navradio.cxx
src/AIModel/AIFlightPlanCreateCruise.cxx
2009-09-09 08:56:30 +02:00
jmt
80a6317ab6
Re-structure the nav-radio code, in preparation for cleaner GPS-slave separation. No functionality changes (hopefully).
2009-09-09 08:56:30 +02:00
Tim Moore
67c7d8642a
fix warnings in Instrumentation
...
Mostly signed comparisons and order of initializers in constructors
2009-08-24 18:02:15 +02:00
torsten
b3ceb9a2fd
warning fixes
2009-08-23 21:43:10 +02:00
torsten
8d98e4cd49
warning fixes
2009-08-23 21:43:10 +02:00
daveluff
443f3f3654
Fix the rendering of the KLN89 on the 2D panel that was broken during the move to osg. This is an interim step with the aim being to eventually use render-to-texture.
2009-07-27 23:52:32 +02:00
Tim Moore
ddb6551a91
SGRawValue::DefaultValue is now a function
2009-07-17 11:47:11 +02:00
timoore
4cc3084256
SGPropertyNode::Type moves to simgear::props namespace
2009-07-16 12:10:47 +02:00
