Improved gamepad support and added basic mapping for unknown controllers.

Updated dependencies.

Author: MarkusBordihn

src/frameworks/internal/ev3/ev3.js

@@ -713,6 +713,7 @@ cwc.framework.Ev3.prototype.handleUpdateWheelDiameter_ = function(data) {
  */
 cwc.framework.Ev3.prototype.handleUpdateGamepad_ = function(data) {
   console.log(data);
+  console.log(data['buttons']);
 };
 
 

src/mode/lego/ev3/monitor.js

@@ -259,8 +259,10 @@ cwc.mode.lego.ev3.Monitor.prototype.addGamepadHandler_ = function() {
       this.api.rotatePower(e.data * 100);
   });
   this.events_.listen(eventHandler, cwc.utils.Gamepad.Events.Type.BUTTON[0],
-    () => {
-      this.api.playTone(3000, 200, 50);
+    (e) => {
+      if (e.data) {
+        this.api.playTone(3000, 200, 50);
+      }
   });
 };
 

src/mode/sphero/classic/advanced/mod.js

@@ -20,10 +20,10 @@
 goog.provide('cwc.mode.sphero.classic.advanced.Mod');
 
 goog.require('cwc.mode.default.Mod');
-goog.require('cwc.mode.sphero.Connection');
 goog.require('cwc.mode.sphero.Hints');
 goog.require('cwc.mode.sphero.Monitor');
 goog.require('cwc.mode.sphero.Runner');
+goog.require('cwc.mode.sphero.classic.Connection');
 goog.require('cwc.renderer.external.Sphero');
 
 
