Non GSX Fuel setting

.clang-format

@@ -0,0 +1,6 @@
+---
+BasedOnStyle: LLVM
+ColumnLimit: 130
+IndentCaseLabels: true
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLoopsOnASingleLine: true

.vscode/settings.json

@@ -18,5 +18,8 @@
   },
   "[xml]": {
     "editor.defaultFormatter": "redhat.vscode-xml"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

EFB/efb-js.patch

@@ -2,23 +2,26 @@ Index: EFB.js
 ===================================================================
 --- EFB.js
 +++ EFB.js
-@@ -30203,9 +30203,9 @@
+@@ -40265,11 +40265,11 @@
-         {
+         ),
-           className: "middle none center rounded-lg bg-green-700 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none",
+         /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
-           "data-ripple-light": "true",
+           "button",
-           onClick: () => getOutput(),
+           {
--          children: "Set Payload"
+-            onClick: loadPayload,
-+          children: "Manage Payload"
++            onClick: () => dispatch(setRoute({ path: "/payload" })),
-         }
+             className: "middle none center rounded-lg bg-green-700 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none",
-       ) }) })
+-            children: "Set payload & fuel"
-     ] }) }) });
++            children: "Manage payload & fuel"
-   }
+           }
-@@ -40556,8 +40556,27 @@
+         ),
+         /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+           "button",
+@@ -40767,8 +40767,27 @@
        ] })
      ] }) }) });
    }
  
-+  // Exports for add. script
++// Exports for add. script
 +  window.reactExports = __toESM(require_react());
 +  window.reactDomExports = __toESM(require_react_dom());
 +  window.jsxRuntimeExports = __toESM(require_jsx_runtime());

PackageDefinitions/xkhofmann-tfdidesign-md11-load-manager.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<AssetPackage Version="0.1.0">
+<AssetPackage Version="1.1.0">
 	<ItemSettings>
 		<ContentType>MISC</ContentType>
 		<Title>TFDi Design MD-11 Load Manager</Title>
@@ -10,9 +10,10 @@
 		<VisibleInStore>false</VisibleInStore>
 		<CanBeReferenced>false</CanBeReferenced>
 	</Flags>
+	<PackageOrderHint>CUSTOM_SIMOBJECTS_PATCH</PackageOrderHint>
 	<AssetGroups>
 		<AssetGroup Name="ContentInfo">
-			<Type>ContentInfo</Type>
+			<Type Version="0">ContentInfo</Type>
 			<Flags>
 				<FSXCompatibility>false</FSXCompatibility>
 			</Flags>
@@ -20,7 +21,7 @@
 			<OutputDir>ContentInfo\xkhofmann-tfdidesign-md11-load-manager\</OutputDir>
 		</AssetGroup>
 		<AssetGroup Name="html-ui">
-			<Type>Copy</Type>
+			<Type Version="0">Copy</Type>
 			<Flags>
 				<FSXCompatibility>false</FSXCompatibility>
 			</Flags>
@@ -31,7 +32,7 @@
 			</Config>
 		</AssetGroup>
 		<AssetGroup Name="md-11-panel-config">
-			<Type>Copy</Type>
+			<Type Version="0">Copy</Type>
 			<Flags>
 				<FSXCompatibility>false</FSXCompatibility>
 			</Flags>
@@ -40,4 +41,3 @@
 		</AssetGroup>
 	</AssetGroups>
 </AssetPackage>
-

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11 GE LOW/config/flight_model.cfg

@@ -1,15 +1,15 @@
-//TFDi Designs MD-11 (GE CF6-80C2D1F) vRC1.7.0_GE 15MAY25
+//TFDi Designs MD-11 (GE CF6-80C2D1F) vRC1.8.0_GE 04FEB26
 
 [VERSION]
 //KH Bump major
 major = 4
-minor = 1
+minor = 8
 
 [WEIGHT_AND_BALANCE]
 max_gross_weight = 630500
 empty_weight = 283975
 reference_datum_position = 0, 0, 0
-empty_weight_CG_position = -13.3, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
 CG_forward_limit = 0.12
 CG_aft_limit = 0.34
 empty_weight_pitch_MOI = 20897456
@@ -24,21 +24,21 @@ station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
 station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
 station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
 station_load.3=760, 66.0, 0.0, 4.0, Cabin crew 1, 0
-station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 0
+station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 4
-station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 0
+station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 4
-station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 0
+station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 4
-station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 0
+station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 4
-station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 0
+station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 4
-station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 0
+station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 4
-station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 0
+station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 3
-station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 0
+station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 3
-station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 0
+station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 3
-station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 0
+station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 5
-station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 0
+station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 5
-station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 0
+station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 5
 station_load.16=760, -55.0, 0.0, 4.0, Cabin crew 2, 0
-station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 0
+station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 6
-station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 0
+station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 6
 station_load.19=0, 5.0, -2.0, -4.5, Left aux tank, 0
 station_load.20=0, 5.0, 2.0, -4.5, Right aux tank, 0
 //KH END
@@ -59,7 +59,7 @@ max_speed_decreasing_steering_castering = 35
 emergency_extension_type = 2
 hyd_need_power_to_function= 0
 min_castering_angle = 0.05236
-max_castering_angle = 1.32645
+max_castering_angle = 3.142
 allow_stopped_steering = 1
 point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
 point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
@@ -88,9 +88,9 @@ LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
 RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
 External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
 //KH From 5.00, -2.00, -3.00, 0.00, 10.00
-LeftAux = 5.00, -2.00, -3.00, 1917.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
 //KH From 5.00, 2.00, -3.00, 0.00, 10.0
-RightAux = 5.00, 2.00, -3.00, 1917.00, 10.00
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
 fuel_type = 2
 number_of_tank_selectors = 3
 electric_pump = 0
@@ -175,7 +175,7 @@ lift_coef_horizontal_incidence = 0.91357
 lift_coef_flaps = 1
 lift_coef_spoilers = 0
 drag_coef_zero_lift = 0.02539
-drag_coef_flaps = 0.1889
+drag_coef_flaps = 0.1339
 drag_coef_gear = 0.0549
 drag_coef_spoilers = 0.05207
 side_force_slip_angle = -0.77392
@@ -265,7 +265,7 @@ cruise_lift_scalar = 1
 parasite_drag_scalar = 1
 induced_drag_scalar = 1
 flap_induced_drag_scalar = 1
-elevator_effectiveness = 1
+elevator_effectiveness = 1.1
 elevator_maxangle_scalar = 1
 aileron_effectiveness = 1
 rudder_effectiveness = 1
@@ -319,19 +319,19 @@ max_gear_extended = 200
 
 [INTERACTIVE POINTS]
 number_of_interactive_points = 13
-interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,0
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,-1
-interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
-interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,0
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,0
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
-interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,0
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
-interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,0
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
-interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33
+interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33,-1
-interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,0
+interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,-1
-interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,0
+interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,-1
-interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,0
+interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,-1
-interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,0
+interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,-1
-interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,0
+interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,-1
 
 [STALL PROTECTION]
 stall_protection = 1		; Alpha Protection
@@ -348,8 +348,8 @@ type = 1
 system_type = 1
 span-outboard = 0.25
 extending-time = 22
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -357,12 +357,12 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 
 [FLAPS.1]
@@ -370,8 +370,8 @@ type = 1
 system_type = 1
 span-outboard = 0.7
 extending-time = 23
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -379,12 +379,12 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 
 [FLAPS.2]
@@ -392,8 +392,8 @@ type = 2
 system_type = 1
 span-outboard = 0.2
 extending-time = 8
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
@@ -407,8 +407,8 @@ type = 2
 system_type = 1
 span-outboard = 0.7
 extending-time = 21
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11 GE/config/flight_model.cfg

@@ -0,0 +1,418 @@
+//TFDi Designs MD-11 (GE CF6-80C2D1F) vRC1.8.0_GE 04FEB26
+
+[VERSION]
+//KH Bump major
+major = 4
+minor = 8
+
+[WEIGHT_AND_BALANCE]
+max_gross_weight = 630500
+empty_weight = 283975
+reference_datum_position = 0, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
+CG_forward_limit = 0.12
+CG_aft_limit = 0.34
+empty_weight_pitch_MOI = 20897456
+empty_weight_roll_MOI = 6368555
+empty_weight_yaw_MOI = 40761191
+empty_weight_coupled_MOI = 0
+activate_mach_limit_based_on_cg = 0
+activate_cg_limit_based_on_mach = 0
+max_number_of_stations = 21
+//KH START Empty default
+station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
+station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
+station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
+station_load.3=760, 66.0, 0.0, 4.0, Cabin crew 1, 0
+station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 4
+station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 4
+station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 4
+station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 4
+station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 4
+station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 4
+station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 3
+station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 3
+station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 3
+station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 5
+station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 5
+station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 5
+station_load.16=760, -55.0, 0.0, 4.0, Cabin crew 2, 0
+station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 6
+station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 6
+station_load.19=0, 5.0, -2.0, -4.5, Left aux tank, 0
+station_load.20=0, 5.0, 2.0, -4.5, Right aux tank, 0
+//KH END
+
+[CONTACT_POINTS]
+static_pitch = 0
+static_cg_height = 16.4
+gear_system_type = 1
+tailwheel_lock = 0
+max_number_of_points = 16
+gear_locked_on_ground = 0
+gear_locked_above_speed = -1
+max_speed_full_steering = 25
+min_available_steering_angle_pct = 0.2
+max_speed_decreasing_steering = 45
+max_speed_full_steering_castering = 20
+max_speed_decreasing_steering_castering = 35
+emergency_extension_type = 2
+hyd_need_power_to_function= 0
+min_castering_angle = 0.05236
+max_castering_angle = 3.142
+allow_stopped_steering = 1
+point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
+point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
+point.2 = 1, -19.00,  17.15, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 53, 54, 3, 200, 250, 8
+point.3 = 1, -19.00,  0.00, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 55, 56, 3, 200, 250, 8
+point.4 = 2, 93.0, 0.0, 0.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.5 = 2, -48, -82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 5, 0, 0, 1
+point.6 = 2, -48, 82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 6, 0, 0, 1
+point.7 = 2, 60, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.8 = 2, 60, 0.0, 11.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.9 = 2, 16.0,  -28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.10 = 2, 16.0,  28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.11 = 2, -110.0,  0.00,  14.20,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.12 = 2, -96.5, 0.0, 42.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.13 = 2, -94.5, -30.0, 8.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.14 = 2, -94.5, 30.0, 8.05,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.15 = 2, -52.0, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+
+[FUEL]
+LeftMain = -20.00, -38.00, -1.0, 8938, 10.00
+RightMain = -20.00, 38.00, -1.0, 8938, 10.00
+Center1 = 10.00, 0.00, -3.00, 13000.00, 10.00
+Center2 = 0.00, 0.00, -1.00, 1642.00, 10.00
+Center3 = 0.00, 0.00, -5.00, 1958.00, 11.00
+LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
+RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
+External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
+//KH From 5.00, -2.00, -3.00, 0.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
+//KH From 5.00, 2.00, -3.00, 0.00, 10.0
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
+fuel_type = 2
+number_of_tank_selectors = 3
+electric_pump = 0
+engine_driven_pump = 1
+manual_transfer_pump = 0
+manual_pump = 0
+anemometer_pump = 0
+fuel_dump_rate = 0.02
+default_fuel_tank_selector.1 = 1
+default_fuel_tank_selector.2 = 1
+default_fuel_tank_selector.3 = 1
+
+[AIRPLANE_GEOMETRY]
+wing_area = 3648
+wing_span = 170.5
+wing_root_chord = 34.68
+wing_camber = 1
+wing_thickness_ratio = 0.04
+wing_dihedral = 2.2
+wing_incidence = 1.5
+wing_twist = -0.5
+oswald_efficiency_factor = 0.72
+wing_winglets_flag = 1
+wing_sweep = 38
+wing_pos_apex_lon = 1
+wing_pos_apex_vert = -2.75
+htail_area = 920
+htail_span = 59.5
+htail_pos_lon = -88
+htail_pos_vert = 5.0
+htail_incidence = 0.8
+htail_sweep = 36.5
+htail_thickness_ratio = 0.02
+vtail_area = 760
+vtail_span = 28.1
+vtail_sweep = 43
+vtail_pos_lon = -79.5
+vtail_pos_vert = 28
+vtail_thickness_ratio = 0.03
+fuselage_length = 202.16
+fuselage_diameter = 19.75
+fuselage_center_pos = 10, 0, 1.0
+elevator_area = 327.0
+aileron_area = 225.0
+rudder_area = 190.0
+elevator_up_limit = 25
+elevator_down_limit = 15
+aileron_up_limit = 25
+aileron_down_limit = 15
+rudder_limit = 23
+rudder_trim_limit = 20
+elevator_trim_limit = 30
+spoiler_limit = 60
+spoilerons_available = 1
+aileron_to_spoileron_gain = 3
+min_ailerons_for_spoilerons = 10
+min_flaps_for_spoilerons = 0
+spoiler_extension_time = 2.0
+spoiler_handle_available = 1
+auto_spoiler_available = 1
+auto_spoiler_auto_retracts = 0
+auto_spoiler_min_speed = 72
+positive_g_limit_flaps_up = 5.0
+positive_g_limit_flaps_down = 4.0
+negative_g_limit_flaps_up = -4.0
+negative_g_limit_flaps_down = -3.0
+load_safety_factor = 1.5
+elevator_trim_neutral = -1
+aileron_to_rudder_scale = 0
+flap_to_aileron_scale = 0
+fly_by_wire = 0
+elevator_elasticity_table = 0:0.7, 87:0.3, 210:0.5, 315:0.5
+aileron_elasticity_table = 0:1, 300:0.7, 600:0.6, 1500:0.4
+rudder_elasticity_table = 0:1, 300:1, 800:1, 1000:0.7
+elevator_trim_elasticity_table = 0:0.0, 87:0.40, 240:0.60, 295:1.00, 315:1.00
+
+[AERODYNAMICS]
+lift_coef_pitch_rate = -8.09375
+lift_coef_daoa = 2.68359
+lift_coef_delta_elevator = -0.28906
+lift_coef_horizontal_incidence = 0.91357
+lift_coef_flaps = 1
+lift_coef_spoilers = 0
+drag_coef_zero_lift = 0.02539
+drag_coef_flaps = 0.1339
+drag_coef_gear = 0.0549
+drag_coef_spoilers = 0.05207
+side_force_slip_angle = -0.77392
+side_force_roll_rate = 0.15478
+side_force_yaw_rate = 0
+side_force_delta_rudder = -0.14746
+pitch_moment_horizontal_incidence = 4.24755
+pitch_moment_delta_elevator = -2.37011
+pitch_moment_delta_trim = 0
+pitch_moment_pitch_damping = -214.1455
+pitch_moment_aoa_0 = 0.11621
+pitch_moment_daoa = 8.87255
+pitch_moment_flaps = 0.0105
+pitch_moment_gear = 0.0171
+pitch_moment_spoilers = 0
+pitch_moment_delta_elevator_propwash = -2.37011
+pitch_moment_pitch_propwash = -214.1455
+roll_moment_slip_angle = 0.26855
+roll_moment_roll_damping = -3.40869
+roll_moment_yaw_rate = -0.27197
+roll_moment_spoilers = 0.07
+roll_moment_delta_aileron = -0.34521
+roll_moment_delta_rudder = 0.01660
+roll_moment_delta_aileron_trim_scalar = -0.2
+yaw_moment_slip_angle = 0.18066
+yaw_moment_roll = 0.07470
+yaw_moment_yaw_damping = -2.49023
+yaw_moment_yaw_propwash = 0
+yaw_moment_delta_aileron = -0.00683
+yaw_moment_delta_rudder = 0.07128
+yaw_moment_delta_rudder_propwash = 0.075
+yaw_moment_delta_rudder_trim_scalar = -0.2
+compute_aero_center = 0
+aero_center_lift = -13.75
+lift_coef_aoa_table = -3.15:0, -2.36:0.36, -1.57:0, -0.349:-1.2, 0:-0.022, 0.0314:0.6082, 0.221:2.049, 0.244:1.15, 0.349:0.6, 0.436:0.5, 0.698:0.1, 1.963:-0.359, 2.356:-0.5, 3.15:0
+lift_coef_ground_effect_mach_table = 0.06:0.50, 0.227:0.80, 0.242:0.80, 0.3:1.0, 0.9:1.0
+lift_coef_mach_table = 0:1
+lift_coef_delta_elevator_mach_table = 0:0
+lift_coef_daoa_mach_table = 0:0
+lift_coef_pitch_rate_mach_table = 0:0
+lift_coef_horizontal_incidence_mach_table = 0:0
+drag_coef_zero_lift_mach_tab = 0:0, 0.4:0.0054, 0.5:0.0056, 0.6:0.0059, 0.7:0.0062, 0.72:0.0062, 0.8:0.0063, 0.8:0.0063, 1:0.0337, 1.2:0.0337, 1.4:0.0337, 1.6:0.0337, 1.8:0.0337, 2.0:0.0337
+side_force_slip_angle_mach_table = 0:0
+side_force_delta_rudder_mach_table = 0:0
+side_force_yaw_rate_mach_table = 0:0
+side_force_roll_rate_mach_table = 0:0
+pitch_moment_aoa_table = -3.15:-2, -0.436:-0.626, -0.262:-0.434, 0:-0.146, 0.087:-0.05, 0.175:0.0466, 0.262:0.143, 0.314:0.2, 0.349:0.1, 0.436:0.15, 3.15:2
+pitch_moment_delta_elevator_aoa_table = -180:-1, -40:0.05, -20:0.455, -14:0.853, -7:1.007, 0:1, 7:0.839, 14:0.693, 20:0.381, 40:-0.08, 180:-1
+pitch_moment_horizontal_incidence_aoa_table = 0:1
+pitch_moment_daoa_aoa_table = 0:1
+pitch_moment_pitch_alpha_table = 0:1
+pitch_moment_delta_elevator_mach_table = 0:0
+pitch_moment_daoa_mach_table = 0:0
+pitch_moment_pitch_rate_mach_table = 0:0
+pitch_moment_horizontal_incidence_mach_table = 0:0
+pitch_moment_aoa_0_mach_table = 0:0
+roll_moment_aoa_table = 0:0
+roll_moment_slip_angle_aoa_table = 0:1
+roll_moment_roll_rate_aoa_table = 0:1
+roll_moment_delta_aileron_aoa_table = 0:1
+roll_moment_slip_angle_mach_table = 0:0
+roll_moment_delta_rudder_mach_table = 0:0
+roll_moment_delta_aileron_mach_table = 0:0
+roll_moment_yaw_rate_mach_table = 0:0
+roll_moment_roll_rate_mach_table = 0:0
+yaw_moment_aoa_table = 0:0
+yaw_moment_slip_angle_aoa_table = 0:1
+yaw_moment_yaw_rate_aoa_table = 0:1
+yaw_moment_delta_rudder_aoa_table = 0:1
+yaw_moment_slip_angle_mach_table = 0:0
+yaw_moment_delta_rudder_mach_table = 0:0
+yaw_moment_delta_aileron_mach_table = 0:0
+yaw_moment_yaw_rate_mach_table = 0:0
+yaw_moment_roll_rate_mach_table = 0:0
+elevator_scaling_table = -0.785:0.5, -0.524:0.85, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.85, 0.785:0.5 ; 0:1
+aileron_scaling_table = -0.785:1 ;0:1
+rudder_scaling_table = -0.785:0.5, -0.524:0.6, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.6, 0.785:0.5 ;0:1
+elevator_lift_coef=3
+rudder_lift_coef=2
+aileron_load_factor_effectiveness_table = 0:1
+lift_coef_at_drag_zero = 0.1
+lift_coef_at_drag_zero_flaps = 0.1
+
+[FLIGHT_TUNING]
+modern_fm_only = 1
+cruise_lift_scalar = 1
+parasite_drag_scalar = 1
+induced_drag_scalar = 1
+flap_induced_drag_scalar = 1
+elevator_effectiveness = 1.1
+elevator_maxangle_scalar = 1
+aileron_effectiveness = 1
+rudder_effectiveness = 1
+rudder_maxangle_scalar = 1
+pitch_stability = 5
+roll_stability = 1
+yaw_stability = 1
+pitch_gyro_stability = 1
+roll_gyro_stability = 1
+yaw_gyro_stability = 1
+empty_CG_deviation_limit=0
+elevator_trim_effectiveness = 1.5
+aileron_trim_effectiveness = 1
+rudder_trim_effectiveness = 1
+hi_alpha_on_roll = 0
+hi_alpha_on_yaw = 0
+p_factor_on_yaw = 0
+torque_on_roll = 0
+gyro_precession_on_roll = 0
+gyro_precession_on_yaw = 0
+engine_wash_on_roll = 0
+wingflex_scalar = 2
+wingflex_offset = 0
+stall_coef_at_min_weight = 0.71
+ground_crosswind_effect_zero_speed=10
+ground_crosswind_effect_max_speed=150
+ground_high_speed_steeringwheel_static_friction_scalar=1.5
+ground_high_speed_otherwheel_static_friction_scalar=1.2
+
+[REFERENCE SPEEDS]
+full_flaps_stall_speed = 115
+flaps_up_stall_speed = 149
+cruise_speed = 345
+cruise_mach = 0.85
+crossover_speed = 330
+max_mach = 0.9
+max_indicated_speed = 395
+max_flaps_extended = 170
+normal_operating_speed = 325
+airspeed_indicator_max = 562.5
+rotation_speed_min = 145
+climb_speed = 250
+cruise_alt = 41000
+takeoff_speed = 165
+spawn_cruise_altitude = 5000
+spawn_descent_altitude = 500
+best_angle_climb_speed = 0
+approach_speed = 0
+best_glide = 0
+max_gear_extended = 200
+
+[INTERACTIVE POINTS]
+number_of_interactive_points = 13
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,-1
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
+interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33,-1
+interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,-1
+interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,-1
+interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,-1
+interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,-1
+interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,-1
+
+[STALL PROTECTION]
+stall_protection = 1		; Alpha Protection
+off_limit = 11.5				; Alpha below which the Alpha Protection can be disabled (If also below off_yoke_limit)
+off_yoke_limit = 1			; Yoke position (in Pct) below which the Alpha Protection can be disabled (If also below off_limit)
+on_limit = 14				; Alpha above which the Alpha Protection timer starts
+on_goal = 10				; The alpha that the Alpha Protection will attempt to reach when triggered
+timer_trigger = 1.0			; Duration (in Sec) the alpha must be above on_limit before the Alpha Protection is triggered
+
+;===================== FLAPS =====================
+
+[FLAPS.0]
+type = 1
+system_type = 1
+span-outboard = 0.25
+extending-time = 22
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+
+[FLAPS.1]
+type = 1
+system_type = 1
+span-outboard = 0.7
+extending-time = 23
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+
+[FLAPS.2]
+type = 2
+system_type = 1
+span-outboard = 0.2
+extending-time = 8
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5
+
+[FLAPS.3]
+type = 2
+system_type = 1
+span-outboard = 0.7
+extending-time = 21
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11 PW LOW/config/flight_model.cfg

