Added check if the device could be automatic detected or if the user needs to pair the device first.

Added navigator translations.
Fixes open issues for the 5.6.28 release.

Author: MarkusBordihn

app/chrome_app/manifest.json

@@ -9,7 +9,7 @@
   "short_name": "Coding with Chrome",
   "description": "Learn, improve, or teach coding skills within a Chrome browser.",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSWdCJSwkgFTY9d993Quot277oCS2PCM2H/F6U28NE8D3Z21GXS/7qW8XCGShB054Wboq62pP679f9tB9F+GRHzOh/an4zIu+Uhb3ZKVzZLJbHsP8N+E5wk3wgwOBgE+UXCy9I8i1RpfzutJ4aha+YEzvCsVpo6UwsuWiXORB9yRU5NuooYX+fhVpWZmrZJo4vqzQhuoJ/uWiQujABXXo4qdrclwSw8+JlpWLMqHHQ6HE8Sf7VWDdGvRdYP6LRZobWqovb659qEumJ0bxhwXtHkWgPHQWtW35T/r/oH8uuke35pH+YtBtaOqN5U3bYGPinP0bYrI33OSLUJx/DrC1wIDAQAB",
-  "version": "5.6.24",
+  "version": "5.6.28",
   "oauth2": {
     "client_id": "418162477970-2qmsb2sp3m522hf292154favsjgpsj9n.apps.googleusercontent.com",
     "scopes": [
@@ -58,7 +58,7 @@
       }
     ]
   },
