]> git.mxchange.org Git - flightgear.git/blobdiff - src/FDM/YASim/FGFDM.cpp
simplify name/number handling
[flightgear.git] / src / FDM / YASim / FGFDM.cpp
index c0aa05684916ae7a93730f76d6d462e6952ef3c7..1d1074619a0f5e4962ba4365c8c319577dd94354 100644 (file)
@@ -3,15 +3,22 @@
 
 #include <Main/fg_props.hxx>
 
+#include "Math.hpp"
 #include "Jet.hpp"
 #include "SimpleJet.hpp"
 #include "Gear.hpp"
+#include "Hook.hpp"
+#include "Launchbar.hpp"
 #include "Atmosphere.hpp"
 #include "PropEngine.hpp"
 #include "Propeller.hpp"
 #include "PistonEngine.hpp"
+#include "TurbineEngine.hpp"
+#include "Rotor.hpp"
+#include "Rotorpart.hpp"
 
 #include "FGFDM.hpp"
+
 namespace yasim {
 
 // Some conversion factors
@@ -26,7 +33,11 @@ static const float CM2GALS = 264.172037284;
 static const float HP2W = 745.700;
 static const float INHG2PA = 3386.389;
 static const float K2DEGF = 1.8;
+static const float K2DEGFOFFSET = -459.4;
 static const float CIN2CM = 1.6387064e-5;
+static const float YASIM_PI = 3.14159265358979323846;
+
+static const float NM2FTLB = (1/(LBS2N*FT2M));
 
 // Stubs, so that this can be compiled without the FlightGear
 // binary.  What's the best way to handle this?
@@ -36,12 +47,18 @@ static const float CIN2CM = 1.6387064e-5;
 
 FGFDM::FGFDM()
 {
+    _vehicle_radius = 0.0f;
+
     _nextEngine = 0;
 
-    // Map /controls/elevator to the approach elevator control.  This
+    // Map /controls/flight/elevator to the approach elevator control.  This
     // should probably be settable, but there are very few aircraft
     // who trim their approaches using things other than elevator.
-    _airplane.setElevatorControl(parseAxis("/controls/elevator-trim"));
+    _airplane.setElevatorControl(parseAxis("/controls/flight/elevator-trim"));
+
+    // FIXME: read seed from somewhere?
+    int seed = 0;
+    _turb = new Turbulence(10, seed);
 }
 
 FGFDM::~FGFDM()
@@ -65,13 +82,33 @@ FGFDM::~FGFDM()
     }
     for(i=0; i<_controlProps.size(); i++)
         delete (PropOut*)_controlProps.get(i);
+    delete _turb;
 }
 
 void FGFDM::iterate(float dt)
 {
     getExternalInput(dt);
     _airplane.iterate(dt);
-    setOutputProperties();
+
+    // Do fuel stuff (FIXME: should stash SGPropertyNode objects here)
+    char buf[256];
+    for(int i=0; i<_airplane.numThrusters(); i++) {
+        Thruster* t = _airplane.getThruster(i);
+
+        sprintf(buf, "/engines/engine[%d]/out-of-fuel", i);
+        t->setFuelState(!fgGetBool(buf));
+
+        sprintf(buf, "/engines/engine[%d]/fuel-consumed-lbs", i);
+        double consumed = fgGetDouble(buf) + dt * KG2LBS * t->getFuelFlow();
+        fgSetDouble(buf, consumed);
+    }
+    for(int i=0; i<_airplane.numTanks(); i++) {
+        sprintf(buf, "/consumables/fuel/tank[%d]/level-lbs", i);
+        _airplane.setFuel(i, LBS2KG * fgGetFloat(buf));
+    } 
+    _airplane.calcFuelWeights();
+    
+    setOutputProperties(dt);
 }
 
 Airplane* FGFDM::getAirplane()
@@ -84,9 +121,28 @@ void FGFDM::init()
     // Allows the user to start with something other than full fuel
     _airplane.setFuelFraction(fgGetFloat("/sim/fuel-fraction", 1));
 
+    // Read out the resulting fuel state
+    char buf[256];
+    for(int i=0; i<_airplane.numTanks(); i++) {
+        sprintf(buf, "/consumables/fuel/tank[%d]/level-lbs", i);
+        fgSetDouble(buf, _airplane.getFuel(i) * KG2LBS);
+
+        double density = _airplane.getFuelDensity(i);
+        sprintf(buf, "/consumables/fuel/tank[%d]/density-ppg", i);
+        fgSetDouble(buf, density * (KG2LBS/CM2GALS));
+
+        sprintf(buf, "/consumables/fuel/tank[%d]/level-gal_us", i);
+        fgSetDouble(buf, _airplane.getFuel(i) * CM2GALS / density);
+
+        sprintf(buf, "/consumables/fuel/tank[%d]/capacity-gal_us", i);
+        fgSetDouble(buf, CM2GALS * _airplane.getTankCapacity(i)/density);
+    }    
+
     // This has a nasty habit of being false at startup.  That's not
     // good.