@@ -0,0 +1,417 @@
+; TFDi Designs MD-11 (PW4462) vRC1.8.0_PW 04FEB26
+
+[MODULAR_MERGE]
+auto = true
+
+[VERSION]
+//KH Bump major
+major = 4
+minor = 8
+
+[WEIGHT_AND_BALANCE]
+max_gross_weight = 630500
+empty_weight = 283975
+reference_datum_position = 0, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
+CG_forward_limit = 0.12
+CG_aft_limit = 0.34
+empty_weight_pitch_MOI = 20897456
+empty_weight_roll_MOI = 6368555
+empty_weight_yaw_MOI = 40761191
+empty_weight_coupled_MOI = 0
+activate_mach_limit_based_on_cg = 0
+activate_cg_limit_based_on_mach = 0
+max_number_of_stations = 21
+//KH START Empty default
+station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
+station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
+station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
+station_load.3=760, 66.0, 0.0, 4.0, Cabin crew 1, 0
+station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 4
+station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 4
+station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 4
+station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 4
+station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 4
+station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 4
+station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 3
+station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 3
+station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 3
+station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 5
+station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 5
+station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 5
+station_load.16=760, -55.0, 0.0, 4.0, Cabin crew 2, 0
+station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 6
+station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 6
+station_load.19=0, 5.0, -2.0, -4.5, Left aux tank, 0
+station_load.20=0, 5.0, 2.0, -4.5, Right aux tank, 0
+//KH END
+
+[CONTACT_POINTS]
+static_pitch = 0
+static_cg_height = 16.4
+gear_system_type = 1
+tailwheel_lock = 0
+max_number_of_points = 16
+gear_locked_on_ground = 0
+gear_locked_above_speed = -1
+max_speed_full_steering = 25
+min_available_steering_angle_pct = 0.2
+max_speed_decreasing_steering = 45
+max_speed_full_steering_castering = 20
+max_speed_decreasing_steering_castering = 35
+emergency_extension_type = 2
+hyd_need_power_to_function= 0
+min_castering_angle = 0.05236
+max_castering_angle = 3.142
+allow_stopped_steering = 1
+point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
+point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
+point.2 = 1, -19.00,  17.15, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 53, 54, 3, 200, 250, 8
+point.3 = 1, -19.00,  0.00, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 55, 56, 3, 200, 250, 8
+point.4 = 2, 93.0, 0.0, 0.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.5 = 2, -48, -82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 5, 0, 0, 1
+point.6 = 2, -48, 82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 6, 0, 0, 1
+point.7 = 2, 60, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.8 = 2, 60, 0.0, 11.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.9 = 2, 16.0,  -28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.10 = 2, 16.0,  28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.11 = 2, -110.0,  0.00,  14.20,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.12 = 2, -96.5, 0.0, 42.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.13 = 2, -94.5, -30.0, 8.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.14 = 2, -94.5, 30.0, 8.05,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.15 = 2, -52.0, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+
+[FUEL]
+LeftMain = -20.00, -38.00, -1.0, 8938, 10.00
+RightMain = -20.00, 38.00, -1.0, 8938, 10.00
+Center1 = 10.00, 0.00, -3.00, 13000.00, 10.00
+Center2 = 0.00, 0.00, -1.00, 1642.00, 10.00
+Center3 = 0.00, 0.00, -5.00, 1958.00, 11.00
+LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
+RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
+External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
+fuel_type = 2
+number_of_tank_selectors = 3
+electric_pump = 0
+engine_driven_pump = 1
+manual_transfer_pump = 0
+manual_pump = 0
+anemometer_pump = 0
+fuel_dump_rate = 0.02
+default_fuel_tank_selector.1 = 1
+default_fuel_tank_selector.2 = 1
+default_fuel_tank_selector.3 = 1
+
+[AIRPLANE_GEOMETRY]
+wing_area = 3648
+wing_span = 170.5
+wing_root_chord = 34.68
+wing_camber = 1
+wing_thickness_ratio = 0.04
+wing_dihedral = 2.2
+wing_incidence = 1.5
+wing_twist = -0.5
+oswald_efficiency_factor = 0.72
+wing_winglets_flag = 1
+wing_sweep = 38
+wing_pos_apex_lon = 1
+wing_pos_apex_vert = -2.75
+htail_area = 920
+htail_span = 59.5
+htail_pos_lon = -88
+htail_pos_vert = 5.0
+htail_incidence = 0.8
+htail_sweep = 36.5
+htail_thickness_ratio = 0.02
+vtail_area = 760
+vtail_span = 28.1
+vtail_sweep = 43
+vtail_pos_lon = -79.5
+vtail_pos_vert = 28
+vtail_thickness_ratio = 0.03
+fuselage_length = 200.92
+fuselage_diameter = 19.75
+fuselage_center_pos = 10, 0, 1.0
+elevator_area = 327.0
+aileron_area = 225.0
+rudder_area = 190.0
+elevator_up_limit = 25
+elevator_down_limit = 15
+aileron_up_limit = 25
+aileron_down_limit = 15
+rudder_limit = 23
+rudder_trim_limit = 20
+elevator_trim_limit = 30
+spoiler_limit = 60
+spoilerons_available = 1
+aileron_to_spoileron_gain = 3
+min_ailerons_for_spoilerons = 10
+min_flaps_for_spoilerons = 0
+spoiler_extension_time = 2.0
+spoiler_handle_available = 1
+auto_spoiler_available = 1
+auto_spoiler_auto_retracts = 0
+auto_spoiler_min_speed = 72
+positive_g_limit_flaps_up = 5.0
+positive_g_limit_flaps_down = 4.0
+negative_g_limit_flaps_up = -4.0
+negative_g_limit_flaps_down = -3.0
+load_safety_factor = 1.5
+elevator_trim_neutral = -1
+aileron_to_rudder_scale = 0
+flap_to_aileron_scale = 0
+fly_by_wire = 0
+elevator_elasticity_table = 0:0.7, 87:0.3, 210:0.5, 315:0.5
+aileron_elasticity_table = 0:1, 300:0.7, 600:0.6, 1500:0.4
+rudder_elasticity_table = 0:1, 300:1, 800:1, 1000:0.7
+elevator_trim_elasticity_table = 0:0.0, 87:0.40, 240:0.60, 295:1.00, 315:1.00
+
+[AERODYNAMICS]
+lift_coef_pitch_rate = -8.09375
+lift_coef_daoa = 2.68359
+lift_coef_delta_elevator = -0.28906
+lift_coef_horizontal_incidence = 0.91357
+lift_coef_flaps = 1
+lift_coef_spoilers = 0
+drag_coef_zero_lift = 0.02539
+drag_coef_flaps = 0.1339
+drag_coef_gear = 0.0549
+drag_coef_spoilers = 0.05207
+side_force_slip_angle = -0.77392
+side_force_roll_rate = 0.15478
+side_force_yaw_rate = 0
+side_force_delta_rudder = -0.14746
+pitch_moment_horizontal_incidence = 4.24755
+pitch_moment_delta_elevator = -2.37011
+pitch_moment_delta_trim = 0
+pitch_moment_pitch_damping = -214.1455
+pitch_moment_aoa_0 = 0.11621
+pitch_moment_daoa = 8.87255
+pitch_moment_flaps = 0.0105
+pitch_moment_gear = 0.0171
+pitch_moment_spoilers = 0
+pitch_moment_delta_elevator_propwash = -2.37011
+pitch_moment_pitch_propwash = -214.1455
+roll_moment_slip_angle = 0.26855
+roll_moment_roll_damping = -3.40869
+roll_moment_yaw_rate = -0.27197
+roll_moment_spoilers = 0.07
+roll_moment_delta_aileron = -0.34521
+roll_moment_delta_rudder = 0.01660
+roll_moment_delta_aileron_trim_scalar = -0.2
+yaw_moment_slip_angle = 0.18066
+yaw_moment_roll = 0.07470
+yaw_moment_yaw_damping = -2.49023
+yaw_moment_yaw_propwash = 0
+yaw_moment_delta_aileron = -0.00683
+yaw_moment_delta_rudder = 0.07128
+yaw_moment_delta_rudder_propwash = 0.075
+yaw_moment_delta_rudder_trim_scalar = -0.2
+compute_aero_center = 0
+aero_center_lift = -13.75
+lift_coef_aoa_table = -3.15:0, -2.36:0.36, -1.57:0, -0.349:-1.2, 0:-0.022, 0.0314:0.6082, 0.221:2.049, 0.244:1.15, 0.349:0.6, 0.436:0.5, 0.698:0.1, 1.963:-0.359, 2.356:-0.5, 3.15:0
+lift_coef_ground_effect_mach_table = 0.06:0.50, 0.227:0.80, 0.242:0.80, 0.3:1.0, 0.9:1.0
+lift_coef_mach_table = 0:1
+lift_coef_delta_elevator_mach_table = 0:0
+lift_coef_daoa_mach_table = 0:0
+lift_coef_pitch_rate_mach_table = 0:0
+lift_coef_horizontal_incidence_mach_table = 0:0
+drag_coef_zero_lift_mach_tab = 0:0, 0.4:0.0054, 0.5:0.0056, 0.6:0.0059, 0.7:0.0062, 0.72:0.0062, 0.8:0.0063, 0.8:0.0063, 1:0.0337, 1.2:0.0337, 1.4:0.0337, 1.6:0.0337, 1.8:0.0337, 2.0:0.0337
+side_force_slip_angle_mach_table = 0:0
+side_force_delta_rudder_mach_table = 0:0
+side_force_yaw_rate_mach_table = 0:0
+side_force_roll_rate_mach_table = 0:0
+pitch_moment_aoa_table = -3.15:-2, -0.436:-0.626, -0.262:-0.434, 0:-0.146, 0.087:-0.05, 0.175:0.0466, 0.262:0.143, 0.314:0.2, 0.349:0.1, 0.436:0.15, 3.15:2
+pitch_moment_delta_elevator_aoa_table = -180:-1, -40:0.05, -20:0.455, -14:0.853, -7:1.007, 0:1, 7:0.839, 14:0.693, 20:0.381, 40:-0.08, 180:-1
+pitch_moment_horizontal_incidence_aoa_table = 0:1
+pitch_moment_daoa_aoa_table = 0:1
+pitch_moment_pitch_alpha_table = 0:1
+pitch_moment_delta_elevator_mach_table = 0:0
+pitch_moment_daoa_mach_table = 0:0
+pitch_moment_pitch_rate_mach_table = 0:0
+pitch_moment_horizontal_incidence_mach_table = 0:0
+pitch_moment_aoa_0_mach_table = 0:0
+roll_moment_aoa_table = 0:0
+roll_moment_slip_angle_aoa_table = 0:1
+roll_moment_roll_rate_aoa_table = 0:1
+roll_moment_delta_aileron_aoa_table = 0:1
+roll_moment_slip_angle_mach_table = 0:0
+roll_moment_delta_rudder_mach_table = 0:0
+roll_moment_delta_aileron_mach_table = 0:0
+roll_moment_yaw_rate_mach_table = 0:0
+roll_moment_roll_rate_mach_table = 0:0
+yaw_moment_aoa_table = 0:0
+yaw_moment_slip_angle_aoa_table = 0:1
+yaw_moment_yaw_rate_aoa_table = 0:1
+yaw_moment_delta_rudder_aoa_table = 0:1
+yaw_moment_slip_angle_mach_table = 0:0
+yaw_moment_delta_rudder_mach_table = 0:0
+yaw_moment_delta_aileron_mach_table = 0:0
+yaw_moment_yaw_rate_mach_table = 0:0
+yaw_moment_roll_rate_mach_table = 0:0
+elevator_scaling_table = -0.785:0.5, -0.524:0.85, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.85, 0.785:0.5 ; 0:1
+aileron_scaling_table = -0.785:1 ;0:1
+rudder_scaling_table = -0.785:0.5, -0.524:0.6, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.6, 0.785:0.5 ;0:1
+elevator_lift_coef=3
+rudder_lift_coef=2
+aileron_load_factor_effectiveness_table = 0:1
+lift_coef_at_drag_zero = 0.1
+lift_coef_at_drag_zero_flaps = 0.1
+
+[FLIGHT_TUNING]
+modern_fm_only = 1
+cruise_lift_scalar = 1
+parasite_drag_scalar = 1
+induced_drag_scalar = 1
+flap_induced_drag_scalar = 1
+elevator_effectiveness = 1.1
+elevator_maxangle_scalar = 1
+aileron_effectiveness = 1
+rudder_effectiveness = 1
+rudder_maxangle_scalar = 1
+pitch_stability = 5
+roll_stability = 1
+yaw_stability = 1
+pitch_gyro_stability = 1
+roll_gyro_stability = 1
+yaw_gyro_stability = 1
+empty_CG_deviation_limit=0
+elevator_trim_effectiveness = 1.5
+aileron_trim_effectiveness = 1
+rudder_trim_effectiveness = 1
+hi_alpha_on_roll = 0
+hi_alpha_on_yaw = 0
+p_factor_on_yaw = 0
+torque_on_roll = 0
+gyro_precession_on_roll = 0
+gyro_precession_on_yaw = 0
+engine_wash_on_roll = 0
+wingflex_scalar = 2
+wingflex_offset = 0
+stall_coef_at_min_weight = 0.71
+ground_crosswind_effect_zero_speed=10
+ground_crosswind_effect_max_speed=150
+ground_high_speed_steeringwheel_static_friction_scalar=1.5
+ground_high_speed_otherwheel_static_friction_scalar=1.2
+
+[REFERENCE SPEEDS]
+full_flaps_stall_speed = 115
+flaps_up_stall_speed = 149
+cruise_speed = 345
+cruise_mach = 0.85
+crossover_speed = 330
+max_mach = 0.9
+max_indicated_speed = 395
+max_flaps_extended = 170
+normal_operating_speed = 325
+airspeed_indicator_max = 562.5
+rotation_speed_min = 145
+climb_speed = 250
+cruise_alt = 41000
+takeoff_speed = 165
+spawn_cruise_altitude = 5000
+spawn_descent_altitude = 500
+best_angle_climb_speed = 0
+approach_speed = 0
+best_glide = 0
+max_gear_extended = 200
+
+[INTERACTIVE POINTS]
+number_of_interactive_points = 13
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,-1
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
+interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33,-1
+interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,-1
+interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,-1
+interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,-1
+interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,-1
+interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,-1
+
+[STALL PROTECTION]
+stall_protection = 1		; Alpha Protection
+off_limit = 11.5				; Alpha below which the Alpha Protection can be disabled (If also below off_yoke_limit)
+off_yoke_limit = 1			; Yoke position (in Pct) below which the Alpha Protection can be disabled (If also below off_limit)
+on_limit = 14				; Alpha above which the Alpha Protection timer starts
+on_goal = 10				; The alpha that the Alpha Protection will attempt to reach when triggered
+timer_trigger = 1.0			; Duration (in Sec) the alpha must be above on_limit before the Alpha Protection is triggered
+
+;===================== FLAPS =====================
+
+[FLAPS.0]
+type = 1
+system_type = 1
+span-outboard = 0.25
+extending-time = 22
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+[FLAPS.1]
+type = 1
+system_type = 1
+span-outboard = 0.7
+extending-time = 23
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+[FLAPS.2]
+type = 2
+system_type = 1
+span-outboard = 0.2
+extending-time = 8
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5
+
+[FLAPS.3]
+type = 2
+system_type = 1
+span-outboard = 0.7
+extending-time = 21
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11 PW/config/flight_model.cfg

@@ -1,15 +1,18 @@
-//TFDi Designs MD-11 (PW4460) vRC1.7.0_PW 15MAY25
+; TFDi Designs MD-11 (PW4462) vRC1.8.0_PW 04FEB26
+
+[MODULAR_MERGE]
+auto = true
 
 [VERSION]
 //KH Bump major
 major = 4
-minor = 1
+minor = 8
 
 [WEIGHT_AND_BALANCE]
 max_gross_weight = 630500
 empty_weight = 283975
 reference_datum_position = 0, 0, 0
-empty_weight_CG_position = -13.3, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
 CG_forward_limit = 0.12
 CG_aft_limit = 0.34
 empty_weight_pitch_MOI = 20897456
@@ -24,21 +27,21 @@ station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
 station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
 station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
 station_load.3=760, 66.0, 0.0, 4.0, Cabin crew 1, 0
-station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 0
+station_load.4=0, 45.0, -5.0, 4.0, Business 1 L, 4
-station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 0
+station_load.5=0, 45.0, 0.0, 4.0, Business 1 C, 4
-station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 0
+station_load.6=0, 45.0, 5.0, 4.0, Business 1 R, 4
-station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 0
+station_load.7=0, 25.0, -5.0, 4.0, Business 2 L, 4
-station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 0
+station_load.8=0, 25.0, 0.0, 4.0, Business 2 C, 4
-station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 0
+station_load.9=0, 25.0, 5.0, 4.0, Business 2 R, 4
-station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 0
+station_load.10=0, -20.0, -5.0, 4.0, Economy 3 L, 3
-station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 0
+station_load.11=0, -20.0, 0.0, 4.0, Economy 3 C, 3
-station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 0
+station_load.12=0, -20.0, 5.0, 4.0, Economy 3 R, 3
-station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 0
+station_load.13=0, -50.0, -5.0, 4.0, Economy 4 L, 5
-station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 0
+station_load.14=0, -50.0, 0.0, 4.0, Economy 4 C, 5
-station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 0
+station_load.15=0, -50.0, 5.0, 4.0, Economy 4 R, 5
 station_load.16=760, -55.0, 0.0, 4.0, Cabin crew 2, 0
-station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 0
+station_load.17=0, 30.0, 0.0, -4.5, Forward cargo, 6
-station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 0
+station_load.18=0, -30.0, 0.0, -4.5, Rear cargo, 6
 station_load.19=0, 5.0, -2.0, -4.5, Left aux tank, 0
 station_load.20=0, 5.0, 2.0, -4.5, Right aux tank, 0
 //KH END
@@ -59,7 +62,7 @@ max_speed_decreasing_steering_castering = 35
 emergency_extension_type = 2
 hyd_need_power_to_function= 0
 min_castering_angle = 0.05236
-max_castering_angle = 1.32645
+max_castering_angle = 3.142
 allow_stopped_steering = 1
 point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
 point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
@@ -88,9 +91,9 @@ LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
 RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
 External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
 //KH From 5.00, -2.00, -3.00, 0.00, 10.00
-LeftAux = 5.00, -2.00, -3.00, 1917.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
 //KH From 5.00, 2.00, -3.00, 0.00, 10.0
-RightAux = 5.00, 2.00, -3.00, 1917.00, 10.00
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
 fuel_type = 2
 number_of_tank_selectors = 3
 electric_pump = 0
@@ -175,7 +178,7 @@ lift_coef_horizontal_incidence = 0.91357
 lift_coef_flaps = 1
 lift_coef_spoilers = 0
 drag_coef_zero_lift = 0.02539
-drag_coef_flaps = 0.1889
+drag_coef_flaps = 0.1339
 drag_coef_gear = 0.0549
 drag_coef_spoilers = 0.05207
 side_force_slip_angle = -0.77392
@@ -265,7 +268,7 @@ cruise_lift_scalar = 1
 parasite_drag_scalar = 1
 induced_drag_scalar = 1
 flap_induced_drag_scalar = 1
-elevator_effectiveness = 1
+elevator_effectiveness = 1.1
 elevator_maxangle_scalar = 1
 aileron_effectiveness = 1
 rudder_effectiveness = 1
@@ -319,19 +322,19 @@ max_gear_extended = 200
 
 [INTERACTIVE POINTS]
 number_of_interactive_points = 13
-interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,0
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,2,0,0,-75,33,2,33,2,2,33,-1
-interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
-interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,0
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,0
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
-interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,0
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
-interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,0
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
-interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33
+interactive_point.7 = 0.4,44.150002,-10.05,-0.567,0,0,0,-88,35,0,35,0,2,33,-1
-interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,0
+interactive_point.8 = 0.4,44.150002,10.05,-0.567,0,0,0,88,35,0,35,0,2,33,-1
-interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,0
+interactive_point.9 = 0.4,-2.869313,-10.049908,-0.566572,0,0,0,-90,35,0,35,0,2,33,-1
-interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,0
+interactive_point.10 = 0.4,-2.869313,10.049908,-0.566572,0,0,0,90,35,0,35,0,2,33,-1
-interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,0
+interactive_point.11 = 0.4,-62.995712,-8.519092,-0.565611,0,0,0,-100,35,0,35,0,2,33,-1
-interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,0
+interactive_point.12 = 0.4,-62.995712,8.519092,-0.565611,0,0,0,100,35,0,35,0,2,33,-1
 
 [STALL PROTECTION]
 stall_protection = 1		; Alpha Protection
@@ -348,8 +351,8 @@ type = 1
 system_type = 1
 span-outboard = 0.25
 extending-time = 22
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -357,20 +360,20 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 [FLAPS.1]
 type = 1
 system_type = 1
 span-outboard = 0.7
 extending-time = 23
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -378,20 +381,20 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 [FLAPS.2]
 type = 2
 system_type = 1
 span-outboard = 0.2
 extending-time = 8
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
@@ -405,8 +408,8 @@ type = 2
 system_type = 1
 span-outboard = 0.7
 extending-time = 21
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11F GE LOW/config/flight_model.cfg

@@ -1,15 +1,18 @@
-//TFDi Designs MD-11F (GE CF6-80C2D1F) vRC1.7.0_GE_F 15MAY25
+; TFDi Designs MD-11F (GE CF6-80C2D1F) vRC1.8.0_GE_F 04FEB26
+
+[MODULAR_MERGE]
+auto = true
 
 [VERSION]
 //KH Bump major
 major = 4
-minor = 1
+minor = 8
 
 [WEIGHT_AND_BALANCE]
 max_gross_weight = 630500
 empty_weight = 248567
 reference_datum_position = 0, 0, 0
-empty_weight_CG_position = -13.3, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
 CG_forward_limit = 0.12
 CG_aft_limit = 0.34
 empty_weight_pitch_MOI = 20897456
@@ -20,9 +23,9 @@ activate_mach_limit_based_on_cg = 0
 activate_cg_limit_based_on_mach = 0
 max_number_of_stations = 15
 //KH START Empty default
-station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
+station_load.0=190.0, 82.0, -2.0, 4.0, Pilot, 1
-station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
+station_load.1=190.0, 82.0, 2.0, 4.0, First Officer, 2
-station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
+station_load.2=190.0, 80.0, 3.3, 4.0, Engineer, 0
 station_load.3=0, 55.0, -5.0, 4.0, Upper zone 1 L, 0
 station_load.4=0, 55.0, 5.0, 4.0, Upper zone 1 R, 0
 station_load.5=0, 20.0, -5.0, 4.0, Upper zone 2 L, 0
@@ -53,7 +56,7 @@ max_speed_decreasing_steering_castering = 35
 emergency_extension_type = 2
 hyd_need_power_to_function= 0
 min_castering_angle = 0.05236
-max_castering_angle = 1.32645
+max_castering_angle = 3.142
 allow_stopped_steering = 1
 point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
 point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
@@ -82,9 +85,9 @@ LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
 RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
 External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
 //KH From 5.00, -2.00, -3.00, 0.00, 10.00
-LeftAux = 5.00, -2.00, -3.00, 1917.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
 //KH From 5.00, 2.00, -3.00, 0.00, 10.0
-RightAux = 5.00, 2.00, -3.00, 1917.00, 10.00
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
 fuel_type = 2
 number_of_tank_selectors = 3
 electric_pump = 0
@@ -169,7 +172,7 @@ lift_coef_horizontal_incidence = 0.91357
 lift_coef_flaps = 1
 lift_coef_spoilers = 0
 drag_coef_zero_lift = 0.02539
-drag_coef_flaps = 0.1889
+drag_coef_flaps = 0.1339
 drag_coef_gear = 0.0549
 drag_coef_spoilers = 0.05207
 side_force_slip_angle = -0.77392
@@ -259,7 +262,7 @@ cruise_lift_scalar = 1
 parasite_drag_scalar = 1
 induced_drag_scalar = 1
 flap_induced_drag_scalar = 1
-elevator_effectiveness = 1
+elevator_effectiveness = 1.1
 elevator_maxangle_scalar = 1
 aileron_effectiveness = 1
 rudder_effectiveness = 1
@@ -313,14 +316,14 @@ max_gear_extended = 200
 
 [INTERACTIVE POINTS]
 number_of_interactive_points = 8
-interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,0
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,-1
-interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
-interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,0
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,0
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
-interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,0
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
-interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,0
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
-interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,0
+interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,-1
 
 [STALL PROTECTION]
 stall_protection = 1		; Alpha Protection
@@ -337,8 +340,8 @@ type = 1
 system_type = 1
 span-outboard = 0.25
 extending-time = 22
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -346,20 +349,21 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
 
 [FLAPS.1]
 type = 1
 system_type = 1
 span-outboard = 0.7
 extending-time = 23
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -367,20 +371,20 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 [FLAPS.2]
 type = 2
 system_type = 1
 span-outboard = 0.2
 extending-time = 8
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
@@ -394,12 +398,12 @@ type = 2
 system_type = 1
 span-outboard = 0.7
 extending-time = 21
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
 pitch_scalar = 1
 max_on_ground_position = 1
 flaps-position.0 = 0, -1, 0
-flaps-position.1 = 20, 215, 0.5, 0.5
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11F GE/config/flight_model.cfg