-  "minimum_chrome_version": "38",
+  "minimum_chrome_version": "42",
   "offline_enabled": true,
   "bluetooth": {
     "uuids": [

app/nw_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binary",
-  "version": "5.6.24",
+  "version": "5.6.28",
   "main": "js/background.js",
   "window": {
     "title": "Coding with Chrome",

locales/deu/navigation.js

@@ -0,0 +1,44 @@
+/**
+ * @fileoverview Translation file for the navigation (german).
+ *
+ * @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)
+ */
+/* eslint-disable max-len */
+Locales['deu']['NAVIGATION'] = {
+  'ABOUT': 'Über',
+  'ABOUT_TEXT': 'Weitere Informationen zur Codierung mit Chrome',
+  'DEBUG': 'Debuggen',
+  'DEBUG_TEXT': 'Open Debug',
+  'HELP': 'Hilfe',
+  'HELP_TEXT': 'Dokumentation öffnen',
+  'HOME': 'Home',
+  'HOME_TEXT': 'Nach Hause gehen',
+  'NEW_FILE': 'Neue Datei',
+  'NEW_FILE_TEXT': 'Eine Datei starten',
+  'OPEN_FILE': 'Datei öffnen',
+  'OPEN_FILE_TEXT': 'Öffne eine lokale Datei',
+  'OPEN_GDRIVE_FILE': 'Open Google Drive-Datei',
+  'OPEN_GDRIVE_FILE_TEXT': 'Öffnen Sie eine Google Drive-Datei ...',
+  'OVERVIEW': 'Überblick',
+  'OVERVIEW_TEXT': 'Überblick',
+  'SAVE_AS': 'Als neue Datei speichern',
+  'SAVE_AS_TEXT': 'Als neue Datei speichern ...',
+  'SAVE_GDRIVE_FILE': 'Als Google Drive-Datei speichern',
+  'SAVE_GDRIVE_FILE_TEXT': 'Als Google Drive-Datei speichern ...',
+  'SETTINGS': 'Einstellungen',
+  'SETTINGS_TEXT': 'Einstellungen öffnen',
+};

locales/eng/navigation.js

@@ -0,0 +1,44 @@
+/**
+ * @fileoverview Translation file for the navigation (english).
+ *
+ * @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)
+ */
+/* eslint-disable max-len */
+Locales['eng']['NAVIGATION'] = {
+  'ABOUT': 'About',
+  'ABOUT_TEXT': 'Learn more about Coding with Chrome',
+  'DEBUG': 'Debug',
+  'DEBUG_TEXT': 'Open Debug',
+  'HELP': 'Help',
+  'HELP_TEXT': 'Open documentation',
+  'HOME': 'Home',
+  'HOME_TEXT': 'Go Home',
+  'NEW_FILE': 'New file',
+  'NEW_FILE_TEXT': 'Start a file',
+  'OPEN_FILE': 'Open file',
+  'OPEN_FILE_TEXT': 'Open a local file',
+  'OPEN_GDRIVE_FILE': 'Open Google Drive file',
+  'OPEN_GDRIVE_FILE_TEXT': 'Open a Google Drive file...',
+  'OVERVIEW': 'Overview',
+  'OVERVIEW_TEXT': 'Go Overview',
+  'SAVE_AS': 'Save as new file',
+  'SAVE_AS_TEXT': 'Save as new file...',
+  'SAVE_GDRIVE_FILE': 'Save as Google Drive file',
+  'SAVE_GDRIVE_FILE_TEXT': 'Save as Google Drive file...',
+  'SETTINGS': 'Settings',
+  'SETTINGS_TEXT': 'Open settings',
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coding-with-chrome",
   "description": "Coding with Chrome",
-  "version": "5.6.24",
+  "version": "5.6.28",
   "author": "Markus Bordihn ([email protected])",
   "license": "Apache-2.0",
   "private": true,

src/mode/lego/ev3/connection.js

@@ -19,14 +19,17 @@
  */
 goog.provide('cwc.mode.lego.ev3.Connection');
 
+goog.require('cwc.lib.protocol.bluetoothChrome.profile.Device');
 goog.require('cwc.protocol.lego.ev3.Api');
 goog.require('cwc.ui.PreviewState');
 goog.require('cwc.utils.Events');
-goog.require('cwc.utils.Logger');
 
 goog.require('goog.Timer');
 
 
+goog.scope(function() {
+const BluetoothProfile =
+  goog.module.get('cwc.lib.protocol.bluetoothChrome.profile.Device');
 /**
  * @constructor
  * @param {!cwc.utils.Helper} helper
@@ -35,9 +38,6 @@ cwc.mode.lego.ev3.Connection = function(helper) {
   /** @type {string} */
   this.name = 'EV3 Connection';
 
-  /** @type {string} */
-  this.autoConnectName = 'EV3';
-
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
@@ -56,22 +56,18 @@ cwc.mode.lego.ev3.Connection = function(helper) {
   /** @private {!cwc.utils.Events} */
   this.events_ = new cwc.utils.Events(this.name);
 
-  /** @private {!cwc.utils.Logger|null} */
-  this.log_ = new cwc.utils.Logger(this.name);
+  /** @private {!cwc.lib.protocol.bluetoothChrome.profile.Device} */
+  this.device_ = BluetoothProfile.LEGO_EV3;
 };
 
 
 /**
  * Connects the EV3 unit.
  */
 cwc.mode.lego.ev3.Connection.prototype.init = function() {
-  this.handleConnecting_({
-    'data': 'Connecting EV3',
-    'source': 1,
-  });
   if (this.apiEvents_) {
     this.events_.listen(this.apiEvents_,
-      cwc.protocol.sphero.v1.Events.Type.CONNECT,
+      cwc.protocol.lego.ev3.Events.Type.CONNECT,
       this.handleConnecting_.bind(this));
 
     // Monitor device data
@@ -93,6 +89,21 @@ cwc.mode.lego.ev3.Connection.prototype.init = function() {
       false, this);
   }
 
+  let bluetoothInstance = this.helper.getInstance('bluetoothChrome');
+  if (bluetoothInstance) {
+    if (bluetoothInstance.getDeviceByName(this.device_.namePrefix)) {
+      this.handleConnecting_({
+        'data': 'Searching for ' + this.device_.name,
+        'source': 1,
+      });
+    } else {
+      this.handleConnecting_({
+        'data': 'Unable to find any valid ' + this.device_.name + ' device!',
+        'source': -1,
+      });
+    }
+  }
+
   if (!this.connectMonitor) {
     this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
     this.events_.listen(this.connectMonitor, goog.Timer.TICK,
@@ -113,7 +124,7 @@ cwc.mode.lego.ev3.Connection.prototype.connect = function() {
     return;
   }
   if (!this.isConnected()) {
-    bluetoothInstance.autoConnectDevice(this.autoConnectName,
+    bluetoothInstance.autoConnectDevice(this.device_.namePrefix,
       this.api_.connect.bind(this.api_));
   }
   this.api_.monitor(true);
@@ -124,7 +135,6 @@ cwc.mode.lego.ev3.Connection.prototype.connect = function() {
  * Connects the EV3 unit.
  */
 cwc.mode.lego.ev3.Connection.prototype.disconnect = function() {
-  this.log_.info('Disconnect the EV3 unit...');
   this.api_.disconnect();
 };
 
@@ -191,47 +201,47 @@ cwc.mode.lego.ev3.Connection.prototype.stop = function() {
  * @param {Event|Object} e
  * @private
  */
-cwc.mode.lego.ev3.Connection.prototype.handleConnecting_ = function(e) {
-  let message = e.data;
-  let step = e.source;
-  let title = 'Connecting EV3';
-  let connectScreenInstance = this.helper.getInstance('connectScreen');
-  connectScreenInstance.showConnectingStep(title, message, step);
+cwc.mode.lego.ev3.Connection.prototype.handleUpdateDevices_ = function(e) {
+  let rendererInstance = this.helper.getInstance('renderer');
+  if (rendererInstance && e.data) {
+    rendererInstance.setDevices(e.data);
+  }
 };
 
 
 /**
- * @param {Event|Object} e
- * @private
+ * Cleans up the event listener and any other modification.
  */
-cwc.mode.lego.ev3.Connection.prototype.handlePreviewStatus_ = function(e) {
-  if (e.data === cwc.ui.PreviewState.STOPPED) {
-    this.stop();
+cwc.mode.lego.ev3.Connection.prototype.cleanUp = function() {
+  if (this.connectMonitor) {
+    this.connectMonitor.stop();
   }
+  this.api_.cleanUp();
+  this.stop();
+  this.events_.clear();
 };
 
 
 /**
  * @param {Event|Object} e
  * @private
  */
-cwc.mode.lego.ev3.Connection.prototype.handleUpdateDevices_ = function(e) {
-  let rendererInstance = this.helper.getInstance('renderer');
-  if (rendererInstance && e.data) {
-    rendererInstance.setDevices(e.data);
-  }
+cwc.mode.lego.ev3.Connection.prototype.handleConnecting_ = function(e) {
+  let message = e.data;
+  let step = e.source;
+  let title = 'Connecting EV3';
+  let connectScreenInstance = this.helper.getInstance('connectScreen');
+  connectScreenInstance.showConnectingStep(title, message, step);
 };
 
 
 /**
- * Cleans up the event listener and any other modification.
+ * @param {Event|Object} e
+ * @private
  */
-cwc.mode.lego.ev3.Connection.prototype.cleanUp = function() {
-  this.log_.info('Clean up ...');
-  if (this.connectMonitor) {
-    this.connectMonitor.stop();
+cwc.mode.lego.ev3.Connection.prototype.handlePreviewStatus_ = function(e) {
+  if (e.data === cwc.ui.PreviewState.STOPPED) {
+    this.stop();
   }
-  this.api_.cleanUp();
-  this.stop();
-  this.events_.clear();
 };
+});

src/mode/makeblock/mbot/connection.js

@@ -41,9 +41,6 @@ cwc.mode.makeblock.mBot.Connection = function(helper) {
   /** @type {string} */
   this.name = 'mBot Connection';
 
-  /** @type {string} */
-  this.autoConnectName = 'Makeblock';
-
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
@@ -72,11 +69,6 @@ cwc.mode.makeblock.mBot.Connection = function(helper) {
  * @export
  */
 cwc.mode.makeblock.mBot.Connection.prototype.init = function() {
-  this.handleConnecting_({
-    'data': 'Searching for ' + this.device_.name,
-    'source': 1,
-  });
-
   if (this.apiEvents_) {
     this.events_.listen(this.apiEvents_,
       Events.Type.CONNECT, this.handleConnecting_.bind(this));
@@ -95,6 +87,21 @@ cwc.mode.makeblock.mBot.Connection.prototype.init = function() {
       false, this);
   }
 
+  let bluetoothInstance = this.helper.getInstance('bluetoothChrome');
+  if (bluetoothInstance) {
+    if (bluetoothInstance.getDeviceByName(this.device_.namePrefix)) {
+      this.handleConnecting_({
+        'data': 'Searching for ' + this.device_.name,
+        'source': 1,
+      });
+    } else {
+      this.handleConnecting_({
+        'data': 'Unable to find any valid ' + this.device_.name + ' device!',
+        'source': -1,
+      });
+    }
+  }
+
   if (!this.connectMonitor) {
     this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
     this.events_.listen(this.connectMonitor, goog.Timer.TICK,
@@ -117,7 +124,7 @@ cwc.mode.makeblock.mBot.Connection.prototype.connect = function(opt_event) {
     return;
   }
   if (!this.isConnected()) {
-    bluetoothInstance.autoConnectDevice(this.autoConnectName,
+    bluetoothInstance.autoConnectDevice(this.device_.namePrefix,
       this.api_.connect.bind(this.api_));
   }
   this.api_.monitor(true);

src/mode/makeblock/mbot_ranger/connection.js

@@ -41,9 +41,6 @@ cwc.mode.makeblock.mBotRanger.Connection = function(helper) {
   /** @type {string} */
   this.name = 'mBot Ranger Connection';
 
-  /** @type {string} */
-  this.autoConnectName = 'Makeblock';
-
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
@@ -72,11 +69,6 @@ cwc.mode.makeblock.mBotRanger.Connection = function(helper) {
  * @export
  */
 cwc.mode.makeblock.mBotRanger.Connection.prototype.init = function() {
-  this.handleConnecting_({
-    'data': 'Searching for ' + this.device_.name,
-    'source': 1,
-  });
-
   if (this.apiEvents_) {
     this.events_.listen(this.apiEvents_,
       Events.Type.CONNECT, this.handleConnecting_.bind(this));
@@ -95,6 +87,21 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.init = function() {
       false, this);
   }
 
+  let bluetoothInstance = this.helper.getInstance('bluetoothChrome');
+  if (bluetoothInstance) {
+    if (bluetoothInstance.getDeviceByName(this.device_.namePrefix)) {
+      this.handleConnecting_({
+        'data': 'Searching for ' + this.device_.name,
+        'source': 1,
+      });
+    } else {
+      this.handleConnecting_({
+        'data': 'Unable to find any valid ' + this.device_.name + ' device!',
+        'source': -1,
+      });
+    }
+  }
+
   if (!this.connectMonitor) {
     this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
     this.events_.listen(this.connectMonitor, goog.Timer.TICK,
@@ -118,8 +125,8 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.connect = function(
     return;
   }
   if (!this.isConnected()) {
-    bluetoothInstance.autoConnectDevice(this.autoConnectName,
-      this.api_.connect.bind(this.api_));
+    bluetoothInstance.autoConnectDevice(
+        this.device_.namePrefix, this.api_.connect.bind(this.api_));
   }
   this.api_.monitor(true);
 };