Tim Moore
be13f1f3ac
Merge branch 'fred/effects-doc' into next
2010-03-30 12:22:52 +02:00
fredb
5522dca8ee
Synchronize doc
2010-03-30 12:22:37 +02:00
Tim Moore
cf6cdd0b78
Merge branch 'timoore/getpath-rebase'
2010-03-30 11:49:14 +02:00
Tim Moore
ebdeb3eed3
Merge branch 'jmt/gps' into next
...
Conflicts:
src/Instrumentation/navradio.cxx
2010-03-28 15:32:59 +02:00
fredb
1c7278b474
Initialise member variable
2010-03-28 15:26:43 +02:00
jmt
597df694e3
GPS/route-manager - notify listeners when current waypoint is changed.
2010-03-28 15:26:25 +02:00
jmt
e4c4a3a412
MapWidget for the GUI, initial commit.
2010-03-28 15:25:47 +02:00
jmt
ee8437431a
Expose a flag indicating if the GPS is driving the AP (to give clearer user feedback when that is the case)
2010-03-28 15:21:05 +02:00
Tim Moore
1aff92ce49
Merge to get true base of James' recent gps changes
2010-03-28 15:20:09 +02:00
Tim Moore
39def8132a
Merge branch 'jmt/gpswidget'
2010-03-28 15:15:58 +02:00
Tim Moore
2229af9f78
Merge branch 'ehofman/particle' into next
2010-03-28 00:35:35 +01:00
ehofman
e78c56af7d
Allow particles to be frozen on pause.
2010-03-28 00:35:28 +01:00
Tim Moore
70ebde4488
Merge branch 'jmt/gps' into next
...
Conflicts:
src/Instrumentation/gps.cxx
2010-03-28 00:34:51 +01:00
jmt
4e24fbbb91
GPS: enable switching to OBS/DTO mode with no valid scratch - use active waypoint.
2010-03-28 00:33:44 +01:00
jmt
40e383451b
GPS: add NS and EW velocity computation, which some real-world devices display.
2010-03-28 00:33:29 +01:00
jmt
4265b2e241
GPS: make slaved-to-gps read course from the GPS *when active*, via a listener.
2010-03-28 00:33:13 +01:00
jmt
0be2e03d7e
GPS: fix bugs where GPS overwrites NAV1 course, including --nav1 command line
2010-03-28 00:32:34 +01:00
Tim Moore
37d3cf7fbb
Merge branch 'syd/ias-limit' into next
2010-03-27 19:06:53 +01:00
jmt
5695395dd5
Add Mach/TAS computation to the airspeed indicator.
2010-03-27 19:06:42 +01:00
Tim Moore
dba4a69e2c
Merge branch 'torsten/commands' into next
2010-03-27 15:45:44 +01:00
torsten
5df9f6a951
Code cleanup: reuse duplicate code.
2010-03-27 15:45:25 +01:00
Tim Moore
5a16a28893
Merge branch 'torsten/metar' into next
2010-03-27 14:19:15 +01:00
torsten
26a72a9ee2
Bugfix:
...
- METAR changes caused strong aircraft movements if the station temperature or field elevation changed. Temperature and dewpoint are now also slowly interpolated to reach the new value.
- Probably unnoticed bug: calculation of the interpolation speed was wrong.
- some minor code-cleanup
2010-03-27 14:19:05 +01:00
Tim Moore
b587400846
Merge branch 'curt/replay' into next
2010-03-27 13:48:30 +01:00
curt
b9b6a3a54c
Stomp out a long standing bug in the replay system. Originally we didn't
...
collect flight data while the replay was running, but along the way someone
(who shall remain nameless) tweaked a property name and didn't update the
name in the replay system. This led to a problem where the replay system
continued to collect replayed data into the buffer while it replayed it,
leading to an infinite loop. And then due to the tiered recording rate
system, you would never see the highly detailed final minute of your flight.
This is now fixed!
2010-03-27 13:47:52 +01:00
Tim Moore
f71c094da2
Merge branch 'torsten/auto' into next
2010-03-20 18:46:27 +01:00
torsten
c55874d70e
Fix broken anti windup if the proportional gain runs into the nonlinear area and gets clipped.
...
Also fix the wrong debug message.
2010-03-20 18:46:19 +01:00
Tim Moore
7cde2e800b
Merge branch 'syd/ias-limit' into next
2010-03-20 18:45:52 +01:00
jmt
432da86c7b
Read airspeed-indicator overspeed limit values from instrument configuration, as Syd intended.
2010-03-20 18:45:43 +01:00
Tim Moore
c4ea02811b
Merge branch 'ehofman/normal' into next
2010-03-16 15:15:07 +01:00
ehofman
ff7f894754
better calculations.
2010-03-16 15:14:58 +01:00
ehofman
19b857d9be
improved normal map calculation
2010-03-16 15:14:55 +01:00
ehofman
4329945e74
be a bit more helpful when the texture file could not be found
2010-03-16 15:14:53 +01:00
Tim Moore
ca346ebc9c
Merge branch 'torsten/js64' into next
2010-03-16 15:13:32 +01:00
torsten
32f8d1a110
Compile again for MSVC
2010-03-16 15:13:24 +01:00
Tim Moore
a357aad365
Merge branch 'syd/ias-limit' into next
2010-03-16 15:12:46 +01:00
jmt
b1855b34c6
Syd Adams: only define overspeed-indicator properties when enabled.
2010-03-16 15:12:38 +01:00
jmt
65ad38ccae
Airspeed indicator: add default values for overspeed, and rename the
...
enable property to 'has-overspeed-indicator'.
2010-03-16 15:12:26 +01:00
Tim Moore
3973637606
Merge branch 'torsten/auto' into next
2010-03-11 09:01:42 +01:00
torsten
f4f784a514
Added anti windup for the pi-simple-controller
2010-03-11 09:01:25 +01:00
Tim Moore
c1e1e2f541
Merge branch 'torsten/js64' into next
2010-03-11 09:01:02 +01:00
torsten
0288a8af4c
Just another 64bit fix
2010-03-11 09:00:07 +01:00
torsten
91f0059c89
David Fries:
...
64bit fixes
2010-03-11 08:59:52 +01:00
torsten
f3677a4ddf
David Fries:
...
Fixes for 64bit systems
2010-03-11 08:59:37 +01:00
Tim Moore
dd7a5dd32d
Merge branch 'syd/ias-limit' into next
2010-03-11 08:58:45 +01:00
jmt
45a446dfaf
Syd Adams:
...
add ias-limit (brarber-pole) computation to airpseed-indicator
expose selected DME frequency on the DME instrument
2010-03-11 08:58:23 +01:00
Tim Moore
7ee645aa20
Merge branch 'timoore/getpath-rebase' into next
2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0
changes for SGPropertyNode::getPath return type
...
It's now a std::string.
2010-03-09 11:24:45 +01:00
Tim Moore
fa7d9ed549
Merge branch 'jmt/gps'
2010-03-09 11:20:04 +01:00
Tim Moore
4e0e5c0b98
Merge branch 'maint'
2010-03-09 11:19:40 +01:00