Improved existing mBot Ranger implementation.

Added Bluetooth web warning and error infobar for unsupported platforms.

Author: MarkusBordihn

locales/deu/select_screen.js

@@ -0,0 +1,40 @@
+/**
+ * @fileoverview Translation file for the Select screen (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']['SELECT_SCREEN'] = {
+  'LOAD_FILE': 'Load {$title}',
+  'BLUETOOTH_WEB_NOT_AVAILABLE': 'Erforderliche Web-Bluetooth-Unterstützung ist nicht verfügbar.',
+  'BLUETOOTH_WEB_LIGHT': 'Erforderliche Web-Bluetooth-Unterstützung ist derzeit auf Windows-Betriebssystemen eingeschränkt.',
+};
+
+
+Locales['deu']['SELECT_SCREEN_NORMAL'] = {
+  'TITLE': 'Block Coding',
+  'DESCRIPTION': 'Block basierte Programmierung',
+  'BLOCKLY': 'Blockly',
+  'BLOCKLY_ACTION': 'Verwende Blockly',
+  'BLOCKLY_TEXT': 'Verwende Blockly, um mit Hilfe von Codeblöcken ein Programm zu erstellen.',
+  'GAME': 'Games',
+  'GAME_ACTION': 'Ein Spiel erstellen',
+  'GAME_TEXT': 'Erstelle ein einfaches Spiele durch das ziehen und plazieren von Codeblöcken',
+  'ROBOTS': 'Roboter',
+  'ROBOTS_ACTION': 'Kontroliere Roboter',
+  'ROBOTS_TEXT': 'Kontrolliere einen echten oder virtuellen Roboter mit Codeblöcke',
+};

locales/deu/translation.js

@@ -22,7 +22,6 @@
 Object.assign(Locales['deu'], {
   'All': 'Alle',
   'Audio': 'Audio',
-  'Block Coding': 'Block basierte Programmierung',
   'Blockly Prompt': 'Blockly Aufforderung',
   'Blockly file': 'Blockly Datei',
   'Bluetooth is disabled!': 'Bluetooth ist deaktiviert!',
@@ -34,10 +33,8 @@ Object.assign(Locales['deu'], {
   'Colour': 'Farbe',
   'Connect Bluetooth device...': 'Verbinde ein Bluetooth Gerät...',
   'Connect serial device...': 'Verbinde ein serieles Gerät...',
-  'Control real or on-screen robots with Blockly': 'Kontrollieren Sie einen echte oder virtuelle Roboter mit Blockly',
   'Create Game with name': 'Erstelle ein Spiel mit den Namen',
   'Create new variable...': 'Lege eine neue Variable an...',
-  'Create simple games by dragging and dropping code blocks': 'Erstellen ein einfache Spiele durch das ziehen und plazieren von Codeblöcken',
   'Create your own game': 'Erstelle dein eigenes Spiel',
   'Create your own games...': 'Erstelle dein eigenenes Spiel...',
   'Create': 'Anlegen',
@@ -105,7 +102,6 @@ Object.assign(Locales['deu'], {
   'Start a file': 'Start eine neue Datei',
   'Start a new project': 'Starte ein neues Projekt',
   'Start building new code': 'Neuen Code aufbauen',
-  'Start creating games': 'Ein Spiel erstellen',
   'Switch from one game state to another game state': 'Wechsel von einem Spiel Modus zum anderen Spielmodus',
   'Switch to Blockly': 'Wechsel zu Blockly',
   'Switch to Editor': 'Wechsel zum Editor',
@@ -123,7 +119,6 @@ Object.assign(Locales['deu'], {
   'Update': 'Aktualisieren',
   'Upload file': 'Datei hochladen',
   'Upload': 'Hochladen',
-  'Use Blockly to build code by dragging and dropping code blocks': 'Verwenden Sie Blockly, um Code zu erstellen, indem Sie Codeblöcke reinziehen und ablegen',
   'Variables': 'Variablen',
   'World wrap sprite': 'Welt wrap Sprite',
   'World': 'Welt',

locales/eng/select_screen.js

@@ -0,0 +1,40 @@
+/**
+ * @fileoverview Translation file for the Select screen (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']['SELECT_SCREEN'] = {
+  'LOAD_FILE': 'Load {$title}',
+  'BLUETOOTH_WEB_NOT_AVAILABLE': 'Required Web Bluetooth support is not available.',
+  'BLUETOOTH_WEB_LIGHT': 'Required Web Bluetooth support is currently limited on Windows OS.',
+};
+
+
+Locales['eng']['SELECT_SCREEN_NORMAL'] = {
+  'TITLE': 'Block Coding',
+  'DESCRIPTION': 'Block-based programming',
+  'BLOCKLY': 'Blockly',
+  'BLOCKLY_ACTION': 'Go Blockly',
+  'BLOCKLY_TEXT': 'Use Blockly to build code by dragging and dropping code blocks',
+  'GAME': 'Games',
+  'GAME_ACTION': 'Start creating games',
+  'GAME_TEXT': 'Create simple games by dragging and dropping code blocks',
+  'ROBOTS': 'Robots',
+  'ROBOTS_ACTION': 'Control Robots',
+  'ROBOTS_TEXT': 'Control real or on-screen robots with Blockly',
+};

locales/eng/translation.js

@@ -31,7 +31,6 @@ Object.assign(Locales['eng'], {
   'Begin a new program to drive a mBot or an on-screen robot with Blockly': 'Begin a new program to drive a mBot or an on-screen robot with Blockly',
   'Begin a new program to drive a mBot with Blockly': 'Begin a new program to drive a mBot with Blockly',
   'Begin a new program to drive an EV3 or an on-screen robot with Blockly': 'Begin a new program to drive an EV3 or an on-screen robot with Blockly',
-  'Block Coding': 'Block Coding',
   'Blockly file': 'Blockly file',
   'Blocks': 'Blocks',
   'Build software with text-based programming languages': 'Build software with text-based programming languages',
@@ -71,7 +70,6 @@ Object.assign(Locales['eng'], {
   'Control an EV3 with Blocks': 'Control an EV3 with Blocks',
   'Control an EV3 with JavaScript': 'Control an EV3 with JavaScript',
   'Control an mBot by assembling Blockly Blocks': 'Control an mBot by assembling Blockly Blocks',
-  'Control real or on-screen robots with Blockly': 'Control real or on-screen robots with Blockly',
   'Control real or virtual robots': 'Control real or virtual robots',
   'Control the EV3 or a virtual robot with JavaScript': 'Control the EV3 or a virtual robot with JavaScript',
   'Control the Sphero or a virtual robot with JavaScript': 'Control the Sphero or a virtual robot with JavaScript',
@@ -82,7 +80,6 @@ Object.assign(Locales['eng'], {
   'Create empty project': 'Create empty project',
   'Create games with the Phaser framework': 'Create games with the Phaser framework',
   'Create new project': 'Create new project',
-  'Create simple games by dragging and dropping code blocks': 'Create simple games by dragging and dropping code blocks',
   'Create some music': 'Create some music',
   'Create website code': 'Create website code',
   'Create your own games...': 'Create your own games...',
@@ -127,9 +124,7 @@ Object.assign(Locales['eng'], {
   'Get the current value of the Ultrasonic sensor': 'Get the current value of the Ultrasonic sensor',
   'Get the current value of the color sensor': 'Get the current value of the color sensor',
   'Get the current value of the touch sensor': 'Get the current value of the touch sensor',
-  'Go Blockly': 'Go Blockly',
   'Go Coding ': 'Go Coding ',
-  'Go Robots': 'Go Robots',
   'Go Simple': 'Go Simple',
   'Go Web': 'Go Web',
   'Guess number': 'Guess number',
@@ -284,7 +279,6 @@ Object.assign(Locales['eng'], {
   'Start an empty Sphero project': 'Start an empty Sphero project',
   'Start an empty pencil code project': 'Start an empty pencil code project',
   'Start building new code': 'Start building new code',
-  'Start creating games': 'Start creating games',
   'Start drawing': 'Start drawing',
   'Start learning JavaScript with video tutorials on YouTube': 'Start learning JavaScript with video tutorials on YouTube',
   'Stop all motors immediately or after the last command has finished': 'Stop all motors immediately or after the last command has finished',
@@ -328,7 +322,6 @@ Object.assign(Locales['eng'], {
   'Undo last change': 'Undo last change',
   'Unsaved changes for Game Engine': 'Unsaved changes for Game Engine',
   'Unsaved changes for basic: Text loop': 'Unsaved changes for basic: Text loop',
-  'Use Blockly to build code by dragging and dropping code blocks': 'Use Blockly to build code by dragging and dropping code blocks',
   'Use CoffeeScript': 'Use CoffeeScript',
   'Use EV3 Robot': 'Use EV3 Robot',
   'Use HTML5': 'Use HTML5',

src/blocks/makeblock/mbot/javascript.js

@@ -222,7 +222,7 @@ Blockly.JavaScript['mbot_rgb'] = function(block) {
   let green = colour >> 8 & 0xFF;
   let blue = colour & 0xFF;
   return 'mBot.setRGBLED(' + red + ', ' + green + ', ' + blue + ', ' +
-    position + ', 100);\n';
+    position + ', 50);\n';
 };
 
 

src/frameworks/makeblock/mbot/mbot.js

@@ -84,32 +84,31 @@ cwc.framework.makeblock.MBot.prototype.setLEDColor =
  * @param {number} red 0-255
  * @param {number} green 0-255
  * @param {number} blue 0-255
- * @param {string=} opt_position
- *   position of the on-board LED: 0-both, 1-left, 2-right
- * @param {void=} opt_delay
+ * @param {string=} index On-board LED: 0-both, 1-left, 2-right
+ * @param {void=} delay
  * @export
  */