-    fgSetBool("/controls/gear-down", true);
+    fgSetBool("/controls/gear/gear-down", true);
+
+    _airplane.getModel()->setTurbulence(_turb);
 }
 
 // Not the worlds safest parser.  But it's short & sweet.
@@ -102,24 +158,50 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
        float spd = attrf(a, "speed") * KTS2MPS;
        float alt = attrf(a, "alt", 0) * FT2M;
        float aoa = attrf(a, "aoa", 0) * DEG2RAD;
-       _airplane.setApproach(spd, alt, aoa);
+       _airplane.setApproach(spd, alt, aoa, attrf(a, "fuel", 0.2));
        _cruiseCurr = false;
     } else if(eq(name, "cruise")) {
        float spd = attrf(a, "speed") * KTS2MPS;
        float alt = attrf(a, "alt") * FT2M;
-       _airplane.setCruise(spd, alt);
+       _airplane.setCruise(spd, alt, attrf(a, "fuel", 0.5));
        _cruiseCurr = true;
+    } else if(eq(name, "solve-weight")) {
+        int idx = attri(a, "idx");
+        float wgt = attrf(a, "weight") * LBS2KG;
+        _airplane.addSolutionWeight(!_cruiseCurr, idx, wgt);
     } else if(eq(name, "cockpit")) {
        v[0] = attrf(a, "x");
        v[1] = attrf(a, "y");
        v[2] = attrf(a, "z");
        _airplane.setPilotPos(v);
+    } else if(eq(name, "rotor")) {
+        _airplane.getModel()->getRotorgear()->addRotor(parseRotor(a, name));
+    } else if(eq(name, "rotorgear")) {
+        Rotorgear* r = _airplane.getModel()->getRotorgear();
+       _currObj = r;
+        #define p(x) if (a->hasAttribute(#x)) r->setParameter((char *)#x,attrf(a,#x) );
+        #define p2(x,y) if (a->hasAttribute(#x)) {r->setParameter((char *)#y,attrf(a,#x) ); SG_LOG(SG_INPUT, SG_ALERT,"Warning: Aircraft defnition files uses outdated tag '" <<#x<<"', use '"<<#y<<"' instead (see README.YASim)" <<endl);}
+        p(max_power_engine)
+        p(engine_prop_factor)
+        p(yasimdragfactor)
+        p(yasimliftfactor)
+        p(max_power_rotor_brake)
+        p(rotorgear_friction)
+        p(engine_accel_limit)
+        p2(engine_accell_limit,engine_accel_limit)
+        #undef p
+        #undef p2
+        r->setInUse();
     } else if(eq(name, "wing")) {
        _airplane.setWing(parseWing(a, name));
     } else if(eq(name, "hstab")) {
        _airplane.setTail(parseWing(a, name));
-    } else if(eq(name, "vstab")) {
+    } else if(eq(name, "vstab") || eq(name, "mstab")) {
        _airplane.addVStab(parseWing(a, name));
+    } else if(eq(name, "piston-engine")) {
+        parsePistonEngine(a);
+    } else if(eq(name, "turbine-engine")) {
+        parseTurbineEngine(a);
     } else if(eq(name, "propeller")) {
        parsePropeller(a);
     } else if(eq(name, "thruster")) {
@@ -141,6 +223,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
        j->setMaxThrust(attrf(a, "thrust") * LBS2N,
                        attrf(a, "afterburner", 0) * LBS2N);
        j->setVectorAngle(attrf(a, "rotate", 0) * DEG2RAD);
+        j->setReverseThrust(attrf(a, "reverse", 0.2));
 
        float n1min = attrf(a, "n1-idle", 55);
        float n1max = attrf(a, "n1-max", 102);
@@ -148,11 +231,13 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
        float n2max = attrf(a, "n2-max", 103);
        j->setRPMs(n1min, n1max, n2min, n2max);
 
-       if(a->hasAttribute("tsfc")) j->setTSFC(attrf(a, "tsfc"));
+       j->setTSFC(attrf(a, "tsfc", 0.8));
        if(a->hasAttribute("egt"))  j->setEGT(attrf(a, "egt"));
        if(a->hasAttribute("epr"))  j->setEPR(attrf(a, "epr"));
        if(a->hasAttribute("exhaust-speed"))
            j->setVMax(attrf(a, "exhaust-speed") * KTS2MPS);
+       if(a->hasAttribute("spool-time"))
+           j->setSpooling(attrf(a, "spool-time"));
        
        j->setPosition(v);
        _airplane.addThruster(j, mass, v);
@@ -168,14 +253,60 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
        v[1] = attrf(a, "y");
        v[2] = attrf(a, "z");
        g->setPosition(v);
-       v[0] = 0;
-       v[1] = 0;
-       v[2] = attrf(a, "compression", 1);
+        float nrm = Math::mag3(v);
+        if (_vehicle_radius < nrm)
+            _vehicle_radius = nrm;
+        if(a->hasAttribute("upx")) {
+            v[0] = attrf(a, "upx");
+            v[1] = attrf(a, "upy");
+            v[2] = attrf(a, "upz");
+            Math::unit3(v, v);
+        } else {
+            v[0] = 0;
+            v[1] = 0;
+            v[2] = 1;
+        }
+        for(int i=0; i<3; i++)
+            v[i] *= attrf(a, "compression", 1);
        g->setCompression(v);
         g->setBrake(attrf(a, "skid", 0));
        g->setStaticFriction(attrf(a, "sfric", 0.8));
        g->setDynamicFriction(attrf(a, "dfric", 0.7));
+        g->setSpring(attrf(a, "spring", 1));
+        g->setDamping(attrf(a, "damp", 1));
        _airplane.addGear(g);
+    } else if(eq(name, "hook")) {
+       Hook* h = new Hook();
+       _currObj = h;
+       v[0] = attrf(a, "x");
+       v[1] = attrf(a, "y");
+       v[2] = attrf(a, "z");
+       h->setPosition(v);
+        float length = attrf(a, "length", 1.0);
+        h->setLength(length);
+        float nrm = length+Math::mag3(v);
+        if (_vehicle_radius < nrm)
+            _vehicle_radius = nrm;
+        h->setDownAngle(attrf(a, "down-angle", 70) * DEG2RAD);
+        h->setUpAngle(attrf(a, "up-angle", 0) * DEG2RAD);
+       _airplane.addHook(h);
+    } else if(eq(name, "launchbar")) {
+       Launchbar* l = new Launchbar();
+       _currObj = l;
+       v[0] = attrf(a, "x");
+       v[1] = attrf(a, "y");
+       v[2] = attrf(a, "z");
+       l->setLaunchbarMount(v);
+       v[0] = attrf(a, "holdback-x", v[0]);
+       v[1] = attrf(a, "holdback-y", v[1]);
+       v[2] = attrf(a, "holdback-z", v[2]);
+       l->setHoldbackMount(v);
+        float length = attrf(a, "length", 1.0);
+        l->setLength(length);
+        l->setDownAngle(attrf(a, "down-angle", 45) * DEG2RAD);
+        l->setUpAngle(attrf(a, "up-angle", -45) * DEG2RAD);
+        l->setHoldbackLength(attrf(a, "holdback-length", 2.0));
+       _airplane.addLaunchbar(l);
     } else if(eq(name, "fuselage")) {
        float b[3];
        v[0] = attrf(a, "ax");
@@ -219,6 +350,11 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
     } else if(eq(name, "spoiler")) {
        ((Wing*)_currObj)->setSpoiler(attrf(a, "start"), attrf(a, "end"),
                                      attrf(a, "lift"), attrf(a, "drag"));
+    /* } else if(eq(name, "collective")) {
+        ((Rotor*)_currObj)->setcollective(attrf(a, "min"), attrf(a, "max"));
+    } else if(eq(name, "cyclic")) {
+        ((Rotor*)_currObj)->setcyclic(attrf(a, "ail"), attrf(a, "ele"));
+    */                               
     } else if(eq(name, "actionpt")) {
        v[0] = attrf(a, "x");
        v[1] = attrf(a, "y");
@@ -287,6 +423,11 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
 
 void FGFDM::getExternalInput(float dt)
 {
+    char buf[256];
+
+    _turb->setMagnitude(fgGetFloat("/environment/turbulence/magnitude-norm"));
+    _turb->update(dt, fgGetFloat("/environment/turbulence/rate-hz"));
+
     // The control axes
     ControlMap* cm = _airplane.getControlMap();
     cm->reset();
@@ -303,11 +444,34 @@ void FGFDM::getExternalInput(float dt)
        WeightRec* wr = (WeightRec*)_weights.get(i);
        _airplane.setWeight(wr->handle, LBS2KG * fgGetFloat(wr->prop));
     }
+
+    for(i=0; i<_thrusters.size(); i++) {
+       EngRec* er = (EngRec*)_thrusters.get(i);
+        Thruster* t = er->eng;
+
+       if(t->getPropEngine()) {
+            PropEngine* p = t->getPropEngine();
+            sprintf(buf, "%s/rpm", er->prefix);
+            p->setOmega(fgGetFloat(buf, 500) * RPM2RAD);
+        }
+    }
 }
 
