From 5f5bdd7294b7c551df1cc4bf0ed0291519eb8600 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 13 Oct 2019 00:35:20 -0700 Subject: [PATCH 01/13] blink fix (#949) --- libs/color-sensor/color.ts | 2 -- libs/core/input.ts | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/color-sensor/color.ts b/libs/color-sensor/color.ts index ef7fc9fe..90105692 100644 --- a/libs/color-sensor/color.ts +++ b/libs/color-sensor/color.ts @@ -1,5 +1,4 @@ const enum ColorSensorMode { - None = 0, //% block="reflected light intensity" ReflectedLightIntensity = 0, //% block="ambient light intensity" @@ -59,7 +58,6 @@ namespace sensors { constructor(port: number) { super(port) - this._setMode(ColorSensorMode.None); this.thresholdDetector = new sensors.ThresholdDetector(this.id()); this.calibrating = false; } diff --git a/libs/core/input.ts b/libs/core/input.ts index 44c2d4ef..2841eb0e 100644 --- a/libs/core/input.ts +++ b/libs/core/input.ts @@ -275,21 +275,23 @@ void cUiUpdatePower(void) const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS) let r = 0; for (let i = 0; i < conns.length; ++i) { - r = (r << 8 | conns[i]); + r = conns[i] + (r << 6) + (r << 16) - r; } return r; } let nonActivated = 0; function detectDevices() { - //control.dmesg(`detect devices (${nonActivated} na)`) + control.dmesg(`detect devices (hash ${hashDevices()})`) const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS) let numChanged = 0; const uartSensors: SensorInfo[] = []; for (const sensorInfo of sensorInfos) { const newConn = conns[sensorInfo.port] - if (newConn == sensorInfo.connType) { + if (newConn == sensorInfo.connType + && sensorInfo.sensor + && sensorInfo.sensor.isActive()) { // control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`) continue; } @@ -425,11 +427,11 @@ void cUiUpdatePower(void) constructor(port: number) { super(port) this.mode = 0 - this.realmode = 0 + this.realmode = -1 } _activated() { - this.realmode = 0 + this.realmode = -1 this._setMode(this.mode) } @@ -456,7 +458,7 @@ void cUiUpdatePower(void) reset() { if (this.isActive()) uartReset(this._port); - this.realmode = 0; + this.realmode = -1; } } From ec900f805e6f7cc82184c833139d81d6b1616ea2 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 13 Oct 2019 00:35:47 -0700 Subject: [PATCH 02/13] 1.2.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cdaecd01..15230af2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-ev3", - "version": "1.2.22", + "version": "1.2.23", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "private": false, "keywords": [ From 00194d4aa68010665f521f0441133654b8f4a1b2 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 13 Oct 2019 00:36:00 -0700 Subject: [PATCH 03/13] 1.2.24 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15230af2..d29a2830 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-ev3", - "version": "1.2.23", + "version": "1.2.24", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "private": false, "keywords": [ From 8bd884e155910679162c850c2ad44f356cb06363 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 16 Oct 2019 21:23:14 -0700 Subject: [PATCH 04/13] bump blockly --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1c370819..977eb49b 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "@types/web-bluetooth": "0.0.4" }, "dependencies": { - "pxt-common-packages": "6.16.10", - "pxt-core": "5.25.13" + "pxt-common-packages": "6.16.11", + "pxt-core": "5.25.16" }, "scripts": { "test": "node node_modules/pxt-core/built/pxt.js travis" From 6a577287c11f0fc8fe90839312bf7ccbbe7c7d7c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 16 Oct 2019 21:24:06 -0700 Subject: [PATCH 05/13] 1.4.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 977eb49b..dd16a459 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-ev3", - "version": "1.4.7", + "version": "1.4.8", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "private": false, "keywords": [ From 5c47ce2f9133930318431fe80767213afc1326e5 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 18 Oct 2019 22:53:17 -0700 Subject: [PATCH 06/13] add stable path --- docs/stable-ref.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/stable-ref.json diff --git a/docs/stable-ref.json b/docs/stable-ref.json new file mode 100644 index 00000000..8c795df2 --- /dev/null +++ b/docs/stable-ref.json @@ -0,0 +1,3 @@ +{ + "appref": "v1.2" +} From bc4b71e0d6b1827b0ebe37ea33eb3c8d7c1f5bd5 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 18 Oct 2019 22:53:30 -0700 Subject: [PATCH 07/13] Pulling updates from master (#951) * show ports on start * don't run show ports automatically * polarity in synched motor (#945) * account for polarity * more comments * handle dual motor in runtime * invert steer * don't use firmware polarity * add block to stop program (#943) * add block to stop program * renaming * fix translation --- docs/reference/brick/exit-program.md | 18 ++++++++++ fieldeditors/field_motors.ts | 6 ++-- libs/core/battery.ts | 1 + libs/core/buttons.ts | 2 +- libs/core/input.ts | 8 +++-- libs/core/output.ts | 18 ++++++---- libs/ev3/brick.ts | 13 ++++++++ libs/ev3/ns.ts | 2 +- libs/ev3/pxt.json | 3 +- libs/ev3/startup.ts | 8 ++--- libs/screen/targetoverrides.ts | 49 +++++++++++++++++++++------- sim/state/motornode.ts | 13 +------- sim/state/output.ts | 6 +--- 13 files changed, 97 insertions(+), 50 deletions(-) create mode 100644 docs/reference/brick/exit-program.md create mode 100644 libs/ev3/brick.ts diff --git a/docs/reference/brick/exit-program.md b/docs/reference/brick/exit-program.md new file mode 100644 index 00000000..5500d77c --- /dev/null +++ b/docs/reference/brick/exit-program.md @@ -0,0 +1,18 @@ +# exit Program + +Stops the program and returns to the brick menu + +```sig +brick.exitProgram(); +``` + +## Example + +Do a sequence of motor commands and stop the program. + +```blocks +motors.largeA.run(50) +pause(500) +motors.stopAll() +brick.exitProgram(); +``` \ No newline at end of file diff --git a/fieldeditors/field_motors.ts b/fieldeditors/field_motors.ts index e24d3338..a9212afd 100644 --- a/fieldeditors/field_motors.ts +++ b/fieldeditors/field_motors.ts @@ -149,9 +149,9 @@ export class FieldMotors extends Blockly.FieldDropdown implements Blockly.FieldC getFirstValueI11n(value: string) { const firstValue = this.getFirstValue(value); const motorOptions = { - 'medium motor': lf('medium motor'), - 'large motor': lf('large motor'), - 'large motors': lf('large motors') + 'medium motor': lf("medium motor"), + 'large motor': lf("large motor"), + 'large motors': lf("large motors") } return motorOptions[firstValue]; } diff --git a/libs/core/battery.ts b/libs/core/battery.ts index dc26f5fb..eef02ff7 100644 --- a/libs/core/battery.ts +++ b/libs/core/battery.ts @@ -26,6 +26,7 @@ namespace brick { */ //% blockId=brickBatteryProperty block="battery %property" //% group="Battery" + //% blockGap=8 //% help=brick/battery-property export function batteryInfo(property: BatteryProperty): number { const info = sensors.internal.getBatteryInfo(); diff --git a/libs/core/buttons.ts b/libs/core/buttons.ts index 134ef4e7..3033d3c0 100644 --- a/libs/core/buttons.ts +++ b/libs/core/buttons.ts @@ -85,7 +85,7 @@ namespace brick { //% blockId=buttonIsPressed //% parts="brick" //% blockNamespace=brick - //% weight=81 blockGap=8 + //% weight=81 //% group="Buttons" //% button.fieldEditor="brickbuttons" isPressed() { diff --git a/libs/core/input.ts b/libs/core/input.ts index 2841eb0e..c1f8d715 100644 --- a/libs/core/input.ts +++ b/libs/core/input.ts @@ -104,7 +104,7 @@ namespace sensors.internal { } } - function init() { + export function init() { if (sensorInfos) return sensorInfos = [] for (let i = 0; i < DAL.NUM_INPUTS; ++i) sensorInfos.push(new SensorInfo(i)) @@ -137,6 +137,7 @@ namespace sensors.internal { buf[UartCtlOff.Port] = port buf[UartCtlOff.Mode] = mode uartMM.ioctl(IO.UART_READ_MODE_INFO, buf) + control.dmesg(`UART_READ_MODE_INFO ${buf.toHex()}`) return buf //let info = `t:${buf[TypesOff.Type]} c:${buf[TypesOff.Connection]} m:${buf[TypesOff.Mode]} n:${buf.slice(0, 12).toHex()}` //serial.writeLine("UART " + port + " / " + mode + " - " + info) @@ -558,7 +559,7 @@ void cUiUpdatePower(void) } function setUartModes() { - control.dmesg(`UART set modes`) + control.dmesg(`UART set modes ${devcon.toHex()}`) uartMM.ioctl(IO.UART_SET_CONN, devcon) const ports: number[] = []; for (let port = 0; port < DAL.NUM_INPUTS; ++port) { @@ -570,7 +571,7 @@ void cUiUpdatePower(void) while (ports.length) { const port = ports.pop(); const status = waitNonZeroUartStatus(port) - control.dmesg(`UART set mode ${status} at ${port}`); + control.dmesg(`UART status ${status} at ${port}`); } } @@ -586,6 +587,7 @@ void cUiUpdatePower(void) while (true) { if (port < 0) return updateUartMode(port, mode); + control.dmesg(`UART_SET_CONN ${devcon.toHex()}`) uartMM.ioctl(IO.UART_SET_CONN, devcon) let status = waitNonZeroUartStatus(port) if (status & UART_PORT_CHANGED) { diff --git a/libs/core/output.ts b/libs/core/output.ts index cba65479..ea431c00 100644 --- a/libs/core/output.ts +++ b/libs/core/output.ts @@ -55,7 +55,7 @@ namespace motors { Size = 12 } - function init() { + export function init() { if (pwmMM) return pwmMM = control.mmap("/dev/lms_pwm", 0, 0) if (!pwmMM) control.fail("no PWM file") @@ -159,6 +159,7 @@ namespace motors { private _accelerationTime: number; private _decelerationSteps: number; private _decelerationTime: number; + private _inverted: boolean; protected static output_types: number[] = [0x7, 0x7, 0x7, 0x7]; @@ -176,6 +177,7 @@ namespace motors { this._accelerationTime = 0; this._decelerationSteps = 0; this._decelerationTime = 0; + this._inverted = false; } /** @@ -225,9 +227,11 @@ namespace motors { //% help=motors/motor/set-inverted setInverted(inverted: boolean) { this.init(); - const b = mkCmd(this._port, DAL.opOutputPolarity, 1) - b.setNumber(NumberFormat.Int8LE, 2, inverted ? 0 : 1); - writePWM(b) + this._inverted = inverted; + } + + protected invertedFactor(): number { + return this._inverted ? -1 : 1; } /** @@ -294,8 +298,9 @@ namespace motors { } private normalizeSchedule(speed: number, step1: number, step2: number, step3: number, unit: MoveUnit): MoveSchedule { + // motor polarity is not supported at the firmware level for sync motor operations const r: MoveSchedule = { - speed: Math.clamp(-100, 100, speed >> 0), + speed: Math.clamp(-100, 100, speed | 0) * this.invertedFactor(), useSteps: true, steps: [step1 || 0, step2 || 0, step3 || 0] } @@ -562,6 +567,7 @@ namespace motors { private __init() { this.setOutputType(this._large); + this.setInverted(false); } /** @@ -741,7 +747,7 @@ namespace motors { //% help=motors/synced/steer steer(turnRatio: number, speed: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) { this.init(); - speed = Math.clamp(-100, 100, speed >> 0); + speed = Math.clamp(-100, 100, speed >> 0) * this.invertedFactor(); if (!speed) { this.stop(); return; diff --git a/libs/ev3/brick.ts b/libs/ev3/brick.ts new file mode 100644 index 00000000..16c073ef --- /dev/null +++ b/libs/ev3/brick.ts @@ -0,0 +1,13 @@ +namespace brick { + /** + * Exits the program to the main menu. (in the simulator restarts it) + */ + //% blockId=loopstop block="exit program" + //% help=reference/brick/exit-program + //% weight=10 + //% blockGap=8 + //% group="Buttons" + export function exitProgram() { + control.reset(); + } +} \ No newline at end of file diff --git a/libs/ev3/ns.ts b/libs/ev3/ns.ts index 71c4dfe4..89e02bc1 100644 --- a/libs/ev3/ns.ts +++ b/libs/ev3/ns.ts @@ -1,6 +1,6 @@ //% color="#68C3E2" weight=100 icon="\uf106" -//% groups='["Buttons", "Screen", "Battery"]' +//% groups='["Buttons", "Screen", "Power"]' //% labelLineWidth=60 namespace brick { } diff --git a/libs/ev3/pxt.json b/libs/ev3/pxt.json index 1f7c4746..a54af080 100644 --- a/libs/ev3/pxt.json +++ b/libs/ev3/pxt.json @@ -2,8 +2,9 @@ "name": "ev3", "description": "The EV3 library", "files": [ - "README.md", + "README.md", "ns.ts", + "brick.ts", "startup.ts", "images.jres", "images.ts", diff --git a/libs/ev3/startup.ts b/libs/ev3/startup.ts index 93941d60..8a48a002 100644 --- a/libs/ev3/startup.ts +++ b/libs/ev3/startup.ts @@ -2,9 +2,5 @@ console.addListener(function(msg: string) { control.dmesg(msg.substr(0, msg.length - 1)) }) -// pulse green, play startup sound, turn off light -brick.setStatusLight(StatusLight.GreenPulse); -// We pause for 100ms to give time to read sensor values, so they work in on_start block -pause(400) -// and we're ready -brick.setStatusLight(StatusLight.Off); + +brick.showBoot(); \ No newline at end of file diff --git a/libs/screen/targetoverrides.ts b/libs/screen/targetoverrides.ts index 3cb991c9..53cb1742 100644 --- a/libs/screen/targetoverrides.ts +++ b/libs/screen/targetoverrides.ts @@ -129,8 +129,8 @@ namespace brick { screenMode = ScreenMode.Ports; renderPorts(); - control.runInParallel(function() { - while(screenMode == ScreenMode.Ports) { + control.runInParallel(function () { + while (screenMode == ScreenMode.Ports) { renderPorts(); pause(50); } @@ -140,8 +140,20 @@ namespace brick { function renderPorts() { const col = 44; const lineHeight8 = image.font8.charHeight + 2; + const h = screen.height; + const w = screen.width; + const blink = (control.millis() >> 5) % (h - 1); + clearScreen(); + for (let i = 0; i < 4; ++i) { + const x = i * col + 2; + screen.print("ABCD"[i], x, 1 * lineHeight8, 1, image.font8) + screen.print((i + 1).toString(), x, h - lineHeight8, 1, image.font8) + } + screen.drawLine(0, 5 * lineHeight8, screen.width, 5 * lineHeight8, 1); + screen.drawLine(0, h - 5 * lineHeight8, screen.width, h - 5 * lineHeight8, 1) + function scale(x: number) { if (Math.abs(x) >= 5000) { const k = Math.floor(x / 1000); @@ -155,25 +167,38 @@ namespace brick { const datas = motors.getAllMotorData(); for (let i = 0; i < datas.length; ++i) { const data = datas[i]; + const x = i * col + 2; if (!data.actualSpeed && !data.count) continue; - const x = i * col; - screen.print("ABCD"[i], x + 2, 1 * lineHeight8, 1, image.font8) - screen.print(`${scale(data.actualSpeed)}%`, x + 2, 3 * lineHeight8, 1, image.font8) - screen.print(`${scale(data.count)}>`, x + 2, 4 * lineHeight8, 1, image.font8) + screen.print(`${scale(data.actualSpeed)}%`, x, 3 * lineHeight8, 1, image.font8) + screen.print(`${scale(data.count)}>`, x, 4 * lineHeight8, 1, image.font8) } - screen.drawLine(0, 5 * lineHeight8, screen.width, 5 * lineHeight8, 1); // sensors const sis = sensors.internal.getActiveSensors(); - const h = screen.height; - screen.drawLine(0, h - 5 * lineHeight8, screen.width, h - 5 * lineHeight8, 1) for (let i = 0; i < sis.length; ++i) { const si = sis[i]; - const x = (si.port() - 1) * col; + const x = (si.port() - 1) * col + 2; const inf = si._info(); - screen.print(si.port() + "", x, h - 4 * lineHeight8, 1, image.font8) - screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : image.font8); + if (inf) + screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : image.font8); } + + // alive dot + screen.setPixel(w - 1, blink, 1); + screen.setPixel(w - 1, blink - 1, 1); + screen.setPixel(w - 2, blink - 1, 1); + screen.setPixel(w - 2, blink, 1); + } + + export function showBoot() { + // pulse green, play startup sound, turn off light + brick.setStatusLight(StatusLight.GreenPulse); + // We pause for 100ms to give time to read sensor values, so they work in on_start block + sensors.internal.init(); + motors.init(); + pause(800); + // and we're ready + brick.setStatusLight(StatusLight.Off); } /** diff --git a/sim/state/motornode.ts b/sim/state/motornode.ts index 15c0fb2f..6cc34bb7 100644 --- a/sim/state/motornode.ts +++ b/sim/state/motornode.ts @@ -9,7 +9,6 @@ namespace pxsim { private angle: number = 0; private tacho: number = 0; private speed: number = 0; - private polarity: number = 1; // -1, 1 or -1 private started: boolean; private speedCmd: DAL; @@ -31,7 +30,7 @@ namespace pxsim { } getSpeed() { - return Math.round(this.speed * (!this._synchedMotor && this.polarity == 0 ? -1 : 1)); + return Math.round(this.speed); } getAngle() { @@ -82,16 +81,6 @@ namespace pxsim { return this.id == NodeType.LargeMotor; } - setPolarity(polarity: number) { - // Either 1 or 255 (reverse) - /* - -1 : Motor will run backward - 0 : Motor will run opposite direction - 1 : Motor will run forward - */ - this.polarity = polarity; - } - reset() { // not sure what reset does... } diff --git a/sim/state/output.ts b/sim/state/output.ts index b3d10bbf..e059e318 100644 --- a/sim/state/output.ts +++ b/sim/state/output.ts @@ -119,11 +119,7 @@ namespace pxsim { return 2; } case DAL.opOutputPolarity: { - // reverse - const port = buf.data[1]; - const polarity = pxsim.BufferMethods.getNumber(buf, BufferMethods.NumberFormat.Int8LE, 2); - const motors = ev3board().getMotor(port); - motors.forEach(motor => motor.setPolarity(polarity)); + console.error("opOutputPolarity not supported"); return 2; } case DAL.opOutputSetType: { From 1d5d18dc88dc89893c2d328faf35ea4177b111b4 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 18 Oct 2019 22:53:46 -0700 Subject: [PATCH 08/13] 1.2.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d29a2830..c422699d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-ev3", - "version": "1.2.24", + "version": "1.2.25", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "private": false, "keywords": [ From 62b5941143f9421ce2ed9bb2a87bbabf93972aaa Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 20 Oct 2019 09:02:17 -0700 Subject: [PATCH 09/13] is color detected (#952) * added query function * reshuffle --- libs/color-sensor/color.ts | 16 ++++++++++ .../sensors/color-sensor/is-color-detected.md | 30 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 libs/color-sensor/docs/reference/sensors/color-sensor/is-color-detected.md diff --git a/libs/color-sensor/color.ts b/libs/color-sensor/color.ts index 90105692..9883b0d8 100644 --- a/libs/color-sensor/color.ts +++ b/libs/color-sensor/color.ts @@ -179,6 +179,22 @@ namespace sensors { return this.getNumber(NumberFormat.UInt8LE, 0) } + /** + * Checks the color is being detected + * @param color the color to detect + */ + //% help=sensors/color-sensor/is-color-detected + //% block="is **color sensor** %this|detected|%color=colorEnumPicker" + //% blockId=colorisColorDetectedDetected + //% parts="colorsensor" + //% blockNamespace=sensors + //% this.fieldEditor="ports" + //% weight=99 blockGap=8 + //% group="Color Sensor" + isColorDetected(color: number) { + return this.color() == color; + } + /** * Get the current raw rgb values as an array from the color sensor. * @param sensor the color sensor to query the request diff --git a/libs/color-sensor/docs/reference/sensors/color-sensor/is-color-detected.md b/libs/color-sensor/docs/reference/sensors/color-sensor/is-color-detected.md new file mode 100644 index 00000000..0fe7d900 --- /dev/null +++ b/libs/color-sensor/docs/reference/sensors/color-sensor/is-color-detected.md @@ -0,0 +1,30 @@ +# Is Color Detected + +Checks the color is detected + +```sig +let b = sensors.color1.isColorDetected(ColorSensorColor.Blue) +``` + +The [color](/reference/sensors/color) you choose to look for is one of the colors that the sensor can detect. If you want to use colors for tracking, it's best to use a color that is the same or very close to the ones the sensor detects. + +## Parameters + +* **color**: the [color](/reference/sensors/color) to watch for. + +## Example + +Wait for the sensor to see ``blue``. Then, show an expression on the screen. + +```blocks +brick.showString("Waiting for blue", 1) +while(!sensors.color1.isColorDetected(ColorSensorColor.Blue)) { + pause(20) +} +brick.clearScreen() +brick.showImage(images.expressionsSick) +``` + +## See also + +[on color detected](/reference/sensors/color-sensor/on-color-detected), [color](/reference/sensors/color) \ No newline at end of file From c8381d76262186898db1fa1922cdbd3255ebbcd3 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 20 Oct 2019 09:02:44 -0700 Subject: [PATCH 10/13] 1.2.26 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c422699d..c963d3b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-ev3", - "version": "1.2.25", + "version": "1.2.26", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "private": false, "keywords": [ From 85a8f1c2c5ff662ad6e401b7a2f9c1911e7a5f60 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 20 Oct 2019 16:37:57 -0700 Subject: [PATCH 11/13] bump to v1.2.26 --- docs/index-ref.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index-ref.json b/docs/index-ref.json index 55f7f6a2..7621d242 100644 --- a/docs/index-ref.json +++ b/docs/index-ref.json @@ -1,3 +1,3 @@ { - "appref": "v1.2.22" + "appref": "v1.2.26" } From 991813fff7ab39414508b2602caa8ca6e1972da6 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 23 Oct 2019 11:22:30 -0700 Subject: [PATCH 12/13] update elecron version to 1.2.26 (#953) --- docs/offline-app.html | 4 ++-- targetconfig.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/offline-app.html b/docs/offline-app.html index c0a2ae11..6565b0ed 100644 --- a/docs/offline-app.html +++ b/docs/offline-app.html @@ -388,12 +388,12 @@ } function downloadWin64() { // TODO: Keep this link up-to-date with the desired release version - window.open("https://makecode.com/api/release/ev3/v1.2.22/win64"); + window.open("https://makecode.com/api/release/ev3/v1.2.26/win64"); tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" }); } function downloadMac64() { // TODO: Keep this link up-to-date with the desired release version - window.open("https://makecode.com/api/release/ev3/v1.2.22/mac64"); + window.open("https://makecode.com/api/release/ev3/v1.2.26/mac64"); tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" }); } diff --git a/targetconfig.json b/targetconfig.json index aaa01a00..c2fdaf7d 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -27,6 +27,6 @@ "Tutorial Videos": "videos" }, "electronManifest": { - "latest": "v1.2.22" + "latest": "v1.2.26" } } From c3f539f396038601ecc43396c50a5c1845514b18 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 31 Oct 2019 10:22:37 -0700 Subject: [PATCH 13/13] Bump pxt 5.28.7 (#954) * bump * bump pxt --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dd16a459..478e57d2 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "@types/web-bluetooth": "0.0.4" }, "dependencies": { - "pxt-common-packages": "6.16.11", - "pxt-core": "5.25.16" + "pxt-common-packages": "6.16.18", + "pxt-core": "5.28.8" }, "scripts": { "test": "node node_modules/pxt-core/built/pxt.js travis"