@@ -0,0 +1,409 @@
+; TFDi Designs MD-11F (GE CF6-80C2D1F) vRC1.8.0_GE_F 04FEB26
+
+[MODULAR_MERGE]
+auto = true
+
+[VERSION]
+//KH Bump major
+major = 4
+minor = 8
+
+[WEIGHT_AND_BALANCE]
+max_gross_weight = 630500
+empty_weight = 248567
+reference_datum_position = 0, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
+CG_forward_limit = 0.12
+CG_aft_limit = 0.34
+empty_weight_pitch_MOI = 20897456
+empty_weight_roll_MOI = 6368555
+empty_weight_yaw_MOI = 40761191
+empty_weight_coupled_MOI = 0
+activate_mach_limit_based_on_cg = 0
+activate_cg_limit_based_on_mach = 0
+max_number_of_stations = 15
+//KH START Empty default
+station_load.0=190.0, 82.0, -2.0, 4.0, Pilot, 1
+station_load.1=190.0, 82.0, 2.0, 4.0, First Officer, 2
+station_load.2=190.0, 80.0, 3.3, 4.0, Engineer, 0
+station_load.3=0, 55.0, -5.0, 4.0, Upper zone 1 L, 0
+station_load.4=0, 55.0, 5.0, 4.0, Upper zone 1 R, 0
+station_load.5=0, 20.0, -5.0, 4.0, Upper zone 2 L, 0
+station_load.6=0, 20.0, 5.0, 4.0, Upper zone 2 R, 0
+station_load.7=0, -20.0, -5.0, 4.0, Upper zone 3 L, 0
+station_load.8=0, -20.0, 5.0, 4.0, Upper zone 3 R, 0
+station_load.9=0, -50.0, -5.0, 4.0, Upper zone 4 L, 0
+station_load.10=0, -50.0, 5.0, 4.0, Upper zone 4 R, 0
+station_load.11=0, 30.0, 0.0, -4.5, Lower forward cargo, 0
+station_load.12=0, -30.0, 0.0, -4.5, Lower rear cargo, 0
+station_load.13=0, 5.0, -2.0, -4.5, Left aux tank, 0
+station_load.14=0, 5.0, 2.0, -4.5, Right aux tank, 0
+//KH END
+
+[CONTACT_POINTS]
+static_pitch = 0
+static_cg_height = 16.4
+gear_system_type = 1
+tailwheel_lock = 0
+max_number_of_points = 16
+gear_locked_on_ground = 0
+gear_locked_above_speed = -1
+max_speed_full_steering = 25
+min_available_steering_angle_pct = 0.2
+max_speed_decreasing_steering = 45
+max_speed_full_steering_castering = 20
+max_speed_decreasing_steering_castering = 35
+emergency_extension_type = 2
+hyd_need_power_to_function= 0
+min_castering_angle = 0.05236
+max_castering_angle = 3.142
+allow_stopped_steering = 1
+point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
+point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
+point.2 = 1, -19.00,  17.15, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 53, 54, 3, 200, 250, 8
+point.3 = 1, -19.00,  0.00, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 55, 56, 3, 200, 250, 8
+point.4 = 2, 93.0, 0.0, 0.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.5 = 2, -48, -82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 5, 0, 0, 1
+point.6 = 2, -48, 82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 6, 0, 0, 1
+point.7 = 2, 60, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.8 = 2, 60, 0.0, 11.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.9 = 2, 16.0,  -28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.10 = 2, 16.0,  28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.11 = 2, -110.0,  0.00,  14.20,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.12 = 2, -96.5, 0.0, 42.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.13 = 2, -94.5, -30.0, 8.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.14 = 2, -94.5, 30.0, 8.05,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.15 = 2, -52.0, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+
+[FUEL]
+LeftMain = -20.00, -38.00, -1.0, 8938, 10.00
+RightMain = -20.00, 38.00, -1.0, 8938, 10.00
+Center1 = 10.00, 0.00, -3.00, 13000.00, 10.00
+Center2 = 0.00, 0.00, -1.00, 1642.00, 10.00
+Center3 = 0.00, 0.00, -5.00, 1958.00, 11.00
+LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
+RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
+External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
+//KH From 5.00, -2.00, -3.00, 0.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
+//KH From 5.00, 2.00, -3.00, 0.00, 10.0
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
+fuel_type = 2
+number_of_tank_selectors = 3
+electric_pump = 0
+engine_driven_pump = 1
+manual_transfer_pump = 0
+manual_pump = 0
+anemometer_pump = 0
+fuel_dump_rate = 0.02
+default_fuel_tank_selector.1 = 1
+default_fuel_tank_selector.2 = 1
+default_fuel_tank_selector.3 = 1
+
+[AIRPLANE_GEOMETRY]
+wing_area = 3648
+wing_span = 170.5
+wing_root_chord = 34.68
+wing_camber = 1
+wing_thickness_ratio = 0.04
+wing_dihedral = 2.2
+wing_incidence = 1.5
+wing_twist = -0.5
+oswald_efficiency_factor = 0.72
+wing_winglets_flag = 1
+wing_sweep = 38
+wing_pos_apex_lon = 1
+wing_pos_apex_vert = -2.75
+htail_area = 920
+htail_span = 59.5
+htail_pos_lon = -88
+htail_pos_vert = 5.0
+htail_incidence = 0.8
+htail_sweep = 36.5
+htail_thickness_ratio = 0.02
+vtail_area = 760
+vtail_span = 28.1
+vtail_sweep = 43
+vtail_pos_lon = -79.5
+vtail_pos_vert = 28
+vtail_thickness_ratio = 0.03
+fuselage_length = 202.16
+fuselage_diameter = 19.75
+fuselage_center_pos = 10, 0, 1.0
+elevator_area = 327.0
+aileron_area = 225.0
+rudder_area = 190.0
+elevator_up_limit = 25
+elevator_down_limit = 15
+aileron_up_limit = 25
+aileron_down_limit = 15
+rudder_limit = 23
+rudder_trim_limit = 20
+elevator_trim_limit = 30
+spoiler_limit = 60
+spoilerons_available = 1
+aileron_to_spoileron_gain = 3
+min_ailerons_for_spoilerons = 10
+min_flaps_for_spoilerons = 0
+spoiler_extension_time = 2.0
+spoiler_handle_available = 1
+auto_spoiler_available = 1
+auto_spoiler_auto_retracts = 0
+auto_spoiler_min_speed = 72
+positive_g_limit_flaps_up = 5.0
+positive_g_limit_flaps_down = 4.0
+negative_g_limit_flaps_up = -4.0
+negative_g_limit_flaps_down = -3.0
+load_safety_factor = 1.5
+elevator_trim_neutral = -1
+aileron_to_rudder_scale = 0
+flap_to_aileron_scale = 0
+fly_by_wire = 0
+elevator_elasticity_table = 0:0.7, 87:0.3, 210:0.5, 315:0.5
+aileron_elasticity_table = 0:1, 300:0.7, 600:0.6, 1500:0.4
+rudder_elasticity_table = 0:1, 300:1, 800:1, 1000:0.7
+elevator_trim_elasticity_table = 0:0.0, 87:0.40, 240:0.60, 295:1.00, 315:1.00
+
+[AERODYNAMICS]
+lift_coef_pitch_rate = -8.09375
+lift_coef_daoa = 2.68359
+lift_coef_delta_elevator = -0.28906
+lift_coef_horizontal_incidence = 0.91357
+lift_coef_flaps = 1
+lift_coef_spoilers = 0
+drag_coef_zero_lift = 0.02539
+drag_coef_flaps = 0.1339
+drag_coef_gear = 0.0549
+drag_coef_spoilers = 0.05207
+side_force_slip_angle = -0.77392
+side_force_roll_rate = 0.15478
+side_force_yaw_rate = 0
+side_force_delta_rudder = -0.14746
+pitch_moment_horizontal_incidence = 4.24755
+pitch_moment_delta_elevator = -2.37011
+pitch_moment_delta_trim = 0
+pitch_moment_pitch_damping = -214.1455
+pitch_moment_aoa_0 = 0.11621
+pitch_moment_daoa = 8.87255
+pitch_moment_flaps = 0.0105
+pitch_moment_gear = 0.0171
+pitch_moment_spoilers = 0
+pitch_moment_delta_elevator_propwash = -2.37011
+pitch_moment_pitch_propwash = -214.1455
+roll_moment_slip_angle = 0.26855
+roll_moment_roll_damping = -3.40869
+roll_moment_yaw_rate = -0.27197
+roll_moment_spoilers = 0.07
+roll_moment_delta_aileron = -0.34521
+roll_moment_delta_rudder = 0.01660
+roll_moment_delta_aileron_trim_scalar = -0.2
+yaw_moment_slip_angle = 0.18066
+yaw_moment_roll = 0.07470
+yaw_moment_yaw_damping = -2.49023
+yaw_moment_yaw_propwash = 0
+yaw_moment_delta_aileron = -0.00683
+yaw_moment_delta_rudder = 0.07128
+yaw_moment_delta_rudder_propwash = 0.075
+yaw_moment_delta_rudder_trim_scalar = -0.2
+compute_aero_center = 0
+aero_center_lift = -13.75
+lift_coef_aoa_table = -3.15:0, -2.36:0.36, -1.57:0, -0.349:-1.2, 0:-0.022, 0.0314:0.6082, 0.221:2.049, 0.244:1.15, 0.349:0.6, 0.436:0.5, 0.698:0.1, 1.963:-0.359, 2.356:-0.5, 3.15:0
+lift_coef_ground_effect_mach_table = 0.06:0.50, 0.227:0.80, 0.242:0.80, 0.3:1.0, 0.9:1.0
+lift_coef_mach_table = 0:1
+lift_coef_delta_elevator_mach_table = 0:0
+lift_coef_daoa_mach_table = 0:0
+lift_coef_pitch_rate_mach_table = 0:0
+lift_coef_horizontal_incidence_mach_table = 0:0
+drag_coef_zero_lift_mach_tab = 0:0, 0.4:0.0054, 0.5:0.0056, 0.6:0.0059, 0.7:0.0062, 0.72:0.0062, 0.8:0.0063, 0.8:0.0063, 1:0.0337, 1.2:0.0337, 1.4:0.0337, 1.6:0.0337, 1.8:0.0337, 2.0:0.0337
+side_force_slip_angle_mach_table = 0:0
+side_force_delta_rudder_mach_table = 0:0
+side_force_yaw_rate_mach_table = 0:0
+side_force_roll_rate_mach_table = 0:0
+pitch_moment_aoa_table = -3.15:-2, -0.436:-0.626, -0.262:-0.434, 0:-0.146, 0.087:-0.05, 0.175:0.0466, 0.262:0.143, 0.314:0.2, 0.349:0.1, 0.436:0.15, 3.15:2
+pitch_moment_delta_elevator_aoa_table = -180:-1, -40:0.05, -20:0.455, -14:0.853, -7:1.007, 0:1, 7:0.839, 14:0.693, 20:0.381, 40:-0.08, 180:-1
+pitch_moment_horizontal_incidence_aoa_table = 0:1
+pitch_moment_daoa_aoa_table = 0:1
+pitch_moment_pitch_alpha_table = 0:1
+pitch_moment_delta_elevator_mach_table = 0:0
+pitch_moment_daoa_mach_table = 0:0
+pitch_moment_pitch_rate_mach_table = 0:0
+pitch_moment_horizontal_incidence_mach_table = 0:0
+pitch_moment_aoa_0_mach_table = 0:0
+roll_moment_aoa_table = 0:0
+roll_moment_slip_angle_aoa_table = 0:1
+roll_moment_roll_rate_aoa_table = 0:1
+roll_moment_delta_aileron_aoa_table = 0:1
+roll_moment_slip_angle_mach_table = 0:0
+roll_moment_delta_rudder_mach_table = 0:0
+roll_moment_delta_aileron_mach_table = 0:0
+roll_moment_yaw_rate_mach_table = 0:0
+roll_moment_roll_rate_mach_table = 0:0
+yaw_moment_aoa_table = 0:0
+yaw_moment_slip_angle_aoa_table = 0:1
+yaw_moment_yaw_rate_aoa_table = 0:1
+yaw_moment_delta_rudder_aoa_table = 0:1
+yaw_moment_slip_angle_mach_table = 0:0
+yaw_moment_delta_rudder_mach_table = 0:0
+yaw_moment_delta_aileron_mach_table = 0:0
+yaw_moment_yaw_rate_mach_table = 0:0
+yaw_moment_roll_rate_mach_table = 0:0
+elevator_scaling_table = -0.785:0.5, -0.524:0.85, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.85, 0.785:0.5 ; 0:1
+aileron_scaling_table = -0.785:1 ;0:1
+rudder_scaling_table = -0.785:0.5, -0.524:0.6, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.6, 0.785:0.5 ;0:1
+elevator_lift_coef=3
+rudder_lift_coef=2
+aileron_load_factor_effectiveness_table = 0:1
+lift_coef_at_drag_zero = 0.1
+lift_coef_at_drag_zero_flaps = 0.1
+
+[FLIGHT_TUNING]
+modern_fm_only = 1
+cruise_lift_scalar = 1
+parasite_drag_scalar = 1
+induced_drag_scalar = 1
+flap_induced_drag_scalar = 1
+elevator_effectiveness = 1.1
+elevator_maxangle_scalar = 1
+aileron_effectiveness = 1
+rudder_effectiveness = 1
+rudder_maxangle_scalar = 1
+pitch_stability = 5
+roll_stability = 1
+yaw_stability = 1
+pitch_gyro_stability = 1
+roll_gyro_stability = 1
+yaw_gyro_stability = 1
+empty_CG_deviation_limit=0
+elevator_trim_effectiveness = 1.5
+aileron_trim_effectiveness = 1
+rudder_trim_effectiveness = 1
+hi_alpha_on_roll = 0
+hi_alpha_on_yaw = 0
+p_factor_on_yaw = 0
+torque_on_roll = 0
+gyro_precession_on_roll = 0
+gyro_precession_on_yaw = 0
+engine_wash_on_roll = 0
+wingflex_scalar = 2
+wingflex_offset = 0
+stall_coef_at_min_weight = 0.71
+ground_crosswind_effect_zero_speed=10
+ground_crosswind_effect_max_speed=150
+ground_high_speed_steeringwheel_static_friction_scalar=1.5
+ground_high_speed_otherwheel_static_friction_scalar=1.2
+
+[REFERENCE SPEEDS]
+full_flaps_stall_speed = 115
+flaps_up_stall_speed = 149
+cruise_speed = 345
+cruise_mach = 0.85
+crossover_speed = 330
+max_mach = 0.9
+max_indicated_speed = 395
+max_flaps_extended = 170
+normal_operating_speed = 325
+airspeed_indicator_max = 562.5
+rotation_speed_min = 145
+climb_speed = 250
+cruise_alt = 41000
+takeoff_speed = 165
+spawn_cruise_altitude = 5000
+spawn_descent_altitude = 500
+best_angle_climb_speed = 0
+approach_speed = 0
+best_glide = 0
+max_gear_extended = 200
+
+[INTERACTIVE POINTS]
+number_of_interactive_points = 8
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,-1
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
+interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,-1
+
+[STALL PROTECTION]
+stall_protection = 1		; Alpha Protection
+off_limit = 11.5				; Alpha below which the Alpha Protection can be disabled (If also below off_yoke_limit)
+off_yoke_limit = 1			; Yoke position (in Pct) below which the Alpha Protection can be disabled (If also below off_limit)
+on_limit = 14				; Alpha above which the Alpha Protection timer starts
+on_goal = 10				; The alpha that the Alpha Protection will attempt to reach when triggered
+timer_trigger = 1.0			; Duration (in Sec) the alpha must be above on_limit before the Alpha Protection is triggered
+
+;===================== FLAPS =====================
+
+[FLAPS.0]
+type = 1
+system_type = 1
+span-outboard = 0.25
+extending-time = 22
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+
+[FLAPS.1]
+type = 1
+system_type = 1
+span-outboard = 0.7
+extending-time = 23
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+[FLAPS.2]
+type = 2
+system_type = 1
+span-outboard = 0.2
+extending-time = 8
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5
+
+[FLAPS.3]
+type = 2
+system_type = 1
+span-outboard = 0.7
+extending-time = 21
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11F PW LOW/config/flight_model.cfg

@@ -1,15 +1,18 @@
-//TFDi Designs MD-11F (P&W PW4660) vRC1.7.0_PW_F 15MAY25
+; TFDi Designs MD-11F (P&W PW4662) vRC1.8.0_PW_F 04FEB26
+
+[MODULAR_MERGE]
+auto = true
 
 [VERSION]
 //KH Bump major
 major = 4
-minor = 1
+minor = 8
 
 [WEIGHT_AND_BALANCE]
 max_gross_weight = 630500
 empty_weight = 248567
 reference_datum_position = 0, 0, 0
-empty_weight_CG_position = -13.3, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
 CG_forward_limit = 0.12
 CG_aft_limit = 0.34
 empty_weight_pitch_MOI = 20897456
@@ -20,9 +23,9 @@ activate_mach_limit_based_on_cg = 0
 activate_cg_limit_based_on_mach = 0
 max_number_of_stations = 15
 //KH START Empty default
-station_load.0=190, 82.0, -2.0, 4.0, Pilot, 1
+station_load.0=190.0, 82.0, -2.0, 4.0, Pilot, 1
-station_load.1=190, 82.0, 2.0, 4.0, First Officer, 2
+station_load.1=190.0, 82.0, 2.0, 4.0, First Officer, 2
-station_load.2=190, 80.0, 3.3, 4.0, Engineer, 0
+station_load.2=190.0, 80.0, 3.3, 4.0, Engineer, 0
 station_load.3=0, 55.0, -5.0, 4.0, Upper zone 1 L, 0
 station_load.4=0, 55.0, 5.0, 4.0, Upper zone 1 R, 0
 station_load.5=0, 20.0, -5.0, 4.0, Upper zone 2 L, 0
@@ -53,7 +56,7 @@ max_speed_decreasing_steering_castering = 35
 emergency_extension_type = 2
 hyd_need_power_to_function= 0
 min_castering_angle = 0.05236
-max_castering_angle = 1.32645
+max_castering_angle = 3.142
 allow_stopped_steering = 1
 point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
 point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
@@ -82,9 +85,9 @@ LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
 RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
 External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
 //KH From 5.00, -2.00, -3.00, 0.00, 10.00
-LeftAux = 5.00, -2.00, -3.00, 1917.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
 //KH From 5.00, 2.00, -3.00, 0.00, 10.0
-RightAux = 5.00, 2.00, -3.00, 1917.00, 10.00
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
 fuel_type = 2
 number_of_tank_selectors = 3
 electric_pump = 0
@@ -169,7 +172,7 @@ lift_coef_horizontal_incidence = 0.91357
 lift_coef_flaps = 1
 lift_coef_spoilers = 0
 drag_coef_zero_lift = 0.02539
-drag_coef_flaps = 0.1889
+drag_coef_flaps = 0.1339
 drag_coef_gear = 0.0549
 drag_coef_spoilers = 0.05207
 side_force_slip_angle = -0.77392
@@ -259,7 +262,7 @@ cruise_lift_scalar = 1
 parasite_drag_scalar = 1
 induced_drag_scalar = 1
 flap_induced_drag_scalar = 1
-elevator_effectiveness = 1
+elevator_effectiveness = 1.1
 elevator_maxangle_scalar = 1
 aileron_effectiveness = 1
 rudder_effectiveness = 1
@@ -313,14 +316,14 @@ max_gear_extended = 200
 
 [INTERACTIVE POINTS]
 number_of_interactive_points = 8
-interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,0
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,-1
-interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
-interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,0
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
-interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,0
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
-interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,0
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
-interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,0
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
-interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,0
+interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,-1
 
 [STALL PROTECTION]
 stall_protection = 1		; Alpha Protection
@@ -337,8 +340,8 @@ type = 1
 system_type = 1
 span-outboard = 0.25
 extending-time = 22
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -346,20 +349,20 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 [FLAPS.1]
 type = 1
 system_type = 1
 span-outboard = 0.7
 extending-time = 23
-damaging-speed = 250
+damaging-speed = 280
-blowout-speed = 300
+blowout-speed = 310
 maneuvering_flaps = 0
 lift_scalar = 0.1
 drag_scalar = 1.1
@@ -367,20 +370,20 @@ pitch_scalar = 1
 max_on_ground_position = 7
 flaps-position.0 = 0, -1, 0
 flaps-position.1 = 0, -1, 0
-flaps-position.2 = 15, 215, 0.25, 2, 0, 0, 0, 1
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
-flaps-position.3 = 20, 200, 0.26, 1.1, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
-flaps-position.4 = 24, 185, 0.28, 1.0, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
 flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
 flaps-position.6 = 35, 160, 0.32, 1
-flaps-position.7 = 50, 150, 0.33, 1
+flaps-position.7 = 50, 155, 0.43, 1
 
 [FLAPS.2]
 type = 2
 system_type = 1
 span-outboard = 0.2
 extending-time = 8
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
@@ -394,12 +397,12 @@ type = 2
 system_type = 1
 span-outboard = 0.7
 extending-time = 21
-damaging-speed = 250
+damaging-speed = 300
-blowout-speed = 300
+blowout-speed = 330
 maneuvering_flaps = 0
 lift_scalar = 0.5
 drag_scalar = 0.75
 pitch_scalar = 1
 max_on_ground_position = 1
 flaps-position.0 = 0, -1, 0
-flaps-position.1 = 20, 215, 0.5, 0.5
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/SimObjects/Airplanes/TFDi_Design_MD-11/presets/tfdi-design/TFDi_Design_MD-11F PW/config/flight_model.cfg

@@ -0,0 +1,408 @@
+; TFDi Designs MD-11F (P&W PW4662) vRC1.8.0_PW_F 04FEB26
+
+[MODULAR_MERGE]
+auto = true
+
+[VERSION]
+//KH Bump major
+major = 4
+minor = 8
+
+[WEIGHT_AND_BALANCE]
+max_gross_weight = 630500
+empty_weight = 248567
+reference_datum_position = 0, 0, 0
+empty_weight_CG_position = -10.0, 0, 0
+CG_forward_limit = 0.12
+CG_aft_limit = 0.34
+empty_weight_pitch_MOI = 20897456
+empty_weight_roll_MOI = 6368555
+empty_weight_yaw_MOI = 40761191
+empty_weight_coupled_MOI = 0
+activate_mach_limit_based_on_cg = 0
+activate_cg_limit_based_on_mach = 0
+max_number_of_stations = 15
+//KH START Empty default
+station_load.0=190.0, 82.0, -2.0, 4.0, Pilot, 1
+station_load.1=190.0, 82.0, 2.0, 4.0, First Officer, 2
+station_load.2=190.0, 80.0, 3.3, 4.0, Engineer, 0
+station_load.3=0, 55.0, -5.0, 4.0, Upper zone 1 L, 0
+station_load.4=0, 55.0, 5.0, 4.0, Upper zone 1 R, 0
+station_load.5=0, 20.0, -5.0, 4.0, Upper zone 2 L, 0
+station_load.6=0, 20.0, 5.0, 4.0, Upper zone 2 R, 0
+station_load.7=0, -20.0, -5.0, 4.0, Upper zone 3 L, 0
+station_load.8=0, -20.0, 5.0, 4.0, Upper zone 3 R, 0
+station_load.9=0, -50.0, -5.0, 4.0, Upper zone 4 L, 0
+station_load.10=0, -50.0, 5.0, 4.0, Upper zone 4 R, 0
+station_load.11=0, 30.0, 0.0, -4.5, Lower forward cargo, 0
+station_load.12=0, -30.0, 0.0, -4.5, Lower rear cargo, 0
+station_load.13=0, 5.0, -2.0, -4.5, Left aux tank, 0
+station_load.14=0, 5.0, 2.0, -4.5, Right aux tank, 0
+//KH END
+
+[CONTACT_POINTS]
+static_pitch = 0
+static_cg_height = 16.4
+gear_system_type = 1
+tailwheel_lock = 0
+max_number_of_points = 16
+gear_locked_on_ground = 0
+gear_locked_above_speed = -1
+max_speed_full_steering = 25
+min_available_steering_angle_pct = 0.2
+max_speed_decreasing_steering = 45
+max_speed_full_steering_castering = 20
+max_speed_decreasing_steering_castering = 35
+emergency_extension_type = 2
+hyd_need_power_to_function= 0
+min_castering_angle = 0.05236
+max_castering_angle = 3.142
+allow_stopped_steering = 1
+point.0 = 1, 64.22,  0.00,  -17.31, 1500, 0, 1.67, 70, 1.15, 1.183, 0.9, 49, 50,  0, 200, 250, 8
+point.1 = 1, -19.00, -17.15, -18.02, 2000, 1, 2.25, 0,  1.60, 1.116, 0.9, 51, 52, 2, 200, 250, 8
+point.2 = 1, -19.00,  17.15, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 53, 54, 3, 200, 250, 8
+point.3 = 1, -19.00,  0.00, -18.02, 2000, 2, 2.25, 0,  1.60, 1.116, 0.9, 55, 56, 3, 200, 250, 8
+point.4 = 2, 93.0, 0.0, 0.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.5 = 2, -48, -82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 5, 0, 0, 1
+point.6 = 2, -48, 82.5, 0.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 6, 0, 0, 1
+point.7 = 2, 60, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.8 = 2, 60, 0.0, 11.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+point.9 = 2, 16.0,  -28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.10 = 2, 16.0,  28.00,  -13.00,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.11 = 2, -110.0,  0.00,  14.20,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.12 = 2, -96.5, 0.0, 42.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.13 = 2, -94.5, -30.0, 8.0,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.14 = 2, -94.5, 30.0, 8.05,  787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 4, 0, 0, 1
+point.15 = 2, -52.0, 0.0, -9.0, 787, 0, 0.0,  0, 0.00, 0.0, 0.0,  0.0,  0.0, 9, 0, 0, 1
+
+[FUEL]
+LeftMain = -20.00, -38.00, -1.0, 8938, 10.00
+RightMain = -20.00, 38.00, -1.0, 8938, 10.00
+Center1 = 10.00, 0.00, -3.00, 13000.00, 10.00
+Center2 = 0.00, 0.00, -1.00, 1642.00, 10.00
+Center3 = 0.00, 0.00, -5.00, 1958.00, 11.00
+LeftTip = -39.00, -74.00, 0.00, 884.00, 10.00
+RightTip = -39.00, 74.00, 0.00, 884.00, 10.00
+External1 = -70.00, 0.00, -3.00, 2371.00, 10.00
+//KH From 5.00, -2.00, -3.00, 0.00, 10.00
+LeftAux = 5.00, -2.00, -3.00, 1973.00, 10.00
+//KH From 5.00, 2.00, -3.00, 0.00, 10.0
+RightAux = 5.00, 2.00, -3.00, 1973.00, 10.00
+fuel_type = 2
+number_of_tank_selectors = 3
+electric_pump = 0
+engine_driven_pump = 1
+manual_transfer_pump = 0
+manual_pump = 0
+anemometer_pump = 0
+fuel_dump_rate = 0.02
+default_fuel_tank_selector.1 = 1
+default_fuel_tank_selector.2 = 1
+default_fuel_tank_selector.3 = 1
+
+[AIRPLANE_GEOMETRY]
+wing_area = 3648
+wing_span = 170.5
+wing_root_chord = 34.68
+wing_camber = 1
+wing_thickness_ratio = 0.04
+wing_dihedral = 2.2
+wing_incidence = 1.5
+wing_twist = -0.5
+oswald_efficiency_factor = 0.72
+wing_winglets_flag = 1
+wing_sweep = 38
+wing_pos_apex_lon = 1
+wing_pos_apex_vert = -2.75
+htail_area = 920
+htail_span = 59.5
+htail_pos_lon = -88
+htail_pos_vert = 5.0
+htail_incidence = 0.8
+htail_sweep = 36.5
+htail_thickness_ratio = 0.02
+vtail_area = 760
+vtail_span = 28.1
+vtail_sweep = 43
+vtail_pos_lon = -79.5
+vtail_pos_vert = 28
+vtail_thickness_ratio = 0.03
+fuselage_length = 200.92
+fuselage_diameter = 19.75
+fuselage_center_pos = 10, 0, 1.0
+elevator_area = 327.0
+aileron_area = 225.0
+rudder_area = 190.0
+elevator_up_limit = 25
+elevator_down_limit = 15
+aileron_up_limit = 25
+aileron_down_limit = 15
+rudder_limit = 23
+rudder_trim_limit = 20
+elevator_trim_limit = 30
+spoiler_limit = 60
+spoilerons_available = 1
+aileron_to_spoileron_gain = 3
+min_ailerons_for_spoilerons = 10
+min_flaps_for_spoilerons = 0
+spoiler_extension_time = 2.0
+spoiler_handle_available = 1
+auto_spoiler_available = 1
+auto_spoiler_auto_retracts = 0
+auto_spoiler_min_speed = 72
+positive_g_limit_flaps_up = 5.0
+positive_g_limit_flaps_down = 4.0
+negative_g_limit_flaps_up = -4.0
+negative_g_limit_flaps_down = -3.0
+load_safety_factor = 1.5
+elevator_trim_neutral = -1
+aileron_to_rudder_scale = 0
+flap_to_aileron_scale = 0
+fly_by_wire = 0
+elevator_elasticity_table = 0:0.7, 87:0.3, 210:0.5, 315:0.5
+aileron_elasticity_table = 0:1, 300:0.7, 600:0.6, 1500:0.4
+rudder_elasticity_table = 0:1, 300:1, 800:1, 1000:0.7
+elevator_trim_elasticity_table = 0:0.0, 87:0.40, 240:0.60, 295:1.00, 315:1.00
+
+[AERODYNAMICS]
+lift_coef_pitch_rate = -8.09375
+lift_coef_daoa = 2.68359
+lift_coef_delta_elevator = -0.28906
+lift_coef_horizontal_incidence = 0.91357
+lift_coef_flaps = 1
+lift_coef_spoilers = 0
+drag_coef_zero_lift = 0.02539
+drag_coef_flaps = 0.1339
+drag_coef_gear = 0.0549
+drag_coef_spoilers = 0.05207
+side_force_slip_angle = -0.77392
+side_force_roll_rate = 0.15478
+side_force_yaw_rate = 0
+side_force_delta_rudder = -0.14746
+pitch_moment_horizontal_incidence = 4.24755
+pitch_moment_delta_elevator = -2.37011
+pitch_moment_delta_trim = 0
+pitch_moment_pitch_damping = -214.1455
+pitch_moment_aoa_0 = 0.11621
+pitch_moment_daoa = 8.87255
+pitch_moment_flaps = 0.0105
+pitch_moment_gear = 0.0171
+pitch_moment_spoilers = 0
+pitch_moment_delta_elevator_propwash = -2.37011
+pitch_moment_pitch_propwash = -214.1455
+roll_moment_slip_angle = 0.26855
+roll_moment_roll_damping = -3.40869
+roll_moment_yaw_rate = -0.27197
+roll_moment_spoilers = 0.07
+roll_moment_delta_aileron = -0.34521
+roll_moment_delta_rudder = 0.01660
+roll_moment_delta_aileron_trim_scalar = -0.2
+yaw_moment_slip_angle = 0.18066
+yaw_moment_roll = 0.07470
+yaw_moment_yaw_damping = -2.49023
+yaw_moment_yaw_propwash = 0
+yaw_moment_delta_aileron = -0.00683
+yaw_moment_delta_rudder = 0.07128
+yaw_moment_delta_rudder_propwash = 0.075
+yaw_moment_delta_rudder_trim_scalar = -0.2
+compute_aero_center = 0
+aero_center_lift = -13.75
+lift_coef_aoa_table = -3.15:0, -2.36:0.36, -1.57:0, -0.349:-1.2, 0:-0.022, 0.0314:0.6082, 0.221:2.049, 0.244:1.15, 0.349:0.6, 0.436:0.5, 0.698:0.1, 1.963:-0.359, 2.356:-0.5, 3.15:0
+lift_coef_ground_effect_mach_table = 0.06:0.50, 0.227:0.80, 0.242:0.80, 0.3:1.0, 0.9:1.0
+lift_coef_mach_table = 0:1
+lift_coef_delta_elevator_mach_table = 0:0
+lift_coef_daoa_mach_table = 0:0
+lift_coef_pitch_rate_mach_table = 0:0
+lift_coef_horizontal_incidence_mach_table = 0:0
+drag_coef_zero_lift_mach_tab = 0:0, 0.4:0.0054, 0.5:0.0056, 0.6:0.0059, 0.7:0.0062, 0.72:0.0062, 0.8:0.0063, 0.8:0.0063, 1:0.0337, 1.2:0.0337, 1.4:0.0337, 1.6:0.0337, 1.8:0.0337, 2.0:0.0337
+side_force_slip_angle_mach_table = 0:0
+side_force_delta_rudder_mach_table = 0:0
+side_force_yaw_rate_mach_table = 0:0
+side_force_roll_rate_mach_table = 0:0
+pitch_moment_aoa_table = -3.15:-2, -0.436:-0.626, -0.262:-0.434, 0:-0.146, 0.087:-0.05, 0.175:0.0466, 0.262:0.143, 0.314:0.2, 0.349:0.1, 0.436:0.15, 3.15:2
+pitch_moment_delta_elevator_aoa_table = -180:-1, -40:0.05, -20:0.455, -14:0.853, -7:1.007, 0:1, 7:0.839, 14:0.693, 20:0.381, 40:-0.08, 180:-1
+pitch_moment_horizontal_incidence_aoa_table = 0:1
+pitch_moment_daoa_aoa_table = 0:1
+pitch_moment_pitch_alpha_table = 0:1
+pitch_moment_delta_elevator_mach_table = 0:0
+pitch_moment_daoa_mach_table = 0:0
+pitch_moment_pitch_rate_mach_table = 0:0
+pitch_moment_horizontal_incidence_mach_table = 0:0
+pitch_moment_aoa_0_mach_table = 0:0
+roll_moment_aoa_table = 0:0
+roll_moment_slip_angle_aoa_table = 0:1
+roll_moment_roll_rate_aoa_table = 0:1
+roll_moment_delta_aileron_aoa_table = 0:1
+roll_moment_slip_angle_mach_table = 0:0
+roll_moment_delta_rudder_mach_table = 0:0
+roll_moment_delta_aileron_mach_table = 0:0
+roll_moment_yaw_rate_mach_table = 0:0
+roll_moment_roll_rate_mach_table = 0:0
+yaw_moment_aoa_table = 0:0
+yaw_moment_slip_angle_aoa_table = 0:1
+yaw_moment_yaw_rate_aoa_table = 0:1
+yaw_moment_delta_rudder_aoa_table = 0:1
+yaw_moment_slip_angle_mach_table = 0:0
+yaw_moment_delta_rudder_mach_table = 0:0
+yaw_moment_delta_aileron_mach_table = 0:0
+yaw_moment_yaw_rate_mach_table = 0:0
+yaw_moment_roll_rate_mach_table = 0:0
+elevator_scaling_table = -0.785:0.5, -0.524:0.85, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.85, 0.785:0.5 ; 0:1
+aileron_scaling_table = -0.785:1 ;0:1
+rudder_scaling_table = -0.785:0.5, -0.524:0.6, -0.175:0.9, 0:1, 0.175:0.9, 0.524:0.6, 0.785:0.5 ;0:1
+elevator_lift_coef=3
+rudder_lift_coef=2
+aileron_load_factor_effectiveness_table = 0:1
+lift_coef_at_drag_zero = 0.1
+lift_coef_at_drag_zero_flaps = 0.1
+
+[FLIGHT_TUNING]
+modern_fm_only = 1
+cruise_lift_scalar = 1
+parasite_drag_scalar = 1
+induced_drag_scalar = 1
+flap_induced_drag_scalar = 1
+elevator_effectiveness = 1.1
+elevator_maxangle_scalar = 1
+aileron_effectiveness = 1
+rudder_effectiveness = 1
+rudder_maxangle_scalar = 1
+pitch_stability = 5
+roll_stability = 1
+yaw_stability = 1
+pitch_gyro_stability = 1
+roll_gyro_stability = 1
+yaw_gyro_stability = 1
+empty_CG_deviation_limit=0
+elevator_trim_effectiveness = 1.5
+aileron_trim_effectiveness = 1
+rudder_trim_effectiveness = 1
+hi_alpha_on_roll = 0
+hi_alpha_on_yaw = 0
+p_factor_on_yaw = 0
+torque_on_roll = 0
+gyro_precession_on_roll = 0
+gyro_precession_on_yaw = 0
+engine_wash_on_roll = 0
+wingflex_scalar = 2
+wingflex_offset = 0
+stall_coef_at_min_weight = 0.71
+ground_crosswind_effect_zero_speed=10
+ground_crosswind_effect_max_speed=150
+ground_high_speed_steeringwheel_static_friction_scalar=1.5
+ground_high_speed_otherwheel_static_friction_scalar=1.2
+
+[REFERENCE SPEEDS]
+full_flaps_stall_speed = 115
+flaps_up_stall_speed = 149
+cruise_speed = 345
+cruise_mach = 0.85
+crossover_speed = 330
+max_mach = 0.9
+max_indicated_speed = 395
+max_flaps_extended = 170
+normal_operating_speed = 325
+airspeed_indicator_max = 562.5
+rotation_speed_min = 145
+climb_speed = 250
+cruise_alt = 41000
+takeoff_speed = 165
+spawn_cruise_altitude = 5000
+spawn_descent_altitude = 500
+best_angle_climb_speed = 0
+approach_speed = 0
+best_glide = 0
+max_gear_extended = 200
+
+[INTERACTIVE POINTS]
+number_of_interactive_points = 8
+interactive_point.0 = 0.4,75.650002,-7.92,-0.567,0,0,0,-75,33,2,33,2,2,33,-1
+interactive_point.1 = 0.4,75.650002,7.92,-0.567,0,0,0,75,33,2,33,2,2,33,-1
+interactive_point.2 = 0.4,33.299999,6.28,-7.18,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.3 = 0.4,-51.700363,6.28,-7.180745,1,0,0,90,0,0,0,0,0,0,-1
+interactive_point.4 = 0.4,-68.277824,-2.822939,-5.923376,1,2.395636,12.258935,79.089348,0,0,0,0,0,0,-1
+interactive_point.5 = 0,85.062134,-3.882079,4.412694,2,-0,-29.85655,42.814491,0,0,0,0,0,0,-1
+interactive_point.6 = 0,85.062134,3.882079,4.412694,2,-0,29.85655,-42.814491,0,0,0,0,0,0,-1
+interactive_point.7 = 0,54.038418,-9.45901,-0.003025,1,0,0,0,0,0,0,0,0,0,-1
+
+[STALL PROTECTION]
+stall_protection = 1		; Alpha Protection
+off_limit = 11.5				; Alpha below which the Alpha Protection can be disabled (If also below off_yoke_limit)
+off_yoke_limit = 1			; Yoke position (in Pct) below which the Alpha Protection can be disabled (If also below off_limit)
+on_limit = 14				; Alpha above which the Alpha Protection timer starts
+on_goal = 10				; The alpha that the Alpha Protection will attempt to reach when triggered
+timer_trigger = 1.0			; Duration (in Sec) the alpha must be above on_limit before the Alpha Protection is triggered
+
+;===================== FLAPS =====================
+
+[FLAPS.0]
+type = 1
+system_type = 1
+span-outboard = 0.25
+extending-time = 22
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+[FLAPS.1]
+type = 1
+system_type = 1
+span-outboard = 0.7
+extending-time = 23
+damaging-speed = 280
+blowout-speed = 310
+maneuvering_flaps = 0
+lift_scalar = 0.1
+drag_scalar = 1.1
+pitch_scalar = 1
+max_on_ground_position = 7
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 0, -1, 0
+flaps-position.2 = 15, 215, 0.45, 2, 0, 0, 0, 1
+flaps-position.3 = 20, 200, 0.46, 1.1, 0, 0, 0, 1
+flaps-position.4 = 24, 185, 0.48, 1.0, 0, 0, 0, 1
+flaps-position.5 = 28, 177, 0.3, 1.0, 1.5, 0, 0
+flaps-position.6 = 35, 160, 0.32, 1
+flaps-position.7 = 50, 155, 0.43, 1
+
+[FLAPS.2]
+type = 2
+system_type = 1
+span-outboard = 0.2
+extending-time = 8
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5
+
+[FLAPS.3]
+type = 2
+system_type = 1
+span-outboard = 0.7
+extending-time = 21
+damaging-speed = 300
+blowout-speed = 330
+maneuvering_flaps = 0
+lift_scalar = 0.5
+drag_scalar = 0.75
+pitch_scalar = 1
+max_on_ground_position = 1
+flaps-position.0 = 0, -1, 0
+flaps-position.1 = 20, 215, 0.5, 0.5