-void FGFDM::setOutputProperties()
+// Linearly "seeks" a property by the specified fraction of the way to
+// the target value.  Used to emulate "slowly changing" output values.
+static void moveprop(SGPropertyNode* node, const char* prop,
+                    float target, float frac)
 {
-    char buf[256];
+    float val = node->getFloatValue(prop);
+    if(frac > 1) frac = 1;
+    if(frac < 0) frac = 0;
+    val += (target - val) * frac;
+    node->setFloatValue(prop, val);
+}
+
+void FGFDM::setOutputProperties(float dt)
+{
+    // char buf[256];
     int i;
 
     float grossWgt = _airplane.getModel()->getBody()->getTotalMass() * KG2LBS;
@@ -326,51 +490,83 @@ void FGFDM::setOutputProperties()
         p->prop->setFloatValue(val);
     }
 
-    float fuelDensity = 718.95; // default to gasoline: ~6 lb/gal
-    for(i=0; i<_airplane.numTanks(); i++) {
-        fuelDensity = _airplane.getFuelDensity(i);
-       sprintf(buf, "/consumables/fuel/tank[%d]/level-gal_us", i);
-       fgSetFloat(buf, CM2GALS*_airplane.getFuel(i)/fuelDensity);
+    for(i=0; i<_airplane.getRotorgear()->getNumRotors(); i++) {
+        Rotor*r=(Rotor*)_airplane.getRotorgear()->getRotor(i);
+        int j = 0;
+        float f;
+        char b[256];
+        while((j = r->getValueforFGSet(j, b, &f)))
+            if(b[0]) fgSetFloat(b,f);
+        j=0;
+        while((j = _airplane.getRotorgear()->getValueforFGSet(j, b, &f)))
+            if(b[0]) fgSetFloat(b,f);
+        for(j=0; j < r->numRotorparts(); j+=r->numRotorparts()>>2) {
+            Rotorpart* s = (Rotorpart*)r->getRotorpart(j);
+            char *b;
+            int k;
+            for(k=0; k<2; k++) {
+                b=s->getAlphaoutput(k);
+                if(b[0]) fgSetFloat(b, s->getAlpha(k));
+            }
+        }
     }
 
+    float fuelDensity = _airplane.getFuelDensity(0); // HACK
     for(i=0; i<_thrusters.size(); i++) {
        EngRec* er = (EngRec*)_thrusters.get(i);
         Thruster* t = er->eng;
+        SGPropertyNode * node = fgGetNode("engines/engine", i, true);
+
+        // Set: running, cranking, prop-thrust, max-hp, power-pct
+       node->setBoolValue("running", t->isRunning());
+       node->setBoolValue("cranking", t->isCranking());
 
-       sprintf(buf, "%s/fuel-flow-gph", er->prefix);
-        fgSetFloat(buf, (t->getFuelFlow()/fuelDensity) * 3600 * CM2GALS);
+        float tmp[3];
+        t->getThrust(tmp);
+        float lbs = Math::mag3(tmp) * (KG2LBS/9.8);
+       node->setFloatValue("prop-thrust", lbs); // Deprecated name
+       node->setFloatValue("thrust-lbs", lbs);
+        node->setFloatValue("fuel-flow-gph",
+                            (t->getFuelFlow()/fuelDensity) * 3600 * CM2GALS);
 
        if(t->getPropEngine()) {
             PropEngine* p = t->getPropEngine();
-
-            sprintf(buf, "%s/rpm", er->prefix);
-            fgSetFloat(buf, p->getOmega() / RPM2RAD);
-        }
-
-        if(t->getPistonEngine()) {
-            PistonEngine* p = t->getPistonEngine();
-           
-            sprintf(buf, "%s/mp-osi", er->prefix);
-           fgSetFloat(buf, p->getMP() * (1/INHG2PA));
-
-           sprintf(buf, "%s/egt-degf", er->prefix);
-           fgSetFloat(buf, p->getEGT() * K2DEGF + 459.4);
+            node->setFloatValue("rpm", p->getOmega() * (1/RPM2RAD));
+            node->setFloatValue("torque-ftlb",
+                                p->getEngine()->getTorque() * NM2FTLB);
+        
+            if(p->getEngine()->isPistonEngine()) {
+                PistonEngine* pe = p->getEngine()->isPistonEngine();
+                node->setFloatValue("mp-osi", pe->getMP() * (1/INHG2PA));
+                node->setFloatValue("mp-inhg", pe->getMP() * (1/INHG2PA));
+                node->setFloatValue("egt-degf",
+                                    pe->getEGT() * K2DEGF + K2DEGFOFFSET);
+                node->setFloatValue("oil-temperature-degf",
+                                    pe->getOilTemp() * K2DEGF + K2DEGFOFFSET);
+                node->setFloatValue("boost-gauge-inhg",
+                                    pe->getBoost() * (1/INHG2PA));
+            } else if(p->getEngine()->isTurbineEngine()) {
+                TurbineEngine* te = p->getEngine()->isTurbineEngine();
+                node->setFloatValue("n2", te->getN2());
+            }
         }
 
         if(t->getJet()) {
             Jet* j = t->getJet();
-
-            sprintf(buf, "%s/n1", er->prefix);
-            fgSetFloat(buf, j->getN1());
-
-            sprintf(buf, "%s/n2", er->prefix);
-            fgSetFloat(buf, j->getN2());
-
-            sprintf(buf, "%s/epr", er->prefix);
-            fgSetFloat(buf, j->getEPR());
-
-            sprintf(buf, "%s/egt-degf", er->prefix);
-            fgSetFloat(buf, j->getEGT() * K2DEGF + 459.4);
+            node->setFloatValue("n1", j->getN1());
+            node->setFloatValue("n2", j->getN2());
+            node->setFloatValue("epr", j->getEPR());
+            node->setFloatValue("egt-degf",
+                                j->getEGT() * K2DEGF + K2DEGFOFFSET);
+
+            // These are "unmodeled" values that are still needed for
+            // many cockpits.  Tie them all to the N1 speed, but
+            // normalize the numbers to the range [0:1] so the
+            // cockpit code can scale them to the right values.
+            float pnorm = j->getPerfNorm();
+            moveprop(node, "oilp-norm", pnorm, dt/3); // 3s seek time
+            moveprop(node, "oilt-norm", pnorm, dt/30); // 30s 
+            moveprop(node, "itt-norm", pnorm, dt/1); // 1s
         }
     }
 }