-cwc.framework.makeblock.MBot.prototype.setRGBLED = function(red, green, blue,
-    opt_position, opt_delay) {
+cwc.framework.makeblock.MBot.prototype.setRGBLED = function(
+    red, green, blue, index, delay) {
   this.messenger_.send('setRGBLED', {
     'red': red,
     'green': green,
     'blue': blue,
-    'position': opt_position || 0}, opt_delay);
+    'index': index || 0}, delay);
 };
 
 
 /**
  * Plays a tone through the buzzer.
  * @param  {number} frequency frequency of the note
  * @param  {number} duration  duration in milliseconds
- * @param  {number=} opt_delay
+ * @param  {number=} delay
  * @export
  */
 cwc.framework.makeblock.MBot.prototype.playTone = function(frequency, duration,
-    opt_delay) {
+    delay) {
   this.messenger_.send('playTone', {
-    'frequency': frequency, 'duration': duration}, opt_delay);
+    'frequency': frequency, 'duration': duration}, delay);
 };
 
 
@@ -231,11 +230,11 @@ cwc.framework.makeblock.MBot.prototype.wait = function(time) {
 
 /**
  * Stop the mBot
- * @param {number=} opt_delay in msec
+ * @param {number=} delay in msec
  * @export
  */
-cwc.framework.makeblock.MBot.prototype.stop = function(opt_delay) {
-  this.messenger_.send('stop', null, opt_delay);
+cwc.framework.makeblock.MBot.prototype.stop = function(delay) {
+  this.messenger_.send('stop', null, delay);
 };
 
 

src/mode/makeblock/mbot/connection.js

@@ -63,17 +63,17 @@ cwc.mode.makeblock.mBot.Connection = function(helper) {
   this.events_ = new cwc.utils.Events(this.name);
 
   /** @private {!cwc.lib.protocol.bluetoothChrome.profile.Device} */
-  this.device_ = BluetoothProfile.MAKEBLOCK_MBOT_RANGER;
+  this.device_ = BluetoothProfile.MAKEBLOCK_MBOT;
 };
 
 
 /**
- * Connects the mbot unit.
+ * Connects the mBot unit.
  * @export
  */
 cwc.mode.makeblock.mBot.Connection.prototype.init = function() {
   this.handleConnecting_({
-    'data': 'Connecting Sphero 2.0',
+    'data': 'Searching for ' + this.device_.name,
     'source': 1,
   });
 
@@ -194,7 +194,7 @@ cwc.mode.makeblock.mBot.Connection.prototype.cleanUp = function() {
 cwc.mode.makeblock.mBot.Connection.prototype.handleConnecting_ = function(e) {
   let message = e.data;
   let step = e.source;
-  let title = 'Connecting' + this.device_.name;
+  let title = 'Connecting ' + this.device_.name;
   let connectScreenInstance = this.helper.getInstance('connectScreen');
   connectScreenInstance.showConnectingStep(title, message, step);
 };

src/mode/makeblock/mbot_ranger/connection.js

@@ -19,12 +19,20 @@
  */
 goog.provide('cwc.mode.makeblock.mBotRanger.Connection');
 
-goog.require('cwc.protocol.makeblock.mBotRanger.Api');
+goog.require('cwc.lib.protocol.makeblock.mBotRanger.Api');
+goog.require('cwc.lib.protocol.bluetoothChrome.profile.Device');
+goog.require('cwc.lib.protocol.makeblock.mBotRanger.Events');
 goog.require('cwc.utils.Events');
 
 goog.require('goog.Timer');
 
 
+goog.scope(function() {
+const Api = goog.module.get('cwc.lib.protocol.makeblock.mBotRanger.Api');
+const BluetoothProfile =
+  goog.module.get('cwc.lib.protocol.bluetoothChrome.profile.Device');
+const Events = goog.module.get('cwc.lib.protocol.makeblock.mBotRanger.Events');
+
 /**
  * @constructor
  * @param {!cwc.utils.Helper} helper
@@ -39,32 +47,41 @@ cwc.mode.makeblock.mBotRanger.Connection = function(helper) {
   /** @type {!cwc.utils.Helper} */
   this.helper = helper;
 
-  /** @type {!cwc.protocol.makeblock.mBotRanger.Api} */
-  this.api_ = new cwc.protocol.makeblock.mBotRanger.Api();
-
   /** @type {goog.Timer} */
   this.connectMonitor = null;
 
   /** @type {number} */
   this.connectMonitorInterval = 5000;
 
+  /** @type {!cwc.protocol.makeblock.mBotRanger.Api} */
+  this.api_ = new Api();
+
+  /** @private {!goog.events.EventTarget} */
+  this.apiEvents_ = this.api_.getEventTarget();
+
   /** @private {!cwc.utils.Events} */
   this.events_ = new cwc.utils.Events(this.name);
+
+  /** @private {!cwc.lib.protocol.bluetoothChrome.profile.Device} */
+  this.device_ = BluetoothProfile.MAKEBLOCK_MBOT_RANGER;
 };
 
 
 /**
- * Connects the mbot unit.
+ * Connects the mBot Ranger unit.
  * @export
  */
 cwc.mode.makeblock.mBotRanger.Connection.prototype.init = function() {
-  if (!this.connectMonitor) {
-    this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
-    this.events_.listen(this.connectMonitor, goog.Timer.TICK,
-      this.connect.bind(this));
+  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));
   }
 
-  // Unload event
   let layoutInstance = this.helper.getInstance('layout');
   if (layoutInstance) {
     this.events_.listen(layoutInstance.getEventTarget(),
@@ -78,13 +95,19 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.init = function() {
       false, this);
   }
 
+  if (!this.connectMonitor) {
+    this.connectMonitor = new goog.Timer(this.connectMonitorInterval);
+    this.events_.listen(this.connectMonitor, goog.Timer.TICK,
+      this.connect.bind(this));
+  }
+
   this.connectMonitor.start();
   this.connect();
 };
 
 
 /**
- * Connects the mbot ball.
+ * Connects the mBot Ranger robot.
  * @param {Event=} opt_event
  * @export
  */
@@ -95,12 +118,10 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.connect = function(
     return;
   }
   if (!this.isConnected()) {
-    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);
 };
 
 
@@ -169,6 +190,20 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.cleanUp = function() {
 };
 
 
+/**
+ * @param {Event|Object} e
+ * @private
+ */
+cwc.mode.makeblock.mBotRanger.Connection.prototype.handleConnecting_ =
+    function(e) {
+  let message = e.data;
+  let step = e.source;
+  let title = 'Connecting ' + this.device_.name;
+  let connectScreenInstance = this.helper.getInstance('connectScreen');
+  connectScreenInstance.showConnectingStep(title, message, step);
+};
+
+
 /**
  * @param {Event|Object} e
  * @private
@@ -179,3 +214,4 @@ cwc.mode.makeblock.mBotRanger.Connection.prototype.handlePreviewStatus_ =
     this.stop();
   }
 };
+});