PackageSources/js-bundle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfdidesign-md11-load-manager",
-  "version": "0.1.186",
+  "version": "0.2.8",
   "description": "",
   "main": "index.js",
   "type": "module",

PackageSources/js-bundle/src/assets/licenses_node.md

@@ -1,7 +1,8 @@
 | Department | Related to | Name                             | License period | Material not material | License type | Link                                                                      | Remote version | Installed version | Defined version | Author                                                      |
 | :--------- | :--------- | :------------------------------- | :------------- | :-------------------- | :----------- | :------------------------------------------------------------------------ | :------------- | :---------------- | :-------------- | :---------------------------------------------------------- |
-| kessler    | stuff      | react                            | perpetual      | material              | MIT          | git+https://github.com/facebook/react.git                                 | 19.2.0         | 19.1.0            | ^19.1.0         | n/a                                                         |
+| kessler    | stuff      | lucide-react                     | perpetual      | material              | ISC          | git+https://github.com/lucide-icons/lucide.git                            | 0.555.0        | 0.555.0           | ^0.555.0        | Eric Fennis                                                 |
-| kessler    | stuff      | react-dom                        | perpetual      | material              | MIT          | git+https://github.com/facebook/react.git                                 | 19.2.0         | 19.1.0            | ^19.1.0         | n/a                                                         |
+| kessler    | stuff      | react                            | perpetual      | material              | MIT          | git+https://github.com/facebook/react.git                                 | 19.2.4         | 19.1.0            | ^19.1.0         | n/a                                                         |
+| kessler    | stuff      | react-dom                        | perpetual      | material              | MIT          | git+https://github.com/facebook/react.git                                 | 19.2.4         | 19.1.0            | ^19.1.0         | n/a                                                         |
 | kessler    | stuff      | uuid                             | perpetual      | material              | MIT          | git+https://github.com/uuidjs/uuid.git                                    | 11.1.0         | 11.1.0            | ^11.1.0         | n/a                                                         |
 | kessler    | stuff      | @microsoft/msfs-types            | perpetual      | material              | MIT          | git+https://github.com/microsoft/msfs-avionics-mirror.git                 | 1.14.6         | 1.14.6            | ^1.14.6         | Asobo Studio / Working Title Simulations                    |
 | kessler    | stuff      | @rollup/plugin-commonjs          | perpetual      | material              | MIT          | git+https://github.com/rollup/plugins.git                                 | 28.0.9         | 28.0.3            | ^28.0.3         | Rich Harris <richard.a.harris@gmail.com>                    |
@@ -10,13 +11,13 @@
 | kessler    | stuff      | @rollup/plugin-replace           | perpetual      | material              | MIT          | git+https://github.com/rollup/plugins.git                                 | 6.0.3          | 6.0.2             | ^6.0.2          | Rich Harris <richard.a.harris@gmail.com>                    |
 | kessler    | stuff      | @rollup/plugin-terser            | perpetual      | material              | MIT          | git+https://github.com/rollup/plugins.git                                 | 0.4.4          | 0.4.4             | ^0.4.4          | Peter Placzek <peter.placzek1996@gmail.com>                 |
 | kessler    | stuff      | @rollup/plugin-typescript        | perpetual      | material              | MIT          | git+https://github.com/rollup/plugins.git                                 | 12.3.0         | 12.1.2            | ^12.1.2         | Oskar Segersvärd                                            |
-| kessler    | stuff      | @types/node                      | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 24.10.1        | 24.3.1            | ^24.3.1         | n/a                                                         |
+| kessler    | stuff      | @types/node                      | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 24.10.11       | 24.3.1            | ^24.3.1         | n/a                                                         |
-| kessler    | stuff      | @types/react                     | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 19.2.7         | 19.1.6            | ^19.1.6         | n/a                                                         |
+| kessler    | stuff      | @types/react                     | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 19.2.13        | 19.1.6            | ^19.1.6         | n/a                                                         |
 | kessler    | stuff      | @types/react-dom                 | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 19.2.3         | 19.1.6            | ^19.1.6         | n/a                                                         |
 | kessler    | stuff      | @types/uuid                      | perpetual      | material              | MIT          | https://github.com/DefinitelyTyped/DefinitelyTyped.git                    | 10.0.0         | 10.0.0            | ^10.0.0         | n/a                                                         |
 | kessler    | stuff      | @typescript-eslint/eslint-plugin | perpetual      | material              | MIT          | git+https://github.com/typescript-eslint/typescript-eslint.git            | 6.21.0         | 6.21.0            | ^6.21.0         | n/a                                                         |
 | kessler    | stuff      | @typescript-eslint/parser        | perpetual      | material              | BSD-2-Clause | git+https://github.com/typescript-eslint/typescript-eslint.git            | 6.21.0         | 6.21.0            | ^6.21.0         | n/a                                                         |
-| kessler    | stuff      | autoprefixer                     | perpetual      | material              | MIT          | git+https://github.com/postcss/autoprefixer.git                           | 10.4.22        | 10.4.21           | ^10.4.21        | Andrey Sitnik <andrey@sitnik.ru>                            |
+| kessler    | stuff      | autoprefixer                     | perpetual      | material              | MIT          | git+https://github.com/postcss/autoprefixer.git                           | 10.4.24        | 10.4.21           | ^10.4.21        | Andrey Sitnik <andrey@sitnik.ru>                            |
 | kessler    | stuff      | cross-env                        | perpetual      | material              | MIT          | git+https://github.com/kentcdodds/cross-env.git                           | 7.0.3          | 7.0.3             | ^7.0.3          | Kent C. Dodds <me@kentcdodds.com> (https://kentcdodds.com)  |
 | kessler    | stuff      | eslint                           | perpetual      | material              | MIT          | git+https://github.com/eslint/eslint.git                                  | 8.57.1         | 8.57.1            | ^8.57.1         | Nicholas C. Zakas <nicholas+npm@nczconsulting.com>          |
 | kessler    | stuff      | eslint-plugin-import             | perpetual      | material              | MIT          | git+https://github.com/import-js/eslint-plugin-import.git                 | 2.32.0         | 2.31.0            | ^2.31.0         | Ben Mosher <me@benmosher.com>                               |
@@ -25,15 +26,15 @@
 | kessler    | stuff      | license-report                   | perpetual      | material              | MIT          | git+https://github.com/kessler/license-report.git                         | 6.8.1          | 6.7.2             | ^6.7.2          | Yaniv Kessler                                               |
 | kessler    | stuff      | postcss                          | perpetual      | material              | MIT          | git+https://github.com/postcss/postcss.git                                | 8.5.6          | 8.5.4             | ^8.5.4          | Andrey Sitnik <andrey@sitnik.ru>                            |
 | kessler    | stuff      | postcss-import                   | perpetual      | material              | MIT          | git+https://github.com/postcss/postcss-import.git                         | 16.1.1         | 16.1.0            | ^16.1.0         | Maxime Thirouin                                             |
-| kessler    | stuff      | prettier                         | perpetual      | material              | MIT          | git+https://github.com/prettier/prettier.git                              | 3.7.3          | 3.5.3             | ^3.5.3          | James Long                                                  |
+| kessler    | stuff      | prettier                         | perpetual      | material              | MIT          | git+https://github.com/prettier/prettier.git                              | 3.8.1          | 3.5.3             | ^3.5.3          | James Long                                                  |
 | kessler    | stuff      | prettier-plugin-organize-imports | perpetual      | material              | MIT          | git+https://github.com/simonhaenisch/prettier-plugin-organize-imports.git | 4.3.0          | 4.1.0             | ^4.1.0          | Simon Haenisch (https://github.com/simonhaenisch)           |
 | kessler    | stuff      | rimraf                           | perpetual      | material              | ISC          | git+ssh://git@github.com/isaacs/rimraf.git                                | 6.1.2          | 6.0.1             | ^6.0.1          | Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)         |
-| kessler    | stuff      | rollup                           | perpetual      | material              | MIT          | git+https://github.com/rollup/rollup.git                                  | 4.53.3         | 4.42.0            | ^4.42.0         | Rich Harris                                                 |
+| kessler    | stuff      | rollup                           | perpetual      | material              | MIT          | git+https://github.com/rollup/rollup.git                                  | 4.57.1         | 4.42.0            | ^4.42.0         | Rich Harris                                                 |
 | kessler    | stuff      | rollup-plugin-copy               | perpetual      | material              | MIT          | git+https://github.com/vladshcherbin/rollup-plugin-copy.git               | 3.5.0          | 3.5.0             | ^3.5.0          | Vlad Shcherbin <vlad.shcherbin@gmail.com>                   |
 | kessler    | stuff      | rollup-plugin-postcss            | perpetual      | material              | MIT          | git+https://github.com/egoist/rollup-plugin-postcss.git                   | 4.0.2          | 4.0.2             | ^4.0.2          | EGOIST <0x142857@gmail.com>                                 |
 | kessler    | stuff      | rollup-plugin-react-svg          | perpetual      | material              | MIT          | git+https://github.com/boopathi/react-svg-loader.git                      | 3.0.3          | 3.0.3             | ^3.0.3          | boopathi                                                    |
 | kessler    | stuff      | rollup-plugin-version-injector   | perpetual      | material              | ISC          | git+https://github.com/djhouseknecht/rollup-plugin-version-injector.git   | 1.3.3          | 1.3.3             | ^1.3.3          | David Houseknecht <david.j.houseknecht@gmail.com>           |
-| kessler    | stuff      | sass                             | perpetual      | material              | MIT          | git+https://github.com/sass/dart-sass.git                                 | 1.94.2         | 1.89.1            | ^1.89.1         | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 |
+| kessler    | stuff      | sass                             | perpetual      | material              | MIT          | git+https://github.com/sass/dart-sass.git                                 | 1.97.3         | 1.89.1            | ^1.89.1         | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 |
 | kessler    | stuff      | tslib                            | perpetual      | material              | 0BSD         | git+https://github.com/Microsoft/tslib.git                                | 2.8.1          | 2.8.1             | ^2.8.1          | Microsoft Corp.                                             |
 | kessler    | stuff      | typed-scss-modules               | perpetual      | material              | MIT          | git+https://github.com/skovy/typed-scss-modules.git                       | 8.1.1          | 8.1.1             | ^8.1.1          | Spencer Miskoviak <smiskoviak@gmail.com>                    |
 | kessler    | stuff      | typescript                       | perpetual      | material              | Apache-2.0   | git+https://github.com/microsoft/TypeScript.git                           | 5.8.3          | 5.8.3             | 5.8.3           | Microsoft Corp.                                             |

PackageSources/js-bundle/src/components/SBEntry/SBEntryF.tsx

@@ -2,7 +2,7 @@ import { FC, useEffect, useState } from 'react';
 import { WASMDataF } from '../../types/WASMData';
 import { LoadingState, SimBrief } from '../../types/general';
 import { ImportFlightPlanKH } from '../../utils/TFDISBImport';
-import { CoherentCallSBEntryF, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallSBEntryF, loadAircraft, unloadAircraft } from '../../utils/utils';
 import CGSelect from '../CGSelect/CGSelect';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
@@ -16,8 +16,7 @@ interface SBEntryProps {
 
 const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoadingState }) => {
   const [CGTarget, setCGTarget] = useState(WASMData.targetPayload.CGTarget);
-  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
+  const [fuel, setFuel] = useState(Math.round(WASMData.targetPayload.fuel));
-  const [fuelEnabled, setFuelEnabled] = useState(true);
   const [SBInFlight, setSBInFlight] = useState(false);
 
   // FROM EFB
@@ -52,6 +51,11 @@ const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoad
     }
   };
 
+  const updateData = (SBPlan?: SimBrief, _fuel?: number) => {
+    CoherentCallSBEntryF(CGTarget, _fuel ?? fuel, SBPlan);
+  };
+
+  useEffect(() => updateData(), [CGTarget, fuel]);
   useEffect(() => {
     if (!simBrief || gsxActive) return;
 
@@ -70,12 +74,13 @@ const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoad
       return;
     }
 
-    updateData(undefined, SBResponse.message as SimBrief);
+    const _fuel = parseFloat((SBResponse.message as SimBrief).fuel as unknown as string) ?? 0;
 
-    setFuel(parseFloat((SBResponse.message as SimBrief).fuel as unknown as string) ?? 0);
+    updateData(SBResponse.message as SimBrief, _fuel);
+
+    setFuel(_fuel);
     setSBInFlight(false);
   }, [simBrief, gsxActive]);
