Default false gamepads

hitman249 · Aug 9, 2021 · 36bc414 · 36bc414
1 parent 2c7de70
commit 36bc414
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 35 deletions.
diff --git a/src/src/helpers/collects.js b/src/src/helpers/collects.js
@@ -43,12 +43,12 @@ export default class Collects {
 
   static fsr = {
     '':      'Disabled',
-    'fsr-0': '0 - Quality',
+    'fsr-0': '0 - Max blur',
     'fsr-1': '1',
     'fsr-2': '2',
     'fsr-3': '3 - Balanced',
     'fsr-4': '4',
-    'fsr-5': '5 - Performance',
+    'fsr-5': '5 - Max sharp',
   };
 
   static commands = {

diff --git a/src/src/modules/config.js b/src/src/modules/config.js
@@ -196,6 +196,8 @@ export default class Config {
     }
 
     this.sort = _.get(this.config, 'app.sort', 500);
+
+    this.config.app.disable_gamepads = this.isDisabledGamepads();
   }
 
   getDefaultConfig() {
@@ -211,7 +213,7 @@ export default class Config {
         sort:             500,
         time:             0,
         icon_height:      88,
-        disable_gamepads: false,
+        disable_gamepads: true,
       },
       exports: {},
       wine:    {
@@ -898,7 +900,8 @@ export default class Config {
    * @return {boolean}
    */
   isDisabledGamepads() {
-    return Boolean(_.get(this.config, 'app.disable_gamepads', false));
+    let status =  _.get(this.config, 'app.disable_gamepads');
+    return undefined === status ? true : Boolean(status);
   }
 
   /**

diff --git a/src/src/modules/gamepads/key-mapping.js b/src/src/modules/gamepads/key-mapping.js
@@ -168,37 +168,8 @@ export default class KeyMapping {
     });
 
     if (gamepad.axes && gamepad.axes.length > 0) {
-      const count = gamepad.axes.length;
       Array.from(gamepad.axes).forEach((button, index) => {
-        if (count > 3) {
-          switch (index) {
-            case 0:
-              axes[index] = 'a|d';
-              break;
-            case 1:
-              axes[index] = 'w|s';
-              break;
-            case 2:
-              axes[index] = 'mouse_inverted_x|3';
-              break;
-            case 3:
-              axes[index] = 'mouse_inverted_y|3';
-              break;
-            default:
-              axes[index] = '';
-          }
-        } else {
-          switch (index) {
-            case 0:
-              axes[index] = 'mouse_inverted_x|3';
-              break;
-            case 1:
-              axes[index] = 'mouse_inverted_y|3';
-              break;
-            default:
-              axes[index] = '';
-          }
-        }
+        axes[index] = '';
       });
     }
 

diff --git a/src/src/modules/update.js b/src/src/modules/update.js
@@ -8,7 +8,7 @@ const fs            = require('fs');
 
 export default class Update {
 
-  version = '1.5.8';
+  version = '1.5.9';
 
   /**
    * @type {string}