#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 "Rotorblade.hpp"
#include "FGFDM.hpp"
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?
FGFDM::FGFDM()
{
+ _vehicle_radius = 0.0f;
+
_nextEngine = 0;
// Map /controls/flight/elevator to the approach elevator control. This
}
for(i=0; i<_controlProps.size(); i++)
delete (PropOut*)_controlProps.get(i);
+ delete _turb;
}
void FGFDM::iterate(float dt)
getExternalInput(dt);
_airplane.iterate(dt);
- if(fgGetBool("/sim/freeze/fuel") != true)
- _airplane.consumeFuel(dt);
+ // 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));
- setOutputProperties();
+ 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()
// 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/gear-down", true);
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.addRotor(parseRotor(a, name));
+ _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") || 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")) {
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);
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);
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->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");
}
}
-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;
p->prop->setFloatValue(val);
}
- float totalFuel = 0, totalCap = 0;
- float fuelDensity = 720; // in kg/m^3, 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);
- sprintf(buf, "/consumables/fuel/tank[%d]/level-lbs", i);
- fgSetFloat(buf, KG2LBS*_airplane.getFuel(i));
- totalFuel += _airplane.getFuel(i);
- totalCap += _airplane.getTankCapacity(i);
- }
- if(totalCap != 0) {
- fgSetFloat("/consumables/fuel/total-fuel-lbs", KG2LBS*totalFuel);
- fgSetFloat("/consumables/fuel/total-fuel-gals",
- CM2GALS*totalFuel/fuelDensity);
- fgSetFloat("/consumables/fuel/total-fuel-norm", totalFuel/totalCap);
- }
-
- for(i=0; i<_airplane.getNumRotors(); i++) {
- Rotor*r=(Rotor*)_airplane.getRotor(i);
+ 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))
+ while((j = r->getValueforFGSet(j, b, &f)))
if(b[0]) fgSetFloat(b,f);
-
- for(j=0; j < r->numRotorparts(); j++) {
+ 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;
if(b[0]) fgSetFloat(b, s->getAlpha(k));
}
}
- for(j=0; j < r->numRotorblades(); j++) {
- Rotorblade* s = (Rotorblade*)r->getRotorblade(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);
- sprintf(buf, "%s/fuel-flow-gph", er->prefix);
- fgSetFloat(buf, (t->getFuelFlow()/fuelDensity) * 3600 * CM2GALS);
+ // Set: running, cranking, prop-thrust, max-hp, power-pct
+ node->setBoolValue("running", t->isRunning());
+ node->setBoolValue("cranking", t->isCranking());
+
+ 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 + K2DEGFOFFSET);
+ 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 + K2DEGFOFFSET);
+ 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
}
}
}
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);
- w->setTwist(attrf(a, "twist", 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.
{
Rotor* w = new Rotor();
- float defDihed = 0;
+ // float defDihed = 0;
float pos[3];
pos[0] = attrf(a, "x");
w->setPowerAtPitchB(attrf(a, "poweratpitch_b", 3000));
if(attrb(a,"notorque"))
w->setNotorque(1);
- if(attrb(a,"simblades"))
- w->setSimBlades(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;
}
+void FGFDM::parsePistonEngine(XMLAttributes* a)
+{
+ float engP = attrf(a, "eng-power") * HP2W;
+ float engS = attrf(a, "eng-rpm") * RPM2RAD;
+
+ PistonEngine* 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);
+ 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");
float power = attrf(a, "cruise-power") * HP2W;
float rho = Atmosphere::getStdDensity(attrf(a, "cruise-alt") * FT2M);
- // Hack, fix this pronto:
- 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);
-
- 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);
- }
+ // 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;
thruster->setVariableProp(min, max);
}
+ if(attrb(a, "contra"))
+ thruster->setContraPair(true);
+
if(a->hasAttribute("manual-pitch")) {
prop->setManualPitch();
}
// 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;
{
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;
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, "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, "ROTORENGINEON")) return ControlMap::ROTORENGINEON;
+ 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);
projects / flightgear.git / blobdiff