-
   useEffect(
     () =>
       setFuel((prev) => {
@@ -84,13 +89,6 @@ const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoad
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
-
-  const updateData = (_CGTarget?: number, SBPlan?: SimBrief) => {
-    CoherentCallSBEntryF(_CGTarget ?? CGTarget, SBPlan);
-  };
 
   return (
     <>
@@ -106,22 +104,6 @@ const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoad
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>
@@ -164,14 +146,12 @@ const SBEntryF: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoad
               increase={() =>
                 setCGTarget((prev) => {
                   const _new = prev + 0.1;
-                  updateData(_new);
                   return _new;
                 })
               }
               decrease={() =>
                 setCGTarget((prev) => {
                   const _new = prev - 0.1;
-                  updateData(_new);
                   return _new;
                 })
               }

PackageSources/js-bundle/src/components/SBEntry/SBEntryPax.tsx

@@ -2,7 +2,7 @@ import { FC, useEffect, useState } from 'react';
 import { WASMDataPax } from '../../types/WASMData';
 import { LoadingState, SimBrief } from '../../types/general';
 import { ImportFlightPlanKH } from '../../utils/TFDISBImport';
-import { CoherentCallSBEntryPax, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallSBEntryPax, loadAircraft, unloadAircraft } from '../../utils/utils';
 import CGSelect from '../CGSelect/CGSelect';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
@@ -16,7 +16,7 @@ interface SBEntryProps {
 
 const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLoadingState }) => {
   const [CGTarget, setCGTarget] = useState(WASMData.targetPayload.CGTarget);
-  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
+  const [fuel, setFuel] = useState(Math.round(WASMData.targetPayload.fuel));
   const [fuelEnabled, setFuelEnabled] = useState(true);
   const [SBInFlight, setSBInFlight] = useState(false);
 
@@ -52,6 +52,10 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
     }
   };
 
+  const updateData = (SBPlan?: SimBrief, _fuel?: number) => {
+    CoherentCallSBEntryPax(CGTarget, _fuel ?? fuel, SBPlan);
+  };
+
   useEffect(() => {
     if (!simBrief || gsxActive) return;
 
@@ -70,12 +74,17 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
       return;
     }
 
-    updateData(undefined, SBResponse.message as SimBrief);
+    const _fuel = parseFloat((SBResponse.message as SimBrief).fuel as unknown as string) ?? 0;
+
+    updateData(SBResponse.message as SimBrief, _fuel);
+
+    setFuel(_fuel);
 
     setFuel(parseFloat((SBResponse.message as SimBrief).fuel as unknown as string) ?? 0);
     setSBInFlight(false);
   }, [simBrief, gsxActive]);
 
+  useEffect(() => updateData(), [CGTarget, fuel]);
   useEffect(
     () =>
       setFuel((prev) => {
@@ -84,13 +93,6 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
-
-  const updateData = (_CGTarget?: number, SBPlan?: SimBrief) => {
-    CoherentCallSBEntryPax(_CGTarget ?? CGTarget, SBPlan);
-  };
 
   return (
     <>
@@ -106,22 +108,6 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>
@@ -164,14 +150,12 @@ const SBEntryPax: FC<SBEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
               increase={() =>
                 setCGTarget((prev) => {
                   const _new = prev + 0.1;
-                  updateData(_new);
                   return _new;
                 })
               }
               decrease={() =>
                 setCGTarget((prev) => {
                   const _new = prev - 0.1;
-                  updateData(_new);
                   return _new;
                 })
               }

PackageSources/js-bundle/src/components/input/Input.tsx

@@ -5,11 +5,11 @@ import Keyboard from '../keyboard/Keyboard';
 export default function Input(props: {
   type?: string;
   topKeyboard?: boolean;
-  value: any;
+  value: number | string;
   min?: number;
   max?: number;
   step?: number;
-  placeholder?: any;
+  placeholder?: string;
   className?: string;
   disabled?: boolean;
   onChange?: (value: string) => void;

PackageSources/js-bundle/src/components/keyboard/Keyboard.tsx

@@ -103,5 +103,6 @@ const Keyboard = forwardRef<
     document.body
   );
 });
+Keyboard.displayName = "Keyboard"
 
 export default Keyboard;

PackageSources/js-bundle/src/components/options/OptionsF.tsx

@@ -48,7 +48,7 @@ const OptionsF: FC<OptionsFProps> = ({ WASMData, loadingState, gsxActive }) => {
                   <td className="p-1 px-2">0 {WASMData.userData.isImperial ? 'lbs' : 'kg'}</td>
                 </tr>
                 <tr>
-                  <td className="p-1 px-2">Empty Weight</td>
+                  <td className="p-1 px-2">Empty Weight (inc. crew)</td>
                   <td className="p-1 px-2">{WASMData.userData.isImperial ? '249537 lbs' : '113188 kg'}</td>
                 </tr>
                 <tr>
@@ -84,7 +84,7 @@ const OptionsF: FC<OptionsFProps> = ({ WASMData, loadingState, gsxActive }) => {
                   <td className="p-1 px-2">0 {WASMData.userData.isImperial ? 'lbs' : 'kg'}</td>
                 </tr>
                 <tr>
-                  <td className="p-1 px-2">Empty Weight</td>
+                  <td className="p-1 px-2">Empty Weight (inc. crew)</td>
                   <td className="p-1 px-2">{WASMData.userData.isImperial ? '249137 lbs' : '113006 kg'}</td>
                 </tr>
                 <tr>

PackageSources/js-bundle/src/components/options/OptionsPax.tsx

@@ -2,8 +2,8 @@ import { FC, useEffect, useState } from 'react';
 import { LoadingState } from '../../types/general';
 import { WASMDataPax } from '../../types/WASMData';
 import { CoherentCallGSXReset, CoherentCallOptionsSet } from '../../utils/utils';
-import ToggleComponentKH from '../toggleComponent/ToggleComponent';
 import Input from '../input/Input';
+import ToggleComponentKH from '../toggleComponent/ToggleComponent';
 
 interface OptionsPaxProps {
   WASMData: WASMDataPax;
@@ -105,8 +105,8 @@ const OptionsPax: FC<OptionsPaxProps> = ({ WASMData, loadingState, gsxActive })
                   </td>
                 </tr>
                 <tr>
-                  <td className="p-1 px-2">Empty Weight</td>
+                  <td className="p-1 px-2">Empty Weight (inc. crew)</td>
-                  <td className="p-1 px-2">{WASMData.userData.isImperial ? '284375 lbs' : '128991 kg'}</td>
+                  <td className="p-1 px-2">{WASMData.userData.isImperial ? '286465 lbs' : '129937 kg'}</td>
                 </tr>
                 <tr>
                   <td className="p-1 px-2">Max Zero Fuel Weight</td>
@@ -145,8 +145,8 @@ const OptionsPax: FC<OptionsPaxProps> = ({ WASMData, loadingState, gsxActive })
                   </td>
                 </tr>
                 <tr>
-                  <td className="p-1 px-2">Empty Weight</td>
+                  <td className="p-1 px-2">Empty Weight (inc. crew)</td>
-                  <td className="p-1 px-2">{WASMData.userData.isImperial ? '283975 lbs' : '128809 kg'}</td>
+                  <td className="p-1 px-2">{WASMData.userData.isImperial ? '286065 lbs' : '129755 kg'}</td>
                 </tr>
                 <tr>
                   <td className="p-1 px-2">Max Zero Fuel Weight</td>

PackageSources/js-bundle/src/components/stationEntry/StationEntryF.tsx

@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react';
 import { LoadingState } from '../../types/general';
 import { WASMDataF } from '../../types/WASMData';
-import { CoherentCallStationEntryF, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallStationEntryF, loadAircraft, unloadAircraft } from '../../utils/utils';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
 
@@ -19,8 +19,7 @@ const StationEntryF: FC<StationEntryProps> = ({ WASMData, loadingState, gsxActiv
   const [upper4, setUpper4] = useState(WASMData.targetPayload.upper4);
   const [lowerForward, setLowerForward] = useState(WASMData.targetPayload.lowerForward);
   const [lowerRear, setLowerRear] = useState(WASMData.targetPayload.lowerRear);
-  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
+  const [fuel, setFuel] = useState(Math.round(WASMData.targetPayload.fuel));
-  const [fuelEnabled, setFuelEnabled] = useState(true);
 
   const ZFW = () => {
     if (loadingState !== 'loaded' && !gsxActive) return Math.round(WASMData.targetPayload.total);
@@ -52,10 +51,10 @@ const StationEntryF: FC<StationEntryProps> = ({ WASMData, loadingState, gsxActiv
   };
 
   const updateData = () => {
-    CoherentCallStationEntryF(upper1, upper2, upper3, upper4, lowerForward, lowerRear);
+    CoherentCallStationEntryF(upper1, upper2, upper3, upper4, lowerForward, lowerRear, fuel);
   };
 
-  useEffect(() => updateData(), [upper1, upper2, upper3, upper4, lowerForward, lowerRear]);
+  useEffect(() => updateData(), [upper1, upper2, upper3, upper4, lowerForward, lowerRear, fuel]);
   useEffect(
     () =>
       setFuel((prev) => {
@@ -64,9 +63,6 @@ const StationEntryF: FC<StationEntryProps> = ({ WASMData, loadingState, gsxActiv
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
 
   return (
     <>
@@ -82,22 +78,6 @@ const StationEntryF: FC<StationEntryProps> = ({ WASMData, loadingState, gsxActiv
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>

PackageSources/js-bundle/src/components/stationEntry/StationEntryPax.tsx

@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react';
 import { LoadingState } from '../../types/general';
 import { WASMDataPax } from '../../types/WASMData';
-import { CoherentCallStationEntryPax, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallStationEntryPax, loadAircraft, unloadAircraft } from '../../utils/utils';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
 
@@ -20,7 +20,6 @@ const StationEntryPax: FC<StationEntryProps> = ({ WASMData, loadingState, gsxAct
   const [forwardCargo, setForwardCargo] = useState(WASMData.targetPayload.forwardCargo);
   const [rearCargo, setRearCargo] = useState(WASMData.targetPayload.rearCargo);
   const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
-  const [fuelEnabled, setFuelEnabled] = useState(true);
 
   const ZFW = () => {
     if (loadingState !== 'loaded' && !gsxActive) return Math.round(WASMData.targetPayload.total);
@@ -52,10 +51,10 @@ const StationEntryPax: FC<StationEntryProps> = ({ WASMData, loadingState, gsxAct
   };
 
   const updateData = () => {
-    CoherentCallStationEntryPax(business1, business2, economy1, economy2, forwardCargo, rearCargo);
+    CoherentCallStationEntryPax(business1, business2, economy1, economy2, forwardCargo, rearCargo, fuel);
   };
 
-  useEffect(() => updateData(), [business1, business2, economy1, economy2, forwardCargo, rearCargo]);
+  useEffect(() => updateData(), [business1, business2, economy1, economy2, forwardCargo, rearCargo, fuel]);
   useEffect(
     () =>
       setFuel((prev) => {
@@ -64,9 +63,6 @@ const StationEntryPax: FC<StationEntryProps> = ({ WASMData, loadingState, gsxAct
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
 
   return (
     <>
@@ -82,22 +78,6 @@ const StationEntryPax: FC<StationEntryProps> = ({ WASMData, loadingState, gsxAct
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>

PackageSources/js-bundle/src/components/zfwEntry/ZFWEntryF.tsx

@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react';
 import { WASMDataF } from '../../types/WASMData';
 import { LoadingState } from '../../types/general';
-import { CoherentCallZFWEntry, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallZFWEntry, loadAircraft, unloadAircraft } from '../../utils/utils';
 import CGSelect from '../CGSelect/CGSelect';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
@@ -15,9 +15,8 @@ interface ZFWEntryProps {
 
 const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLoadingState }) => {
   const [CGTarget, setCGTarget] = useState(WASMData.targetPayload.CGTarget);
-  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
+  const [fuel, setFuel] = useState(Math.round(WASMData.targetPayload.fuel));
   const [ZFWTarget, setZFWTarget] = useState(Math.round(WASMData.targetPayload.total));
-  const [fuelEnabled, setFuelEnabled] = useState(true);
 
   const ZFW = () => {
     if (loadingState !== 'loaded' && !gsxActive) return ZFWTarget;
@@ -55,12 +54,13 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
 
     const converted = parseInt(input);
     if (converted) {
-      if (converted < 0) setZFWTarget(Math.round(WASMData.targetPayload.empty + WASMData.targetPayload.crew));
+      if (converted <= 0) setZFWTarget(Math.round(WASMData.targetPayload.empty + WASMData.targetPayload.crew));
       else if (converted > WASMData.limits.maxZFW) setZFWTarget(WASMData.limits.maxZFW);
       else setZFWTarget(converted);
     }
   };
-  const handleBlur = (input: string) => {
+
+  const handleBlurZFW = (input: string) => {
     const minZFW = Math.round(WASMData.targetPayload.empty + WASMData.targetPayload.crew);
 
     if (!input) {
@@ -74,10 +74,13 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
       else if (converted > WASMData.limits.maxZFW) setZFWTarget(WASMData.limits.maxZFW);
       else setZFWTarget(converted);
     }
-
-    updateData(converted);
   };
 
+  const updateData = () => {
+    CoherentCallZFWEntry(ZFWTarget, CGTarget, fuel);
+  };
+
+  useEffect(() => updateData(), [ZFWTarget, CGTarget, fuel]);
   useEffect(
     () =>
       setFuel((prev) => {
@@ -86,13 +89,6 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
-
-  const updateData = (_ZFWTarget?: number, _CGTarget?: number) => {
-    CoherentCallZFWEntry(_ZFWTarget ?? ZFWTarget, _CGTarget ?? CGTarget);
-  };
 
   return (
     <>
@@ -108,22 +104,6 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>
@@ -138,7 +118,7 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
               className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
               value={ZFWTarget}
               onChange={(value) => handleInputZFW(value)}
-              onBlur={(value) => handleBlur(value)}
+              onBlur={(value) => handleBlurZFW(value)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
           </div>
@@ -156,14 +136,12 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLo
               increase={() =>
                 setCGTarget((prev) => {
                   const _new = prev + 0.1;
-                  updateData(undefined, _new);
                   return _new;
                 })
               }
               decrease={() =>
                 setCGTarget((prev) => {
                   const _new = prev - 0.1;
-                  updateData(undefined, _new);
                   return _new;
                 })
               }

PackageSources/js-bundle/src/components/zfwEntry/ZFWEntryPax.tsx

@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react';
 import { WASMDataPax } from '../../types/WASMData';
 import { LoadingState } from '../../types/general';
-import { CoherentCallZFWEntry, inRangeOf, loadAircraft, unloadAircraft } from '../../utils/utils';
+import { CoherentCallZFWEntry, loadAircraft, unloadAircraft } from '../../utils/utils';
 import CGSelect from '../CGSelect/CGSelect';
 import ActionBar from '../actionbar/ActionBar';
 import Input from '../input/Input';
@@ -15,9 +15,8 @@ interface ZFWEntryProps {
 
 const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, setLoadingState }) => {
   const [CGTarget, setCGTarget] = useState(WASMData.targetPayload.CGTarget);
-  const [fuel, setFuel] = useState(Math.round(WASMData.livePayload.fuel));
+  const [fuel, setFuel] = useState(Math.round(WASMData.targetPayload.fuel));
   const [ZFWTarget, setZFWTarget] = useState(Math.round(WASMData.targetPayload.total));
-  const [fuelEnabled, setFuelEnabled] = useState(true);
 
   const ZFW = () => {
     if (loadingState !== 'loaded' && !gsxActive) return ZFWTarget;
@@ -60,7 +59,8 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
       else setZFWTarget(converted);
     }
   };
-  const handleBlur = (input: string) => {
+
+  const handleBlurZFW = (input: string) => {
     const minZFW = Math.round(WASMData.targetPayload.empty + WASMData.targetPayload.crew);
 
     if (!input) {
@@ -74,10 +74,13 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
       else if (converted > WASMData.limits.maxZFW) setZFWTarget(WASMData.limits.maxZFW);
       else setZFWTarget(converted);
     }
-
-    updateData(converted);
   };
 
+  const updateData = () => {
+    CoherentCallZFWEntry(ZFWTarget, CGTarget, fuel);
+  };
+
+  useEffect(() => updateData(), [ZFWTarget, CGTarget, fuel]);
   useEffect(
     () =>
       setFuel((prev) => {
@@ -86,13 +89,6 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
       }),
     [WASMData.userData.isER]
   );
-  useEffect(() => {
-    setFuelEnabled((prev) => (!prev ? inRangeOf(Math.round(WASMData.livePayload.fuel), fuel) : prev));
-  }, [WASMData.livePayload.fuel]);
-
-  const updateData = (_ZFWTarget?: number, _CGTarget?: number) => {
-    CoherentCallZFWEntry(_ZFWTarget ?? ZFWTarget, _CGTarget ?? CGTarget);
-  };
 
   return (
     <>
@@ -108,22 +104,6 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
               onChange={(value) => handleInput(value, WASMData.limits.maxFuel, setFuel)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
-            <button
-              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-              data-ripple-light="true"
-              onClick={() => {
-                SimVar.SetSimVarValue(
-                  'L:MD11_EFB_PAYLOAD_FUEL',
-                  'lbs',
-                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-                );
-                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-                setFuelEnabled(WASMData.livePayload.fuel === fuel);
-              }}
-              disabled={loadingState !== 'preview' || !fuelEnabled || gsxActive}
-            >
-              Load Fuel
-            </button>
           </div>
         </div>
       </div>
@@ -138,7 +118,7 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
               className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
               value={ZFWTarget}
               onChange={(value) => handleInputZFW(value)}
-              onBlur={(value) => handleBlur(value)}
+              onBlur={(value) => handleBlurZFW(value)}
               disabled={loadingState !== 'preview' || gsxActive}
             />
           </div>
@@ -156,14 +136,12 @@ const ZFWEntryPax: FC<ZFWEntryProps> = ({ WASMData, loadingState, gsxActive, set
               increase={() =>
                 setCGTarget((prev) => {
                   const _new = prev + 0.1;
-                  updateData(undefined, _new);
                   return _new;
                 })
               }
               decrease={() =>
                 setCGTarget((prev) => {
                   const _new = prev - 0.1;
-                  updateData(undefined, _new);
                   return _new;
                 })
               }

PackageSources/js-bundle/src/types/WASMData.ts

@@ -5,6 +5,7 @@ interface WASMData {
   sbPlanned: {
     ZFW: number;
     GW: number;
+    fuel: number;
   };
   loaded: boolean;
 }
@@ -26,6 +27,7 @@ interface TargetPayload {
   ZFWCG: number;
   TOCG: number;
   total: number;
+  fuel: number;
 }
 
 interface TargetPayloadPax extends TargetPayload {
@@ -39,9 +41,7 @@ interface TargetPayloadPax extends TargetPayload {
   rearCargo: number;
 }
 
-interface LivePayloadPax extends TargetPayloadPax {
+type LivePayloadPax = TargetPayloadPax;
-  fuel: number;
-}
 
 interface TargetPayloadF extends TargetPayload {
   empty: number;
@@ -54,9 +54,7 @@ interface TargetPayloadF extends TargetPayload {
   lowerRear: number;
 }
 
-interface LivePayloadF extends TargetPayloadF {
+type LivePayloadF = TargetPayloadF;
-  fuel: number;
-}
 
 interface GSX {
   couatlStarted: boolean;

PackageSources/js-bundle/src/utils/utils.ts

@@ -25,7 +25,7 @@ export const inRangeOf = (value: number, target: number, tolerance: number = 10)
   return Math.abs(value - target) < tolerance;
 };
 
-export const CoherentCallZFWEntry = (ZFWTarget: number, CGTarget: number) => {
+export const CoherentCallZFWEntry = (ZFWTarget: number, CGTarget: number, fuelTarget: number) => {
   Coherent.call(
     COHERENT_COMM_BUS_WASM_CALL,
     CommBusEvent.UPDATE_TARGET,
@@ -33,6 +33,7 @@ export const CoherentCallZFWEntry = (ZFWTarget: number, CGTarget: number) => {
       mode: CallMode.ZFW_SET,
       ZFWTarget: ZFWTarget,
       CGTarget: CGTarget,
+      fuelTarget: fuelTarget,
     })
   );
 };
@@ -43,7 +44,8 @@ export const CoherentCallStationEntryPax = (
   economy1: number,
   economy2: number,
   forwardCargo: number,
-  rearCargo: number
+  rearCargo: number,
+  fuelTarget: number
 ) => {
   Coherent.call(
     COHERENT_COMM_BUS_WASM_CALL,
@@ -56,6 +58,7 @@ export const CoherentCallStationEntryPax = (
       economy2,
       forwardCargo,
       rearCargo,
+      fuelTarget,
     })
   );
 };
@@ -66,7 +69,8 @@ export const CoherentCallStationEntryF = (
   upper3: number,
   upper4: number,
   lowerForward: number,
-  lowerRear: number
+  lowerRear: number,
+  fuelTarget: number
 ) => {
   Coherent.call(
     COHERENT_COMM_BUS_WASM_CALL,
@@ -79,11 +83,12 @@ export const CoherentCallStationEntryF = (
       upper4,
       lowerForward,
       lowerRear,
+      fuelTarget,
     })
   );
 };
 
-export const CoherentCallSBEntryPax = (CGTarget: number, SBPlan?: SimBrief) => {
+export const CoherentCallSBEntryPax = (CGTarget: number, fuel: number, SBPlan?: SimBrief) => {
   Coherent.call(
     COHERENT_COMM_BUS_WASM_CALL,
     CommBusEvent.UPDATE_TARGET,
@@ -94,11 +99,12 @@ export const CoherentCallSBEntryPax = (CGTarget: number, SBPlan?: SimBrief) => {
       CGTarget: CGTarget,
       plannedZFW: SBPlan?.plannedZFW,
       plannedGW: SBPlan?.plannedGW,
+      fuel: fuel,
     })
   );
 };
 
-export const CoherentCallSBEntryF = (CGTarget: number, SBPlan?: SimBrief) => {
+export const CoherentCallSBEntryF = (CGTarget: number, fuel: number, SBPlan?: SimBrief) => {
   Coherent.call(
     COHERENT_COMM_BUS_WASM_CALL,
     CommBusEvent.UPDATE_TARGET,
@@ -108,6 +114,7 @@ export const CoherentCallSBEntryF = (CGTarget: number, SBPlan?: SimBrief) => {
       CGTarget: CGTarget,
       plannedZFW: SBPlan?.plannedZFW,
       plannedGW: SBPlan?.plannedGW,
+      fuel: SBPlan?.fuel,
     })
   );
 };

PackageSources/wasm-module/freighter.cpp

@@ -1,306 +1,299 @@
 #include "freighter.h"
 
 // ZFW Entry
-void distribute(fPayloadData_t* const targetPayload, const FuelData_t* const fuel, const double ZFWTarget, const UserData_t* const userData) {
+void distribute(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, const double ZFWTarget,
-    // Find payload, num pax and extra cargo
+                const UserData_t *const userData) {
-    double payload = ZFWTarget - targetPayload->empty - targetPayload->pilot - targetPayload->firstOfficer - targetPayload->engineer -
+  // Find payload, num pax and extra cargo
-                     targetPayload->leftAux - targetPayload->rightAux;
+  double payload = ZFWTarget - targetPayload->empty - targetPayload->pilot - targetPayload->firstOfficer -
-    unsigned int cargo = round(payload);
+                   targetPayload->engineer - targetPayload->leftAux - targetPayload->rightAux;
+  unsigned int cargo = round(payload);
 
-    distribute(targetPayload, fuel, cargo, userData);
+  distribute(targetPayload, fuel, cargo, userData);
 }
 
 // SimBrief Entry
-void distribute(fPayloadData_t* const targetPayload, const FuelData_t* const fuel, unsigned int cargo, const UserData_t* const userData) {
+void distribute(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, unsigned int cargo,
-    // Clear
+                const UserData_t *const userData) {
-    targetPayload->stations.upper1 = targetPayload->stations.upper2 = targetPayload->stations.upper3 = targetPayload->stations.upper4 =
+  // Clear
-        targetPayload->stations.total = 0;
+  targetPayload->stations.upper1 = targetPayload->stations.upper2 = targetPayload->stations.upper3 =
-    targetPayload->lowerForward = targetPayload->lowerRear = 0;
+      targetPayload->stations.upper4 = targetPayload->stations.total = 0;
+  targetPayload->lowerForward = targetPayload->lowerRear = 0;
 
-    unsigned short _cargo = 0;
+  unsigned short _cargo = 0;
-    unsigned int count = MAX_UPPER_CARGO(userData->isImperial) * 4 + MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+  unsigned int count = MAX_UPPER_CARGO(userData->isImperial) * 4 + MAX_FRONT_CARGO(userData->isImperial) +
-    // Initial distributiob
+                       MAX_REAR_CARGO(userData->isImperial, userData->isER);
-    while (cargo > 0 && count > 0) {
+  // Initial distributiob
-        if (cargo >= 6) {
+  while (cargo > 0 && count > 0) {
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+    if (cargo >= 6) {
-                targetPayload->stations.upper1++;
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper1++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper2++;
+      if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper2++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper3++;
+      if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper3++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper4++;
+      if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper4++;
-            }
+        _cargo++;
-            if (targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
+      }
-                targetPayload->lowerForward++;
+      if (targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->lowerForward++;
-            }
+        _cargo++;
-            if (targetPayload->lowerRear < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
+      }
-                targetPayload->lowerRear++;
+      if (targetPayload->lowerRear < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
-                _cargo++;
+        targetPayload->lowerRear++;
-            }
+        _cargo++;
-        } else if (cargo == 5) {
+      }
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+    } else if (cargo == 5) {
-                targetPayload->stations.upper1++;
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper1++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper2++;
+      if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper2++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper3++;
+      if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper3++;
-            }
+        _cargo++;
-            if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper4++;
+      if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->stations.upper4++;
-            }
+        _cargo++;
-            if (targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
+      }
-                targetPayload->lowerForward++;
+      if (targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
-                _cargo++;
+        targetPayload->lowerForward++;
-            }
+        _cargo++;
-        }
+      }
-        else if (cargo == 4) {
+    } else if (cargo == 4) {
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-                targetPayload->stations.upper1++;
+        targetPayload->stations.upper1++;
-                _cargo++;
+        _cargo++;
-            }
+      }
-            if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+      if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-                targetPayload->stations.upper2++;
+        targetPayload->stations.upper2++;
-                _cargo++;
+        _cargo++;
-            }
+      }
-            if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+      if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
-                targetPayload->stations.upper3++;
+        targetPayload->stations.upper3++;
-                _cargo++;
+        _cargo++;
-            }
+      }
-            if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
+      if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
-                targetPayload->stations.upper4++;
+        targetPayload->stations.upper4++;
-                _cargo++;
+        _cargo++;
-            }
+      }
-        }
+    } else if (cargo == 3) {
-        else if (cargo == 3) {
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper1++;
-                targetPayload->stations.upper1++;
+        _cargo++;
-                _cargo++;
+      }
-            }
+      if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-            if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper2++;
-                targetPayload->stations.upper2++;
+        _cargo++;
-                _cargo++;
+      }
-            }
+      if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
-            if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper3++;
-                targetPayload->stations.upper3++;
+        _cargo++;
-                _cargo++;
+      }
-            }
+    } else if (cargo == 2) {
-        }
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-        else if (cargo == 2) {
+        targetPayload->stations.upper1++;
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+        _cargo++;
-                targetPayload->stations.upper1++;
+      }
-                _cargo++;
+      if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-            }
+        targetPayload->stations.upper2++;
-            if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+        _cargo++;
-                targetPayload->stations.upper2++;
+      }
-                _cargo++;
+    } else if (cargo == 1) {
-            }
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-        }
+        targetPayload->stations.upper1++;
-        else if (cargo == 1) {
+        _cargo++;
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+      }
-                targetPayload->stations.upper1++;
-                _cargo++;
-            }
-        }
-        cargo -= _cargo;
-        targetPayload->stations.total += _cargo;
-
-        _cargo = 0;
-
-        count--;
     }
-    // Refinement
+    cargo -= _cargo;
-    count = MAX_UPPER_CARGO(userData->isImperial) * 4 + MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+    targetPayload->stations.total += _cargo;
-    while (count > 0) {
-        generatePayload(targetPayload, userData->isImperial);
-        calculateCGs(targetPayload, fuel, &targetPayload->ZFWCG, &targetPayload->TOCG, userData->isImperial);
 
-        // in front of target
+    _cargo = 0;
-        if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
-            if (targetPayload->stations.upper1 > 0) {
-                targetPayload->stations.upper1--;
-            }
-            else if (targetPayload->stations.upper2 > 0) {
-                targetPayload->stations.upper2--;
-            }
-            else if (targetPayload->stations.upper3 > 0) {
-                targetPayload->stations.upper3--;
-            }
-            else {
-                break;
-            }
 
-            if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
+    count--;
-                targetPayload->stations.upper4++;
+  }
-            }
+  // Refinement
-            else if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+  count = MAX_UPPER_CARGO(userData->isImperial) * 4 + MAX_FRONT_CARGO(userData->isImperial) +
-                targetPayload->stations.upper3++;
+          MAX_REAR_CARGO(userData->isImperial, userData->isER);
-            }
+  while (count > 0) {
-            else if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+    generatePayload(targetPayload, userData->isImperial);
-                targetPayload->stations.upper2++;
+    calculateCGs(targetPayload, fuel, userData->isImperial);
-            }
-            else {
-                targetPayload->stations.upper1++;
-            }
-        }
-        // behind target
-        else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
-            if (targetPayload->stations.upper4 > 0) {
-                targetPayload->stations.upper4--;
-            }
-            else if (targetPayload->stations.upper3 > 0) {
-                targetPayload->stations.upper3--;
-            }
-            else if (targetPayload->stations.upper2 > 0) {
-                targetPayload->stations.upper2--;
-            }
-            else {
-                break;
-            }
 
-            if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
+    // in front of target
-                targetPayload->stations.upper1++;
+    if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
-            }
+      if (targetPayload->stations.upper1 > 0) {
-            else if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper1--;
-                targetPayload->stations.upper2++;
+      } else if (targetPayload->stations.upper2 > 0) {
-            }
+        targetPayload->stations.upper2--;
-            else if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+      } else if (targetPayload->stations.upper3 > 0) {
-                targetPayload->stations.upper3++;
+        targetPayload->stations.upper3--;
-            }
+      } else {
-            else {
+        break;
-                targetPayload->stations.upper4++;
+      }
-            }
-        }
-        else {
-            break;
-        }
 
-        count--;
+      if (targetPayload->stations.upper4 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper4++;
+      } else if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper3++;
+      } else if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
+        targetPayload->stations.upper2++;
+      } else {
+        targetPayload->stations.upper1++;
+      }
     }
-    // Refinement cargo
+    // behind target
-    count = MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+    else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
-    while (count > 0) {
+      if (targetPayload->stations.upper4 > 0) {
-        generatePayload(targetPayload, userData->isImperial);
+        targetPayload->stations.upper4--;
-        calculateCGs(targetPayload, fuel, &targetPayload->ZFWCG, &targetPayload->TOCG, userData->isImperial);
+      } else if (targetPayload->stations.upper3 > 0) {
+        targetPayload->stations.upper3--;
+      } else if (targetPayload->stations.upper2 > 0) {
+        targetPayload->stations.upper2--;
+      } else {
+        break;
+      }
 
-        // in front of target
+      if (targetPayload->stations.upper1 < MAX_UPPER_CARGO(userData->isImperial)) {
-        if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
+        targetPayload->stations.upper1++;
-            if (targetPayload->lowerForward > 0 && targetPayload->lowerRear < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
+      } else if (targetPayload->stations.upper2 < MAX_UPPER_CARGO(userData->isImperial)) {
-                targetPayload->lowerForward--;
+        targetPayload->stations.upper2++;
-                targetPayload->lowerRear++;
+      } else if (targetPayload->stations.upper3 < MAX_UPPER_CARGO(userData->isImperial)) {
-            }
+        targetPayload->stations.upper3++;
-            else {
+      } else {
-                break;
+        targetPayload->stations.upper4++;
-            }
+      }
-        }
+    } else {
-        // behind target
+      break;
-        else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
-            if (targetPayload->lowerRear > 0 && targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
-                targetPayload->lowerRear--;
-                targetPayload->lowerForward++;
-            }
-            else {
-                break;
-            }
-        }
-        else {
-            break;
-        }
-
-        count--;
     }
+
+    count--;
+  }
+  // Refinement cargo
+  count = MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+  while (count > 0) {
+    generatePayload(targetPayload, userData->isImperial);
+    calculateCGs(targetPayload, fuel, userData->isImperial);
+
+    // in front of target
+    if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
+      if (targetPayload->lowerForward > 0 && targetPayload->lowerRear < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
+        targetPayload->lowerForward--;
+        targetPayload->lowerRear++;
+      } else {
+        break;
+      }
+    }
+    // behind target
+    else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
+      if (targetPayload->lowerRear > 0 && targetPayload->lowerForward < MAX_FRONT_CARGO(userData->isImperial)) {
+        targetPayload->lowerRear--;
+        targetPayload->lowerForward++;
+      } else {
+        break;
+      }
+    } else {
+      break;
+    }
+
+    count--;
+  }
 }
 
 // Updates pax stations with their respective weights
 // Used internally and used for Station Entry (pax only, cargo is set directly)
-void generatePayload(fPayloadData_t* const targetPayload, const bool isImperial) {
+void generatePayload(fPayloadData_t *const targetPayload, const bool isImperial) {
-    targetPayload->upper1Left = targetPayload->upper1Right = (targetPayload->stations.upper1 / 2.0);
+  targetPayload->upper1Left = targetPayload->upper1Right = (targetPayload->stations.upper1 / 2.0);
-    targetPayload->upper2Left = targetPayload->upper2Right = (targetPayload->stations.upper2 / 2.0);
+  targetPayload->upper2Left = targetPayload->upper2Right = (targetPayload->stations.upper2 / 2.0);
-    targetPayload->upper3Left = targetPayload->upper3Right = (targetPayload->stations.upper3 / 2.0);
+  targetPayload->upper3Left = targetPayload->upper3Right = (targetPayload->stations.upper3 / 2.0);
-    targetPayload->upper4Left = targetPayload->upper4Right = (targetPayload->stations.upper4 / 2.0);
+  targetPayload->upper4Left = targetPayload->upper4Right = (targetPayload->stations.upper4 / 2.0);
-    targetPayload->total = targetPayload->empty + targetPayload->pilot + targetPayload->firstOfficer + targetPayload->engineer + targetPayload->upper1Left +
+  targetPayload->total = targetPayload->empty + targetPayload->pilot + targetPayload->firstOfficer + targetPayload->engineer +
-                           targetPayload->upper1Right + targetPayload->upper2Left + targetPayload->upper2Right + targetPayload->upper3Left +
+                         targetPayload->upper1Left + targetPayload->upper1Right + targetPayload->upper2Left +
-                           targetPayload->upper3Right + targetPayload->upper4Left + targetPayload->upper4Right + targetPayload->lowerForward +
+                         targetPayload->upper2Right + targetPayload->upper3Left + targetPayload->upper3Right +
-                           targetPayload->lowerRear + targetPayload->leftAux + targetPayload->rightAux;
+                         targetPayload->upper4Left + targetPayload->upper4Right + targetPayload->lowerForward +
+                         targetPayload->lowerRear + targetPayload->leftAux + targetPayload->rightAux;
 }
 
 // Normalise to Pounds
 // MANDATORY BEFORE SETTING WEIGHTS
 // USE ON COPY OF GLOBAL STATE ONLY
-void normalisePayload(fPayloadData_t* const targetPayload, const bool isImperial) {
+void normalisePayload(fPayloadData_t *const targetPayload, const bool isImperial) {
-    targetPayload->empty = TO_POUNDS(isImperial, targetPayload->empty);
+  targetPayload->empty = TO_POUNDS(isImperial, targetPayload->empty);
-    targetPayload->pilot = TO_POUNDS(isImperial, targetPayload->pilot);
+  targetPayload->pilot = TO_POUNDS(isImperial, targetPayload->pilot);
-    targetPayload->firstOfficer = TO_POUNDS(isImperial, targetPayload->firstOfficer);
+  targetPayload->firstOfficer = TO_POUNDS(isImperial, targetPayload->firstOfficer);
-    targetPayload->engineer = TO_POUNDS(isImperial, targetPayload->engineer);
+  targetPayload->engineer = TO_POUNDS(isImperial, targetPayload->engineer);
-    targetPayload->upper1Left = TO_POUNDS(isImperial, targetPayload->upper1Left);
+  targetPayload->upper1Left = TO_POUNDS(isImperial, targetPayload->upper1Left);
-    targetPayload->upper1Right = TO_POUNDS(isImperial, targetPayload->upper1Right);
+  targetPayload->upper1Right = TO_POUNDS(isImperial, targetPayload->upper1Right);
-    targetPayload->upper2Left = TO_POUNDS(isImperial, targetPayload->upper2Left);
+  targetPayload->upper2Left = TO_POUNDS(isImperial, targetPayload->upper2Left);
-    targetPayload->upper2Right = TO_POUNDS(isImperial, targetPayload->upper2Right);
+  targetPayload->upper2Right = TO_POUNDS(isImperial, targetPayload->upper2Right);
-    targetPayload->upper3Left = TO_POUNDS(isImperial, targetPayload->upper3Left);
+  targetPayload->upper3Left = TO_POUNDS(isImperial, targetPayload->upper3Left);
-    targetPayload->upper3Right = TO_POUNDS(isImperial, targetPayload->upper3Right);
+  targetPayload->upper3Right = TO_POUNDS(isImperial, targetPayload->upper3Right);
-    targetPayload->upper4Left = TO_POUNDS(isImperial, targetPayload->upper4Left);
+  targetPayload->upper4Left = TO_POUNDS(isImperial, targetPayload->upper4Left);
-    targetPayload->upper4Right = TO_POUNDS(isImperial, targetPayload->upper4Right);
+  targetPayload->upper4Right = TO_POUNDS(isImperial, targetPayload->upper4Right);
-    targetPayload->lowerForward = TO_POUNDS(isImperial, targetPayload->lowerForward);
+  targetPayload->lowerForward = TO_POUNDS(isImperial, targetPayload->lowerForward);
-    targetPayload->lowerRear = TO_POUNDS(isImperial, targetPayload->lowerRear);
+  targetPayload->lowerRear = TO_POUNDS(isImperial, targetPayload->lowerRear);
-    targetPayload->leftAux = TO_POUNDS(isImperial, targetPayload->leftAux);
+  targetPayload->leftAux = TO_POUNDS(isImperial, targetPayload->leftAux);
-    targetPayload->rightAux = TO_POUNDS(isImperial, targetPayload->rightAux);
+  targetPayload->rightAux = TO_POUNDS(isImperial, targetPayload->rightAux);
 }
 
-void calculateCGs(const fPayloadData_t* const targetPayload, const FuelData_t* const fuel, double* const ZFWCG, double* const TOCG, const bool isImperial) {
+void calculateCGs(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, const bool isImperial) {
-    fPayloadData_t localPayload = {};
+  fPayloadData_t localPayload = {};
-    memcpy(&localPayload, targetPayload, sizeof(localPayload));
+  memcpy(&localPayload, targetPayload, sizeof(localPayload));
-    normalisePayload(&localPayload, isImperial);
+  normalisePayload(&localPayload, isImperial);
 
-    double totalMoment = localPayload.empty * ARM_EMPTY + localPayload.pilot * ARM_PILOT + localPayload.firstOfficer * ARM_FIRST_OFFICER +
+  double totalMoment = localPayload.empty * ARM_EMPTY + localPayload.pilot * ARM_PILOT +
-                         localPayload.engineer * ARM_ENGINEER + localPayload.upper1Left * ARM_F_UPPER1_LEFT + localPayload.upper1Right * ARM_F_UPPER1_RIGHT +
+                       localPayload.firstOfficer * ARM_FIRST_OFFICER + localPayload.engineer * ARM_ENGINEER +
-                         localPayload.upper2Left * ARM_F_UPPER2_LEFT + localPayload.upper2Right * ARM_F_UPPER2_RIGHT + localPayload.upper3Left * ARM_F_UPPER3_LEFT +
+                       localPayload.upper1Left * ARM_F_UPPER1_LEFT + localPayload.upper1Right * ARM_F_UPPER1_RIGHT +
-                         localPayload.upper3Right * ARM_F_UPPER3_RIGHT + localPayload.upper4Left * ARM_F_UPPER4_LEFT + localPayload.upper4Right * ARM_F_UPPER4_RIGHT +
+                       localPayload.upper2Left * ARM_F_UPPER2_LEFT + localPayload.upper2Right * ARM_F_UPPER2_RIGHT +
-                         localPayload.lowerForward * ARM_FORWARD_CARGO + localPayload.lowerRear * ARM_REAR_CARGO + localPayload.leftAux * ARM_LEFT_AUX +
+                       localPayload.upper3Left * ARM_F_UPPER3_LEFT + localPayload.upper3Right * ARM_F_UPPER3_RIGHT +
-                         localPayload.rightAux * ARM_RIGHT_AUX;
+                       localPayload.upper4Left * ARM_F_UPPER4_LEFT + localPayload.upper4Right * ARM_F_UPPER4_RIGHT +
+                       localPayload.lowerForward * ARM_FORWARD_CARGO + localPayload.lowerRear * ARM_REAR_CARGO +
+                       localPayload.leftAux * ARM_LEFT_AUX + localPayload.rightAux * ARM_RIGHT_AUX;
 
-    double totalWeight = localPayload.empty + localPayload.pilot + localPayload.firstOfficer + localPayload.engineer + localPayload.upper1Left +
+  double totalWeight = localPayload.empty + localPayload.pilot + localPayload.firstOfficer + localPayload.engineer +
-                         localPayload.upper1Right + localPayload.upper2Left + localPayload.upper2Right + localPayload.upper3Left + localPayload.upper3Right +
+                       localPayload.upper1Left + localPayload.upper1Right + localPayload.upper2Left + localPayload.upper2Right +
-                         localPayload.upper4Left + localPayload.upper4Right + localPayload.lowerForward + localPayload.lowerRear + localPayload.leftAux +
+                       localPayload.upper3Left + localPayload.upper3Right + localPayload.upper4Left + localPayload.upper4Right +
-                         localPayload.rightAux;
+                       localPayload.lowerForward + localPayload.lowerRear + localPayload.leftAux + localPayload.rightAux;
 
-    *ZFWCG = TO_PERCENT_MAC(totalMoment / totalWeight);
+  targetPayload->ZFWCG = TO_PERCENT_MAC(totalMoment / totalWeight);
 
-    totalMoment += fuel->main1 * ARM_MAIN1 + fuel->main3 * ARM_MAIN3 + fuel->main2 * ARM_MAIN2 + fuel->upperAux * ARM_UPPER_AUX +
+  totalMoment += fuel->main1 * ARM_MAIN1 + fuel->main3 * ARM_MAIN3 + fuel->main2 * ARM_MAIN2 + fuel->upperAux * ARM_UPPER_AUX +
-                   fuel->lowerAux * ARM_LOWER_AUX + fuel->main1Tip * ARM_MAIN1_TIP + fuel->main3Tip * ARM_MAIN3_TIP +
+                 fuel->lowerAux * ARM_LOWER_AUX + fuel->main1Tip * ARM_MAIN1_TIP + fuel->main3Tip * ARM_MAIN3_TIP +
-                   fuel->tail * ARM_TAIL + fuel->forwardAux1 * ARM_FORWARD_AUX1 + fuel->forwardAux2 * ARM_FORWARD_AUX2;
+                 fuel->tail * ARM_TAIL + fuel->forwardAux1 * ARM_FORWARD_AUX1 + fuel->forwardAux2 * ARM_FORWARD_AUX2;
 
-    totalWeight += fuel->total;
+  totalWeight += fuel->total;
 
-    *TOCG = TO_PERCENT_MAC(totalMoment / totalWeight);
+  targetPayload->TOCG = TO_PERCENT_MAC(totalMoment / totalWeight);
 }
 
-void load(const fPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial) {
+void load(const fPayloadData_t *const targetPayload, const HANDLE simConnect, const bool isImperial) {
-    fPayloadData_t localPayload = {};
+  fPayloadData_t localPayload = {};
-    memcpy(&localPayload, targetPayload, sizeof(localPayload));
+  memcpy(&localPayload, targetPayload, sizeof(localPayload));
-    normalisePayload(&localPayload, isImperial);
+  normalisePayload(&localPayload, isImperial);
 
-    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_F, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(fPayloadDataSet_t), &localPayload);
+  localPayload._ZFWCG = localPayload.ZFWCG / 100.0;
+
+  SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_F, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(fPayloadDataSet_t),
+                                &localPayload);
 }
 
 void unloadF(const HANDLE simConnect, const bool isER) {
-    fPayloadData_t localPayload = {};
+  fPayloadData_t localPayload = {};
 
-    localPayload.leftAux = localPayload.rightAux = isER ? AUX_WEIGHT(true) : 0;
+  localPayload.leftAux = localPayload.rightAux = isER ? AUX_WEIGHT(true) : 0;
-    localPayload.pilot = localPayload.firstOfficer = localPayload.engineer = PILOT_WEIGHT(true);
+  localPayload.pilot = localPayload.firstOfficer = localPayload.engineer = PILOT_WEIGHT(true);
 
-    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_F, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(fPayloadDataSet_t), &localPayload);
+  localPayload._ZFWCG = -1;
+
+  SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_F, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(fPayloadDataSet_t),
+                                &localPayload);
 }

PackageSources/wasm-module/freighter.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #ifndef __INTELLISENSE__
-#	define MODULE_EXPORT __attribute__( ( visibility( "default" ) ) )
+#define MODULE_EXPORT __attribute__((visibility("default")))
-#	define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
+#define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
 #else
-#	define MODULE_EXPORT
+#define MODULE_EXPORT
-#	define MODULE_WASM_MODNAME(mod)
+#define MODULE_WASM_MODNAME(mod)
-#	define __attribute__(x)
+#define __attribute__(x)
-#	define __restrict__
+#define __restrict__
 #endif
 
 /********************************* Headers *********************************/
@@ -19,10 +19,11 @@
 // C++ headers
 #include <algorithm>
 // Own headers
+#include "fuel.h"
 #include "shared.h"
 
 /******************************** Constants ********************************/
-//PMC pallet due to 104in door
+// PMC pallet due to 104in door
 #define MAX_UPPER_CARGO(IS_IMPERIAL) ((IS_IMPERIAL) ? (6.5 * 15000.0) : (6.5 * 6804.0))
 // Max ZFW
 #define MAX_F_ZFW(IS_IMPERIAL) ((IS_IMPERIAL) ? (451300) : (204706))
@@ -38,74 +39,79 @@
 
 /***************************** Data structures *****************************/
 typedef struct {
-    // SimConnect mapped
+  // SimConnect mapped
-    double pilot;
+  double pilot;
-    double firstOfficer;
+  double firstOfficer;
-    double engineer;
+  double engineer;
-    double upper1Left;
+  double upper1Left;
-    double upper1Right;
+  double upper1Right;
-    double upper2Left;
+  double upper2Left;
-    double upper2Right;
+  double upper2Right;
-    double upper3Left;
+  double upper3Left;
-    double upper3Right;
+  double upper3Right;
-    double upper4Left;
+  double upper4Left;
-    double upper4Right;
+  double upper4Right;
-    double lowerForward;
+  double lowerForward;
-    double lowerRear;
+  double lowerRear;
-    double leftAux;
+  double leftAux;
-    double rightAux;
+  double rightAux;
+  double _ZFWCG; // DO NOT USE
 
-    // Additional properties
+  // Additional properties
-    double empty;
+  double empty;
-    double total;
+  double total;
-    double CGTarget;
+  double CGTarget;
-    double ZFWCG;
+  double ZFWCG;
-    double TOCG;
+  double TOCG;
-    struct stations {
+  struct stations {
-        unsigned int upper1;
+    unsigned int upper1;
-        unsigned int upper2;
+    unsigned int upper2;
-        unsigned int upper3;
+    unsigned int upper3;
-        unsigned int upper4;
+    unsigned int upper4;
-        unsigned int total;
+    unsigned int total;
-    } stations;
+  } stations;
-    struct sbPlanned {
+  struct sbPlanned {
-        double ZFW;
+    double ZFW;
-        double GW;
+    double GW;
-        unsigned int cargo;
+    double fuel;
-    } sbPlanned;
+    unsigned int cargo;
+  } sbPlanned;
 } fPayloadData_t;
 
 typedef struct {
-    // SimConnect mapped
+  // SimConnect mapped
-    double pilot;
+  double pilot;
-    double firstOfficer;
+  double firstOfficer;
-    double engineer;
+  double engineer;
-    double upper1Left;
+  double upper1Left;
-    double upper1Right;
+  double upper1Right;
-    double upper2Left;
+  double upper2Left;
-    double upper2Right;
+  double upper2Right;
-    double upper3Left;
+  double upper3Left;
-    double upper3Right;
+  double upper3Right;
-    double upper4Left;
+  double upper4Left;
-    double upper4Right;
+  double upper4Right;
-    double lowerForward;
+  double lowerForward;
-    double lowerRear;
+  double lowerRear;
-    double leftAux;
+  double leftAux;
-    double rightAux;
+  double rightAux;
+  double ZFWCG;
 } fPayloadDataSet_t;
 
 /******************************** Functions ********************************/
 // ZFW Entry
-void distribute(fPayloadData_t* const targetPayload, const FuelData_t* const fuel, const double ZFWTarget, const UserData_t* const userData);
+void distribute(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, const double ZFWTarget,
+                const UserData_t *const userData);
 // SimBrief Entry
-void distribute(fPayloadData_t* const targetPayload, const FuelData_t* const fuel, unsigned int cargo, const UserData_t* const userData);
+void distribute(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, unsigned int cargo,
+                const UserData_t *const userData);
 // Updates pax stations with their respective weights
 // Used internally and used for Station Entry (pax only, cargo is ste directly)
 // STATION WEIGHTS ARE NOT NORMALISED TO POUNDS
-void generatePayload(fPayloadData_t* const targetPayload, const bool isImperial);
+void generatePayload(fPayloadData_t *const targetPayload, const bool isImperial);
 // Normalise to Pounds
 // For Station Entry: CALL AFTER `generatePayload`
-void normalisePayload(fPayloadData_t* const targetPayload, const bool isImperial);
+void normalisePayload(fPayloadData_t *const targetPayload, const bool isImperial);
-void calculateCGs(const fPayloadData_t* const targetPayload, const FuelData_t* const fuel, double* const ZFWCG, double* const TOCG, const bool isImperial);
+void calculateCGs(fPayloadData_t *const targetPayload, const FuelData_t *const fuel, const bool isImperial);
-void load(const fPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial);
+void load(const fPayloadData_t *const targetPayload, const HANDLE simConnect, const bool isImperial);
 void unloadF(const HANDLE simConnect, const bool isER);

PackageSources/wasm-module/fuel.cpp

@@ -0,0 +1,135 @@
+#include "fuel.h"
+
+// ZFW Entry
+void distribute(FuelData_t *const targetFuel, const double fuelTarget, const UserData_t *const userData) {
+  double fuelLbs = TO_POUNDS(userData->isImperial, fuelTarget);
+
+  // Equal mains
+  if (fuelLbs <= MAX_TANK_1_3_LBS * 3) {
+    double tanks = fuelLbs / 3;
+    // Only main
+    if (tanks <= MAX_TANK_1_3_TIP_LBS) {
+      targetFuel->main1 = tanks;
+      targetFuel->main3 = tanks;
+      targetFuel->main1Tip = 0;
+      targetFuel->main3Tip = 0;
+    }
+    // Tips
+    else if (tanks <= MAX_TANK_1_3_TIP_LBS * 2) {
+      double tips = tanks - MAX_TANK_1_3_TIP_LBS;
+      targetFuel->main1 = MAX_TANK_1_3_TIP_LBS;
+      targetFuel->main3 = MAX_TANK_1_3_TIP_LBS;
+      targetFuel->main1Tip = tips;
+      targetFuel->main3Tip = tips;
+    }
+    // Max tip
+    else {
+      double mains = tanks - MAX_TANK_1_3_TIP_LBS;
+      targetFuel->main1 = mains;
+      targetFuel->main3 = mains;
+      targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+      targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+    }
+
+    targetFuel->main2 = tanks;
+
+    targetFuel->upperAux = 0;
+    targetFuel->lowerAux = 0;
+    targetFuel->tail = 0;
+    targetFuel->forwardAux1 = 0;
+    targetFuel->forwardAux2 = 0;
+  }
+  // No Aux
+  else if (fuelLbs <= MAX_TANK_1_3_LBS * 2 + MAX_TANK_2_LBS) {
+    targetFuel->main1 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main3 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+
+    targetFuel->main2 = fuelLbs - MAX_TANK_1_3_LBS * 2;
+
+    targetFuel->upperAux = 0;
+    targetFuel->lowerAux = 0;
+    targetFuel->tail = 0;
+    targetFuel->forwardAux1 = 0;
+    targetFuel->forwardAux2 = 0;
+  }
+  // UPR AUX
+  else if (fuelLbs <= MAX_TANK_1_3_LBS * 2 + MAX_TANK_2_LBS + MAX_UPR_AUX_LBS) {
+    targetFuel->main1 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main3 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main2 = MAX_TANK_2_LBS;
+
+    targetFuel->upperAux = fuelLbs - MAX_TANK_1_3_LBS * 2 - MAX_TANK_2_LBS;
+
+    targetFuel->lowerAux = 0;
+    targetFuel->tail = 0;
+    targetFuel->forwardAux1 = 0;
+    targetFuel->forwardAux2 = 0;
+  }
+  // LWR AUX
+  else if (fuelLbs <= MAX_TANK_1_3_LBS * 2 + MAX_TANK_2_LBS + MAX_UPR_AUX_LBS + MAX_LWR_AUX_LBS) {
+    targetFuel->main1 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main3 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main2 = MAX_TANK_2_LBS;
+    targetFuel->upperAux = MAX_UPR_AUX_LBS;
+
+    targetFuel->lowerAux = fuelLbs - MAX_TANK_1_3_LBS * 2 - MAX_TANK_2_LBS - MAX_UPR_AUX_LBS;
+
+    targetFuel->tail = 0;
+    targetFuel->forwardAux1 = 0;
+    targetFuel->forwardAux2 = 0;
+  }
+  // Tail
+  else if (fuelLbs <= MAX_TANK_1_3_LBS * 2 + MAX_TANK_2_LBS + MAX_UPR_AUX_LBS + MAX_LWR_AUX_LBS + MAX_TAIL_LBS) {
+    targetFuel->main1 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main3 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main2 = MAX_TANK_2_LBS;
+    targetFuel->upperAux = MAX_UPR_AUX_LBS;
+    targetFuel->lowerAux = MAX_LWR_AUX_LBS;
+
+    targetFuel->tail = fuelLbs - MAX_TANK_1_3_LBS * 2 - MAX_TANK_2_LBS - MAX_UPR_AUX_LBS - MAX_LWR_AUX_LBS;
+
+    targetFuel->forwardAux1 = 0;
+    targetFuel->forwardAux2 = 0;
+  } else if (userData->isER) {
+    targetFuel->main1 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main3 = MAX_TANK_1_3_MAIN_LBS;
+    targetFuel->main1Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main3Tip = MAX_TANK_1_3_TIP_LBS;
+    targetFuel->main2 = MAX_TANK_2_LBS;
+    targetFuel->upperAux = MAX_UPR_AUX_LBS;
+    targetFuel->lowerAux = MAX_LWR_AUX_LBS;
+    targetFuel->tail = MAX_TAIL_LBS;
+
+    fuelLbs = fuelLbs - MAX_TANK_1_3_LBS * 2 - MAX_TANK_2_LBS - MAX_UPR_AUX_LBS - MAX_LWR_AUX_LBS - MAX_TAIL_LBS;
+    targetFuel->forwardAux1 = min(fuelLbs / 2, MAX_FWD_AUX_LBS);
+    targetFuel->forwardAux2 = min(fuelLbs / 2, MAX_FWD_AUX_LBS);
+  }
+
+  targetFuel->total = targetFuel->main1 + targetFuel->main3 + targetFuel->main2 + targetFuel->upperAux + targetFuel->lowerAux +
+                      targetFuel->main1Tip + targetFuel->main3Tip + targetFuel->tail + targetFuel->forwardAux1 +
+                      targetFuel->forwardAux2;
+}
+
+void fuel(const FuelData_t *const targetFuel, const HANDLE simConnect) {
+  FuelDataSet_t localFuel = {};
+
+  localFuel.main1 = min(MAX_TANK_1_3_GAL, (targetFuel->main1 + targetFuel->main1Tip) / LBS_PER_GAL);
+  localFuel.main2 = min(MAX_TANK_2_GAL, targetFuel->main2 / LBS_PER_GAL);
+  localFuel.main3 = min(MAX_TANK_1_3_GAL, (targetFuel->main3 + targetFuel->main3Tip) / LBS_PER_GAL);
+  localFuel.upperAux = min(MAX_UPR_AUX_GAL, targetFuel->upperAux / LBS_PER_GAL);
+  localFuel.lowerAux = min(MAX_LWR_AUX_GAL, targetFuel->lowerAux / LBS_PER_GAL);
+  localFuel.tail = min(MAX_TAIL_GAL, targetFuel->tail / LBS_PER_GAL);
+  localFuel.forwardAux1 = min(MAX_FWD_AUX_GAL, targetFuel->forwardAux1 / LBS_PER_GAL);
+  localFuel.forwardAux2 = min(MAX_FWD_AUX_GAL, targetFuel->forwardAux2 / LBS_PER_GAL);
+
+  SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_FUEL_SET, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(FuelDataSet_t),
+                                &localFuel);
+}

PackageSources/wasm-module/fuel.h

@@ -0,0 +1,88 @@
+#pragma once
+
+#ifndef __INTELLISENSE__
+#define MODULE_EXPORT __attribute__((visibility("default")))
+#define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
+#else
+#define MODULE_EXPORT
+#define MODULE_WASM_MODNAME(mod)
+#define __attribute__(x)
+#define __restrict__
+#endif
+
+/********************************* Headers *********************************/
+// MSFS headers
+#include <MSFS/MSFS_WindowsTypes.h>
+#include <SimConnect.h>
+// C headers
+#include <math.h>
+// C++ headers
+#include <algorithm>
+// Own headers
+#include "shared.h"
+
+/******************************** Constants ********************************/
+#define LBS_PER_GAL 6.699999809
+#define MAX_TANK_1_3_MAIN_GAL 5167.907
+#define MAX_TANK_1_3_TIP_GAL 874.5
+#define MAX_TANK_1_3_GAL (5167.907 + 874.5)
+#define MAX_TANK_2_GAL 9556.95
+#define MAX_UPR_AUX_GAL 12998.58
+#define MAX_LWR_AUX_GAL 1641.82
+#define MAX_TAIL_GAL 1957.779
+#define MAX_FWD_AUX_GAL 1970.8
+#define MAX_TANK_1_3_MAIN_LBS (LBS_PER_GAL * MAX_TANK_1_3_MAIN_GAL)
+#define MAX_TANK_1_3_TIP_LBS (LBS_PER_GAL * MAX_TANK_1_3_TIP_GAL)
+#define MAX_TANK_1_3_LBS (LBS_PER_GAL * MAX_TANK_1_3_GAL)
+#define MAX_TANK_2_LBS (LBS_PER_GAL * MAX_TANK_2_GAL)
+#define MAX_UPR_AUX_LBS (LBS_PER_GAL * MAX_UPR_AUX_GAL)
+#define MAX_LWR_AUX_LBS (LBS_PER_GAL * MAX_LWR_AUX_GAL)
+#define MAX_TAIL_LBS (LBS_PER_GAL * MAX_TAIL_GAL)
+#define MAX_FWD_AUX_LBS (LBS_PER_GAL * MAX_FWD_AUX_GAL)
+
+// Max Fuel
+#define MAX_FUEL(IS_IMPERIAL) ((IS_IMPERIAL) ? (256207) : (116213))
+#define MAX_FUEL_ER(IS_IMPERIAL) ((IS_IMPERIAL) ? (282619) : (128193))
+// Arms Fuel
+#define ARM_MAIN1 -240.0
+#define ARM_MAIN3 -240.0
+#define ARM_MAIN2 120.0
+#define ARM_UPPER_AUX 0.0
+#define ARM_LOWER_AUX 0.0
+#define ARM_MAIN1_TIP -468.0
+#define ARM_MAIN3_TIP -468.0
+#define ARM_TAIL -840.0
+#define ARM_FORWARD_AUX1 60.0
+#define ARM_FORWARD_AUX2 60.0
+
+/***************************** Data structures *****************************/
+typedef struct {
+  // SimConnect mapped
+  double main1;
+  double main3;
+  double main2;
+  double upperAux;
+  double lowerAux;
+  double main1Tip;
+  double main3Tip;
+  double tail;
+  double forwardAux1;
+  double forwardAux2;
+  // Additional properties
+  double total;
+} FuelData_t;
+
+typedef struct {
+  double main1;
+  double main3;
+  double main2;
+  double upperAux;
+  double lowerAux;
+  double tail;
+  double forwardAux1;
+  double forwardAux2;
+} FuelDataSet_t;
+
+/******************************** Functions ********************************/
+void distribute(FuelData_t *const targetFuel, const double fuelTarget, const UserData_t *const userData);
+void fuel(const FuelData_t *const targetFuel, const HANDLE simConnect);

PackageSources/wasm-module/load-manager-cli.cpp

@@ -1,25 +0,0 @@
-// load-manager-cli.cpp : This file contains the 'main' function. Program execution begins and ends there.
-//
-
-#include "../wasm-module/pax.h"
-
-
-
-int main()
-{
-    bool isImperial = false;
-    bool isER = true;
-
-    paxPayloadData_t targetPaxPayloadData = paxPayloadData_t();
-    targetPaxPayloadData.empty = FROM_POUNDS(isImperial, 283975);
-    targetPaxPayloadData.pilot = PAX_WEIGHT(isImperial);
-    targetPaxPayloadData.firstOfficer = PAX_WEIGHT(isImperial);
-    targetPaxPayloadData.engineer = PAX_WEIGHT(isImperial);
-    targetPaxPayloadData.cabinCrewFront = FRONT_CREW_WEIGHT(isImperial);
-    targetPaxPayloadData.cabinCrewRear = REAR_CREW_WEIGHT(isImperial);
-    targetPaxPayloadData.leftAux = isER ? AUX_WEIGHT(isImperial) : 0;
-    targetPaxPayloadData.rightAux = isER ? AUX_WEIGHT(isImperial) : 0;
-    FuelData_t liveFuelData = FuelData_t();
-
-    distribute(&targetPaxPayloadData, &liveFuelData, 162000.0, 20.5, isImperial);
-}

PackageSources/wasm-module/load-manager-cli.vcxproj

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{992caf4b-b3f6-4a86-a1c1-663686082c5e}</ProjectGuid>
-    <RootNamespace>loadmanagercli</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="pax.cpp" />
-    <ClCompile Include="load-manager-cli.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pax.h" />
-    <ClInclude Include="types.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

PackageSources/wasm-module/load-manager-cli.vcxproj.filters

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>
-        rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="load-manager-cli.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pax.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pax.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

PackageSources/wasm-module/load-manager-cli.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>

PackageSources/wasm-module/load-manager.h

@@ -1,45 +1,47 @@
 #pragma once
 
 #ifndef __INTELLISENSE__
-#	define MODULE_EXPORT __attribute__( ( visibility( "default" ) ) )
+#define MODULE_EXPORT __attribute__((visibility("default")))
-#	define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
+#define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
 #else
-#	define MODULE_EXPORT
+#define MODULE_EXPORT
-#	define MODULE_WASM_MODNAME(mod)
+#define MODULE_WASM_MODNAME(mod)
-#	define __attribute__(x)
+#define __attribute__(x)
-#	define __restrict__
+#define __restrict__
 #endif
 
 /********************************* Headers *********************************/
 // MSFS headers
+#include "rapidjson/filewritestream.h"
+#include <MSFS/Legacy/gauges.h>
 #include <MSFS/MSFS.h>
 #include <MSFS/MSFS_CommBus.h>
-#include <MSFS/Legacy/gauges.h>
+#include <SimConnect.h>
 #include <rapidjson/document.h>
 #include <rapidjson/filereadstream.h>
-#include "rapidjson/filewritestream.h"
 #include <rapidjson/writer.h>
-#include <SimConnect.h>
+
 // C headers
 #include <string.h>
 // C++ headers
 #include <ctime>
 // Own headers
-#include "shared.h"
-#include "pax.h"
 #include "freighter.h"
+#include "fuel.h"
+#include "pax.h"
+#include "shared.h"
 
 /******************************** Constants ********************************/
 // Module identification
 #define MODULE_NAME "[KHOFMANN TFDi MD-11 Load Manager] "
-#define VERSION_STRING "1.6"
+#define VERSION_STRING "2.9-beta"
 // COMM BUS
 #define COMM_BUS_LIVE_DATA_EVENT "khofmann_tfdi_md-11_load_manager_live_data"
 #define COMM_BUS_UPDATE_TARGET_EVENT "khofmann_tfdi_md-11_load_manager_update_target"
 
 /******************************** Functions ********************************/
-void commBusUpdateTargetCallback(const char* args, unsigned int size, void* ctx);
+void commBusUpdateTargetCallback(const char *args, unsigned int size, void *ctx);
-int receiveData(const char* buf);
+int receiveData(const char *buf);
 void sendData();
-void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContext);
+void CALLBACK MyDispatchProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
-void log(FILE* file, const char* format, void* optionalElement = NULL);
+void log(FILE *file, const char *format, void *optionalElement = NULL);

PackageSources/wasm-module/load-manager.sln

@@ -5,28 +5,16 @@ VisualStudioVersion = 17.13.36105.23
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "load-manager", "load-manager.vcxproj", "{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "load-manager-cli", "load-manager-cli.vcxproj", "{992CAF4B-B3F6-4A86-A1C1-663686082C5E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|MSFS = Debug|MSFS
-		Debug|x64 = Debug|x64
 		Release|MSFS = Release|MSFS
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Debug|MSFS.ActiveCfg = Debug|MSFS
 		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Debug|MSFS.Build.0 = Debug|MSFS
-		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Debug|x64.ActiveCfg = Debug|x64
 		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Release|MSFS.ActiveCfg = Release|MSFS
 		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Release|MSFS.Build.0 = Release|MSFS
-		{A5468B35-BBBD-4C55-97ED-81BFE343B0E4}.Release|x64.ActiveCfg = Release|MSFS
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Debug|MSFS.ActiveCfg = Debug|x64
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Debug|x64.ActiveCfg = Debug|x64
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Debug|x64.Build.0 = Debug|x64
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Release|MSFS.ActiveCfg = Release|x64
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Release|x64.ActiveCfg = Release|x64
-		{992CAF4B-B3F6-4A86-A1C1-663686082C5E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PackageSources/wasm-module/load-manager.vcxproj

@@ -288,12 +288,14 @@ Powershell.exe -File .\copy-release.ps1</Command>
     <ClCompile Include="freighter.cpp" />
     <ClCompile Include="load-manager.cpp" />
     <ClCompile Include="pax.cpp" />
+    <ClCompile Include="fuel.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="freighter.h" />
     <ClInclude Include="load-manager.h" />
     <ClInclude Include="pax.h" />
     <ClInclude Include="shared.h" />
+    <ClInclude Include="fuel.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

PackageSources/wasm-module/pax.cpp

@@ -1,329 +1,325 @@
 #include "pax.h"
 
 // ZFW Entry, fill pax first (pax+bag), rest is cargo
-void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, const double ZFWTarget, const UserData_t* const userData,
+void distribute(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, const double ZFWTarget,
-                const UserOptions_t* const userOptions) {
+                const UserData_t *const userData, const UserOptions_t *const userOptions) {
-    // Find payload, num pax and extra cargo
+  // Find payload, num pax and extra cargo
-    double payload = ZFWTarget - targetPayload->empty - targetPayload->pilot - targetPayload->firstOfficer - targetPayload->engineer -
+  double payload = ZFWTarget - targetPayload->empty - targetPayload->pilot - targetPayload->firstOfficer -
-                     targetPayload->cabinCrewFront - targetPayload->cabinCrewRear - targetPayload->leftAux - targetPayload->rightAux;
+                   targetPayload->engineer - targetPayload->cabinCrewFront - targetPayload->cabinCrewRear -
-    unsigned short numPax = max(0.0, min((double)MAX_PAX, floor(payload / (PAX_WEIGHT(userData->isImperial, userOptions) + 
+                   targetPayload->leftAux - targetPayload->rightAux;
-                                                                           BAG_WEIGHT(userData->isImperial, userOptions)))));
+  unsigned short numPax = max(0.0, min((double)MAX_PAX, floor(payload / (PAX_WEIGHT(userData->isImperial, userOptions) +
-    unsigned int cargo = round(payload - numPax * PAX_WEIGHT(userData->isImperial, userOptions) - numPax * BAG_WEIGHT(userData->isImperial, userOptions));
+                                                                         BAG_WEIGHT(userData->isImperial, userOptions)))));
+  unsigned int cargo = round(payload - numPax * PAX_WEIGHT(userData->isImperial, userOptions) -
+                             numPax * BAG_WEIGHT(userData->isImperial, userOptions));
 
-    distribute(targetPayload, fuel, numPax, cargo, userData, userOptions);
+  distribute(targetPayload, fuel, numPax, cargo, userData, userOptions);
 }
 
 // SimBrief Entry, SB pax count and extra cargo
-void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, unsigned short numPax, unsigned int cargo, const UserData_t* const userData,
+void distribute(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, unsigned short numPax, unsigned int cargo,
-                const UserOptions_t* const userOptions) {
+                const UserData_t *const userData, const UserOptions_t *const userOptions) {
-    // Clear
+  // Clear
-    targetPayload->paxCount.business1 = targetPayload->paxCount.business2 = targetPayload->paxCount.economy1 = targetPayload->paxCount.economy2 =
+  targetPayload->paxCount.business1 = targetPayload->paxCount.business2 = targetPayload->paxCount.economy1 =
-        targetPayload->paxCount.total = 0;
+      targetPayload->paxCount.economy2 = targetPayload->paxCount.total = 0;
-    targetPayload->forwardCargo = targetPayload->rearCargo = 0;
+  targetPayload->forwardCargo = targetPayload->rearCargo = 0;
-    
-    unsigned short _numPax = 0;
-    unsigned int count = MAX_PAX;
-    // Initial distribution pax + bags
-    while (numPax > 0 && count > 0) {
-        if (numPax >= 4) {
-            if (targetPayload->paxCount.business1 < MAX_BUSINESS_1) {
-                targetPayload->paxCount.business1++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
-                targetPayload->paxCount.business2++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
-                targetPayload->paxCount.economy1++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
-                targetPayload->paxCount.economy2++;
-                _numPax++;
-            }
-        }
-        else if (numPax == 3) {
-            if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
-                targetPayload->paxCount.business2++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
-                targetPayload->paxCount.economy1++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
-                targetPayload->paxCount.economy2++;
-                _numPax++;
-            }
-        }
-        else if (numPax == 2) {
-            if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
-                targetPayload->paxCount.economy1++;
-                _numPax++;
-            }
-            if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
-                targetPayload->paxCount.economy2++;
-                _numPax++;
-            }
-        }
-        else if (numPax == 1) {
-            if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
-                targetPayload->paxCount.economy2++;
-                _numPax++;
-            }
-        }
-        numPax -= _numPax;
-        targetPayload->paxCount.total += _numPax;
 
-        if (_numPax % 2 == 0) {
+  unsigned short _numPax = 0;
-            targetPayload->forwardCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
+  unsigned int count = MAX_PAX;
-            targetPayload->rearCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
+  // Initial distribution pax + bags
-        }
+  while (numPax > 0 && count > 0) {
-        else {
+    if (numPax >= 4) {
-            _numPax--;
+      if (targetPayload->paxCount.business1 < MAX_BUSINESS_1) {
-            targetPayload->forwardCargo += (_numPax / 2 + 1) * BAG_WEIGHT(userData->isImperial, userOptions);
+        targetPayload->paxCount.business1++;
-            targetPayload->rearCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
+        _numPax++;
-        }
+      }
-
+      if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
-        _numPax = 0;
+        targetPayload->paxCount.business2++;
-
+        _numPax++;
-        count--;
+      }
+      if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
+        targetPayload->paxCount.economy1++;
+        _numPax++;
+      }
+      if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
+        targetPayload->paxCount.economy2++;
+        _numPax++;
+      }
+    } else if (numPax == 3) {
+      if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
+        targetPayload->paxCount.business2++;
+        _numPax++;
+      }
+      if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
+        targetPayload->paxCount.economy1++;
+        _numPax++;
+      }
+      if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
+        targetPayload->paxCount.economy2++;
+        _numPax++;
+      }
+    } else if (numPax == 2) {
+      if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
+        targetPayload->paxCount.economy1++;
+        _numPax++;
+      }
+      if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
+        targetPayload->paxCount.economy2++;
+        _numPax++;
+      }
+    } else if (numPax == 1) {
+      if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
+        targetPayload->paxCount.economy2++;
+        _numPax++;
+      }
     }
