Massive Update Concorde (with repo history) #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thierry (who reads the FG mailing lists, but likes to keep is email address private.) Thierry has done a lot of work on the flight dynamics, and has added a 2d panel.
- Read the Readme.
Most of files have been updated.
A few files have been renamed or merged.
Engine and FDM have changed : reduce idle thrust and drag at Mach 2.0.
Because above 50200 ft, VMO is always (1) in Mach number
(MMO = Mach 2.04) : max climb mode.
While the initial calibration flight had a cruise speed around
Mach 1.98 = 530 kt, which could depend of temperature and pressure.
Cruising at Mach 2.02, I runned out of fuel.
Now, since the cruise speed is constant (Mach 2.02), it is easier to
foresee the consumption (which however decreases with climb).
Reducing the idle thrust enables the deceleration at Mach 2.02.
Thierry in France.
(1) Except if air is too hot, where the speed is reduced to stay
below 128°C (max cruise mode). A goal for the next patch.
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.
…re still missing something because the nav1 and nav2 are still inop.
Yesterday, I have strengthened the autopilot, which should converge quickly at Mach 2. Normally all the files are purged of DOS carriage return (concerns Unix platforms). This is the first patch using the flight manual. The original model is updated to animate visor and nozzles. 2 new views : engineer and overhead ==> update the -set file, if not 6 views in your preferences.xml. Many instruments have been optimized. The number of displayed instruments is dynamically optimized : frame rate should be better.
Implement simple help system with global and aircraft specific dialogs:
The gui.nas changes have been discussed with Andy. All ac have a help dialog,
but some are empty. (This wouldn't have been necessary, as the system falls
back to the "Common Aircraft Keys" if an aircraft has no help defined, but an
empty dialog is less confusing and encourages to be filled with interesting
information. :-) I scanned all aircraft files for interesting performance
data and added some to the dialogs (stall speed, etc.) The Concorde and the
p51d have (over?)complete dialogs and can serve as examples. The format is
documented in $FG_ROOT/Nasa/gui.nas.
There is also a couple of other, minor fixes.
The following files have ugly MSDOS line endings:
$FG_ROOT/Aircraft/Hunter/hunter{-2tanks,}-set.xml
$FG_ROOT/Aircraft/A380/A380-set.xml
The Concorde-jsbsim.nas file is a useless copy of the real */nas file, which is
in Nasal/. I'was debugging the Concorde and wondered why changes to this file
had no effect ...
(Fixed Concorde in the help-ac.diff patch: don't use "interpol" keyword as
variable.)
aircraft-set.xml file. This is picked up automatically from the generic-systems.xml file which is loaded automatically if no aircraft specific systems configuration is specified.
2 new views, copilot and steward. If your preferences.xml doesn't have 6 views, update Nasal/Concorde-views.xml and Nasal/Concorde-keyboard.xml. The windows are transparent. The installation of real sounds is simplified, without file renaming. The autopilot should work correctly both in subsonic and supersonic flight (2 PID, because of 0.9.8). FDM updates : - adjust range (TSFC, because of 0.9.8). - supersonic climb in less than 15 minutes. New systems : - electrical, hydraulics, fuel pumps. - most of files have been updated : all instruments require voltage. One must start the first engine with the ground service or the RAM air turbine.
- Unzip the file in /Aircraft/Concorde. - Read the Readme. The cockpit is textured, with pseudo lighting. There are external lights. Real sound requires an additional file for reversed thrust (not yet implemented by FDM). Autopilot updates : - autothrottle / autopilot are engaged independently of the selected mode. - autoland should be smoother in the last 500 ft, and land in most of airports. - controls.ThrottleAxis is overridden for goaround. FDM update : - removed the electrical FCS. - disable speedbrake. System updates : - nasal/XML electrical system. - engine starter requires air bleed, from ground supply, or adjacent engine.
- finish cleanup/optimization of instrumentation system (started by mfranz) - improve configuration of special properties by addressing them directly
concorde-engine-indicator.xml: Fix texture file name typo.
- Unzip the file in /Aircraft/Concorde.
- Read the Readme.
1 new observer view (ctrl-K) :
- if your preferences.xml doesn't have 6 views, update Nasal/Concorde-views.xml
- can move with keyboard arrows (see keyboard help); shift-ctrl-X resets the view position.
Most of instruments have been updated :
- all warning lights are emissive by night.
- restores cropped textures.
- mouse 3rd button, if 3-state or turn/push.
FDM update :
- dissymetrical tanks.
- front gear is longer when extended, to get a pitch at light load;
the pitch of the original 3D model has been removed (flat cockpit is easier)
System update :
- 1 nav per pilot (nav 0 reserved for interface with FG autopilot).
- depressurization.
- air conditioning.
- removes the double fuel consumption by speed-up (done by JSBSim since 0.9.10).
- virtual crew (ctrl-Z).
- voice callouts with Festival (shift-ctrl-R displays the text).
(not all aircraft want to start with the Concorde's last parameters)
…on split. This is the 4th patch 'flightgear-fgaddon_path_fix4_Instruments.patch' attached to the thread at https://sourceforge.net/p/flightgear/mailman/message/33744249/. Due to the spinning out of the aircraft from FGData into the new FGAddon repository, a number of aircraft now either do not work or have missing features due to now incorrect file path assumptions. This fixes the incorrect references to the Aircraft/Instruments/ path for the aircraft 747-200, 787, A-10, a4, AN-225, B-52F, BAC-TSR2, Boeing314, Buccaneer, c310, c310u3a, CanberraBI8, Concorde, dc3, ercoupe, fokker100, Lockheed1049, MiG-15, Noratlas, seahawk, SeaVixen, SenecaII, SU-37, TU-114, victor, vulcanb2, and YF-23. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@544 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…GAddon. This follows from the proposal for deleting the property for all XML files at http://thread.gmane.org/gmane.games.flightgear.devel/77365 and the discussions in the thread at http://thread.gmane.org/gmane.games.flightgear.devel/77606 (for setting up a repository pre-commit hook script for catching this unused property) where deleting the property for all files was discussed. This svn:mime-type repository property is only for optimising the back-end storage size of the db/revs/* files on the SourceForge infrastructure, by allowing certain text files with a very limited number of extremely long lines to be treated as a binary rather than a text file, hence suppressing diffs in the commit. As no one has deliberately set this and many text files in FGAddon are accidentally not being treated as text, this change will result in a major repository clean up which will allow all text files to be treated as text. The activation of the pre-commit hook will prevent this problem from ever reappearing. This change touches the files in 480 aircraft directories out of 485, however this does not affect the file contents or aircraft in any way. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@583 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
…bmodels patch git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@687 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
some concorde changes
ditto. I made the chock-wood.png woody :) 👍
Needed because the python SGProps parser is stricter than the C++ parser, especially about parsing int/float types. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@814 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Conflicts: Nasal/Concorde-route.xml
The file route.xml has a missing end-tag
…property from all files.
To avoid the files with the extensions [ac, eff, frag, nas, osgx, svg, txt, vert, xhtml, xml, xsl]
being treated as binary files, as was previously the case, the normal 'svn merge' command was not
used for the reversion. Instead the svn:mime-type property was manually readded to all the binary
file types using the find command together with 'svn propset'. Therefore the svn:mime-type
properties of the files may not always match those from before r583.
find -iname "*.wav" -exec svn propset svn:mime-type "audio/x-wav" {} \;
find -iname "*.bmp*" -exec svn propset svn:mime-type "image/x-ms-bmp" {} \;
find -iname "*.gif" -exec svn propset svn:mime-type "image/gif" {} \;
find -iname "*.jpg" -exec svn propset svn:mime-type "image/jpeg" {} \;
find -iname "*.png*" -exec svn propset svn:mime-type "image/png" {} \;
find -iname "*.psd" -exec svn propset svn:mime-type "image/vnd.adobe.photoshop" {} \;
find -iname "*.tif" -exec svn propset svn:mime-type "image/tiff" {} \;
find -iname "*.xcf" -exec svn propset svn:mime-type "image/x-xcf" {} \;
find -iname "*.rgb*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.au" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.*af" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.3ds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.blend*" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.dds" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.od[gst]" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.onetoc2" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.xlsx" -exec svn propset svn:mime-type "application/octet-stream" {} \;
find -iname "*.pdf" -exec svn propset svn:mime-type "application/pdf" {} \;
find -iname "*.ps" -exec svn propset svn:mime-type "application/postscript" {} \;
find -iname "*.gz" -exec svn propset svn:mime-type "application/x-gzip" {} \;
find -iname "*.mdl" -exec svn propset svn:mime-type "application/x-dosexec" {} \;
find -iname "*.zip" -exec svn propset svn:mime-type "application/zip" {} \;
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@997 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Conversion of pedestal to 3D : temperature. FDM update : elevon hydraulics. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@1791 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@1819 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Rembrandt support : internal and external lighting. State support. git-svn-id: http://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft/Concorde@2765 9eb9bc84-db9d-4e05-893b-26dd41ac94a6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.