Added Sphero 2.0 connect screen.

Author: MarkusBordihn

src/mode/lego/ev3/connection.js

@@ -61,7 +61,7 @@ cwc.mode.lego.ev3.Connection = function(helper) {
  */
 cwc.mode.lego.ev3.Connection.prototype.init = function() {
   this.handleConnecting_({
-    'data': 'Connection EV3',
+    'data': 'Connecting EV3',
     'source': 1,
   });
   if (this.apiEvents_) {
@@ -86,11 +86,8 @@ cwc.mode.lego.ev3.Connection.prototype.init = function() {
 cwc.mode.lego.ev3.Connection.prototype.connect = function() {
   if (!this.isConnected()) {
     let bluetoothInstance = this.helper.getInstance('bluetooth', true);
-    bluetoothInstance.autoConnectDevice(this.autoConnectName, function(device) {
-      if (device) {
-        this.api_.connect(device);
-      }
-    }.bind(this));
+    bluetoothInstance.autoConnectDevice(this.autoConnectName,
+      this.api_.connect.bind(this.api_));
   }
   this.api_.monitor(true);
 };

src/mode/sphero/classic/connection.js

@@ -48,6 +48,9 @@ cwc.mode.sphero.classic.Connection = function(helper) {
   /** @private {!cwc.protocol.sphero.classic.Api} */
   this.api_ = new cwc.protocol.sphero.classic.Api();
 
+  /** @private {!goog.events.EventTarget} */
+  this.apiEvents_ = this.api_.getEventHandler();
+
   /** @private {!cwc.utils.Events} */
   this.events_ = new cwc.utils.Events(this.name);
 };
@@ -58,6 +61,16 @@ cwc.mode.sphero.classic.Connection = function(helper) {
  * @export
  */
 cwc.mode.sphero.classic.Connection.prototype.init = function() {
+  this.handleConnecting_({
+    'data': 'Connecting Sphero 2.0',
+    'source': 1,
+  });
+  if (this.apiEvents_) {
+    this.events_.listen(this.apiEvents_,
+      cwc.protocol.sphero.v1.Events.Type.CONNECT,
+      this.handleConnecting_.bind(this));
+  }
+
   if (!this.connectMonitor) {
     this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
     this.events_.listen(this.connectMonitor, goog.Timer.TICK,
@@ -76,11 +89,8 @@ cwc.mode.sphero.classic.Connection.prototype.init = function() {
 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) {
-      if (device) {
-        this.api_.connect(device);
-      }
-    }.bind(this));
+    bluetoothInstance.autoConnectDevice(this.autoConnectName,
+      this.api_.connect.bind(this.api_));
   }
   this.api_.monitor(true);
 };
@@ -147,3 +157,16 @@ cwc.mode.sphero.classic.Connection.prototype.cleanUp = function() {
   this.stop();
   this.events_.clear();
 };
+
+
+/**
+ * @param {Event} e
+ * @private
+ */
+cwc.mode.sphero.classic.Connection.prototype.handleConnecting_ = function(e) {
+  let message = e.data;
+  let step = e.source;
+  let title = 'Connecting Sphero 2.0';
+  let connectScreenInstance = this.helper.getInstance('connectScreen');
+  connectScreenInstance.showConnectingStep(title, message, step);
+};

src/protocol/robots/lego/ev3/api.js

@@ -99,7 +99,9 @@ cwc.protocol.lego.ev3.Api = function() {
  * @export
  */
 cwc.protocol.lego.ev3.Api.prototype.connect = function(device) {
-  if (!device || !device.isConnected()) {
+  if (!device) {
+    return false;
+  } else if (!device.isConnected()) {
     console.error('EV3 unit is not ready yet...');
     return false;
   }

src/protocol/robots/sphero/classic/api.js

@@ -105,16 +105,22 @@ cwc.protocol.sphero.classic.Api = function() {
  * @export
  */
 cwc.protocol.sphero.classic.Api.prototype.connect = function(device) {
-  if (!device || !device.isConnected()) {
+  if (!device) {
+    return false;
+  } else if (!device.isConnected()) {
     console.error('Sphero ball is not ready yet...');
     return false;
   }
 
   if (!this.prepared) {
-    console.log('Preparing Sphero bluetooth api for', device.getAddress());
+    console.log('Preparing Sphero classic api for', device.getAddress());
+    this.eventHandler.dispatchEvent(cwc.protocol.sphero.classic.Events.connect(
+      'Prepare Sphero Classic api for' + device.getAddress(), 2));
     this.device = device;
     this.prepare();
     this.runTest();
+    this.eventHandler.dispatchEvent(cwc.protocol.sphero.classic.Events.connect(
+      'Ready ...', 3));
   }
   return true;
 };

src/protocol/robots/sphero/classic/events.js

@@ -28,9 +28,10 @@ goog.require('cwc.utils.EventData');
  */
 cwc.protocol.sphero.classic.Events.Type = {
   CHANGED_LOCATION: 'changed_devices',
-  CHANGED_VELOCITY: 'changed_values',
   CHANGED_SPEED: 'changed_speed',
+  CHANGED_VELOCITY: 'changed_values',
   COLLISION: 'collision',
+  CONNECT: 'connect',
 };
 
 
@@ -76,3 +77,15 @@ cwc.protocol.sphero.classic.Events.collision = function(data) {
   return new cwc.utils.EventData(
       cwc.protocol.sphero.classic.Events.Type.COLLISION, data);
 };
+
+
+/**
+ * @param {string} data
+ * @param {number} step
+ * @return {!cwc.utils.EventData}
+ * @final
+ */
+cwc.protocol.sphero.classic.Events.connect = function(data, step) {
+  return new cwc.utils.EventData(
+      cwc.protocol.sphero.classic.Events.Type.CONNECT, data, step);
+};

src/protocol/robots/sphero/v1/api.js

@@ -1,8 +1,8 @@
 /**
- * @fileoverview Handles the communication with the Sphero Classic unit.
+ * @fileoverview Handles the communication with the Sphero v1 unit.
  *
- * This api allows to read and control the Lego Mindstorm Sphero sensors and
- * actors over an Bluetooth connection.
+ * This api allows to read and control the Sphero sensors and actors over an
+ * Bluetooth connection.
  *
  * @license Copyright 2018 The Coding with Chrome Authors.
  *
@@ -23,7 +23,7 @@
 goog.provide('cwc.protocol.sphero.v1.Api');
 
 goog.require('cwc.protocol.sphero.v1.CallbackType');
-goog.require('cwc.protocol.sphero.v1.Commands');
+goog.require('cwc.protocol.sphero.classic.Commands');
 goog.require('cwc.protocol.sphero.v1.Events');
 goog.require('cwc.protocol.sphero.v1.MessageType');
 goog.require('cwc.protocol.sphero.v1.Monitoring');
@@ -44,8 +44,8 @@ cwc.protocol.sphero.v1.Api = function() {
   /** @type {boolean} */
   this.prepared = false;
 
-  /** @type {!cwc.protocol.sphero.v1.Commands} */
-  this.commands = new cwc.protocol.sphero.v1.Commands();
+  /** @type {!cwc.protocol.sphero.classic.Commands} */
+  this.commands = new cwc.protocol.sphero.classic.Commands();
 
   /** @type {cwc.protocol.sphero.v1.Monitoring} */
   this.monitoring = new cwc.protocol.sphero.v1.Monitoring(this);