-    count = MAX_FRONT_CARGO(userData->isImperial);
+    numPax -= _numPax;
-    // Initial distibution of remaining cargo
+    targetPayload->paxCount.total += _numPax;
-    while (cargo > 0 && count > 0) {
-        if (targetPayload->forwardCargo < MAX_FRONT_CARGO(userData->isImperial)) {
-            targetPayload->forwardCargo++;
-            cargo--;
-        }
-        if (targetPayload->rearCargo < MAX_REAR_CARGO(userData->isImperial, userData->isER) && cargo > 0) {
-            targetPayload->rearCargo++;
-            cargo--;
-        }
 
-        count--;
+    if (_numPax % 2 == 0) {
+      targetPayload->forwardCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
+      targetPayload->rearCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
+    } else {
+      _numPax--;
+      targetPayload->forwardCargo += (_numPax / 2 + 1) * BAG_WEIGHT(userData->isImperial, userOptions);
+      targetPayload->rearCargo += (_numPax / 2) * BAG_WEIGHT(userData->isImperial, userOptions);
     }
-    // Refinement pax
-    count = MAX_PAX;
 
-    unsigned char minBusiness1 = round(targetPayload->paxCount.business1 / 3);
+    _numPax = 0;
-    unsigned char minBusiness2 = round(targetPayload->paxCount.business2 / 3);
-    unsigned char minEconomy1 = round(targetPayload->paxCount.economy1 / 3);
-    unsigned char minEconomy2 = round(targetPayload->paxCount.economy2 / 3);
 
-    while (count > 0) {
+    count--;
-        generatePayload(targetPayload, userData->isImperial, userOptions);
+  }
-        calculateCGs(targetPayload, fuel, &targetPayload->ZFWCG, &targetPayload->TOCG, userData->isImperial);
+  count = MAX_FRONT_CARGO(userData->isImperial);
-
+  // Initial distribution of remaining cargo
-        // in front of target
+  while (cargo > 0 && count > 0) {
-        if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
+    if (targetPayload->forwardCargo < MAX_FRONT_CARGO(userData->isImperial)) {
-            if (targetPayload->paxCount.business1 > minBusiness1) {
+      targetPayload->forwardCargo++;
-                targetPayload->paxCount.business1--;
+      cargo--;
-            }
-            else if (targetPayload->paxCount.business2 > minBusiness2) {
-                targetPayload->paxCount.business2--;
-            }
-            else if (targetPayload->paxCount.economy1 > minEconomy1) {
-                targetPayload->paxCount.economy1--;
-            }
-            else {
-                break;
-            }
-
-            if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
-                targetPayload->paxCount.economy2++;
-            }
-            else if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
-                targetPayload->paxCount.economy1++;
-            }
-            else if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
-                targetPayload->paxCount.business2++;
-            }
-            else {
-                targetPayload->paxCount.business1++;
-            }
-        }
-        // behind target
-        else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
-            if (targetPayload->paxCount.economy2 > minEconomy2) {
-                targetPayload->paxCount.economy2--;
-            }
-            else if (targetPayload->paxCount.economy1 > minEconomy1) {
-                targetPayload->paxCount.economy1--;
-            }
-            else if (targetPayload->paxCount.business2 > minBusiness2) {
-                targetPayload->paxCount.business2--;
-            }
-            else {
-                break;
-            }
-
-            if (targetPayload->paxCount.business1 < MAX_BUSINESS_1) {
-                targetPayload->paxCount.business1++;
-            }
-            else if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
-                targetPayload->paxCount.business2++;
-            }
-            else if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
-                targetPayload->paxCount.economy1++;
-            }
-            else {
-                targetPayload->paxCount.economy2++;
-            }
-        }
-        else {
-            break;
-        }
-
-        count--;
     }
