merge in from dev

.eslintrc.js

@@ -18,6 +18,13 @@ module.exports = {
     'prettier/prettier': 'error',
     'react/static-property-placement': ['warn', 'static public field'],
     '@typescript-eslint/no-empty-interface': 'off',
+    // eslint-disable-next-line no-dupe-keys
+    'prettier/prettier': [
+      'error',
+      {
+        endOfLine: 'auto',
+      },
+    ],
     '@typescript-eslint/naming-convention': [
       'error',
       {
@@ -41,7 +48,7 @@ module.exports = {
     'jsx-a11y/click-events-have-key-events': 'off',
     'jsx-a11y/no-static-element-interactions': 'off',
   },
-  plugins: ['react', '@typescript-eslint', 'prettier'],
+  plugins: ['react', '@typescript-eslint', 'prettier', 'import'],
   parserOptions: {
     ecmaVersion: 2020,
     sourceType: 'module',

.github/dependabot.yml

@@ -0,0 +1,103 @@
+version: 2
+updates:
+  - labels: [dependencies]
+    package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: bundler
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: composer
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: mix
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: nuget
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: docker
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: elm
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: gitsubmodule
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: pip
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: terraform
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: pub
+    directory: /
+    schedule:
+      interval: daily
+
+  - labels: [dependencies]
+    package-ecosystem: swift
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/deploy_basestation.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest] # Possible values: [ubuntu-latest, windows-latest, macOS-latest]
-        node: [16.x]
+        node: [18.x]
 
     runs-on: ${{ matrix.os }}
 
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Node.js, NPM and Yarn
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
@@ -70,7 +70,7 @@ jobs:
 
       - name: Create Artifact
         if: ${{ github.event_name == 'workflow_dispatch' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: RED.${{ github.ref_name }}
           path: |

.github/workflows/test.yml

@@ -15,10 +15,6 @@ permissions:
   packages: read
   id-token: write
 
-concurrency:
-  group: 'test'
-  cancel-in-progress: false
-
 jobs:
   test:
     strategy:
@@ -34,9 +30,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Node.js, NPM and Yarn
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile --network-timeout 300000

README.md

@@ -7,7 +7,7 @@
 
 [Mars Rover Design Team](https://marsrover.mst.edu/)
 
-<img alt="MS&T Logo" src="https://brand.mst.edu/media/universityadvancement/communications/images/logos/logo/Logo_356.jpg" width="15%" />
+<img alt="MS&T Logo" src="https://brand.mst.edu/media/universityadvancement/brand/logos/Missouri-S&T_PrimaryLogo_Forest_RGB.png" width="15%" />
 
 [Missouri University of Science and Technology](https://www.mst.edu/)
 

package.json

@@ -145,12 +145,12 @@
     "@babel/plugin-proposal-do-expressions": "^7.16.0",
     "@babel/plugin-proposal-export-default-from": "^7.16.0",
     "@babel/plugin-proposal-export-namespace-from": "^7.16.0",
-    "@babel/plugin-proposal-function-bind": "^7.16.0",
+    "@babel/plugin-proposal-function-bind": "^7.23.3",
     "@babel/plugin-proposal-function-sent": "^7.16.0",
     "@babel/plugin-proposal-json-strings": "^7.16.0",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.16.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
     "@babel/plugin-proposal-pipeline-operator": "^7.16.0",
     "@babel/plugin-proposal-throw-expressions": "^7.16.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -160,23 +160,23 @@
     "@babel/plugin-transform-runtime": "^7.16.0",
     "@babel/preset-env": "^7.16.0",
     "@babel/preset-react": "^7.16.0",
-    "@babel/preset-typescript": "^7.16.0",
+    "@babel/preset-typescript": "^7.23.2",
     "@babel/register": "^7.16.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.7",
     "@types/double-ended-queue": "^2.1.1",
     "@types/enzyme": "^3.10.10",
-    "@types/enzyme-adapter-react-16": "^1.0.6",
-    "@types/halogenium": "^2.3.1",
+    "@types/enzyme-adapter-react-16": "^1.0.8",
+    "@types/halogenium": "^2.3.4",
     "@types/history": "4.7.6",
     "@types/jest": "^26.0.15",
-    "@types/leaflet": "^1.7.5",
+    "@types/leaflet": "^1.9.8",
     "@types/node": "14.14.10",
     "@types/react": "^16.14.20",
     "@types/react-beautiful-dnd": "^13.1.2",
-    "@types/react-color": "^3.0.6",
+    "@types/react-color": "^3.0.9",
     "@types/react-dom": "^16.9.14",
     "@types/react-router-dom": "^5.3.2",
     "@types/react-test-renderer": "^16.9.5",
@@ -190,41 +190,41 @@
     "babel-loader": "^8.2.3",
     "babel-plugin-dev-expression": "^0.2.3",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "browserslist-config-erb": "^0.0.1",
+    "browserslist-config-erb": "^0.0.3",
     "chalk": "^4.1.2",
-    "concurrently": "^6.4.0",
-    "core-js": "^3.19.1",
+    "concurrently": "^8.2.2",
+    "core-js": "^3.33.1",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.2.7",
+    "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^1.3.0",
-    "detect-port": "^1.3.0",
-    "electron": "^18.3.7",
-    "electron-builder": "^22.13.1",
+    "detect-port": "^1.5.1",
+    "electron": "^22.3.25",
+    "electron-builder": "^24.6.4",
     "electron-devtools-installer": "^3.2.0",
-    "electron-notarize": "^1.1.1",
+    "electron-notarize": "^1.2.2",
     "electron-rebuild": "^2.3.5",
     "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.3",
+    "enzyme-adapter-react-16": "^1.15.7",
     "enzyme-to-json": "^3.6.2",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-airbnb-typescript": "^12.3.1",
+    "eslint-config-airbnb-typescript": "^14.0.2",
     "eslint-config-erb": "^4.0.0-alpha.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-webpack": "^0.13.2",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-webpack": "^0.13.8",
     "eslint-plugin-compat": "^3.13.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^24.1.3",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "^4.2.0",
     "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-react": "^7.27.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "file-loader": "^6.0.0",
-    "husky": "^4.3.8",
+    "husky": "^8.0.3",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.1.0",
-    "lint-staged": "^10.5.4",
+    "lint-staged": "^15.0.2",
     "mini-css-extract-plugin": "^1.6.2",
     "opencollective-postinstall": "^2.0.3",
     "prettier": "^2.4.1",
@@ -233,28 +233,29 @@
     "rimraf": "^3.0.0",
     "sass-loader": "^10.2.0",
     "stl-viewer": "^0.12.0",
-    "style-loader": "^2.0.0",
-    "terser-webpack-plugin": "^5.2.5",
+    "style-loader": "^3.3.4",
+    "terser-webpack-plugin": "^5.3.9",
     "typescript": "^4.4.4",
     "url-loader": "^4.1.0",
-    "webpack": "^5.76.0",
+    "webpack": "^5.89.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^3.11.3",
-    "webpack-merge": "^5.8.0",
+    "webpack-merge": "^5.10.0",
     "yarn-deduplicate": "^3.1.0"
   },
   "dependencies": {
     "ansi-regex": "^6.0.1",
     "double-ended-queue": "^2.1.0-0",
     "electron-db": "^0.15.7",
     "electron-debug": "^3.1.0",
-    "electron-log": "^4.4.1",
+    "electron-log": "^5.0.0",
     "electron-updater": "^4.3.9",
-    "follow-redirects": "^1.14.8",
+    "follow-redirects": "^1.15.5",
     "halogenium": "^2.3.0",
     "history": "^5.1.0",
     "html2canvas": "^1.3.2",
+    "loader-utils": "^3.2.1",
     "localforage": "^1.10.0",
     "node-fetch": "^3.2.10",
     "react": "^17.0.2",

src/Core/components/ControlScheme.tsx

@@ -133,6 +133,11 @@ function controller(passedScheme: any, pos: any): any {
         }
       }
     }
+    if (navigator.getGamepads()[index] == null && passedScheme !== '') {
+      for (const button in CONTROLLERINPUT[passedScheme].bindings) {
+        controllerInputs[button] = 0;
+      }
+    }
   }, 50);
 }
 
@@ -405,6 +410,39 @@ class ControlScheme extends Component<IProps, IState> {
                 <button style={{ zIndex: 1 }} type="button" onClick={() => this.buttonToggle(config)}>
                   {this.state.functionality[config].toggled}
                 </button>
+                {window.addEventListener('gamepaddisconnected', (e) => {
+                  if (
+                    this.state.functionality[config].toggled === 'On' &&
+                    this.state.functionality[config].controller === 'Xbox 1' &&
+                    e.gamepad.index === 0
+                  ) {
+                    this.buttonToggle(config);
+                  } else if (
+                    this.state.functionality[config].toggled === 'On' &&
+                    this.state.functionality[config].controller === 'Xbox 2' &&
+                    e.gamepad.index === 1
+                  ) {
+                    this.buttonToggle(config);
+                  } else if (
+                    this.state.functionality[config].toggled === 'On' &&
+                    this.state.functionality[config].controller === 'Xbox 3' &&
+                    e.gamepad.index === 2
+                  ) {
+                    this.buttonToggle(config);
+                  } else if (
+                    this.state.functionality[config].toggled === 'On' &&
+                    this.state.functionality[config].controller === 'Xbox 4' &&
+                    e.gamepad.index === 3
+                  ) {
+                    this.buttonToggle(config);
+                  } else if (
+                    this.state.functionality[config].toggled === 'On' &&
+                    this.state.functionality[config].controller === 'Flight Stick' &&
+                    e.gamepad.index === 4
+                  ) {
+                    this.buttonToggle(config);
+                  }
+                })}
               </div>
             );
           })}