0.0.13

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

editor/extension.ts

@@ -28,13 +28,33 @@ namespace pxt.editor {
 
     let initPromise: Promise<Ev3Wrapper>
     function initAsync() {
-        if (!initPromise)
+        if (initPromise)
+            return initPromise
+
+        let canHID = false
+        if (U.isNodeJS) {
+            canHID = true
+        } else {
+            const forceHexDownload = /forceHexDownload/i.test(window.location.href);
+            if (Cloud.isLocalHost() && Cloud.localToken && !forceHexDownload)
+                canHID = true
+        }
+
+        if (noHID)
+            canHID = false
+
+        if (canHID) {
             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 +136,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/core/_locales/core-jsdoc-strings.json

@@ -20,10 +20,33 @@
   "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.getCurrentSpeed": "Get motor speed.",
+  "output.getCurrentSpeed|param|out": "the output connection that the motor is connected to",
+  "output.getPattern": "Pattern block.",
+  "output.getPattern|param|pattern": "the lights pattern to use. eg: LightsPattern.Green",
   "output.setLights": "Set lights.",
+  "output.setLights|param|pattern": "the lights pattern to use.",
+  "output.setPower": "Set motor power.",
+  "output.setPower|param|out": "the output connection that the motor is connected to",
+  "output.setPower|param|power": "the desired power to use. eg: 100",
+  "output.setSpeed": "Set motor speed.",
+  "output.setSpeed|param|out": "the output connection that the motor is connected to",
+  "output.setSpeed|param|speed": "the desired speed to use. eg: 100",
+  "output.start": "Turn motor on.",
+  "output.start|param|out": "the output connection that the motor is connected to",
+  "output.stop": "Turn motor off.",
+  "output.stop|param|out": "the output connection that the motor is connected to",
+  "output.turn": "Turn a motor on for a specified number of milliseconds.",
+  "output.turn|param|ms": "the number of milliseconds to turn the motor on, eg: 500",
+  "output.turn|param|out": "the output connection that the motor is connected to",
+  "output.turn|param|useBrake": "whether or not to use the brake, defaults to false",
   "screen.clear": "Clear screen and reset font to normal.",
   "screen.doubleIcon": "Double size of an icon.",
   "screen.drawIcon": "Draw an icon on the screen.",
+  "screen.drawText": "Show text on the screen.",
+  "screen.drawText|param|text": "the text to print on the screen, eg: \"Hello world\"",
+  "screen.drawText|param|x": "the starting position's x coordinate, eg: 0",
+  "screen.drawText|param|y": "the starting position's x coordinate, eg: 0",
   "serial": "Reading and writing data over a serial connection.",
   "serial.writeDmesg": "Send DMESG debug buffer over serial."
 }

libs/core/_locales/core-strings.json

@@ -3,7 +3,7 @@
   "ButtonEvent.Down|block": "down",
   "ButtonEvent.LongClick|block": "long click",
   "ButtonEvent.Up|block": "up",
-  "control.raiseEvent|block": "raise event|from %src|with value value",
+  "control.raiseEvent|block": "raise event|from %src|with value %value",
   "control|block": "control",
   "input.buttonDown|block": "button down",
   "input.buttonEnter|block": "button enter",
@@ -16,13 +16,24 @@
   "input.remoteTopLeft|block": "remote top-left",
   "input.remoteTopRight|block": "remote top-right",
   "input|block": "input",
-  "output.setLights|block": "set lights %pattern",
+  "output.getCurrentSpeed|block": "motor %out|speed",
+  "output.getPattern|block": "%pattern",
+  "output.setLights|block": "set status light %pattern=led_pattern",
+  "output.setPower|block": "set motor %out| power to %power",
+  "output.setSpeed|block": "set motor %out| speed to %speed",
+  "output.start|block": "turn motor %out|on",
+  "output.stop|block": "turn motor %out|off",
+  "output.turn|block": "turn motor %out| on for %ms|milliseconds",
   "output|block": "output",
+  "screen.drawText|block": "print %text| at x: %x| y: %y",
   "screen|block": "screen",
   "serial|block": "serial",
   "{id:category}Control": "Control",
   "{id:category}Input": "Input",
   "{id:category}Output": "Output",
   "{id:category}Screen": "Screen",
-  "{id:category}Serial": "Serial"
+  "{id:category}Serial": "Serial",
+  "{id:group}Lights": "Lights",
+  "{id:group}Motors": "Motors",
+  "{id:group}Screen": "Screen"
 }

libs/core/buttons.ts

@@ -70,6 +70,7 @@ namespace input {
         //% blockGap=8
         //% parts="buttonpair"
         //% blockNamespace=input
+        //% group="Brick buttons"
         //% button.fieldEditor="gridpicker"
         //% button.fieldOptions.width=220
         //% button.fieldOptions.columns=3
@@ -86,6 +87,7 @@ namespace input {
         //% blockId=buttonWasPressed
         //% parts="buttonpair" blockGap=8
         //% blockNamespace=input advanced=true
+        //% group="Brick buttons"
         //% button.fieldEditor="gridpicker"
         //% button.fieldOptions.width=220
         //% button.fieldOptions.columns=3
@@ -105,6 +107,7 @@ namespace input {
         //% blockId=buttonEvent block="on %button|%event"
         //% parts="buttonpair"
         //% blockNamespace=input
+        //% group="Brick buttons"
         //% button.fieldEditor="gridpicker"
         //% button.fieldOptions.width=220
         //% button.fieldOptions.columns=3
@@ -215,9 +218,11 @@ namespace output {
 
     /**
      * Set lights.
+     * @param pattern the lights pattern to use.
      */
-    //% blockId=setLights block="set lights %pattern" 
-    export function setLights(pattern: LightsPattern): void {
+    //% blockId=setLights block="set status light %pattern=led_pattern"
+    //% weight=100 group="Lights"
+    export function setLights(pattern: number): void {
         if (currPattern === pattern)
             return
         currPattern = pattern
@@ -225,4 +230,16 @@ namespace output {
         cmd[0] = pattern + 48
         input.internal.getBtnsMM().write(cmd)
     }
+
+
+    /**
+     * Pattern block.
+     * @param pattern the lights pattern to use. eg: LightsPattern.Green
+     */
+    //% blockId=led_pattern block="%pattern"
+    //% shim=TD_ID colorSecondary="#6e9a36"
+    //% blockHidden=true
+    export function getPattern(pattern: LightsPattern): number {
+        return pattern;
+    }
 }

libs/core/control.cpp

@@ -9,7 +9,7 @@ namespace control {
  * @param mode optional definition of how the event should be processed after construction.
  */
 //% weight=21 blockGap=12 blockId="control_raise_event"
-//% block="raise event|from %src|with value value" blockExternalInputs=1
+//% block="raise event|from %src|with value %value" blockExternalInputs=1
 void raiseEvent(int src, int value) {
     pxt::raiseEvent(src, value);
 }

libs/core/output.ts

@@ -29,7 +29,7 @@ namespace output {
         pwmMM = control.mmap("/dev/lms_pwm", 0, 0)
         if (!pwmMM) control.fail("no PWM file")
         motorMM = control.mmap("/dev/lms_motor", MotorDataOff.Size * DAL.NUM_OUTPUTS, 0)
-        
+
         stop(Output.ALL)
 
         let buf = output.createBuffer(1)
@@ -42,6 +42,11 @@ namespace output {
         pwmMM.write(buf)
     }
 
+    function readPWM(buf: Buffer): void {
+        init()
+        pwmMM.read(buf);
+    }
+
     function mkCmd(out: Output, cmd: number, addSize: number) {
         let b = createBuffer(2 + addSize)
         b.setNumber(NumberFormat.UInt8LE, 0, cmd)
@@ -49,12 +54,43 @@ namespace output {
         return b
     }
 
-    export function stop(out: Output, useBreak = false) {
+    /**
+     * Turn a motor on for a specified number of milliseconds.
+     * @param out the output connection that the motor is connected to
+     * @param ms the number of milliseconds to turn the motor on, eg: 500
+     * @param useBrake whether or not to use the brake, defaults to false
+     */
+    //% blockId=output_turn block="turn motor %out| on for %ms|milliseconds"
+    //% weight=100 group="Motors"
+    export function turn(out: Output, ms: number, useBrake = false) {
+        // TODO: use current power / speed configuration
+        output.step(out, {
+            power: 100,
+            step1: 0,
+            step2: ms,
+            step3: 0,
+            useBrake: useBrake
+        })
+    }
+
+    /**
+     * Turn motor off.
+     * @param out the output connection that the motor is connected to
+     */
+    //% blockId=output_stop block="turn motor %out|off"
+    //% weight=90 group="Motors"
+    export function stop(out: Output, useBrake = false) {
         let b = mkCmd(out, DAL.opOutputStop, 1)
-        b.setNumber(NumberFormat.UInt8LE, 2, useBreak ? 1 : 0)
+        b.setNumber(NumberFormat.UInt8LE, 2, useBrake ? 1 : 0)
         writePWM(b)
     }
 
+    /**
+     * Turn motor on.
+     * @param out the output connection that the motor is connected to
+     */
+    //% blockId=output_start block="turn motor %out|on"
+    //% weight=95 group="Motors"
     export function start(out: Output) {
         let b = mkCmd(out, DAL.opOutputStart, 0)
         writePWM(b)
@@ -65,12 +101,72 @@ namespace output {
         writePWM(b)
     }
 
+    export function clearCount(out: Output) {
+        let b = mkCmd(out, DAL.opOutputClearCount, 0)
+        writePWM(b)
+        for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
+            if (out & (1 << i)) {
+                motorMM.setNumber(NumberFormat.Int32LE, i * MotorDataOff.Size + MotorDataOff.TachoSensor, 0)
+            }
+        }
+    }
+
+    function outOffset(out: Output) {
+        for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
+            if (out & (1 << i))
+                return i * MotorDataOff.Size
+        }
+        return 0
+    }
+
+    export interface MotorData {
+        actualSpeed: number; // -100..+100
+        tachoCount: number;
+        count: number;
+    }
+
+    // only a single output at a time
+    export function getMotorData(out: Output): MotorData {
+        let buf = motorMM.slice(outOffset(out), MotorDataOff.Size)
+        return {
+            actualSpeed: buf.getNumber(NumberFormat.Int8LE, MotorDataOff.Speed),
+            tachoCount: buf.getNumber(NumberFormat.Int32LE, MotorDataOff.TachoCounts),
+            count: buf.getNumber(NumberFormat.Int32LE, MotorDataOff.TachoSensor),
+        }
+    }
+
+    /**
+     * Get motor speed.
+     * @param out the output connection that the motor is connected to
+     */
+    //% blockId=output_getCurrentSpeed block="motor %out|speed"
+    //% weight=70 group="Motors"
+    export function getCurrentSpeed(out: Output) {
+        return getMotorData(out).actualSpeed;
+    }
+
+    /**
+     * Set motor speed.
+     * @param out the output connection that the motor is connected to
+     * @param speed the desired speed to use. eg: 100
+     */
+    //% blockId=output_setSpeed block="set motor %out| speed to %speed"
+    //% weight=81 group="Motors"
+    //% speed.min=-100 speed.max=100
     export function setSpeed(out: Output, speed: number) {
         let b = mkCmd(out, DAL.opOutputSpeed, 1)
         b.setNumber(NumberFormat.Int8LE, 2, Math.clamp(-100, 100, speed))
         writePWM(b)
     }
 
+    /**
+     * Set motor power.
+     * @param out the output connection that the motor is connected to
+     * @param power the desired power to use. eg: 100
+     */
+    //% blockId=output_setPower block="set motor %out| power to %power"
+    //% weight=80 group="Motors"
+    //% power.min=-100 power.max=100
     export function setPower(out: Output, power: number) {
         let b = mkCmd(out, DAL.opOutputPower, 1)
         b.setNumber(NumberFormat.Int8LE, 2, Math.clamp(-100, 100, power))
@@ -90,7 +186,7 @@ namespace output {
         step2: number;
         step3: number;
         useSteps?: boolean; // otherwise use milliseconds
-        useBreak?: boolean;
+        useBrake?: boolean;
     }
 
     export function step(out: Output, opts: StepOptions) {
@@ -110,7 +206,7 @@ namespace output {
         b.setNumber(NumberFormat.Int32LE, 4 + 4 * 0, opts.step1)
         b.setNumber(NumberFormat.Int32LE, 4 + 4 * 1, opts.step2)
         b.setNumber(NumberFormat.Int32LE, 4 + 4 * 2, opts.step3)
-        b.setNumber(NumberFormat.Int8LE, 4 + 4 * 3, opts.useBreak ? 1 : 0)
+        b.setNumber(NumberFormat.Int8LE, 4 + 4 * 3, opts.useBrake ? 1 : 0)
         writePWM(b)
     }
 

libs/core/screen.ts

@@ -84,8 +84,17 @@ namespace screen {
         if (0 <= x && x < DAL.LCD_WIDTH && 0 <= y && y < DAL.LCD_HEIGHT)
             _setPixel(x, y, mode)
     }
+    
 
-    export function drawText(x: number, y: number, text: string, mode = Draw.Normal) {
+    /**
+     * Show text on the screen.
+     * @param text the text to print on the screen, eg: "Hello world"
+     * @param x the starting position's x coordinate, eg: 0
+     * @param y the starting position's x coordinate, eg: 0
+     */
+    //% blockId=screen_drawText block="print %text| at x: %x| y: %y"
+    //% weight=99 group="Screen" blockNamespace=output inlineInputMode="inline"
+    export function drawText(text: string, x: number, y: number, mode = Draw.Normal) {
         x |= 0
         y |= 0
         if (!currFont) currFont = defaultFont()

libs/core/shims.d.ts

@@ -51,7 +51,7 @@ declare namespace control {
      * @param mode optional definition of how the event should be processed after construction.
      */
     //% weight=21 blockGap=12 blockId="control_raise_event"
-    //% block="raise event|from %src|with value value" blockExternalInputs=1 shim=control::raiseEvent
+    //% block="raise event|from %src|with value %value" blockExternalInputs=1 shim=control::raiseEvent
     function raiseEvent(src: int32, value: int32): void;
 
     /**

libs/core/test.ts

@@ -1,10 +1,10 @@
 screen.clear()
-screen.drawText(10, 30, "PXT!", Draw.Quad)
+screen.drawText("PXT!", 10, 30, Draw.Quad)
 
 screen.drawRect(40, 40, 20, 10, Draw.Fill)
 output.setLights(LightsPattern.Orange)
 
-screen.drawIcon(100, 50, screen.doubleIcon(screen.heart), Draw.Double|Draw.Transparent)
+screen.drawIcon(100, 50, screen.doubleIcon(screen.heart), Draw.Double | Draw.Transparent)
 
 input.buttonEnter.onEvent(ButtonEvent.Click, () => {
     screen.clear()
@@ -17,32 +17,32 @@ input.buttonLeft.onEvent(ButtonEvent.Click, () => {
 })
 
 input.buttonRight.onEvent(ButtonEvent.Click, () => {
-    screen.drawText(10, 60, "Right!")
+    screen.drawText("Right!", 10, 60)
 })
 
 input.buttonDown.onEvent(ButtonEvent.Click, () => {
-    screen.drawText(10, 60, "Down! ")
+    screen.drawText("Down! ", 10, 60)
 })
 
 input.buttonUp.onEvent(ButtonEvent.Click, () => {
-    screen.drawText(10, 60, "Up!  ")
+    screen.drawText("Up!  ", 10, 60)
 })
 
 
 let num = 0
 
 input.touchSensor.onEvent(ButtonEvent.Click, () => {
-    screen.drawText(10, 60, "Click!  " + num)
+    screen.drawText("Click!  " + num, 10, 60)
     num++
 })
 
 input.remoteTopLeft.onEvent(ButtonEvent.Click, () => {
-    screen.drawText(10, 60, "TOPLEFT " + num)
+    screen.drawText("TOPLEFT " + num, 10, 60)
     num++
 })
 
 input.remoteTopRight.onEvent(ButtonEvent.Down, () => {
-    screen.drawText(10, 60, "TOPRIGH " + num)
+    screen.drawText("TOPRIGH " + num, 10, 60)
     num++
 })
 

libs/ev3/ns.ts

@@ -1,9 +1,11 @@
 
 //% color="#D42878"
+//% groups="['Brick buttons']"
 namespace input {
 }
 
 //% color="#8AC044" weight=90 icon="\uf185"
+//% groups="['Lights', 'Screen', Motors']"
 namespace output {
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.4",
+  "version": "0.0.13",
   "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": "2.0.2"
+    "pxt-common-packages": "0.9.2",
+    "pxt-core": "2.0.9"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"