-    // Refinement cargo
+    if (targetPayload->rearCargo < MAX_REAR_CARGO(userData->isImperial, userData->isER) && cargo > 0) {
-    count = MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+      targetPayload->rearCargo++;
-    while (count > 0) {
+      cargo--;
-        generatePayload(targetPayload, userData->isImperial, userOptions);
-        calculateCGs(targetPayload, fuel, &targetPayload->ZFWCG, &targetPayload->TOCG, userData->isImperial);
-
-        // in front of target
-        if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
-            if (targetPayload->forwardCargo > 0 && targetPayload->rearCargo < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
-                if (targetPayload->forwardCargo > BAG_WEIGHT(userData->isImperial, userOptions) &&
-                    targetPayload->rearCargo < MAX_FRONT_CARGO(userData->isImperial) - BAG_WEIGHT(userData->isImperial, userOptions)) {
-                    targetPayload->forwardCargo -= BAG_WEIGHT(userData->isImperial, userOptions);
-                    targetPayload->rearCargo += BAG_WEIGHT(userData->isImperial, userOptions);
-                }
-                else {
-                    targetPayload->forwardCargo--;
-                    targetPayload->rearCargo++;
-                }
-            }
-            else {
-                break;
-            }
-        }
-        // behind target
-        else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
-            if (targetPayload->rearCargo > 0 && targetPayload->forwardCargo < MAX_FRONT_CARGO(userData->isImperial)) {
-                if (targetPayload->rearCargo > BAG_WEIGHT(userData->isImperial, userOptions) &&
-                    targetPayload->forwardCargo < MAX_REAR_CARGO(userData->isImperial, userData->isER) - BAG_WEIGHT(userData->isImperial, userOptions)) {
-                    targetPayload->rearCargo -= BAG_WEIGHT(userData->isImperial, userOptions);
-                    targetPayload->forwardCargo += BAG_WEIGHT(userData->isImperial, userOptions);
-                }
-                else {
-                    targetPayload->rearCargo--;
-                    targetPayload->forwardCargo++;
-                }
-            }
-            else {
-                break;
-            }
-        }
-        else {
-            break;
-        }
-
-        count--;
     }
+
+    count--;
+  }
+  // Refinement pax
+  count = MAX_PAX;
+
+  unsigned char minBusiness1 = round(targetPayload->paxCount.business1 / 3);
+  unsigned char minBusiness2 = round(targetPayload->paxCount.business2 / 3);
+  unsigned char minEconomy1 = round(targetPayload->paxCount.economy1 / 3);
+  unsigned char minEconomy2 = round(targetPayload->paxCount.economy2 / 3);
+
+  while (count > 0) {
+    generatePayload(targetPayload, userData->isImperial, userOptions);
+    calculateCGs(targetPayload, fuel, userData->isImperial);
+
+    // in front of target
+    if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
+      if (targetPayload->paxCount.business1 > minBusiness1) {
+        targetPayload->paxCount.business1--;
+      } else if (targetPayload->paxCount.business2 > minBusiness2) {
+        targetPayload->paxCount.business2--;
+      } else if (targetPayload->paxCount.economy1 > minEconomy1) {
+        targetPayload->paxCount.economy1--;
+      } else {
+        break;
+      }
+
+      if (targetPayload->paxCount.economy2 < MAX_ECONOMY_2) {
+        targetPayload->paxCount.economy2++;
+      } else if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
+        targetPayload->paxCount.economy1++;
+      } else if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
+        targetPayload->paxCount.business2++;
+      } else {
+        targetPayload->paxCount.business1++;
+      }
+    }
+    // behind target
+    else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
+      if (targetPayload->paxCount.economy2 > minEconomy2) {
+        targetPayload->paxCount.economy2--;
+      } else if (targetPayload->paxCount.economy1 > minEconomy1) {
+        targetPayload->paxCount.economy1--;
+      } else if (targetPayload->paxCount.business2 > minBusiness2) {
+        targetPayload->paxCount.business2--;
+      } else {
+        break;
+      }
+
+      if (targetPayload->paxCount.business1 < MAX_BUSINESS_1) {
+        targetPayload->paxCount.business1++;
+      } else if (targetPayload->paxCount.business2 < MAX_BUSINESS_2) {
+        targetPayload->paxCount.business2++;
+      } else if (targetPayload->paxCount.economy1 < MAX_ECONOMY_1) {
+        targetPayload->paxCount.economy1++;
+      } else {
+        targetPayload->paxCount.economy2++;
+      }
+    } else {
+      break;
+    }
+
+    count--;
+  }
+  // Refinement cargo
+  count = MAX_FRONT_CARGO(userData->isImperial) + MAX_REAR_CARGO(userData->isImperial, userData->isER);
+  while (count > 0) {
+    generatePayload(targetPayload, userData->isImperial, userOptions);
+    calculateCGs(targetPayload, fuel, userData->isImperial);
+
+    // in front of target
+    if (targetPayload->ZFWCG < targetPayload->CGTarget - CG_TOLERANCE) {
+      if (targetPayload->forwardCargo > 0 && targetPayload->rearCargo < MAX_REAR_CARGO(userData->isImperial, userData->isER)) {
+        if (targetPayload->forwardCargo > BAG_WEIGHT(userData->isImperial, userOptions) &&
+            targetPayload->rearCargo < MAX_FRONT_CARGO(userData->isImperial) - BAG_WEIGHT(userData->isImperial, userOptions)) {
+          targetPayload->forwardCargo -= BAG_WEIGHT(userData->isImperial, userOptions);
+          targetPayload->rearCargo += BAG_WEIGHT(userData->isImperial, userOptions);
+        } else {
+          targetPayload->forwardCargo--;
+          targetPayload->rearCargo++;
+        }
+      } else {
+        break;
+      }
+    }
+    // behind target
+    else if (targetPayload->ZFWCG > targetPayload->CGTarget + CG_TOLERANCE) {
+      if (targetPayload->rearCargo > 0 && targetPayload->forwardCargo < MAX_FRONT_CARGO(userData->isImperial)) {
+        if (targetPayload->rearCargo > BAG_WEIGHT(userData->isImperial, userOptions) &&
+            targetPayload->forwardCargo <
+                MAX_REAR_CARGO(userData->isImperial, userData->isER) - BAG_WEIGHT(userData->isImperial, userOptions)) {
+          targetPayload->rearCargo -= BAG_WEIGHT(userData->isImperial, userOptions);
+          targetPayload->forwardCargo += BAG_WEIGHT(userData->isImperial, userOptions);
+        } else {
+          targetPayload->rearCargo--;
+          targetPayload->forwardCargo++;
+        }
+      } else {
+        break;
+      }
+    } else {
+      break;
+    }
+
+    count--;
+  }
 }
 
 // Updates pax stations with their respective weights
 // Used internally and used for Station Entry (pax only, cargo is set directly)
