fbw: feat(athr/fadec): improved reverse thrust limit based on TOGA li…

…mit (#8565)
Horizon-Simulations · May 1, 2024 · 882f174 · 882f174
1 parent 2c7fb19
commit 882f174
Show file tree

Hide file tree

Showing 26 changed files with 370 additions and 98 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -7,6 +7,11 @@ indent_style = space
 insert_final_newline = false
 tab_width = 4
 
+[*.{js,jsx,ts,tsx}]
+indent_size = 2
+insert_final_newline = true
+tab_width = 2
+
 [*.{h,hpp,c,cpp}]
 end_of_line = lf
 indent_size = 2
@@ -16,4 +21,4 @@ tab_width = 2
 # Asobo indents json and css with 2 spaces
 [*.{yml,json,css,scss,eslintrc}]
 indent_size = 2
-tab_width = 2
+tab_width = 2
diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,83 @@
+// Copyright (c) 2021-2023 FlyByWire Simulations
+//
+// SPDX-License-Identifier: GPL-3.0
+
+'use strict';
+
+module.exports = {
+  env: { browser: true },
+  root: true,
+  extends: [
+    'eslint:recommended',
+    'plugin:prettier/recommended',
+    // 'plugin:@typescript-eslint/recommended', -- Disabled as it is complex to fix, needs to be done bit by bit
+    'plugin:@typescript-eslint/eslint-recommended',
+    // 'plugin:react-hooks/recommended', -- Disabled as it is complex to fix, needs to be done bit by bit, and we are moving away from react
+    // 'plugin:react/recommended', -- Disabled as it is complex to fix, needs to be done bit by bit, and we are moving away from react
+  ],
+  plugins: ['@typescript-eslint', 'prettier', 'react-hooks', 'react', 'tailwindcss'],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 2021,
+    sourceType: 'script',
+    requireConfigFile: false,
+  },
+  overrides: [
+    {
+      files: [
+        '.eslintrc.js',
+        'scripts/**/*.js',
+        '**/mach.config.js',
+        '**/rollup.config.js',
+        '**/tailwind.config.js',
+        '**/jest.config.js',
+      ],
+      env: {
+        node: true,
+      },
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+      },
+    },
+    {
+      files: ['fbw-common/src/jest/**/*.js'],
+      env: {
+        node: true,
+      },
+      plugins: ['jest'],
+      extends: ['plugin:jest/recommended'],
+    },
+  ],
+  settings: {
+    tailwindcss: { groupByResponsive: true },
+    react: { version: 'detect' },
+  },
+  ignorePatterns: ['fbw-common/src/typings/*', 'fbw-a380x/*', 'fbw-ingamepanels-checklist-fix/*'],
+  rules: {
+    'prettier/prettier': ['error', {}, { usePrettierrc: true }],
+
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {
+        varsIgnorePattern: 'FSComponent|_.*',
+        argsIgnorePattern: '_.*',
+      },
+    ],
+
+    'tailwindcss/classnames-order': 'error',
+    'tailwindcss/enforces-negative-arbitrary-values': 'error',
+    'tailwindcss/enforces-shorthand': 'error',
+    'tailwindcss/migration-from-tailwind-2': 'error',
+    'tailwindcss/no-contradicting-classname': 'error',
+  },
+  globals: {
+    Simplane: 'readonly',
+    SimVar: 'readonly',
+    Utils: 'readonly',
+    JSX: 'readonly',
+    Coherent: 'readonly',
+    ViewListener: 'readonly',
+    RegisterViewListener: 'readonly',
+  },
+};
diff --git a/.gitignore b/.gitignore
@@ -12,13 +12,13 @@
 !/.vscode/**
 
 !.editorconfig
-!.eslintrc
+!.eslintrc.js
 !.gitattributes
 !.gitignore
 !.gitmodules
 !.npmrc
 !.prettierignore
-!.prettierrc.json
+!.prettierrc
 
 !igniter.config.mjs
 !a318ceo-igniter.config.mjs

diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+    "singleQuote": true,
+    "printWidth": 120,
+    "parser": "typescript",
+    "endOfLine": "auto"
+}
diff --git a/hsim-a318ceo/src/base/.eslintrc.js b/hsim-a318ceo/src/base/.eslintrc.js
@@ -0,0 +1,61 @@
+// Copyright (c) 2021-2023 FlyByWire Simulations
+//
+// SPDX-License-Identifier: GPL-3.0
+
+module.exports = {
+    root: true,
+    env: {
+        browser: true,
+        es2021: true,
+    },
+    // DO NOT CHANGE THIS FILE (unless you are an admin) (if admin, make sure you change the same file in the latest asobo branch as well)
+    rules: {
+        "indent": [
+            "error",
+            4,
+            { SwitchCase: 1 },
+        ],
+        "linebreak-style": "off",
+        // No quotes option is really fully consistent, so probably best to jsut not enforce either type
+        "quotes": "off",
+        "semi": ["error", "always"],
+        "curly": ["error", "all"],
+        "brace-style": ["error", "1tbs"],
+        "space-before-blocks": "error",
+        "space-before-function-paren": [
+            "error",
+            {
+                anonymous: "always",
+                named: "never",
+                asyncArrow: "always",
+            },
+        ],
+        "space-in-parens": "error",
+        "space-infix-ops": "error",
+        "space-unary-ops": "error",
+        "keyword-spacing": "error",
+        "no-irregular-whitespace": "error",
+        "no-trailing-spaces": "error",
+        "semi-spacing": "error",
+        "no-mixed-spaces-and-tabs": "error",
+        "no-multi-spaces": "error",
+        // There are too many vars that cant be autofixed
+        "no-var": "off",
+        "prefer-const": [
+            "error",
+            { destructuring: "all" },
+        ],
+        // The vanilla code already has over 100 console.logs, but maybe we can enable this in master and delete them there
+        "no-console": "off",
+        "no-debugger": "error",
+        "eol-last": ["error", "always"],
+        "no-multiple-empty-lines": [
+            "error",
+            {
+                max: 1,
+                maxBOF: 0,
+                maxEOF: 0,
+            },
+        ],
+    },
+};
diff --git a/...8ceo/src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/engines.cfg b/...8ceo/src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318ceoCFM/engines.cfg
@@ -3,15 +3,15 @@
 ; idle, which isn't yet modeled). Will need to be re-looked at if/when flight and approach idle N1 are modeled
 ; 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
 ; TazX - 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
-; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data 
+; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data
 
 [VERSION]
 major = 1
 minor = 0
 
 [GENERALENGINEDATA]
 engine_type = 1 ; 0=Piston, 1=Jet, 2=None, 3=Helo-Turbine, 4=Rocket, 5=Turboprop
-min_throttle_limit = -0.311 ; Minimum percent throttle.  Generally negative for turbine reverser
+min_throttle_limit = -1.0 ; Minimum percent throttle.  Generally negative for turbine reverser
 master_ignition_switch = 0
 starter_type = 2 ; 0=Electric, 1=Manual, 2=Bleed Air
 max_contrail_temperature = -39.724

diff --git a/...18ceo/src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318cjCFM/engines.cfg b/...18ceo/src/base/lvfr-horizonsim-airbus-a318-ceo/SimObjects/Airplanes/A318cjCFM/engines.cfg
@@ -3,15 +3,15 @@
 ; idle, which isn't yet modeled). Will need to be re-looked at if/when flight and approach idle N1 are modeled
 ; 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
 ; TazX - 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
-; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data 
+; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data
 
 [VERSION]
 major = 1
 minor = 0
 
 [GENERALENGINEDATA]
 engine_type = 1 ; 0=Piston, 1=Jet, 2=None, 3=Helo-Turbine, 4=Rocket, 5=Turboprop
-min_throttle_limit = -0.311 ; Minimum percent throttle.  Generally negative for turbine reverser
+min_throttle_limit = -1.0 ; Minimum percent throttle.  Generally negative for turbine reverser
 master_ignition_switch = 0
 starter_type = 2 ; 0=Electric, 1=Manual, 2=Bleed Air
 max_contrail_temperature = -39.724

diff --git a/hsim-a319ceo/src/base/.eslintrc.js b/hsim-a319ceo/src/base/.eslintrc.js
@@ -0,0 +1,61 @@
+// Copyright (c) 2021-2023 FlyByWire Simulations
+//
+// SPDX-License-Identifier: GPL-3.0
+
+module.exports = {
+    root: true,
+    env: {
+        browser: true,
+        es2021: true,
+    },
+    // DO NOT CHANGE THIS FILE (unless you are an admin) (if admin, make sure you change the same file in the latest asobo branch as well)
+    rules: {
+        "indent": [
+            "error",
+            4,
+            { SwitchCase: 1 },
+        ],
+        "linebreak-style": "off",
+        // No quotes option is really fully consistent, so probably best to jsut not enforce either type
+        "quotes": "off",
+        "semi": ["error", "always"],
+        "curly": ["error", "all"],
+        "brace-style": ["error", "1tbs"],
+        "space-before-blocks": "error",
+        "space-before-function-paren": [
+            "error",
+            {
+                anonymous: "always",
+                named: "never",
+                asyncArrow: "always",
+            },
+        ],
+        "space-in-parens": "error",
+        "space-infix-ops": "error",
+        "space-unary-ops": "error",
+        "keyword-spacing": "error",
+        "no-irregular-whitespace": "error",
+        "no-trailing-spaces": "error",
+        "semi-spacing": "error",
+        "no-mixed-spaces-and-tabs": "error",
+        "no-multi-spaces": "error",
+        // There are too many vars that cant be autofixed
+        "no-var": "off",
+        "prefer-const": [
+            "error",
+            { destructuring: "all" },
+        ],
+        // The vanilla code already has over 100 console.logs, but maybe we can enable this in master and delete them there
+        "no-console": "off",
+        "no-debugger": "error",
+        "eol-last": ["error", "always"],
+        "no-multiple-empty-lines": [
+            "error",
+            {
+                max: 1,
+                maxBOF: 0,
+                maxEOF: 0,
+            },
+        ],
+    },
+};
diff --git a/...9ceo/src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM/engines.cfg b/...9ceo/src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM/engines.cfg
@@ -3,15 +3,15 @@
 ; idle, which isn't yet modeled). Will need to be re-looked at if/when flight and approach idle N1 are modeled
 ; 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
 ; TazX - 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
-; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data 
+; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data
 
 [VERSION]
 major = 1
 minor = 0
 
 [GENERALENGINEDATA]
 engine_type = 1 ; 0=Piston, 1=Jet, 2=None, 3=Helo-Turbine, 4=Rocket, 5=Turboprop
-min_throttle_limit = -0.2 ; Minimum percent throttle.  Generally negative for turbine reverser
+min_throttle_limit = -1.0 ; Minimum percent throttle.  Generally negative for turbine reverser
 master_ignition_switch = 0
 starter_type = 2 ; 0=Electric, 1=Manual, 2=Bleed Air
 max_contrail_temperature = -39.724

diff --git a/...eo/src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFMSL/engines.cfg b/...eo/src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFMSL/engines.cfg
@@ -11,7 +11,7 @@ minor = 0
 
 [GENERALENGINEDATA]
 engine_type = 1 ; 0=Piston, 1=Jet, 2=None, 3=Helo-Turbine, 4=Rocket, 5=Turboprop
-min_throttle_limit = -0.2 ; Minimum percent throttle.  Generally negative for turbine reverser
+min_throttle_limit = -1.0 ; Minimum percent throttle.  Generally negative for turbine reverser
 master_ignition_switch = 0
 starter_type = 2 ; 0=Electric, 1=Manual, 2=Bleed Air
 max_contrail_temperature = -39.724

diff --git a/.../src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM_acj/engines.cfg b/.../src/base/lvfr-horizonsim-airbus-a319-ceo/SimObjects/Airplanes/A319ceoCFM_acj/engines.cfg
@@ -3,15 +3,15 @@
 ; idle, which isn't yet modeled). Will need to be re-looked at if/when flight and approach idle N1 are modeled
 ; 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
 ; TazX - 29 April 2021. Changed spool and CN1 vs CN2 tables for belowe Idle conditions (start-up)
-; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data 
+; Minor tweaks to 2 values of N1-thrust at idle N1 (along with flight model changes) to better match FCOM data
 
 [VERSION]
 major = 1
 minor = 0
 
 [GENERALENGINEDATA]
 engine_type = 1 ; 0=Piston, 1=Jet, 2=None, 3=Helo-Turbine, 4=Rocket, 5=Turboprop
-min_throttle_limit = -0.2 ; Minimum percent throttle.  Generally negative for turbine reverser
+min_throttle_limit = -1.0 ; Minimum percent throttle.  Generally negative for turbine reverser
 master_ignition_switch = 0
 starter_type = 2 ; 0=Electric, 1=Manual, 2=Bleed Air
 max_contrail_temperature = -39.724