Merge pull request #159 from MediaTek-Labs/dev

Dev
MediaTek-Labs · Jul 24, 2017 · a3d537a · a3d537a
2 parents 002e7ba + a9eee77
commit a3d537a
Show file tree

Hide file tree

Showing 10 changed files with 2,544 additions and 2,540 deletions.
diff --git a/blockly/arduino_compressed.js b/blockly/arduino_compressed.js
diff --git a/blockly/blockly_uncompressed.js b/blockly/blockly_uncompressed.js
diff --git a/blockly/blocks_compressed.js b/blockly/blocks_compressed.js
diff --git a/blockly/generators/arduino/linkit.js b/blockly/generators/arduino/linkit.js
@@ -70,6 +70,10 @@ Blockly.Arduino.linkit_ble_eddy = function () {
   var url = Blockly.Arduino.valueToCode(this, 'URL', Blockly.Arduino.ORDER_ATOMIC) || ''
   var protocol = this.getFieldValue('TYPE');
   url = url.replace(/\"/g, "");
+
+  Blockly.Arduino.definitions_['define_linkit_ble_include'] = '#include <LBLE.h>';
+  Blockly.Arduino.definitions_['define_linkit_ble_periphral_include'] = '#include <LBLEPeriphral.h>';
+
   var code = "LBLEAdvertisementData beaconData;\n\n";
   if(protocol == "http"){
     if(url.length <= 17)  code += 'beaconData.configAsEddystoneURL(EDDY_HTTP, "'+url+'");\n\n';

diff --git a/blockly/i18n/common.pyc b/blockly/i18n/common.pyc
diff --git a/blockly/msg/json/en.json b/blockly/msg/json/en.json
@@ -1,7 +1,7 @@
 {
 	"@metadata": {
 		"author": "Ellen Spertus <[email protected]>",
-		"lastupdated": "2017-07-14 15:40:28.823008",
+		"lastupdated": "2017-07-24 08:50:31.435951",
 		"locale": "en",
 		"messagedocumentation" : "qqq"
 	},

diff --git a/closure-library/closure/bin/calcdeps.pyc b/closure-library/closure/bin/calcdeps.pyc
diff --git a/offline-editor/js/arduino_compressed.js b/offline-editor/js/arduino_compressed.js
diff --git a/offline-editor/js/blocks_compressed.js b/offline-editor/js/blocks_compressed.js
diff --git a/offline-editor/manifest.json b/offline-editor/manifest.json
@@ -43,6 +43,6 @@
     "alarms"
   ],
   "update_url": "https://raw.githubusercontent.com/MediaTek-Labs/BlocklyDuino-for-LinkIt/master/offline-editor/manifest.json",
-  "version": "2.12.1",
-  "version_name": "2.12.1"
+  "version": "2.13.0",
+  "version_name": "2.13.0"
 }