-void generatePayload(paxPayloadData_t* const targetPayload, const bool isImperial, const UserOptions_t* const userOptions) {
+void generatePayload(paxPayloadData_t *const targetPayload, const bool isImperial, const UserOptions_t *const userOptions) {
-    targetPayload->business1Left = targetPayload->business1Center = targetPayload->business1Right = (targetPayload->paxCount.business1 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
+  targetPayload->business1Left = targetPayload->business1Center = targetPayload->business1Right =
-    targetPayload->business2Left = targetPayload->business2Center = targetPayload->business2Right = (targetPayload->paxCount.business2 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
+      (targetPayload->paxCount.business1 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
-    targetPayload->economy1Left = targetPayload->economy1Center = targetPayload->economy1Right = (targetPayload->paxCount.economy1 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
+  targetPayload->business2Left = targetPayload->business2Center = targetPayload->business2Right =
-    targetPayload->economy2Left = targetPayload->economy2Center = targetPayload->economy2Right = (targetPayload->paxCount.economy2 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
+      (targetPayload->paxCount.business2 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
-    targetPayload->total = targetPayload->empty + targetPayload->pilot + targetPayload->firstOfficer + targetPayload->engineer + targetPayload->cabinCrewFront +
+  targetPayload->economy1Left = targetPayload->economy1Center = targetPayload->economy1Right =
-                           targetPayload->business1Left + targetPayload->business1Center + targetPayload->business1Right + targetPayload->business2Left +
+      (targetPayload->paxCount.economy1 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
-                           targetPayload->business2Center + targetPayload->business2Right + targetPayload->economy1Left + targetPayload->economy1Center +
+  targetPayload->economy2Left = targetPayload->economy2Center = targetPayload->economy2Right =
-                           targetPayload->economy1Right + targetPayload->economy2Left + targetPayload->economy2Center + targetPayload->economy2Right +
+      (targetPayload->paxCount.economy2 / 3.0) * PAX_WEIGHT(isImperial, userOptions);
-                           targetPayload->cabinCrewRear + targetPayload->forwardCargo + targetPayload->rearCargo + targetPayload->leftAux + targetPayload->rightAux;
+  targetPayload->total = targetPayload->empty + targetPayload->pilot + targetPayload->firstOfficer + targetPayload->engineer +
+                         targetPayload->cabinCrewFront + targetPayload->business1Left + targetPayload->business1Center +
+                         targetPayload->business1Right + targetPayload->business2Left + targetPayload->business2Center +
+                         targetPayload->business2Right + targetPayload->economy1Left + targetPayload->economy1Center +
+                         targetPayload->economy1Right + targetPayload->economy2Left + targetPayload->economy2Center +
+                         targetPayload->economy2Right + targetPayload->cabinCrewRear + targetPayload->forwardCargo +
+                         targetPayload->rearCargo + targetPayload->leftAux + targetPayload->rightAux;
 }
 
 // Normalise to Pounds
 // MANDATORY BEFORE SETTING WEIGHTS
 // USE ON COPY OF GLOBAL STATE ONLY
-void normalisePayload(paxPayloadData_t* const targetPayload, const bool isImperial) {
+void normalisePayload(paxPayloadData_t *const targetPayload, const bool isImperial) {
-    targetPayload->empty = TO_POUNDS(isImperial, targetPayload->empty);
+  targetPayload->empty = TO_POUNDS(isImperial, targetPayload->empty);
-    targetPayload->pilot = TO_POUNDS(isImperial, targetPayload->pilot);
+  targetPayload->pilot = TO_POUNDS(isImperial, targetPayload->pilot);
-    targetPayload->firstOfficer = TO_POUNDS(isImperial, targetPayload->firstOfficer);
+  targetPayload->firstOfficer = TO_POUNDS(isImperial, targetPayload->firstOfficer);
-    targetPayload->engineer = TO_POUNDS(isImperial, targetPayload->engineer);
+  targetPayload->engineer = TO_POUNDS(isImperial, targetPayload->engineer);
-    targetPayload->cabinCrewFront = TO_POUNDS(isImperial, targetPayload->cabinCrewFront);
+  targetPayload->cabinCrewFront = TO_POUNDS(isImperial, targetPayload->cabinCrewFront);
-    targetPayload->business1Left = TO_POUNDS(isImperial, targetPayload->business1Left);
+  targetPayload->business1Left = TO_POUNDS(isImperial, targetPayload->business1Left);
-    targetPayload->business1Center = TO_POUNDS(isImperial, targetPayload->business1Center);
+  targetPayload->business1Center = TO_POUNDS(isImperial, targetPayload->business1Center);
-    targetPayload->business1Right = TO_POUNDS(isImperial, targetPayload->business1Right);
+  targetPayload->business1Right = TO_POUNDS(isImperial, targetPayload->business1Right);
-    targetPayload->business2Left = TO_POUNDS(isImperial, targetPayload->business2Left);
+  targetPayload->business2Left = TO_POUNDS(isImperial, targetPayload->business2Left);
-    targetPayload->business2Center = TO_POUNDS(isImperial, targetPayload->business2Center);
+  targetPayload->business2Center = TO_POUNDS(isImperial, targetPayload->business2Center);
-    targetPayload->business2Right = TO_POUNDS(isImperial, targetPayload->business2Right);
+  targetPayload->business2Right = TO_POUNDS(isImperial, targetPayload->business2Right);
-    targetPayload->economy1Left = TO_POUNDS(isImperial, targetPayload->economy1Left);
+  targetPayload->economy1Left = TO_POUNDS(isImperial, targetPayload->economy1Left);
-    targetPayload->economy1Center = TO_POUNDS(isImperial, targetPayload->economy1Center);
+  targetPayload->economy1Center = TO_POUNDS(isImperial, targetPayload->economy1Center);
-    targetPayload->economy1Right = TO_POUNDS(isImperial, targetPayload->economy1Right);
+  targetPayload->economy1Right = TO_POUNDS(isImperial, targetPayload->economy1Right);
-    targetPayload->economy2Left = TO_POUNDS(isImperial, targetPayload->economy2Left);
+  targetPayload->economy2Left = TO_POUNDS(isImperial, targetPayload->economy2Left);
-    targetPayload->economy2Center = TO_POUNDS(isImperial, targetPayload->economy2Center);
+  targetPayload->economy2Center = TO_POUNDS(isImperial, targetPayload->economy2Center);
-    targetPayload->economy2Right = TO_POUNDS(isImperial, targetPayload->economy2Right);
+  targetPayload->economy2Right = TO_POUNDS(isImperial, targetPayload->economy2Right);
-    targetPayload->cabinCrewRear = TO_POUNDS(isImperial, targetPayload->cabinCrewRear);
+  targetPayload->cabinCrewRear = TO_POUNDS(isImperial, targetPayload->cabinCrewRear);
-    targetPayload->forwardCargo = TO_POUNDS(isImperial, targetPayload->forwardCargo);
+  targetPayload->forwardCargo = TO_POUNDS(isImperial, targetPayload->forwardCargo);
-    targetPayload->rearCargo = TO_POUNDS(isImperial, targetPayload->rearCargo);
+  targetPayload->rearCargo = TO_POUNDS(isImperial, targetPayload->rearCargo);
-    targetPayload->leftAux = TO_POUNDS(isImperial, targetPayload->leftAux);
+  targetPayload->leftAux = TO_POUNDS(isImperial, targetPayload->leftAux);
-    targetPayload->rightAux = TO_POUNDS(isImperial, targetPayload->rightAux);
+  targetPayload->rightAux = TO_POUNDS(isImperial, targetPayload->rightAux);
 }
 
-void calculateCGs(const paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, double* const ZFWCG, double* const TOCG, const bool isImperial) {
+void calculateCGs(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, const bool isImperial) {
-    paxPayloadData_t localPayload = {};
+  paxPayloadData_t localPayload = {};
-    memcpy(&localPayload, targetPayload, sizeof(localPayload));
+  memcpy(&localPayload, targetPayload, sizeof(localPayload));
-    normalisePayload(&localPayload, isImperial);
+  normalisePayload(&localPayload, isImperial);
 
-    double totalMoment = localPayload.empty * ARM_EMPTY + localPayload.pilot * ARM_PILOT + localPayload.firstOfficer * ARM_FIRST_OFFICER +
+  double totalMoment =
-                         localPayload.engineer * ARM_ENGINEER + localPayload.cabinCrewFront * ARM_PAX_CABIN_CREW_FRONT +
+      localPayload.empty * ARM_EMPTY + localPayload.pilot * ARM_PILOT + localPayload.firstOfficer * ARM_FIRST_OFFICER +
-                         localPayload.business1Left * ARM_PAX_BUSINESS1_LEFT + localPayload.business1Center * ARM_PAX_BUSINESS1_CENTER +
+      localPayload.engineer * ARM_ENGINEER + localPayload.cabinCrewFront * ARM_PAX_CABIN_CREW_FRONT +
-                         localPayload.business1Right * ARM_PAX_BUSINESS1_RIGHT + localPayload.business2Left * ARM_PAX_BUSINESS2_LEFT +
+      localPayload.business1Left * ARM_PAX_BUSINESS1_LEFT + localPayload.business1Center * ARM_PAX_BUSINESS1_CENTER +
-                         localPayload.business2Center * ARM_PAX_BUSINESS2_CENTER + localPayload.business2Right * ARM_PAX_BUSINESS2_RIGHT +
+      localPayload.business1Right * ARM_PAX_BUSINESS1_RIGHT + localPayload.business2Left * ARM_PAX_BUSINESS2_LEFT +
-                         localPayload.economy1Left * ARM_PAX_ECONOMY1_LEFT + localPayload.economy1Center * ARM_PAX_ECONOMY1_CENTER +
+      localPayload.business2Center * ARM_PAX_BUSINESS2_CENTER + localPayload.business2Right * ARM_PAX_BUSINESS2_RIGHT +
-                         localPayload.economy1Right * ARM_PAX_ECONOMY1_RIGHT + localPayload.economy2Left * ARM_PAX_ECONOMY2_LEFT +
+      localPayload.economy1Left * ARM_PAX_ECONOMY1_LEFT + localPayload.economy1Center * ARM_PAX_ECONOMY1_CENTER +
-                         localPayload.economy2Center * ARM_PAX_ECONOMY2_CENTER + localPayload.economy2Right * ARM_PAX_ECONOMY2_RIGHT +
+      localPayload.economy1Right * ARM_PAX_ECONOMY1_RIGHT + localPayload.economy2Left * ARM_PAX_ECONOMY2_LEFT +
-                         localPayload.cabinCrewRear * ARM_PAX_CABIN_CREW_REAR + localPayload.forwardCargo * ARM_FORWARD_CARGO +
+      localPayload.economy2Center * ARM_PAX_ECONOMY2_CENTER + localPayload.economy2Right * ARM_PAX_ECONOMY2_RIGHT +
-                         localPayload.rearCargo * ARM_REAR_CARGO + localPayload.leftAux * ARM_LEFT_AUX + localPayload.rightAux * ARM_RIGHT_AUX;
+      localPayload.cabinCrewRear * ARM_PAX_CABIN_CREW_REAR + localPayload.forwardCargo * ARM_FORWARD_CARGO +
+      localPayload.rearCargo * ARM_REAR_CARGO + localPayload.leftAux * ARM_LEFT_AUX + localPayload.rightAux * ARM_RIGHT_AUX;
 
-    double totalWeight = localPayload.empty + localPayload.pilot + localPayload.firstOfficer + localPayload.engineer + localPayload.cabinCrewFront + 
+  double totalWeight = localPayload.empty + localPayload.pilot + localPayload.firstOfficer + localPayload.engineer +
-                         localPayload.business1Left + localPayload.business1Center + localPayload.business1Right + localPayload.business2Left +
+                       localPayload.cabinCrewFront + localPayload.business1Left + localPayload.business1Center +
-                         localPayload.business2Center + localPayload.business2Right + localPayload.economy1Left + localPayload.economy1Center +
+                       localPayload.business1Right + localPayload.business2Left + localPayload.business2Center +
-                         localPayload.economy1Right + localPayload.economy2Left + localPayload.economy2Center + localPayload.economy2Right +
+                       localPayload.business2Right + localPayload.economy1Left + localPayload.economy1Center +
-                         localPayload.cabinCrewRear + localPayload.forwardCargo + localPayload.rearCargo + localPayload.leftAux + localPayload.rightAux;
+                       localPayload.economy1Right + localPayload.economy2Left + localPayload.economy2Center +
+                       localPayload.economy2Right + localPayload.cabinCrewRear + localPayload.forwardCargo +
+                       localPayload.rearCargo + localPayload.leftAux + localPayload.rightAux;
 
-    *ZFWCG = TO_PERCENT_MAC(totalMoment / totalWeight);
+  targetPayload->ZFWCG = TO_PERCENT_MAC(totalMoment / totalWeight);
 
-    totalMoment += fuel->main1 * ARM_MAIN1 + fuel->main3 * ARM_MAIN3 + fuel->main2 * ARM_MAIN2 + fuel->upperAux * ARM_UPPER_AUX +
+  totalMoment += fuel->main1 * ARM_MAIN1 + fuel->main3 * ARM_MAIN3 + fuel->main2 * ARM_MAIN2 + fuel->upperAux * ARM_UPPER_AUX +
-                   fuel->lowerAux * ARM_LOWER_AUX + fuel->main1Tip * ARM_MAIN1_TIP + fuel->main3Tip * ARM_MAIN3_TIP +
+                 fuel->lowerAux * ARM_LOWER_AUX + fuel->main1Tip * ARM_MAIN1_TIP + fuel->main3Tip * ARM_MAIN3_TIP +
-                   fuel->tail * ARM_TAIL + fuel->forwardAux1 * ARM_FORWARD_AUX1 + fuel->forwardAux2 * ARM_FORWARD_AUX2;
+                 fuel->tail * ARM_TAIL + fuel->forwardAux1 * ARM_FORWARD_AUX1 + fuel->forwardAux2 * ARM_FORWARD_AUX2;
 
-    totalWeight += fuel->total;
+  totalWeight += fuel->total;
 
-    *TOCG = TO_PERCENT_MAC(totalMoment / totalWeight);
+  targetPayload->TOCG = TO_PERCENT_MAC(totalMoment / totalWeight);
 }
 
-void load(const paxPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial) {
+void load(const paxPayloadData_t *const targetPayload, const HANDLE simConnect, const bool isImperial) {
-    paxPayloadData_t localPayload = {};
+  paxPayloadData_t localPayload = {};
-    memcpy(&localPayload, targetPayload, sizeof(localPayload));
+  memcpy(&localPayload, targetPayload, sizeof(localPayload));
-    normalisePayload(&localPayload, isImperial);
+  normalisePayload(&localPayload, isImperial);
 
-    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(paxPayloadDataSet_t), &localPayload);
+  localPayload._ZFWCG = localPayload.ZFWCG / 100.0;
+
+  SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0,
+                                sizeof(paxPayloadDataSet_t), &localPayload);
 }
 
 void unload(const HANDLE simConnect, const bool isER) {
-    paxPayloadDataSet_t localPayload = {};
+  paxPayloadData_t localPayload = {};
 
-    localPayload.cabinCrewFront = FRONT_CREW_WEIGHT(true);
+  localPayload.cabinCrewFront = FRONT_CREW_WEIGHT(true);
-    localPayload.cabinCrewRear = REAR_CREW_WEIGHT(true);
+  localPayload.cabinCrewRear = REAR_CREW_WEIGHT(true);
-    localPayload.leftAux = localPayload.rightAux = isER ? AUX_WEIGHT(true) : 0;
+  localPayload.leftAux = localPayload.rightAux = isER ? AUX_WEIGHT(true) : 0;
-    localPayload.pilot = localPayload.firstOfficer = localPayload.engineer = PILOT_WEIGHT(true);
+  localPayload.pilot = localPayload.firstOfficer = localPayload.engineer = PILOT_WEIGHT(true);
 
-    SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0, sizeof(paxPayloadDataSet_t), &localPayload);
+  localPayload._ZFWCG = -1;
+
+  SimConnect_SetDataOnSimObject(simConnect, DATA_DEFINITION_PAYLOAD_PAX, SIMCONNECT_OBJECT_ID_USER, 0, 0,
+                                sizeof(paxPayloadDataSet_t), &localPayload);
 }
 
-const double PAX_WEIGHT(const bool isImperial, const UserOptions_t* const options) {
+const double PAX_WEIGHT(const bool isImperial, const UserOptions_t *const options) {
-    return (isImperial) ? (options->paxWeightLBS) : (options->paxWeightKG);
+  return (isImperial) ? (options->paxWeightLBS) : (options->paxWeightKG);
 }
 
-const double BAG_WEIGHT(const bool isImperial, const UserOptions_t* const options) {
+const double BAG_WEIGHT(const bool isImperial, const UserOptions_t *const options) {
-    return (isImperial) ? (options->bagWeightLBS) : (options->bagWeightKG);
+  return (isImperial) ? (options->bagWeightLBS) : (options->bagWeightKG);
 }

PackageSources/wasm-module/pax.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #ifndef __INTELLISENSE__
-#	define MODULE_EXPORT __attribute__( ( visibility( "default" ) ) )
+#define MODULE_EXPORT __attribute__((visibility("default")))
-#	define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
+#define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
 #else
-#	define MODULE_EXPORT
+#define MODULE_EXPORT
-#	define MODULE_WASM_MODNAME(mod)
+#define MODULE_WASM_MODNAME(mod)
-#	define __attribute__(x)
+#define __attribute__(x)
-#	define __restrict__
+#define __restrict__
 #endif
 
 /********************************* Headers *********************************/
@@ -19,6 +19,7 @@
 // C++ headers
 #include <algorithm>
 // Own headers
+#include "fuel.h"
 #include "shared.h"
 
 /******************************** Constants ********************************/
@@ -59,92 +60,95 @@
 
 /***************************** Data structures *****************************/
 typedef struct {
-    // SimConnect mapped
+  // SimConnect mapped
-    double pilot;
+  double pilot;
-    double firstOfficer;
+  double firstOfficer;
-    double engineer;
+  double engineer;
-    double cabinCrewFront;
+  double cabinCrewFront;
-    double business1Left;
+  double business1Left;
-    double business1Center;
+  double business1Center;
-    double business1Right;
+  double business1Right;
-    double business2Left;
+  double business2Left;
-    double business2Center;
+  double business2Center;
-    double business2Right;
+  double business2Right;
-    double economy1Left;
+  double economy1Left;
-    double economy1Center;
+  double economy1Center;
-    double economy1Right;
+  double economy1Right;
-    double economy2Left;
+  double economy2Left;
-    double economy2Center;
+  double economy2Center;
-    double economy2Right;
+  double economy2Right;
-    double cabinCrewRear;
+  double cabinCrewRear;
-    double forwardCargo;
+  double forwardCargo;
-    double rearCargo;
+  double rearCargo;
-    double leftAux;
+  double leftAux;
-    double rightAux;
+  double rightAux;
+  double _ZFWCG; // DO NOT USE
 
-    // Additional properties
+  // Additional properties
-    double empty;
+  double empty;
-    double total;
+  double total;
-    double CGTarget;
+  double CGTarget;
-    double ZFWCG;
+  double ZFWCG;
-    double TOCG;
+  double TOCG;
-    struct paxCount {
+  struct paxCount {
-        unsigned char business1;
+    unsigned char business1;
-        unsigned char business2;
+    unsigned char business2;
-        unsigned char economy1;
+    unsigned char economy1;
-        unsigned char economy2;
+    unsigned char economy2;
-        unsigned short total;
+    unsigned short total;
-    } paxCount;
+  } paxCount;
-    struct sbPlanned {
+  struct sbPlanned {
-        double ZFW;
+    double ZFW;
-        double GW;
+    double GW;
-        unsigned short pax;
+    double fuel;
-        unsigned int cargo;
+    unsigned short pax;
-    } sbPlanned;
+    unsigned int cargo;
+  } sbPlanned;
 } paxPayloadData_t;
 
 typedef struct {
-    double pilot;
+  double pilot;
-    double firstOfficer;
+  double firstOfficer;
-    double engineer;
+  double engineer;
-    double cabinCrewFront;
+  double cabinCrewFront;
-    double business1Left;
+  double business1Left;
-    double business1Center;
+  double business1Center;
-    double business1Right;
+  double business1Right;
-    double business2Left;
+  double business2Left;
-    double business2Center;
+  double business2Center;
-    double business2Right;
+  double business2Right;
-    double economy1Left;
+  double economy1Left;
-    double economy1Center;
+  double economy1Center;
-    double economy1Right;
+  double economy1Right;
-    double economy2Left;
+  double economy2Left;
-    double economy2Center;
+  double economy2Center;
-    double economy2Right;
+  double economy2Right;
-    double cabinCrewRear;
+  double cabinCrewRear;
-    double forwardCargo;
+  double forwardCargo;
-    double rearCargo;
+  double rearCargo;
-    double leftAux;
+  double leftAux;
-    double rightAux;
+  double rightAux;
+  double ZFWCG;
 } paxPayloadDataSet_t;
 
 /******************************** Functions ********************************/
-//ZFW Entry, fill pax first (pax+bag), rest is cargo
+// ZFW Entry, fill pax first (pax+bag), rest is cargo
-void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, const double ZFWTarget, const UserData_t* const userData,
+void distribute(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, const double ZFWTarget,
-                const UserOptions_t* const userOptions);
+                const UserData_t *const userData, const UserOptions_t *const userOptions);
-//SimBrief Entry, SB pax count and total cargo
+// SimBrief Entry, SB pax count and total cargo
-void distribute(paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, unsigned short numPax, unsigned int cargo, const UserData_t* const userData,
+void distribute(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, unsigned short numPax, unsigned int cargo,
-                const UserOptions_t* const userOptions);
+                const UserData_t *const userData, const UserOptions_t *const userOptions);
 // Updates pax stations with their respective weights
 // Used internally and used for Station Entry (pax only, cargo is ste directly)
 // STATION WEIGHTS ARE NOT NORMALISED TO POUNDS
-void generatePayload(paxPayloadData_t* const targetPayload, const bool isImperial, const UserOptions_t* const userOptions);
+void generatePayload(paxPayloadData_t *const targetPayload, const bool isImperial, const UserOptions_t *const userOptions);
 // Normalise to Pounds
 // For Station Entry: CALL AFTER `generatePayload`
-void normalisePayload(paxPayloadData_t* const targetPayload, const bool isImperial);
+void normalisePayload(paxPayloadData_t *const targetPayload, const bool isImperial);
-void calculateCGs(const paxPayloadData_t* const targetPayload, const FuelData_t* const fuel, double* const ZFWCG, double* const TOCG, const bool isImperial);
+void calculateCGs(paxPayloadData_t *const targetPayload, const FuelData_t *const fuel, const bool isImperial);
-void load(const paxPayloadData_t* const targetPayload, const HANDLE simConnect, const bool isImperial);
+void load(const paxPayloadData_t *const targetPayload, const HANDLE simConnect, const bool isImperial);
 void unload(const HANDLE simConnect, const bool isER);
 // Based on ICAO/LH findings
-const double PAX_WEIGHT(const bool isImperial, const UserOptions_t* const options);
+const double PAX_WEIGHT(const bool isImperial, const UserOptions_t *const options);
 // Based on ICAO/LH findings
-const double BAG_WEIGHT(const bool isImperial, const UserOptions_t* const options);
+const double BAG_WEIGHT(const bool isImperial, const UserOptions_t *const options);

PackageSources/wasm-module/shared.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #ifndef __INTELLISENSE__
-#	define MODULE_EXPORT __attribute__( ( visibility( "default" ) ) )
+#define MODULE_EXPORT __attribute__((visibility("default")))
-#	define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
+#define MODULE_WASM_MODNAME(mod) __attribute__((import_module(mod)))
 #else
-#	define MODULE_EXPORT
+#define MODULE_EXPORT
-#	define MODULE_WASM_MODNAME(mod)
+#define MODULE_WASM_MODNAME(mod)
-#	define __attribute__(x)
+#define __attribute__(x)
-#	define __restrict__
+#define __restrict__
 #endif
 
 /******************************** Constants ********************************/
@@ -15,18 +15,15 @@
 #define PILOT_WEIGHT(IS_IMPERIAL) ((IS_IMPERIAL) ? (190.0) : (86.0))
 // 200lbs per tank (one LD3)
 #define AUX_WEIGHT(IS_IMPERIAL) ((IS_IMPERIAL) ? (200.0) : (91.0))
-//PMC pallet due to 104in door
+// PMC pallet due to 104in door
 #define MAX_FRONT_CARGO(IS_IMPERIAL) ((IS_IMPERIAL) ? (6.0 * 15000.0) : (6.0 * 6804.0))
-//LD3s due to 70in door, ER option takes up two slots
+// LD3s due to 70in door, ER option takes up two slots
 #define MAX_REAR_CARGO(IS_IMPERIAL, IS_ER) ((IS_IMPERIAL) ? ((IS_ER ? 12.0 : 14.0) * 3500.0) : ((IS_ER ? 12.0 : 14.0) * 1588.0))
 // Max TOW
 #define MAX_TOW(IS_IMPERIAL) ((IS_IMPERIAL) ? (625500) : (283722))
 #define MAX_TOW_ER(IS_IMPERIAL) ((IS_IMPERIAL) ? (630500) : (285990))
-// Max Fuel
-#define MAX_FUEL(IS_IMPERIAL) ((IS_IMPERIAL) ? (256207) : (116213))
-#define MAX_FUEL_ER(IS_IMPERIAL) ((IS_IMPERIAL) ? (282619) : (128193))
 // Arms Shared
-#define ARM_EMPTY -159.6
+#define ARM_EMPTY -120.0
 #define ARM_PILOT 984.0
 #define ARM_FIRST_OFFICER 984.0
 #define ARM_ENGINEER 960.0
@@ -34,22 +31,11 @@
 #define ARM_REAR_CARGO -360.0
 #define ARM_LEFT_AUX 60.0
 #define ARM_RIGHT_AUX 60.0
-// Arms Fuel
-#define ARM_MAIN1 -240.0
-#define ARM_MAIN3 -240.0
-#define ARM_MAIN2 120.0
-#define ARM_UPPER_AUX 0.0
-#define ARM_LOWER_AUX 0.0
-#define ARM_MAIN1_TIP -468.0
-#define ARM_MAIN3_TIP -468.0
-#define ARM_TAIL -840.0
-#define ARM_FORWARD_AUX1 60.0
-#define ARM_FORWARD_AUX2 60.0
 // MAC
 #define ROOT_CHORD 34.68
 #define WING_SPAN 170.5
 #define WING_AREA 3648.0
-#define QUARTER_MAC -165.0 //aero_center
+#define QUARTER_MAC -165.0 // aero_center
 #define TIP_CHORD ((2.0 * WING_AREA) / WING_SPAN - ROOT_CHORD)
 #define TAPER_RATIO (TIP_CHORD / ROOT_CHORD)
 #define MAC ((2.0 / 3.0) * ROOT_CHORD * ((1.0 + TAPER_RATIO + (TAPER_RATIO * TAPER_RATIO)) / (1.0 + TAPER_RATIO)) * 12.0)
@@ -64,91 +50,75 @@
 
 /********************************* Macros **********************************/
 // Conversions
-#define TO_POUNDS(IS_IMPERIAL, VALUE) ((IS_IMPERIAL) ? (VALUE) : (VALUE) * 2.20462262185)
+#define TO_POUNDS(IS_IMPERIAL, VALUE) ((IS_IMPERIAL) ? (VALUE) : (VALUE)*2.20462262185)
 #define FROM_POUNDS(IS_IMPERIAL, VALUE) ((IS_IMPERIAL) ? (VALUE) : (VALUE) * (1.0 / 2.20462262185))
 // MAC
-#define TO_PERCENT_MAC(POS) ((((POS) - LEMAC) / MAC) * -100.0)
+#define TO_PERCENT_MAC(POS) ((((POS)-LEMAC) / MAC) * -100.0)
 
 /********************************** ENUMS **********************************/
 enum DATA_DEFINITIONS {
-    DATA_DEFINITION_EMPTY_WEIGHT,
+  DATA_DEFINITION_EMPTY_WEIGHT,
-    DATA_DEFINITION_PAYLOAD_PAX,
+  DATA_DEFINITION_PAYLOAD_PAX,
-    DATA_DEFINITION_PAYLOAD_F,
+  DATA_DEFINITION_PAYLOAD_F,
-    DATA_DEFINITION_FUEL,
+  DATA_DEFINITION_FUEL,
-    DATA_DEFINITION_GSX,
+  DATA_DEFINITION_FUEL_SET,
-    DATA_DEFINITION_USER_DATA,
+  DATA_DEFINITION_GSX,
+  DATA_DEFINITION_USER_DATA,
 };
 
 enum DATA_REQUESTS {
-    DATA_REQUEST_EMPTY_WEIGHT,
+  DATA_REQUEST_EMPTY_WEIGHT,
-    DATA_REQUEST_PAYLOAD_PAX,
+  DATA_REQUEST_PAYLOAD_PAX,
-    DATA_REQUEST_PAYLOAD_F,
+  DATA_REQUEST_PAYLOAD_F,
-    DATA_REQUEST_FUEL,
+  DATA_REQUEST_FUEL,
-    DATA_REQUEST_GSX,
+  DATA_REQUEST_FUEL_SET,
-    DATA_REQUEST_USER_DATA,
+  DATA_REQUEST_GSX,
+  DATA_REQUEST_USER_DATA,
 };
 
 enum LOADING_STATES {
-    LOADING_STATE_IDLE,
+  LOADING_STATE_IDLE,
-    LOADING_STATE_BOARDING,
+  LOADING_STATE_BOARDING,
-    LOADING_STATE_BOARDED,
+  LOADING_STATE_BOARDED,
-    LOADING_STATE_DEBOARDING,
+  LOADING_STATE_DEBOARDING,
-    LOADING_STATE_DEBOARDED,
+  LOADING_STATE_DEBOARDED,
 };
 
 enum CALL_MODES {
-    CALL_MODE_SB_SET,
+  CALL_MODE_SB_SET,
-    CALL_MODE_ZFW_SET,
+  CALL_MODE_ZFW_SET,
-    CALL_MODE_STATION_SET,
+  CALL_MODE_STATION_SET,
-    CALL_MODE_LOAD_SET,
+  CALL_MODE_LOAD_SET,
-    CALL_MODE_UNLOAD_SET,
+  CALL_MODE_UNLOAD_SET,
-    CALL_MODE_OPTIONS_SET,
+  CALL_MODE_OPTIONS_SET,
-    CALL_MODE_GSX_RESET,
+  CALL_MODE_GSX_RESET,
 };
 
 /***************************** Data structures *****************************/
 typedef struct {
-    double isCargo;
+  double isCargo;
-    double isER;
+  double isER;
-    double isImperial;
+  double isImperial;
 } UserData_t;
 
 typedef struct {
-    // SimConnect mapped
+  // SimConnect mapped
-    double couatlStarted; // boolean
+  double couatlStarted;       // boolean
-    double boardingState; // See manual, 5 => active
+  double boardingState;       // See manual, 5 => active
-    double deboardingState; // See manual, 5 => active
+  double deboardingState;     // See manual, 5 => active
-    double passengersBoarded; // Num pax
+  double passengersBoarded;   // Num pax
-    double passengersDeboarded; // Num pax
+  double passengersDeboarded; // Num pax
-    double cargoBoarded; // In percent
+  double cargoBoarded;        // In percent
-    double cargoDeboarded; // In percent
+  double cargoDeboarded;      // In percent
 
-    // Additional properties
+  // Additional properties
-    enum LOADING_STATES loadingState;
+  enum LOADING_STATES loadingState;
 } GSXData_t;
 
 typedef struct {
-    // SimConnect mapped
+  bool GSXSync;
-    double poundsPerGallon; // DO NOT USE
+  double paxWeightKG;
-    double main1;
+  double bagWeightKG;
-    double main3;
+  double paxWeightLBS;
-    double main2;
+  double bagWeightLBS;
-    double upperAux;
-    double lowerAux;
-    double main1Tip;
-    double main3Tip;
-    double tail;
-    double forwardAux1;
-    double forwardAux2;
-
-    // Additional properties
-    double total;
-} FuelData_t;
-
-typedef struct {
-    bool GSXSync;
-    double paxWeightKG;
-    double bagWeightKG;
-    double paxWeightLBS;
-    double bagWeightLBS;
 } UserOptions_t;

TODO.md

@@ -0,0 +1,20 @@
+Fuel (once implemented)
+ZFWCG for WBS (once implemented) `MD11_EXTCTL_WBS_ZFWCG`
+https://discord.com/channels/589851727373795331/1165358675037270066/1469039399961497753
+
+Fuel Schedule
+  Mains 1/2/3
+  Upper Aux
+  Lower Aux
+  Tail
+  LEft/Right Forward Aux
+
+Fuel Limits from EFB
+
+GSX Sync
+  When Fueling is called, fuel progressively using FuelDataSet_t and FUEL_SET enums
+    Find fueling rate of plane
+
+In JS
+  Remove Set Fuel
+    Fuel is set with total load button

copy-debug.ps1

@@ -1 +1 @@
-Copy-Item .\PackageSources\wasm-module\MSFS\Debug\load-manager.wasm .\PackageSources\SimObjects\Airplanes\TFDi_Design_MD-11\panel
+Copy-Item .\PackageSources\wasm-module\MSFS\Debug\load-manager.wasm .\PackageSources\SimObjects\Airplanes\TFDi_Design_MD-11\common\panel

copy-release.ps1

@@ -1 +1 @@
-Copy-Item .\PackageSources\wasm-module\MSFS\Release\load-manager.wasm .\PackageSources\SimObjects\Airplanes\TFDi_Design_MD-11\panel
+Copy-Item .\PackageSources\wasm-module\MSFS\Release\load-manager.wasm .\PackageSources\SimObjects\Airplanes\TFDi_Design_MD-11\common\panel

package.json

@@ -1,5 +1,9 @@
 {
-	"devDependencies": {
+  "scripts": {
-		"diff": "^8.0.2"
+    "debugger": "cd \"$env:MSFS_SDK/Tools/CoherentGT Debugger\" && ./Debugger.exe",
-	}
+    "locale": "cd \"$env:MSFS_SDK/Tools/MSFS_Localization\" && ./MSFSLocalizationManager.exe"
+  },
+  "devDependencies": {
+    "diff": "^8.0.2"
+  }
 }

xkhofmann-tfdidesign-md11-load-manager.code-workspace

@@ -6,12 +6,30 @@
   ],
   "settings": {
     "cSpell.words": [
+      "AUXLWR",
+      "AUXUPR",
+      "bksp",
       "couatl",
+      "Deboarded",
       "DEBOARDED",
       "deboarding",
+      "Deinitialized",
+      "EXTCTL",
+      "FCOMs",
+      "FSDT",
+      "FWDAUXL",
+      "FWDAUXR",
+      "HRESULT",
       "khofmann",
+      "LEMAC",
+      "MSFS",
+      "NUMPASSENGERS",
+      "SIMCONNECT",
+      "SIMOBJECT",
+      "SIMOBJECTS",
       "tfdi",
       "TFDI",
+      "tfdidesign",
       "TOCG",
       "ZFWCG"
     ]

xkhofmann-tfdidesign-md11-load-manager.xml.user

@@ -0,0 +1,9 @@
+<UserSettings>
+	<CheckedOutPackages>
+		<Package Name="xkhofmann-tfdidesign-md11-load-manager"/>
+	</CheckedOutPackages>
+	<SelectedPackages/>
+	<Filter/>
+	<ShowOnlyEdited>false</ShowOnlyEdited>
+</UserSettings>
+