@@ -397,7 +593,16 @@ Wing* FGFDM::parseWing(XMLAttributes* a, const char* type)
     w->setTaper(attrf(a, "taper", 1));
     w->setDihedral(attrf(a, "dihedral", defDihed) * DEG2RAD);
     w->setCamber(attrf(a, "camber", 0));
-    w->setIncidence(attrf(a, "incidence", 0) * DEG2RAD);
+
+    // These come in with positive indicating positive AoA, but the
+    // internals expect a rotation about the left-pointing Y axis, so
+    // invert the sign.
+    w->setIncidence(attrf(a, "incidence", 0) * DEG2RAD * -1);
+    w->setTwist(attrf(a, "twist", 0) * DEG2RAD * -1);
+
+    // The 70% is a magic number that sorta kinda seems to match known
+    // throttle settings to approach speed.
+    w->setInducedDrag(0.7*attrf(a, "idrag", 1));
 
     float effect = attrf(a, "effectiveness", 1);
     w->setDragScale(w->getDragScale()*effect);
@@ -406,28 +611,120 @@ Wing* FGFDM::parseWing(XMLAttributes* a, const char* type)
     return w;
 }
 
-void FGFDM::parsePropeller(XMLAttributes* a)
+Rotor* FGFDM::parseRotor(XMLAttributes* a, const char* type)
 {
-    float cg[3];
-    cg[0] = attrf(a, "x");
-    cg[1] = attrf(a, "y");
-    cg[2] = attrf(a, "z");
-    float mass = attrf(a, "mass") * LBS2KG;
-    float moment = attrf(a, "moment");
-    float radius = attrf(a, "radius");
-    float speed = attrf(a, "cruise-speed") * KTS2MPS;
-    float omega = attrf(a, "cruise-rpm") * RPM2RAD;
-    float power = attrf(a, "cruise-power") * HP2W;
-    float rho = Atmosphere::getStdDensity(attrf(a, "cruise-alt") * FT2M);
+    Rotor* w = new Rotor();
+
+    // float defDihed = 0;
+
+    float pos[3];
+    pos[0] = attrf(a, "x");
+    pos[1] = attrf(a, "y");
+    pos[2] = attrf(a, "z");
+    w->setBase(pos);
+
+    float normal[3];
+    normal[0] = attrf(a, "nx");
+    normal[1] = attrf(a, "ny");
+    normal[2] = attrf(a, "nz");
+    w->setNormal(normal);
+
+    float forward[3];
+    forward[0] = attrf(a, "fx");
+    forward[1] = attrf(a, "fy");
+    forward[2] = attrf(a, "fz");
+    w->setForward(forward);
+
+    w->setMaxCyclicail(attrf(a, "maxcyclicail", 7.6));
+    w->setMaxCyclicele(attrf(a, "maxcyclicele", 4.94));
+    w->setMinCyclicail(attrf(a, "mincyclicail", -7.6));
+    w->setMinCyclicele(attrf(a, "mincyclicele", -4.94));
+    w->setMaxCollective(attrf(a, "maxcollective", 15.8));
+    w->setMinCollective(attrf(a, "mincollective", -0.2));
+    w->setDiameter(attrf(a, "diameter", 10.2));
+    w->setWeightPerBlade(attrf(a, "weightperblade", 44));
+    w->setNumberOfBlades(attrf(a, "numblades", 4));
+    w->setRelBladeCenter(attrf(a, "relbladecenter", 0.7));
+    w->setDynamic(attrf(a, "dynamic", 0.7));
+    w->setDelta3(attrf(a, "delta3", 0));
+    w->setDelta(attrf(a, "delta", 0));
+    w->setTranslift(attrf(a, "translift", 0.05));
+    w->setC2(attrf(a, "dragfactor", 1));
+    w->setStepspersecond(attrf(a, "stepspersecond", 120));
+    w->setRPM(attrf(a, "rpm", 424));
+    w->setRelLenHinge(attrf(a, "rellenflaphinge", 0.07));
+    w->setAlpha0((attrf(a, "flap0", -5))*YASIM_PI/180);
+    w->setAlphamin((attrf(a, "flapmin", -15))/180*YASIM_PI);
+    w->setAlphamax((attrf(a, "flapmax",  15))*YASIM_PI/180);
+    w->setAlpha0factor(attrf(a, "flap0factor", 1));
+    w->setTeeterdamp(attrf(a,"teeterdamp",.0001));
+    w->setMaxteeterdamp(attrf(a,"maxteeterdamp",1000));
+    w->setRelLenTeeterHinge(attrf(a,"rellenteeterhinge",0.01));
+    void setAlphamin(float f);
+    void setAlphamax(float f);
+    void setAlpha0factor(float f);
+
+    if(attrb(a,"ccw"))
+       w->setCcw(1); 
+    
+    if(a->hasAttribute("name"))
+       w->setName(a->getValue("name") );
+    if(a->hasAttribute("alphaout0"))
+       w->setAlphaoutput(0,a->getValue("alphaout0") );
+    if(a->hasAttribute("alphaout1"))  w->setAlphaoutput(1,a->getValue("alphaout1") );
+    if(a->hasAttribute("alphaout2"))  w->setAlphaoutput(2,a->getValue("alphaout2") );
+    if(a->hasAttribute("alphaout3"))  w->setAlphaoutput(3,a->getValue("alphaout3") );
+    if(a->hasAttribute("coneout"))  w->setAlphaoutput(4,a->getValue("coneout") );
+    if(a->hasAttribute("yawout"))   w->setAlphaoutput(5,a->getValue("yawout") );
+    if(a->hasAttribute("rollout"))  w->setAlphaoutput(6,a->getValue("rollout") );
+
+    w->setPitchA(attrf(a, "pitch_a", 10));
+    w->setPitchB(attrf(a, "pitch_b", 10));
+    w->setForceAtPitchA(attrf(a, "forceatpitch_a", 3000));
+    w->setPowerAtPitch0(attrf(a, "poweratpitch_0", 300));
+    w->setPowerAtPitchB(attrf(a, "poweratpitch_b", 3000));
+    if(attrb(a,"notorque"))
+       w->setNotorque(1); 
+
+#define p(x) if (a->hasAttribute(#x)) w->setParameter((char *)#x,attrf(a,#x) );
+    p(translift_ve)
+    p(translift_maxfactor)
+    p(ground_effect_constant)
+    p(vortex_state_lift_factor)
+    p(vortex_state_c1)
+    p(vortex_state_c2)
+    p(vortex_state_c3)
+    p(vortex_state_e1)
+    p(vortex_state_e2)
+    p(twist)
+    p(number_of_segments)
+    p(number_of_parts)
+    p(rel_len_where_incidence_is_measured)
+    p(chord)
+    p(taper)
+    p(airfoil_incidence_no_lift)
+    p(rel_len_blade_start)
+    p(incidence_stall_zero_speed)
+    p(incidence_stall_half_sonic_speed)
+    p(lift_factor_stall)
+    p(stall_change_over)
+    p(drag_factor_stall)
+    p(airfoil_lift_coefficient)
+    p(airfoil_drag_coefficient0)
+    p(airfoil_drag_coefficient1)
+    p(cyclic_factor)
+    p(rotor_correction_factor)
+#undef p
+    _currObj = w;
+    return w;
+}
 
