0.0.10

README.md

@@ -9,12 +9,12 @@ This repo contains the editor target hosted at https://lego.makecode.com
 These instructions assume familiarity with dev tools and languages.
 
 * install Node.js 6+
-* install [yotta](http://docs.yottabuild.org/#installing)
+* install Docker; make sure `docker` command is in your `PATH`
 * (optional) install [Visual Studio Code](https://code.visualstudio.com/)
 
 In a common folder,
 
-* clone https://github.com/Microsoft/pxt to ``pxt`` folder
+* clone https://github.com/Microsoft/pxt to ``pxt`` folder (currently, build against `freshcoat` branch)
 * clone https://github.com/Microsoft/pxt-common-packages to ``pxt-common-packages`` folder
 * clone https://github.com/Microsoft/pxt-ev3 to ``pxt-ev3`` folder
 * go to ``pxt`` and run

docfiles/robotsmeta.html

@@ -0,0 +1 @@
+<meta name="robots" content="noindex">

editor/extension.ts

@@ -28,13 +28,18 @@ namespace pxt.editor {
 
     let initPromise: Promise<Ev3Wrapper>
     function initAsync() {
-        if (!initPromise)
+        const forceHexDownload = /forceHexDownload/i.test(window.location.href);
+        if (!initPromise && Cloud.isLocalHost() && Cloud.localToken && !forceHexDownload)
             initPromise = hf2Async()
                 .catch(err => {
                     initPromise = null
                     noHID = true
                     return Promise.reject(err)
                 })
+        else {
+            noHID = true
+            initPromise = Promise.reject(new Error("no HID"))
+        }
         return initPromise
     }
 
@@ -116,13 +121,9 @@ namespace pxt.editor {
         const res: pxt.editor.ExtensionResult = {
             deployCoreAsync,
         };
-        initAsync()
-        /*
-            .then(w => w.streamFileAsync("/tmp/serial.txt", buf => {
-                let str = Util.fromUTF8(Util.uint8ArrayToString(buf))
-                
-            }))
-        */
+        initAsync().catch(e => {
+            // probably no HID - we'll try this again upon deployment
+        })
         return Promise.resolve<pxt.editor.ExtensionResult>(res);
     }
 }

libs/base/_locales/base-jsdoc-strings.json

@@ -1,4 +1,37 @@
 {
+  "Array": "Add, remove, and replace items in lists.\n\nAdd, remove, and replace items in lists.",
+  "Array.filter": "Returns the elements of an array that meet the condition specified in a callback function.",
+  "Array.filter|param|callbackfn": "A function that accepts up to two arguments. The filter method calls the callbackfn function one time for each element in the array.",
+  "Array.get": "Gets the value at a particular index",
+  "Array.get|param|index": "the zero-based position in the list of the item, eg: 0",
+  "Array.indexOf": "Returns the index of the first occurrence of a value in an array.",
+  "Array.indexOf|param|fromIndex": "The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0.",
+  "Array.indexOf|param|item": "The value to locate in the array.",
+  "Array.insertAt": "Insert the value at a particular index, increases length by 1",
+  "Array.insertAt|param|index": "the zero-based position in the list to insert the value, eg: 0",
+  "Array.length": "Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.",
+  "Array.map": "Calls a defined callback function on each element of an array, and returns an array that contains the results.",
+  "Array.map|param|callbackfn": "A function that accepts up to two arguments. The map method calls the callbackfn function one time for each element in the array.",
+  "Array.pop": "Removes the last element from an array and returns it.",
+  "Array.push": "Appends new elements to an array.",
+  "Array.reduce": "Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.",
+  "Array.reduce|param|callbackfn": "A function that accepts up to three arguments. The reduce method calls the callbackfn function one time for each element in the array.",
+  "Array.reduce|param|initialValue": "Initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.",
+  "Array.removeAt": "Removes the object at position index.",
+  "Array.removeElement": "Removes the first occurence of an object. Returns true if removed.",
+  "Array.reverse": "Reverses the elements in an Array. The first array element becomes the last, and the last array element becomes the first.",
+  "Array.set": "Stores the value at a particular index",
+  "Array.set|param|index": "the zero-based position in the list to store the value, eg: 0",
+  "Array.shift": "Removes the first element from an array and returns that element. This method changes the length of the array.",
+  "Array.slice": "Returns a section of an array.",
+  "Array.slice|param|end": "The end of the specified portion of the array. eg: 0",
+  "Array.slice|param|start": "The beginning of the specified portion of the array. eg: 0",
+  "Array.sort": "Sorts the elements of an array in place and returns the array. The sort is not necessarily stable.",
+  "Array.splice": "Removes elements from an array.",
+  "Array.splice|param|deleteCount": "The number of elements to remove. eg: 0",
+  "Array.splice|param|start": "The zero-based location in the array from which to start removing elements. eg: 0",
+  "Array.unshift": "Adds one element to the beginning of an array and returns the new length of the array.",
+  "Math": "More complex operations with numbers.",
   "Math.abs": "Returns the absolute value of a number (the value without regard to whether it is positive or negative).\nFor example, the absolute value of -5 is the same as the absolute value of 5.",
   "Math.abs|param|x": "A numeric expression for which the absolute value is needed.",
   "Math.acos": "Returns the arccosine (in radians) of a number",
@@ -58,6 +91,7 @@
   "Math.tan|param|x": "An angle in radians",
   "Math.trunc": "Returns the number with the decimal part truncated.",
   "Math.trunc|param|x": "A numeric expression.",
+  "String": "Combine, split, and search text strings.\n\nCombine, split, and search text strings.",
   "String.charAt": "Returns the character at the specified index.",
   "String.charAt|param|index": "The zero-based index of the desired character.",
   "String.charCodeAt": "Returns the Unicode value of the character at the specified location.",

libs/base/_locales/base-strings.json

@@ -1,4 +1,14 @@
 {
+  "Array.indexOf|block": "%list| find index of %value",
+  "Array.insertAt|block": "%list| insert at %index| value %value",
+  "Array.length|block": "length of %VALUE",
+  "Array.pop|block": "get and remove last value from %list",
+  "Array.push|block": "%list| add value %value| to end",
+  "Array.removeAt|block": "%list| remove value at %index",
+  "Array.reverse|block": "reverse %list",
+  "Array.shift|block": "get and remove first value from %list",
+  "Array.unshift|block": "%list| insert %value| at beginning",
+  "Array|block": "Array",
   "Math.constrain|block": "constrain %value|between %low|and %high",
   "Math.map|block": "map %value|from low %fromLow|from high %fromHigh|to low %toLow|to high %toHigh",
   "Math.randomRange|block": "pick random %min|to %limit",
@@ -27,6 +37,8 @@
   "serial.writeString|block": "serial|write string %text",
   "serial.writeValue|block": "serial|write value %name|= %value",
   "serial|block": "serial",
+  "{id:category}Array": "Array",
+  "{id:category}Arrays": "Arrays",
   "{id:category}Control": "Control",
   "{id:category}Loops": "Loops",
   "{id:category}Math": "Math",

libs/core/_locales/core-jsdoc-strings.json

@@ -20,6 +20,7 @@
   "input.remoteTopRight": "Remote top-right button.",
   "output.createBuffer": "Create a new zero-initialized buffer.",
   "output.createBuffer|param|size": "number of bytes in the buffer",
+  "output.getPattern": "Pattern block.",
   "output.setLights": "Set lights.",
   "screen.clear": "Clear screen and reset font to normal.",
   "screen.doubleIcon": "Double size of an icon.",

libs/core/_locales/core-strings.json

@@ -16,7 +16,8 @@
   "input.remoteTopLeft|block": "remote top-left",
   "input.remoteTopRight|block": "remote top-right",
   "input|block": "input",
-  "output.setLights|block": "set lights %pattern",
+  "output.getPattern|block": "%pattern",
+  "output.setLights|block": "set lights %pattern=led_pattern",
   "output|block": "output",
   "screen|block": "screen",
   "serial|block": "serial",

libs/core/buttons.ts

@@ -216,8 +216,8 @@ namespace output {
     /**
      * Set lights.
      */
-    //% blockId=setLights block="set lights %pattern" 
-    export function setLights(pattern: LightsPattern): void {
+    //% blockId=setLights block="set lights %pattern=led_pattern" 
+    export function setLights(pattern: number): void {
         if (currPattern === pattern)
             return
         currPattern = pattern
@@ -225,4 +225,15 @@ namespace output {
         cmd[0] = pattern + 48
         input.internal.getBtnsMM().write(cmd)
     }
+
+
+    /**
+     * Pattern block.
+     */
+    //% blockId=led_pattern block="%pattern"
+    //% shim=TD_ID colorSecondary="#6e9a36"
+    //% blockHidden=true
+    export function getPattern(pattern: LightsPattern): number {
+        return pattern;
+    }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.1",
+  "version": "0.0.10",
   "description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
   "private": true,
   "keywords": [
@@ -39,8 +39,8 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-common-packages": "0.9.1",
-    "pxt-core": "1.8.10"
+    "pxt-common-packages": "0.9.2",
+    "pxt-core": "2.0.6"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

theme/style.less

@@ -73,10 +73,6 @@ div.blocklyTreeRow {
     box-shadow: inset 0px 0px 0px 3px rgba(0,0,0,0.1);
 }
 
-div.blocklyTreeRoot div div div div div.blocklyTreeRow {
-    padding-top: 0.5rem !important;
-}
-
 /* Remove shadow around blockly blocks */
 .blocklyPathDark, .blocklyPathLight {
     display: none;
@@ -98,11 +94,12 @@ span.blocklyTreeLabel {
 }
 
 /* Editor menu toggle */
-#menubar .ui.menu .item.editor-menuitem {
+#menubar .ui.menu.fixed .item.editor-menuitem .ui.grid {
     background: @blue !important;
 }
-#menubar .ui.menu .item.editor-menuitem .item {
-    color: white !important;
+
+#menubar .ui.menu.fixed .ui.item.editor-menuitem .item:not(.active) {
+    color: white;
 }
 
 /* Search box */
@@ -124,11 +121,6 @@ span.blocklyTreeLabel {
     #filelist {
         background: transparent;
     }
-    div.blocklyTreeRow {
-        padding-bottom: 2rem !important;
-        min-height: @blocklyRowHeightMobile;
-        line-height: @blocklyRowHeightMobile/2;
-    }
     #blocklyTrashIcon {
         margin: 0.2rem;
     }
@@ -136,29 +128,14 @@ span.blocklyTreeLabel {
 
 /* Tablet */
 @media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) {
-    div.blocklyTreeRow {
-        padding-left: 0.5rem !important;
-        min-height: @blocklyRowHeightTablet;
-        line-height: @blocklyRowHeightTablet/2;
-    }
 }
 
 /* Small Monitor */
 @media only screen and (min-width: @computerBreakpoint) and (max-width: @largestSmallMonitor) {
-    div.blocklyTreeRow {
-        padding-left: 0.5rem !important;
-        min-height: @blocklyRowHeightComputer;
-        line-height: @blocklyRowHeightComputer/2;
-    }
 }
 
 /* Large Monitor */
 @media only screen and (min-width: @largeMonitorBreakpoint) {
-    div.blocklyTreeRow {
-        padding-left: 0.5rem !important;
-        min-height: @blocklyRowHeightWide;
-        line-height: @blocklyRowHeightWide/2;
-    }
 }
 /* Mobile, Tablet AND thin screen */
 @media only screen and (max-width: @largestTabletScreen) and (max-height: @thinEditorBreakpoint) {