From f0efa84610a1c75c410e3fc108d24b51732ee666 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Thu, 27 Aug 2026 22:00:44 +0200 Subject: [PATCH] Fix log Defuling enabled --- PackageSources/js-bundle/package.json | 2 +- .../js-bundle/src/assets/licenses_node.md | 22 +++++++++---------- PackageSources/wasm-module/include/log.h | 2 +- PackageSources/wasm-module/package.json | 2 +- .../wasm-module/src/load-manager.cpp | 16 +++++++++++--- PackageSources/wasm-module/src/log.cpp | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/PackageSources/js-bundle/package.json b/PackageSources/js-bundle/package.json index bcb28ed..38195c7 100644 --- a/PackageSources/js-bundle/package.json +++ b/PackageSources/js-bundle/package.json @@ -1,6 +1,6 @@ { "name": "js-bundle", - "version": "0.2.34", + "version": "0.2.41", "description": "", "main": "index.js", "type": "module", diff --git a/PackageSources/js-bundle/src/assets/licenses_node.md b/PackageSources/js-bundle/src/assets/licenses_node.md index 007b33b..40482ac 100644 --- a/PackageSources/js-bundle/src/assets/licenses_node.md +++ b/PackageSources/js-bundle/src/assets/licenses_node.md @@ -1,9 +1,9 @@ | Department | Related to | Name | License period | Material not material | License type | Link | Remote version | Installed version | Defined version | Author | | :--------- | :--------- | :------------------------------- | :------------- | :-------------------- | :------------ | :------------------------------------------------------------------------ | :------------- | :---------------- | :-------------- | :---------------------------------------------------------- | | 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 | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.2.4 | 19.2.4 | ^19.1.0 | n/a | -| kessler | stuff | react-dom | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.2.4 | 19.2.4 | ^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 | react | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.2.7 | 19.2.4 | ^19.1.0 | n/a | +| kessler | stuff | react-dom | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.2.7 | 19.2.4 | ^19.1.0 | n/a | +| kessler | stuff | uuid | perpetual | material | MIT | git+https://github.com/uuidjs/uuid.git | 11.1.1 | 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.9 | ^28.0.3 | Rich Harris | | kessler | stuff | @rollup/plugin-json | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.1.0 | 6.1.0 | ^6.1.0 | rollup | @@ -11,30 +11,30 @@ | kessler | stuff | @rollup/plugin-replace | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.0.3 | 6.0.3 | ^6.0.2 | Rich Harris | | 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 | | kessler | stuff | @rollup/plugin-typescript | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 12.3.0 | 12.3.0 | ^12.1.2 | Oskar Segersvärd | -| kessler | stuff | @types/node | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 24.12.2 | 24.12.0 | ^24.3.1 | n/a | -| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.14 | 19.2.14 | ^19.1.6 | n/a | +| kessler | stuff | @types/node | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 24.13.2 | 24.12.0 | ^24.3.1 | n/a | +| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.17 | 19.2.14 | ^19.1.6 | n/a | | kessler | stuff | @types/react-dom | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.3 | 19.2.3 | ^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.27 | 10.4.27 | ^10.4.21 | Andrey Sitnik | +| kessler | stuff | autoprefixer | perpetual | material | MIT | git+https://github.com/postcss/autoprefixer.git | 10.5.2 | 10.4.27 | ^10.4.21 | Andrey Sitnik | | 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 (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 | | kessler | stuff | eslint-plugin-import | perpetual | material | MIT | git+https://github.com/import-js/eslint-plugin-import.git | 2.32.0 | 2.32.0 | ^2.31.0 | Ben Mosher | | kessler | stuff | eslint-plugin-react | perpetual | material | MIT | git+https://github.com/jsx-eslint/eslint-plugin-react.git | 7.37.5 | 7.37.5 | ^7.37.5 | Yannick Croissant | | kessler | stuff | eslint-plugin-react-hooks | perpetual | material | MIT | git+https://github.com/facebook/react.git | 4.6.2 | 4.6.2 | ^4.6.2 | n/a | -| kessler | stuff | license-report | perpetual | material | MIT | git+https://github.com/kessler/license-report.git | 6.8.2 | 6.8.2 | ^6.7.2 | Yaniv Kessler | -| kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.5.8 | 8.5.8 | ^8.5.4 | Andrey Sitnik | +| kessler | stuff | license-report | perpetual | material | MIT | git+https://github.com/bepo65/license-report.git | 6.8.5 | 6.8.2 | ^6.7.2 | Yaniv Kessler | +| kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.5.16 | 8.5.8 | ^8.5.4 | Andrey Sitnik | | kessler | stuff | postcss-import | perpetual | material | MIT | git+https://github.com/postcss/postcss-import.git | 16.1.1 | 16.1.1 | ^16.1.0 | Maxime Thirouin | -| kessler | stuff | prettier | perpetual | material | MIT | git+https://github.com/prettier/prettier.git | 3.8.1 | 3.8.1 | ^3.5.3 | James Long | +| kessler | stuff | prettier | perpetual | material | MIT | git+https://github.com/prettier/prettier.git | 3.9.3 | 3.8.1 | ^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.3.0 | ^4.1.0 | Simon Haenisch (https://github.com/simonhaenisch) | | kessler | stuff | rimraf | perpetual | material | BlueOak-1.0.0 | git+ssh://git@github.com/isaacs/rimraf.git | 6.1.3 | 6.1.3 | ^6.0.1 | Isaac Z. Schlueter (http://blog.izs.me/) | -| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.60.1 | 4.60.0 | ^4.42.0 | Rich Harris | +| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.62.2 | 4.60.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 | | 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 | -| kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.99.0 | 1.98.0 | ^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.101.0 | 1.98.0 | ^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 | | 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. | diff --git a/PackageSources/wasm-module/include/log.h b/PackageSources/wasm-module/include/log.h index 3927346..a004a86 100644 --- a/PackageSources/wasm-module/include/log.h +++ b/PackageSources/wasm-module/include/log.h @@ -20,6 +20,6 @@ /******************************** Constants ********************************/ // Module identification #define MODULE_NAME "[KHOFMANN TFDi MD-11 Load Manager] " -#define VERSION_STRING "2.40" +#define VERSION_STRING "2.53" void toLog(FILE *file, const char *format, double *optional = nullptr); \ No newline at end of file diff --git a/PackageSources/wasm-module/package.json b/PackageSources/wasm-module/package.json index ad72ae3..6fd3170 100644 --- a/PackageSources/wasm-module/package.json +++ b/PackageSources/wasm-module/package.json @@ -1,6 +1,6 @@ { "name": "wasm-module", - "version": "0.0.16", + "version": "0.0.23", "description": "Load Manager WASM module", "scripts": { "clean": "rimraf ../SimObjects/Airplanes/TFDi_Design_MD-11/panel/load-manager.wasm && rimraf MSFS", diff --git a/PackageSources/wasm-module/src/load-manager.cpp b/PackageSources/wasm-module/src/load-manager.cpp index fc9f588..80ec1db 100644 --- a/PackageSources/wasm-module/src/load-manager.cpp +++ b/PackageSources/wasm-module/src/load-manager.cpp @@ -625,26 +625,34 @@ extern "C" MSFS_CALLBACK bool Load_Manager_gauge_update(FsContext ctx, float dT) if (GSXData->fuelingState == FUELING_STATE_FUELING && abs(liveFuelData->total - targetFuelData->total) < 1) { GSXData->fuelingState = FUELING_STATE_FUELED; fuel(targetFuelData, simConnect); + + toLog(stdout, "Mainloop: Fueling completed.\n"); } FuelData_t toSet = {}; // Force set to lower before connection + /* if (GSXData->fuelingState == FUELING_STATE_CALLED && targetFuelData->total <= liveFuelData->total) { distribute(&toSet, max(0, targetFuelData->total - 10000), true, UserData->isER); fuel(&toSet, simConnect); } // Fuel - else if (GSXData->fuelingState == FUELING_STATE_FUELING && GSXData->fuelConnected > 0) { + else */ + if (GSXData->fuelingState == FUELING_STATE_FUELING && GSXData->fuelConnected > 0) { if (fuelTimer >= 0.5) { + double step = min(max(abs(targetFuelData->total - liveFuelData->total), 1), FUELING_RATE) * fuelTimer; + distribute(&toSet, - min(targetFuelData->total, - liveFuelData->total + min(max(targetFuelData->total - liveFuelData->total, 1), FUELING_RATE) * fuelTimer), + (targetFuelData->total - liveFuelData->total) > 0 ? min(targetFuelData->total, liveFuelData->total + step) + : max(targetFuelData->total, liveFuelData->total - step), true, UserData->isER); fuel(&toSet, simConnect); + toLog(stdout, "Mainloop: Fueling step: %f\n", &step); + fuelTimer = 0; } else { fuelTimer += dT; @@ -1310,6 +1318,8 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContex GSXData->fuelingState = FUELING_STATE_FUELED; fuel(targetFuelData, simConnect); + toLog(stdout, "GSX fueling finished, fuel set to plan\n"); + break; } default: diff --git a/PackageSources/wasm-module/src/log.cpp b/PackageSources/wasm-module/src/log.cpp index bf6767d..17be6f7 100644 --- a/PackageSources/wasm-module/src/log.cpp +++ b/PackageSources/wasm-module/src/log.cpp @@ -5,7 +5,7 @@ void toLog(FILE *file, const char *format, double *optional) { static bool logFileFailed = false; if (logFile == NULL) { - logFile = fopen("\\work\\toLog.txt", "w"); + logFile = fopen("\\work\\log.txt", "w"); if (logFile == NULL) { logFileFailed = true;