-    // Hack, fix this pronto:
+void FGFDM::parsePistonEngine(XMLAttributes* a)
+{
     float engP = attrf(a, "eng-power") * HP2W;
     float engS = attrf(a, "eng-rpm") * RPM2RAD;
 
-    Propeller* prop = new Propeller(radius, speed, omega, rho, power);
     PistonEngine* eng = new PistonEngine(engP, engS);
-    PropEngine* thruster = new PropEngine(prop, eng, moment);
-    _airplane.addThruster(thruster, mass, cg);
 
     if(a->hasAttribute("displacement"))
         eng->setDisplacement(attrf(a, "displacement") * CIN2CM);
@@ -439,8 +736,78 @@ void FGFDM::parsePropeller(XMLAttributes* a)
         float mul = attrf(a, "turbo-mul");
         float mp = attrf(a, "wastegate-mp", 1e6) * INHG2PA;
         eng->setTurboParams(mul, mp);
+        eng->setTurboLag(attrf(a, "turbo-lag", 2));
+    }
+
+    if(a->hasAttribute("supercharger"))
+        eng->setSupercharger(attrb(a, "supercharger"));
+
+    ((PropEngine*)_currObj)->setEngine(eng);
+}
+
+void FGFDM::parseTurbineEngine(XMLAttributes* a)
+{
+    float power = attrf(a, "eng-power") * HP2W;
+    float omega = attrf(a, "eng-rpm") * RPM2RAD;
+    float alt = attrf(a, "alt") * FT2M;
+    float flatRating = attrf(a, "flat-rating") * HP2W;
+    TurbineEngine* eng = new TurbineEngine(power, omega, alt, flatRating);
+
+    if(a->hasAttribute("n2-low-idle"))
+        eng->setN2Range(attrf(a, "n2-low-idle"), attrf(a, "n2-high-idle"),
+                        attrf(a, "n2-max"));
+
+    // Nasty units conversion: lbs/hr per hp -> kg/s per watt
+    if(a->hasAttribute("bsfc"))
+        eng->setFuelConsumption(attrf(a, "bsfc") * (LBS2KG/(3600*HP2W)));
+
+    ((PropEngine*)_currObj)->setEngine(eng);
+}
+
+void FGFDM::parsePropeller(XMLAttributes* a)
+{
+    // Legacy Handling for the old engines syntax:
+    PistonEngine* eng = 0;
+    if(a->hasAttribute("eng-power")) {
+        SG_LOG(SG_FLIGHT,SG_ALERT, "WARNING: "
+               << "Legacy engine definition in YASim configuration file.  "
+               << "Please fix.");
+        float engP = attrf(a, "eng-power") * HP2W;
+        float engS = attrf(a, "eng-rpm") * RPM2RAD;
+        eng = new PistonEngine(engP, engS);
+        if(a->hasAttribute("displacement"))
+            eng->setDisplacement(attrf(a, "displacement") * CIN2CM);
+        if(a->hasAttribute("compression"))
+            eng->setCompression(attrf(a, "compression"));        
+        if(a->hasAttribute("turbo-mul")) {
+            float mul = attrf(a, "turbo-mul");
+            float mp = attrf(a, "wastegate-mp", 1e6) * INHG2PA;
+            eng->setTurboParams(mul, mp);
+        }
     }
 
+    // Now parse the actual propeller definition:
+    float cg[3];
+    cg[0] = attrf(a, "x");
+    cg[1] = attrf(a, "y");
+    cg[2] = attrf(a, "z");
+    float mass = attrf(a, "mass") * LBS2KG;
+    float moment = attrf(a, "moment");
+    float radius = attrf(a, "radius");
+    float speed = attrf(a, "cruise-speed") * KTS2MPS;
+    float omega = attrf(a, "cruise-rpm") * RPM2RAD;
+    float power = attrf(a, "cruise-power") * HP2W;
+    float rho = Atmosphere::getStdDensity(attrf(a, "cruise-alt") * FT2M);
+
+    Propeller* prop = new Propeller(radius, speed, omega, rho, power);
+    PropEngine* thruster = new PropEngine(prop, eng, moment);
+    _airplane.addThruster(thruster, mass, cg);
+
+    // Set the stops (fine = minimum pitch, coarse = maximum pitch)
+    float fine_stop = attrf(a, "fine-stop", 0.25f);
+    float coarse_stop = attrf(a, "coarse-stop", 4.0f);
+    prop->setStops(fine_stop, coarse_stop);
+
     if(a->hasAttribute("takeoff-power")) {
        float power0 = attrf(a, "takeoff-power") * HP2W;
        float omega0 = attrf(a, "takeoff-rpm") * RPM2RAD;
@@ -453,6 +820,15 @@ void FGFDM::parsePropeller(XMLAttributes* a)
        thruster->setVariableProp(min, max);
     }
 
+    if(attrb(a, "contra"))
+        thruster->setContraPair(true);
+
+    if(a->hasAttribute("manual-pitch")) {
+       prop->setManualPitch();
+    }
+
+    thruster->setGearRatio(attrf(a, "gear-ratio", 1));
+
     char buf[64];
     sprintf(buf, "/engines/engine[%d]", _nextEngine++);
     EngRec* er = new EngRec();
@@ -478,6 +854,7 @@ int FGFDM::parseAxis(const char* name)
     // Not there, make a new one.
     AxisRec* a = new AxisRec();
     a->name = dup(name);
+    fgGetNode( a->name, true ); // make sure the property name exists
     a->handle = _airplane.getControlMap()->newInput();
     _axes.add(a);
     return a->handle;
@@ -487,6 +864,7 @@ int FGFDM::parseOutput(const char* name)
 {
     if(eq(name, "THROTTLE"))  return ControlMap::THROTTLE;
     if(eq(name, "MIXTURE"))   return ControlMap::MIXTURE;
+    if(eq(name, "CONDLEVER")) return ControlMap::CONDLEVER;
     if(eq(name, "STARTER"))   return ControlMap::STARTER;
     if(eq(name, "MAGNETOS"))  return ControlMap::MAGNETOS;
     if(eq(name, "ADVANCE"))   return ControlMap::ADVANCE;
@@ -497,12 +875,23 @@ int FGFDM::parseOutput(const char* name)
     if(eq(name, "BRAKE"))     return ControlMap::BRAKE;
     if(eq(name, "STEER"))     return ControlMap::STEER;
     if(eq(name, "EXTEND"))    return ControlMap::EXTEND;
+    if(eq(name, "HEXTEND"))   return ControlMap::HEXTEND;
+    if(eq(name, "LEXTEND"))   return ControlMap::LEXTEND;
     if(eq(name, "INCIDENCE")) return ControlMap::INCIDENCE;
     if(eq(name, "FLAP0"))     return ControlMap::FLAP0;
     if(eq(name, "FLAP1"))     return ControlMap::FLAP1;
     if(eq(name, "SLAT"))      return ControlMap::SLAT;
     if(eq(name, "SPOILER"))   return ControlMap::SPOILER;
     if(eq(name, "CASTERING")) return ControlMap::CASTERING;
+    if(eq(name, "PROPPITCH")) return ControlMap::PROPPITCH;
+    if(eq(name, "PROPFEATHER")) return ControlMap::PROPFEATHER;
+    if(eq(name, "COLLECTIVE")) return ControlMap::COLLECTIVE;
+    if(eq(name, "CYCLICAIL")) return ControlMap::CYCLICAIL;
+    if(eq(name, "CYCLICELE")) return ControlMap::CYCLICELE;
+    if(eq(name, "ROTORGEARENGINEON")) return ControlMap::ROTORENGINEON;
+    if(eq(name, "ROTORBRAKE")) return ControlMap::ROTORBRAKE;
+    if(eq(name, "REVERSE_THRUST")) return ControlMap::REVERSE_THRUST;
+    if(eq(name, "WASTEGATE")) return ControlMap::WASTEGATE;
     SG_LOG(SG_FLIGHT,SG_ALERT,"Unrecognized control type '"
            << name << "' in YASim aircraft description.");
     exit(1);
@@ -577,4 +966,29 @@ float FGFDM::attrf(XMLAttributes* atts, char* attr, float def)
     else         return (float)atof(val);    
 }
 
+// ACK: the dreaded ambiguous string boolean.  Remind me to shoot Maik
+// when I have a chance. :).  Unless you have a parser that can check
+// symbol constants (we don't), this kind of coding is just a Bad
+// Idea.  This implementation, for example, silently returns a boolean
+// falsehood for values of "1", "yes", "True", and "TRUE".  Which is
+// especially annoying preexisting boolean attributes in the same
+// parser want to see "1" and will choke on a "true"...
+//
+// Unfortunately, this usage creeped into existing configuration files
+// while I wasn't active, and it's going to be hard to remove.  Issue
+// a warning to nag people into changing their ways for now...
+bool FGFDM::attrb(XMLAttributes* atts, char* attr)
+{
+    const char* val = atts->getValue(attr);
+    if(val == 0) return false;
+
+    if(eq(val,"true")) {
+        SG_LOG(SG_FLIGHT, SG_ALERT, "Warning: " <<
+               "deprecated 'true' boolean in YASim configuration file.  " <<
+               "Use numeric booleans (attribute=\"1\") instead");
+        return true;
+    }
+    return attri(atts, attr, 0) ? true : false;
+}
+
 }; // namespace yasim