Added status page for BLE parring/connection status.

TODO: Adding correct data buffer handling for fragments in the BLE interface.

Author: MarkusBordihn

package.json

@@ -14,7 +14,7 @@
     "karma-chrome-launcher": "^2.2.0",
     "karma-closure": "^0.1.3",
     "npm-check-updates": "^2.14.1",
-    "nw": "^0.29.0",
+    "nw": "^0.29.1",
     "nw-builder": "^3.5.1",
     "rimraf": "^2.6.2"
   },

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

@@ -108,25 +108,22 @@ cwc.protocol.sphero.v1.Api.prototype.connect = function(device) {
 
   if (!this.prepared) {
     console.log('Preparing Sphero bluetooth LE api for', device.getId());
-    this.eventHandler.dispatchEvent(
-      cwc.protocol.sphero.v1.Events.connecting(
-        'Connecting  device ...', 1));
+    this.eventHandler.dispatchEvent(cwc.protocol.sphero.v1.Events.connect(
+        'Connecting device ...', 1));
     this.device = device;
 
     // Enable Developer mode.
     this.device.sendRaw(
       new TextEncoder('utf-8').encode('011i3'),
       '22bb746f-2bbd-7554-2d6f-726568705327', () => {
-        this.eventHandler.dispatchEvent(
-          cwc.protocol.sphero.v1.Events.connecting(
+        this.eventHandler.dispatchEvent(cwc.protocol.sphero.v1.Events.connect(
             'Enable developer mode ...', 2));
     });
 
     // Power on device.
     this.device.sendRaw(
       new Uint8Array([0x07]), '22bb746f-2bb2-7554-2d6f-726568705327', () => {
-        this.eventHandler.dispatchEvent(
-          cwc.protocol.sphero.v1.Events.connecting(
+        this.eventHandler.dispatchEvent(cwc.protocol.sphero.v1.Events.connect(
             'Power on device. Waiting until device wakes up ...', 2));
       });
 
@@ -135,9 +132,8 @@ cwc.protocol.sphero.v1.Api.prototype.connect = function(device) {
       new Uint8Array([0x01]), '22bb746f-2bbf-7554-2d6f-726568705327', () => {
         this.prepare();
         this.runTest();
-        this.eventHandler.dispatchEvent(
-          cwc.protocol.sphero.v1.Events.connecting(
-            'Connected ...', 3));
+        this.eventHandler.dispatchEvent(cwc.protocol.sphero.v1.Events.connect(
+            'Ready ...', 3));
       });
   }
   return true;
@@ -367,7 +363,7 @@ cwc.protocol.sphero.v1.Api.prototype.runTest = function() {
   this.setBackLed(25);
   this.setBackLed(0);
 
-  this.setRGB(255, 0, 0);
+  this.setRGB(64, 64, 64);
   this.roll(0, 180);
 };
 
@@ -459,11 +455,23 @@ cwc.protocol.sphero.v1.Api.prototype.parseCollisionData_ = function(data) {
  * @private
  */
 cwc.protocol.sphero.v1.Api.prototype.handleData_ = function(buffer) {
-  if (!this.verifiyChecksum_(buffer)) {
+  let data = new Uint8Array(buffer);
+  console.log('handleData', buffer, data);
+  if (data[0] !== 0xFF) {
+    console.error('Data fragment ...');
+    return;
+  }
+  if (!this.verifiyChecksum_(data)) {
     console.error('Checksum error ...');
     return;
   }
-  console.log('handleData', buffer);
+  if (data[1] === cwc.protocol.sphero.v1.ResponseType.ACKNOWLEDGEMENT) {
+    this.handleAcknowledged_(data);
+  } else if (data[1] === cwc.protocol.sphero.v1.ResponseType.ASYNCHRONOUS) {
+    this.handleAsync_(data);
+  } else {
+    console.error('Data error ...');
+  }
 };
 
 
@@ -473,9 +481,6 @@ cwc.protocol.sphero.v1.Api.prototype.handleData_ = function(buffer) {
  * @private
  */
 cwc.protocol.sphero.v1.Api.prototype.handleAcknowledged_ = function(buffer) {
-  if (!this.verifiyChecksum_(buffer)) {
-    return;
-  }
   let type = buffer[3];
   let len = buffer[4];
   let data = buffer.slice(5, buffer.length -1);
@@ -499,9 +504,6 @@ cwc.protocol.sphero.v1.Api.prototype.handleAcknowledged_ = function(buffer) {
  * @private
  */
 cwc.protocol.sphero.v1.Api.prototype.handleAsync_ = function(buffer) {
-  if (!this.verifiyChecksum_(buffer)) {
-    return;
-  }
   let message = buffer[2];
   let len = buffer[4];
   let data = buffer.slice(5, buffer.length -1);

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

@@ -84,6 +84,15 @@ cwc.protocol.sphero.v1.CommandType = {
 };
 
 
+/**
+ * @enum {!Object.<number>|number}
+ */
+cwc.protocol.sphero.v1.ResponseType = {
+  ACKNOWLEDGEMENT: 0xFF,
+  ASYNCHRONOUS: 0xFE,
+};
+
+
 /**
  * @enum {number}
  */

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

@@ -85,7 +85,7 @@ cwc.protocol.sphero.v1.Events.collision = function(data) {
  * @return {!cwc.utils.EventData}
  * @final
  */
-cwc.protocol.sphero.v1.Events.connecting = function(data, step) {
+cwc.protocol.sphero.v1.Events.connect = function(data, step) {
   return new cwc.utils.EventData(
       cwc.protocol.sphero.v1.Events.Type.CONNECTING, data, step);
 };

src/ui/connect_screen/bluetooth/connect_screen.js

@@ -108,8 +108,11 @@ cwc.ui.connectScreen.Bluetooth.prototype.requestDevice = function(device) {
     });
     this.events_.listen('search-button', goog.events.EventType.CLICK, () => {
       bluetoothInstance.requestDevice(device).then((bluetoothDevice) => {
-        this.close_();
+        this.showConnectingStep(
+          'Pairing Device', 'Pairing device' + device.name, 1);
         resolve(bluetoothDevice);
+      }).catch(() => {
+        this.close_();
       });
     });
   });

static_files/resources/examples/sphero/sprk_plus/blocks/Sphero-collision.cwc

@@ -0,0 +1,34 @@
+{
+  "format": "Coding with Chrome File Format 3",
+  "content": {
+    "blockly": {
+      "content": "<xml xmlns=\"http://www.w3.org/1999/xhtml\">\n  <variables></variables>\n  <block type=\"sphero_collision\" x=\"133\" y=\"126\">\n    <statement name=\"CODE\">\n      <block type=\"sphero_rgb\">\n        <value name=\"colour\">\n          <block type=\"colour_picker\">\n            <field name=\"COLOUR\">#ff0000</field>\n          </block>\n        </value>\n        <next>\n          <block type=\"sphero_rgb\">\n            <value name=\"colour\">\n              <block type=\"colour_picker\">\n                <field name=\"COLOUR\">#33ff33</field>\n              </block>\n            </value>\n          </block>\n        </next>\n      </block>\n    </statement>\n  </block>\n</xml>",
+      "name": "blockly",
+      "size": 642,
+      "type": "application/blockly+xml",
+      "version": 1
+    },
+    "__javascript__": {
+      "content": "",
+      "name": "__javascript__",
+      "size": 151,
+      "type": "application/javascript",
+      "version": 1
+    }
+  },
+  "files": {},
+  "flags": {
+    "__editor__": {}
+  },
+  "frameworks": {},
+  "history": "",
+  "metadata": {
+    "__default__": {
+      "author": "Markus Bordihn",
+      "title": "Collision example",
+      "version": "1.1"
+    }
+  },
+  "mode": "sphero_sprk_plus_blockly",
+  "ui": "blockly"
+}