diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 6dcd9b38c..daa0eafeb 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,9 +6,10 @@ "${MSFS_SDK}/WASM/include", "${MSFS_SDK}/WASM/wasi-sysroot/include", "${MSFS_SDK}/SimConnect SDK/include", - "${workspaceFolder}/a32nx/fbw-common/src/wasm/fbw_common/src/**", - "${workspaceFolder}/a32nx/fbw-a32nx/src/wasm/fbw_a320/src/**", - "${workspaceFolder}/a32nx/fbw-a380x/src/wasm/fbw_a380/src/**" + "${workspaceFolder}/flybywire/fbw-common/src/wasm/fbw_common/src/**", + "${workspaceFolder}/flybywire/fbw-a32nx/src/wasm/fbw_a320/src/**", + "${workspaceFolder}/flybywire/fbw-a380x/src/wasm/fbw_a380/src/**", + "${workspaceFolder}/flybywire/fbw-common/src/wasm/fadec_common/src/**" ], "defines": [ "_MSFS_WASM=1", @@ -18,7 +19,6 @@ "_MBCS" ], "windowsSdkVersion": "10.0.18362.0", - //"compilerPath": "${MSFS_SDK}/WASM/llvm/bin/clang-cl.exe", "compilerArgs": [ "--sysroot ${MSFS_SDK}/WASM/wasi-sysroot", "-target wasm32-unknown-wasi" diff --git a/hdw-a339x/src/base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/flight_model.cfg b/hdw-a339x/src/base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/flight_model.cfg index ab58e0bb1..76105c2b5 100644 --- a/hdw-a339x/src/base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/flight_model.cfg +++ b/hdw-a339x/src/base/headwindsim-aircraft-a330-900/SimObjects/Airplanes/Headwind_A330neo/flight_model.cfg @@ -97,11 +97,12 @@ Version = 4 APU.1 = Name:APU#FuelBurnRate:55 Engine.1 = Name:LeftEngine#Index:1 Engine.2 = Name:RightEngine#Index:2 -Tank.1 = Name:Center#Title:TT:MENU.FUEL.CENTER#Capacity:12625#UnusableCapacity:0#Position:-20.3,0,4#Priority:1#OutputOnlyLines:TankCenterToCenterTankJetPumpL,TankCenterToCenterTankJetPumpR -Tank.2 = Name:LeftInner#Title:TT:MENU.FUEL.LEFT_INNER#Capacity:11095#UnusableCapacity:0#Position:-25.5,-33.8,1.3#Priority:2#InputOnlyLines:AutoCenterXferValveLToLeftInner,CenterXferJunctionLToLeftInner,LeftXferValve2ToLeftInnerTank#OutputOnlyLines:TankLeftInnerToLeftTankPump1,TankLeftInnerToLeftTankPump2 -Tank.3 = Name:RightInner#Title:TT:MENU.FUEL.RIGHT_INNER#Capacity:11095#UnusableCapacity:0#Position:-25.5,33.8,1.3#Priority:2#InputOnlyLines:AutoCenterXferValveRToRightInner,CenterXferJunctionRToRightInner,RightXferValve2ToRightInnerTank#OutputOnlyLines:TankRightInnerToRightTankPump1,TankRightInnerToRightTankPump2 -Tank.4 = Name:LeftOuter#Title:TT:MENU.FUEL.LEFT_OUTER#Capacity:964#UnusableCapacity:0#Position:-41,-70,6.1#Priority:3#OutputOnlyLines:LeftOuterTankToLeftXferValve1,LeftOuterTankToLeftXferValve2 -Tank.5 = Name:RightOuter#Title:TT:MENU.FUEL.RIGHT_OUTER#Capacity:964#UnusableCapacity:0#Position:-41,70,6.1#Priority:3#OutputOnlyLines:RightOuterTankToRightXferValve1,RightOuterTankToRightXferValve2 +Tank.1 = Name:Center#Title:TT:MENU.FUEL.CENTER#Capacity:12625#UnusableCapacity:0#Position:-20.3,0,4#Priority:3#OutputOnlyLines:TankCenterToCenterTankJetPumpL,TankCenterToCenterTankJetPumpR +Tank.2 = Name:LeftInner#Title:TT:MENU.FUEL.LEFT_INNER#Capacity:11095#UnusableCapacity:0#Position:-25.5,-33.8,1.3#Priority:1#InputOnlyLines:AutoCenterXferValveLToLeftInner,CenterXferJunctionLToLeftInner,LeftXferValve2ToLeftInnerTank#OutputOnlyLines:TankLeftInnerToLeftTankPump1,TankLeftInnerToLeftTankPump2 +Tank.3 = Name:RightInner#Title:TT:MENU.FUEL.RIGHT_INNER#Capacity:11095#UnusableCapacity:0#Position:-25.5,33.8,1.3#Priority:1#InputOnlyLines:AutoCenterXferValveRToRightInner,CenterXferJunctionRToRightInner,RightXferValve2ToRightInnerTank#OutputOnlyLines:TankRightInnerToRightTankPump1,TankRightInnerToRightTankPump2 +Tank.4 = Name:LeftOuter#Title:TT:MENU.FUEL.LEFT_OUTER#Capacity:964#UnusableCapacity:0#Position:-41,-70,6.1#Priority:2#OutputOnlyLines:LeftOuterTankToLeftXferValve1,LeftOuterTankToLeftXferValve2 +Tank.5 = Name:RightOuter#Title:TT:MENU.FUEL.RIGHT_OUTER#Capacity:964#UnusableCapacity:0#Position:-41,70,6.1#Priority:2#OutputOnlyLines:RightOuterTankToRightXferValve1,RightOuterTankToRightXferValve2 +Tank.6 = Name:TrimTank#TRIM#Capacity:1646#UnusableCapacity:0#Position:-107,0,23.5#Priority:4#InputOnlyLines:TrimTankInletValveToTrimTank#OutputOnlyLines:TrimTankToTrimTankIsolationValve Line.1 = Name:TankLeftInnerToLeftTankPump1#Source:LeftInner#Destination:LeftInnerTankPump1 Line.2 = Name:TankRightInnerToRightTankPump1#Source:RightInner#Destination:RightInnerTankPump1 Line.3 = Name:TankLeftInnerToLeftTankPump2#Source:LeftInner#Destination:LeftInnerTankPump2 @@ -140,11 +141,18 @@ Line.35 = Name:LeftOuterTankToLeftXferValve2#Source:LeftOuter#Destination:LeftTr Line.36 = Name:RightOuterTankToRightXferValve2#Source:RightOuter#Destination:RightTransferValve2#GravityBasedFuelFlow:1500 Line.37 = Name:LeftXferValve2ToLeftInnerTank#Source:LeftTransferValve2#Destination:LeftInner#GravityBasedFuelFlow:1500 Line.38 = Name:RightXferValve2ToRightInnerTank#Source:RightTransferValve2#Destination:RightInner#GravityBasedFuelFlow:1500 +Line.39 = Name:AftXferLToTrimTankToTrimTransferJunction#Source:LeftTransferValve2#Destination:TrimTransferJunction +Line.40 = Name:AftXferRToTrimTankToTrimTransferJunction#Source:RightTransferValve2#Destination:TrimTransferJunction +Line.41 = Name:TrimTransferJunctionToTrimTankInletValve#Source:TrimTransferJunction#Destination:TrimTankInletValve +Line.42 = Name:TrimTankIsolationValveToTrimTransferJunction#Source:TrimTankIsolationValve#Destination:TrimTransferJunction +Line.43 = Name:TrimTankInletValveToTrimTank#Source:TrimTankInletValve#Destination:TrimTank +Line.44 = Name:TrimTankToTrimTankIsolationValve#Source:TrimTank#Destination:TrimTankIsolationValve Junction.1 = Name:LeftJunction#InputOnlyLines:PumpLeft1ToJuncLeft,PumpLeft2ToJuncLeft#OutputOnlyLines:JuncLeftToEngValveLeft Junction.2 = Name:APUJunction#OutputOnlyLines:JuncAPUToAPUPump Junction.3 = Name:RightJunction#InputOnlyLines:PumpRight1ToJuncRight,PumpRight2ToJuncRight#OutputOnlyLines:JuncRightToEngValveRight Junction.4 = Name:CenterTransferJunctionL#InputOnlyLines:CenterXferDisableValveLToCenterXferJunctionL#OutputOnlyLines:CenterXferJunctionLToAutoCenterXferValveL,CenterXferJunctionLToLeftInner#Option:CenterXferJunctionLToAutoCenterXferValveL#Option:CenterXferJunctionLToLeftInner Junction.5 = Name:CenterTransferJunctionR#InputOnlyLines:CenterXferDisableValveRToCenterXferJunctionR#OutputOnlyLines:CenterXferJunctionRToAutoCenterXferValveR,CenterXferJunctionRToRightInner#Option:CenterXferJunctionRToAutoCenterXferValveR#Option:CenterXferJunctionRToRightInner +Junction.6 = Name:TrimTransferJunction#InputOnlyLines:TrimTankIsolationValveToTrimTransferJunction#OutputOnlyLines:TrimTransferJunctionToTrimTankInletValve Valve.1 = Name:LeftEngineValve#OpeningTime:3#Circuit:1 Valve.2 = Name:RightEngineValve#OpeningTime:3#Circuit:2 Valve.3 = Name:CrossFeedValve#OpeningTime:3#Circuit:3 @@ -157,6 +165,8 @@ Valve.9 = Name:CenterTransferDisableValveL#DestinationLine:CenterXferDisableValv Valve.10 = Name:CenterTransferDisableValveR#DestinationLine:CenterXferDisableValveRToCenterXferJunctionR#Circuit:10 ; When overhead transfer button is OFF, this valve is closed and disables fuel flow in both manual and automatic modes Valve.11 = Name:AutoCenterTransferValveL#DestinationLine:AutoCenterXferValveLToLeftInner#Circuit:11 Valve.12 = Name:AutoCenterTransferValveR#DestinationLine:AutoCenterXferValveRToRightInner#Circuit:12 +Valve.13 = Name:TrimTankInletValve#DestinationLine:TrimTransferJunctionToTrimTankInletValve#Circuit:13 +Valve.14 = Name:TrimTankIsolationValve#DestinationLine:TrimTankIsolationValveToTrimTransferJunction#Circuit:14 Pump.1 = Name:CenterTankJetPumpL#Pressure:10#DestinationLine:CenterTankJetPumpLToCenterXferDisableValveL#TankFuelRequired:Center#Type:Electric#Index:1 Pump.2 = Name:LeftInnerTankPump1#Pressure:25#DestinationLine:PumpLeft1ToJuncLeft#TankFuelRequired:LeftInner#Type:Electric#Index:3 Pump.3 = Name:RightInnerTankPump1#Pressure:25#DestinationLine:PumpRight1ToJuncRight#TankFuelRequired:RightInner#Type:Electric#Index:4 @@ -164,6 +174,7 @@ Pump.4 = Name:CenterTankJetPumpR#Pressure:10#DestinationLine:CenterTankJetPumpRT Pump.5 = Name:LeftInnerTankPump2#Pressure:25#DestinationLine:PumpLeft2ToJuncLeft#TankFuelRequired:LeftInner#Type:Electric#Index:5 Pump.6 = Name:RightInnerTankPump2#Pressure:25#DestinationLine:PumpRight2ToJuncRight#TankFuelRequired:RightInner#Type:Electric#Index:6 Pump.7 = Name:APUPump#Pressure:15#DestinationLine:APUPumpToAPUValve#TankFuelRequired:LeftInner#Type:Electric#Index:7 +Pump.8 = Name:FwdXferPump#Pressure:25#DestinationLine:TrimTankToTrimTankIsolationValve#TankFuelRequired:TrimTank#Type:Electric#Index:8 Trigger.1 = Name:StartCenterTankXferToLeftInner#Target:LeftInner#Threshold:10421.5#Condition:TankQuantityBelow#EffectTrue:OpenValve.AutoCenterTransferValveL Trigger.2 = Name:StartCenterTankXferToRightInner#Target:RightInner#Threshold:10421.5#Condition:TankQuantityBelow#EffectTrue:OpenValve.AutoCenterTransferValveR Trigger.3 = Name:StopCenterTankXferToLeftInner#Target:LeftInner#Threshold:11094#Condition:TankQuantityAbove#EffectTrue:CloseValve.AutoCenterTransferValveL diff --git a/hdw-a339x/src/wasm/fadec_a330/src/EngineControl.h b/hdw-a339x/src/wasm/fadec_a330/src/EngineControl.h index b34bfb8bc..3811f1bd6 100644 --- a/hdw-a339x/src/wasm/fadec_a330/src/EngineControl.h +++ b/hdw-a339x/src/wasm/fadec_a330/src/EngineControl.h @@ -17,16 +17,16 @@ #define CONFIGURATION_SECTION_FUEL_RIGHT_QUANTITY "FUEL_RIGHT_QUANTITY" #define CONFIGURATION_SECTION_FUEL_LEFT_AUX_QUANTITY "FUEL_LEFT_AUX_QUANTITY" #define CONFIGURATION_SECTION_FUEL_RIGHT_AUX_QUANTITY "FUEL_RIGHT_AUX_QUANTITY" -// #define CONFIGURATION_SECTION_FUEL_TRIM_QTY "FUEL_TRIM_QTY" +#define CONFIGURATION_SECTION_FUEL_TRIM_QUANTITY "FUEL_TRIM_QUANTITY" /* Values in gallons */ struct Configuration { double fuelCenter = 0; - double fuelLeft = 1645.0; + double fuelLeft = 5535.5; double fuelRight = fuelLeft; - double fuelLeftAux = 228.0; + double fuelLeftAux = 478.5; double fuelRightAux = fuelLeftAux; - // double fuelTrim = 1617.0; + double fuelTrim = 823.0; }; class EngineControl { @@ -686,6 +686,7 @@ class EngineControl { bool xfrCenterRightAuto = simVars->getValve(12) > 0.0 && !xfrCenterRightManual; bool xfrValveCenterLeftOpen = simVars->getValve(9) > 0.0 && (xfrCenterLeftAuto || xfrCenterLeftManual); bool xfrValveCenterRightOpen = simVars->getValve(10) > 0.0 && (xfrCenterRightAuto || xfrCenterRightManual); + double xfrValveOuterLeft1 = simVars->getValve(6); double xfrValveOuterLeft2 = simVars->getValve(4); double xfrValveOuterRight1 = simVars->getValve(7); @@ -704,25 +705,25 @@ class EngineControl { double fuelUsedEngine1 = simVars->getFuelUsedEngine1(); // Kg double fuelUsedEngine2 = simVars->getFuelUsedEngine2(); // Kg - double fuelLeftPre = simVars->getFuelLeftPre(); // LBS - double fuelRightPre = simVars->getFuelRightPre(); // LBS - double fuelAuxLeftPre = simVars->getFuelAuxLeftPre(); // LBS - double fuelAuxRightPre = simVars->getFuelAuxRightPre(); // LBS - double fuelCenterPre = simVars->getFuelCenterPre(); // LBS - // double fuelTrimPre = simVars->getFuelTrimPre(); // LBS + double fuelLeftPre = simVars->getFuelLeftPre(); // LBS + double fuelRightPre = simVars->getFuelRightPre(); // LBS + double fuelAuxLeftPre = simVars->getFuelAuxLeftPre(); // LBS + double fuelAuxRightPre = simVars->getFuelAuxRightPre(); // LBS + double fuelCenterPre = simVars->getFuelCenterPre(); // LBS + double fuelTrimPre = simVars->getFuelTrimPre(); // LBS double leftQuantity = simVars->getFuelTankQuantity(2) * fuelWeightGallon; // LBS double rightQuantity = simVars->getFuelTankQuantity(3) * fuelWeightGallon; // LBS double leftAuxQuantity = simVars->getFuelTankQuantity(4) * fuelWeightGallon; // LBS double rightAuxQuantity = simVars->getFuelTankQuantity(5) * fuelWeightGallon; // LBS double centerQuantity = simVars->getFuelTankQuantity(1) * fuelWeightGallon; // LBS - // double trimQuantity = simVars->getTankFuelQuantity(6) * fuelWeightGallon; // LBS + double trimQuantity = simVars->getFuelTankQuantity(6) * fuelWeightGallon; // LBS double fuelLeft = 0; double fuelRight = 0; double fuelLeftAux = 0; double fuelRightAux = 0; double fuelCenter = 0; - // double fuelTrim = 0; + double fuelTrim = 0; double xfrCenterToLeft = 0; double xfrCenterToRight = 0; double xfrAuxLeft = 0; @@ -798,14 +799,14 @@ class EngineControl { simVars->setFuelAuxLeftPre(fuelAuxLeftPre); // in LBS simVars->setFuelAuxRightPre(fuelAuxRightPre); // in LBS simVars->setFuelCenterPre(fuelCenterPre); // in LBS - // simVars->setFuelTrimPre(fuelTrimPre); // in LBS + simVars->setFuelTrimPre(fuelTrimPre); // in LBS fuelLeft = (fuelLeftPre / fuelWeightGallon); // USG fuelRight = (fuelRightPre / fuelWeightGallon); // USG fuelCenter = (fuelCenterPre / fuelWeightGallon); // USG fuelLeftAux = (fuelAuxLeftPre / fuelWeightGallon); // USG fuelRightAux = (fuelAuxRightPre / fuelWeightGallon); // USG - // fuelTrim = (fuelTrimPre / fuelWeightGallon); // USG + fuelTrim = (fuelTrimPre / fuelWeightGallon); // USG SimConnect_SetDataOnSimObject(hSimConnect, DataTypesID::FuelCenterMain, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(double), &fuelCenter); SimConnect_SetDataOnSimObject(hSimConnect, DataTypesID::FuelLeftMain, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(double), &fuelLeft); @@ -820,7 +821,7 @@ class EngineControl { simVars->setFuelAuxLeftPre(leftAuxQuantity); // in LBS simVars->setFuelAuxRightPre(rightAuxQuantity); // in LBS simVars->setFuelCenterPre(centerQuantity); // in LBS - // simVars->setFuelTrimPre(trimQty); // in LBS + simVars->setFuelTrimPre(trimQuantity); // in LBS } else { if (uiFuelTamper == 1) { fuelLeftPre = leftQuantity; // LBS @@ -828,7 +829,7 @@ class EngineControl { fuelAuxLeftPre = leftAuxQuantity; // LBS fuelAuxRightPre = rightAuxQuantity; // LBS fuelCenterPre = centerQuantity; // LBS - // fuelTrimPre = trimQuantity; // LBS + fuelTrimPre = trimQuantity; // LBS } //----------------------------------------------------------- // Cross-feed Logic @@ -962,7 +963,7 @@ class EngineControl { configuration.fuelCenter = simVars->getFuelCenterPre() / simVars->getFuelWeightGallon(); configuration.fuelLeftAux = simVars->getFuelAuxLeftPre() / simVars->getFuelWeightGallon(); configuration.fuelRightAux = simVars->getFuelAuxRightPre() / simVars->getFuelWeightGallon(); - // configuration.fuelTrim = simVars->getFuelTrimPre() / simVars->getFuelWeightGallon(); + configuration.fuelTrim = simVars->getFuelTrimPre() / simVars->getFuelWeightGallon(); saveFuelInConfiguration(configuration); timerFuel.reset(); @@ -1165,7 +1166,7 @@ class EngineControl { simVars->setFuelAuxLeftPre(configuration.fuelLeftAux * simVars->getFuelWeightGallon()); // in LBS simVars->setFuelAuxRightPre(configuration.fuelRightAux * simVars->getFuelWeightGallon()); // in LBS simVars->setFuelCenterPre(configuration.fuelCenter * simVars->getFuelWeightGallon()); // in LBS - // simVars->setFuelTrimPre(configuration.fuelTrim * simVars->getFuelWeightGallon()); + simVars->setFuelTrimPre(configuration.fuelTrim * simVars->getFuelWeightGallon()); // Initialize Pump State simVars->setPumpStateEngine1(0); @@ -1287,7 +1288,7 @@ class EngineControl { mINI::INITypeConversion::getDouble(structure, CONFIGURATION_SECTION_FUEL, CONFIGURATION_SECTION_FUEL_RIGHT_QUANTITY, 1645.0), mINI::INITypeConversion::getDouble(structure, CONFIGURATION_SECTION_FUEL, CONFIGURATION_SECTION_FUEL_LEFT_AUX_QUANTITY, 228.0), mINI::INITypeConversion::getDouble(structure, CONFIGURATION_SECTION_FUEL, CONFIGURATION_SECTION_FUEL_RIGHT_AUX_QUANTITY, 228.0), - // mINI::INITypeConversion::getDouble(structure, CONFIGURATION_SECTION_FUEL, CONFIGURATION_SECTION_FUEL_TRIM_QTY, 1617.0), + mINI::INITypeConversion::getDouble(structure, CONFIGURATION_SECTION_FUEL, CONFIGURATION_SECTION_FUEL_TRIM_QUANTITY, 1617.0), }; } @@ -1303,7 +1304,7 @@ class EngineControl { stInitStructure[CONFIGURATION_SECTION_FUEL][CONFIGURATION_SECTION_FUEL_RIGHT_QUANTITY] = std::to_string(configuration.fuelRight); stInitStructure[CONFIGURATION_SECTION_FUEL][CONFIGURATION_SECTION_FUEL_LEFT_AUX_QUANTITY] = std::to_string(configuration.fuelLeftAux); stInitStructure[CONFIGURATION_SECTION_FUEL][CONFIGURATION_SECTION_FUEL_RIGHT_AUX_QUANTITY] = std::to_string(configuration.fuelRightAux); - // stInitStructure[CONFIGURATION_SECTION_FUEL][CONFIGURATION_SECTION_FUEL_TRIM_QTY] = std::to_string(configuration.fuelTrim); + stInitStructure[CONFIGURATION_SECTION_FUEL][CONFIGURATION_SECTION_FUEL_TRIM_QUANTITY] = std::to_string(configuration.fuelTrim); if (!iniFile.write(stInitStructure, true)) { std::cout << "EngineControl: failed to write engine conf " << confFilename << " due to error \"" << strerror(errno) << "\"" diff --git a/hdw-a339x/src/wasm/fadec_a330/src/SimVars.h b/hdw-a339x/src/wasm/fadec_a330/src/SimVars.h index 32767533b..007dbfa9a 100644 --- a/hdw-a339x/src/wasm/fadec_a330/src/SimVars.h +++ b/hdw-a339x/src/wasm/fadec_a330/src/SimVars.h @@ -9,7 +9,7 @@ enum DataTypesID { FuelCenterMain, FuelLeftAux, FuelRightAux, - // FuelTrim, + FuelTrim, OilTempEngine1, OilTempEngine2, OilPsiEngine1, @@ -139,7 +139,7 @@ class SimVars { ID FuelAuxLeftPre; ID FuelAuxRightPre; ID FuelCenterPre; - // ID FuelTrimPre; + ID FuelTrimPre; ID RefuelRate; ID RefuelStartedByUser; ID FuelOverflowLeft; @@ -196,7 +196,7 @@ class SimVars { FuelAuxLeftPre = register_named_variable("A32NX_FUEL_AUX_LEFT_PRE"); FuelAuxRightPre = register_named_variable("A32NX_FUEL_AUX_RIGHT_PRE"); FuelCenterPre = register_named_variable("A32NX_FUEL_CENTER_PRE"); - // FuelTrimPre = register_named_variable("A32NX_FUEL_TRIM_PRE"); + FuelTrimPre = register_named_variable("A32NX_FUEL_TRIM_PRE"); RefuelRate = register_named_variable("A32NX_EFB_REFUEL_RATE_SETTING"); RefuelStartedByUser = register_named_variable("A32NX_REFUEL_STARTED_BY_USR"); Engine1State = register_named_variable("A32NX_ENGINE_STATE:1"); @@ -245,7 +245,7 @@ class SimVars { this->setFuelAuxLeftPre(0); this->setFuelAuxRightPre(0); this->setFuelCenterPre(0); - // this->setFuelTrimPre(0); + this->setFuelTrimPre(0); this->setEngine1State(0); this->setEngine2State(0); this->setEngine1Timer(0); @@ -291,7 +291,7 @@ class SimVars { void setFuelAuxLeftPre(FLOAT64 value) { set_named_variable_value(FuelAuxLeftPre, value); } void setFuelAuxRightPre(FLOAT64 value) { set_named_variable_value(FuelAuxRightPre, value); } void setFuelCenterPre(FLOAT64 value) { set_named_variable_value(FuelCenterPre, value); } - // void setFuelTrimPre(FLOAT64 value) { set_named_variable_value(FuelTrimPre, value); }; + void setFuelTrimPre(FLOAT64 value) { set_named_variable_value(FuelTrimPre, value); }; void setEngine1State(FLOAT64 value) { set_named_variable_value(Engine1State, value); } void setEngine2State(FLOAT64 value) { set_named_variable_value(Engine2State, value); } void setEngine1Timer(FLOAT64 value) { set_named_variable_value(Engine1Timer, value); } @@ -337,7 +337,7 @@ class SimVars { FLOAT64 getFuelAuxLeftPre() { return get_named_variable_value(FuelAuxLeftPre); } FLOAT64 getFuelAuxRightPre() { return get_named_variable_value(FuelAuxRightPre); } FLOAT64 getFuelCenterPre() { return get_named_variable_value(FuelCenterPre); } - // FLOAT64 getFuelTrimPre() { return get_named_variable_value(FuelTrimPre); } + FLOAT64 getFuelTrimPre() { return get_named_variable_value(FuelTrimPre); } FLOAT64 getRefuelRate() { return get_named_variable_value(RefuelRate); } FLOAT64 getRefuelStartedByUser() { return get_named_variable_value(RefuelStartedByUser); } FLOAT64 getPumpStateEngine1() { return get_named_variable_value(PumpStateEngine1); }