@@ -36,7 +36,7 @@ cwc.mode.sphero.classic.advanced.Mod = function(helper) {
   this.mod = new cwc.mode.default.Mod(helper);
 
   /** @type {!cwc.mode.sphero.Connection} */
-  this.connection = new cwc.mode.sphero.Connection(helper);
+  this.connection = new cwc.mode.sphero.classic.Connection(helper);
 
   /** @type {!cwc.mode.sphero.Monitor} */
   this.monitor = new cwc.mode.sphero.Monitor(helper, this.connection);

src/mode/sphero/classic/blockly/mod.js

@@ -20,9 +20,9 @@
 goog.provide('cwc.mode.sphero.classic.blockly.Mod');
 
 goog.require('cwc.mode.default.Mod');
-goog.require('cwc.mode.sphero.Connection');
 goog.require('cwc.mode.sphero.Monitor');
 goog.require('cwc.mode.sphero.Runner');
+goog.require('cwc.mode.sphero.classic.Connection');
 goog.require('cwc.renderer.external.Sphero');
 goog.require('cwc.soy.sphero.Blocks');
 
@@ -36,7 +36,7 @@ cwc.mode.sphero.classic.blockly.Mod = function(helper) {
   this.mod = new cwc.mode.default.Mod(helper);
 
   /** @type {!cwc.mode.sphero.Connection} */
-  this.connection = new cwc.mode.sphero.Connection(helper);
+  this.connection = new cwc.mode.sphero.classic.Connection(helper);
 
   /** @type {!cwc.mode.sphero.Monitor} */
   this.monitor = new cwc.mode.sphero.Monitor(helper, this.connection);

src/mode/sphero/connection.js renamed to src/mode/sphero/classic/connection.js

@@ -17,7 +17,7 @@
  *
  * @author [email protected] (Markus Bordihn)
  */
-goog.provide('cwc.mode.sphero.Connection');
+goog.provide('cwc.mode.sphero.classic.Connection');
 
 goog.require('cwc.protocol.sphero.classic.Api');
 goog.require('cwc.utils.Events');
@@ -29,7 +29,7 @@ goog.require('goog.Timer');
  * @constructor
  * @param {!cwc.utils.Helper} helper
  */
-cwc.mode.sphero.Connection = function(helper) {
+cwc.mode.sphero.classic.Connection = function(helper) {
   /** @type {string} */
   this.name = 'Sphero 2.0 Connection';
 
@@ -57,7 +57,7 @@ cwc.mode.sphero.Connection = function(helper) {
  * Connects the Sphero unit.
  * @export
  */
-cwc.mode.sphero.Connection.prototype.init = function() {
+cwc.mode.sphero.classic.Connection.prototype.init = function() {
   if (!this.connectMonitor) {
     this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
     this.events_.listen(this.connectMonitor, goog.Timer.TICK,
@@ -73,7 +73,7 @@ cwc.mode.sphero.Connection.prototype.init = function() {
  * @param {Event=} opt_event
  * @export
  */
-cwc.mode.sphero.Connection.prototype.connect = function(opt_event) {
+cwc.mode.sphero.classic.Connection.prototype.connect = function(opt_event) {
   if (!this.isConnected()) {
     let bluetoothInstance = this.helper.getInstance('bluetooth', true);
     bluetoothInstance.autoConnectDevice(this.autoConnectName, function(device) {
@@ -89,7 +89,7 @@ cwc.mode.sphero.Connection.prototype.connect = function(opt_event) {
 /**
  * Stops the current executions.
  */
-cwc.mode.sphero.Connection.prototype.stop = function() {
+cwc.mode.sphero.classic.Connection.prototype.stop = function() {
   let runnerInstance = this.helper.getInstance('runner');
   if (runnerInstance) {
     runnerInstance.terminate();
@@ -103,7 +103,7 @@ cwc.mode.sphero.Connection.prototype.stop = function() {
  * @param {Event=} opt_event
  * @export
  */
-cwc.mode.sphero.Connection.prototype.reset = function(opt_event) {
+cwc.mode.sphero.classic.Connection.prototype.reset = function(opt_event) {
   if (this.isConnected()) {
     this.api_.reset();
   }
@@ -114,15 +114,15 @@ cwc.mode.sphero.Connection.prototype.reset = function(opt_event) {
  * @return {!boolean}
  * @export
  */
-cwc.mode.sphero.Connection.prototype.isConnected = function() {
+cwc.mode.sphero.classic.Connection.prototype.isConnected = function() {
   return this.api_.isConnected();
 };
 
 
 /**
  * @return {goog.events.EventTarget}
  */
-cwc.mode.sphero.Connection.prototype.getEventHandler = function() {
+cwc.mode.sphero.classic.Connection.prototype.getEventHandler = function() {
   return this.api_.getEventHandler();
 };
 
@@ -131,15 +131,15 @@ cwc.mode.sphero.Connection.prototype.getEventHandler = function() {
  * @return {!cwc.protocol.sphero.classic.Api}
  * @export
  */
-cwc.mode.sphero.Connection.prototype.getApi = function() {
+cwc.mode.sphero.classic.Connection.prototype.getApi = function() {
   return this.api_;
 };
 
 
 /**
  * Cleans up the event listener and any other modification.
  */
-cwc.mode.sphero.Connection.prototype.cleanUp = function() {
+cwc.mode.sphero.classic.Connection.prototype.cleanUp = function() {
   console.log('Clean up Sphero connection ...');
   if (this.connectMonitor) {
     this.connectMonitor.stop();

src/utils/byte_tools.js

@@ -148,7 +148,6 @@ cwc.utils.ByteTools.uint8Data;
  * @return {cwc.utils.ByteTools.uint8Data} result
  */
 cwc.utils.ByteTools.getUint8Data = function(data, headers, size, buffer) {
-  console.log(data, headers, size, buffer);
   // Prepare Data Buffer
   let dataArray = cwc.utils.ByteTools.getUint8Array(data);
   let uint8Data = {

src/utils/gamepad/gamepad.js

@@ -19,6 +19,8 @@
  */
 goog.provide('cwc.utils.Gamepad');
 
+goog.require('cwc.utils.Gamepad.Events');
+goog.require('cwc.utils.Gamepad.Mapping');
 goog.require('cwc.utils.Logger');
 
 goog.require('goog.events.EventTarget');
@@ -60,7 +62,7 @@ cwc.utils.Gamepad.prototype.prepare = function() {
   window.addEventListener('gamepadconnected',
     this.handleConnect_.bind(this));
   window.addEventListener('gamepaddisconnected',
-   this.handleDisconnect_.bind(this));
+    this.handleDisconnect_.bind(this));
 };
 
 
@@ -142,7 +144,7 @@ cwc.utils.Gamepad.prototype.handleTick_ = function() {
     this.handleEvent_(gamepad);
     this.cache_['timestamp'] = gamepad['timestamp'];
   }
-  window.requestAnimationFrame(this.handleTick_.bind(this));
+  window.setTimeout(this.handleTick_.bind(this), 33);
 };
 
 
@@ -151,31 +153,40 @@ cwc.utils.Gamepad.prototype.handleTick_ = function() {
  */
 cwc.utils.Gamepad.prototype.handleEvent_ = function(gamepad) {
   let changed = false;
+
+  // Checking current status for each single axes.
   gamepad['axes'].forEach((axis, index) => {
+    let mappedIndex = cwc.utils.Gamepad.getIndex(index, 'axes', gamepad);
     // Smooth axes to avoid false triggers from vibrations.
     if (axis > -0.04 && axis < 0.04) {
       axis = 0;
     }
-    if (axis !== this.cache_['axes'][index]) {
-      this.cache_['axes'][index] = axis;
+    if (axis !== this.cache_['axes'][mappedIndex]) {
+      this.cache_['axes'][mappedIndex] = axis;
       this.eventHandler_.dispatchEvent(cwc.utils.Gamepad.Events.axisMoved(
-        index, axis
+        mappedIndex, axis
       ));
       changed = true;
     }
   });
+
+  // Checking current status for each single button.
   gamepad['buttons'].forEach((button, index) => {
-    if (button['pressed'] ||
-        this.cache_['buttons'][index] !== button['value']) {
-      this.cache_['buttons'][index] = button['value'];
+    let mappedIndex = cwc.utils.Gamepad.getIndex(index, 'buttons', gamepad);
+    if (this.cache_['buttons'][mappedIndex] !== button['value']) {
+      this.cache_['buttons'][mappedIndex] = button['value'];
+      let value = button['value'];
       this.eventHandler_.dispatchEvent(cwc.utils.Gamepad.Events.buttonPressed(
-        index, button['value']
+        mappedIndex, button['value'], value
       ));
       changed = true;
     }
   });
+
   if (changed) {
-    this.eventHandler_.dispatchEvent(cwc.utils.Gamepad.Events.update());
+    // Create an immutable version of the current cache for the event.
+    this.eventHandler_.dispatchEvent(cwc.utils.Gamepad.Events.update(
+      JSON.parse(JSON.stringify(this.cache_))));
   }
 };
 
@@ -194,6 +205,28 @@ cwc.utils.Gamepad.getAngle = function(x, y, shift = 90) {
       angle += 360;
     }
   }
-
   return angle;
 };
+
+
+/**
+ * Return's mapped index for supported controllers.
+ * @param {!number} index
+ * @param {!string} type
+ * @param {!Object} gamepad
+ * @return {!number}
+ */
+cwc.utils.Gamepad.getIndex = function(index, type, gamepad) {
+  if (gamepad['mapping'] === 'standard') {
+    return index;
+  }
+
+  if (gamepad['mapping'] === '' && cwc.utils.Gamepad.Mapping[gamepad['id']]) {
+    let mapping = cwc.utils.Gamepad.Mapping[gamepad['id']][type];
+    if (typeof mapping[index] !== 'undefined') {
+      return mapping[index] || 0;
+    }
+  }
+
+  return index || 0;
+};

src/utils/gamepad/mapping.js

@@ -0,0 +1,37 @@
+/**
+ * @fileoverview Gamepad Mapping definitions.
+ *
+ * @license Copyright 2018 The Coding with Chrome Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author [email protected] (Markus Bordihn)
+ */
+goog.provide('cwc.utils.Gamepad.Mapping');
+
+
+/**
+ * @type {Object}
+ */
+cwc.utils.Gamepad.Mapping = {
+  'HORIPAD 4  (Vendor: 0f0d Product: 0066)': {
+    'axes': {
+      5: 3,
+    },
+    'buttons': {
+      0: 2,
+      1: 0,
+      2: 1,
+    },
+  },
+};