pxt-microbit 7.0.25 → 7.0.26

package/built/editor.js

@@ -3962,50 +3962,98 @@ exports.mkDAPLinkPacketIOWrapper = mkDAPLinkPacketIOWrapper;
 
 },{}],4:[function(require,module,exports){
 "use strict";
-/**
- *       <block type="device_show_leds">
-    <field name="LED00">FALSE</field>
-    <field name="LED10">FALSE</field>
-    <field name="LED20">FALSE</field>
-    <field name="LED30">FALSE</field>
-    <field name="LED40">FALSE</field>
-    <field name="LED01">FALSE</field>
-    <field name="LED11">FALSE</field>
-    <field name="LED21">FALSE</field>
-    <field name="LED31">TRUE</field>
-    <field name="LED41">FALSE</field>
-    <field name="LED02">FALSE</field>
-    <field name="LED12">FALSE</field>
-    <field name="LED22">FALSE</field>
-    <field name="LED32">FALSE</field>
-    <field name="LED42">FALSE</field>
-    <field name="LED03">FALSE</field>
-    <field name="LED13">TRUE</field>
-    <field name="LED23">FALSE</field>
-    <field name="LED33">FALSE</field>
-    <field name="LED43">FALSE</field>
-    <field name="LED04">FALSE</field>
-    <field name="LED14">FALSE</field>
-    <field name="LED24">FALSE</field>
-    <field name="LED34">FALSE</field>
-    <field name="LED44">FALSE</field>
-  </block>
-
-  to
-<block type="device_show_leds">
-    <field name="LEDS">`
-    # # # # #
-    . . . . #
-    . . . . .
-    . . . . #
-    . . . . #
-    `
-    </field>
-  </block>
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchBlocks = void 0;
 function patchBlocks(pkgTargetVersion, dom) {
+    if (pxt.semver.majorCmp(pkgTargetVersion || "0.0.0", "7.0.13") <= 0) {
+        // Variable pin param
+        /*
+        <block type="device_get_digital_pin">
+            <field name="name">DigitalPin.P0</field>
+        </block>
+
+        converts to
+
+        <block type="device_get_digital_pin">
+            <value name="name">
+                <shadow type="digital_pin">
+                    <field name="pin">DigitalPin.P0</field>
+                </shadow>
+            </value>
+        </block>
+        */
+        pxt.U.toArray(dom.querySelectorAll("block[type=device_get_digital_pin]"))
+            .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=device_get_digital_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_digital_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_get_analog_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=device_get_analog_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_analog_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_analog_period]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=pins_on_pulsed]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=pins_pulse_in]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=pins_pulse_in]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_servo_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_servo_pulse]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_analog_set_pitch_pin]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_pull]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_set_pin_events]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=pin_neopixel_matrix_width]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=spi_pins]")))
+            .concat(pxt.U.toArray(dom.querySelectorAll("block[type=pin_set_audio_pin]")))
+            .forEach(node => {
+            const blockType = node.getAttribute("type");
+            pxt.U.toArray(node.children)
+                .filter(oldPinNode => {
+                if (oldPinNode.tagName != "field")
+                    return false;
+                switch (blockType) {
+                    case "device_get_digital_pin":
+                    case "device_set_digital_pin":
+                    case "device_get_analog_pin":
+                    case "device_set_analog_pin":
+                    case "pins_pulse_in":
+                    case "device_set_servo_pin":
+                    case "device_analog_set_pitch_pin":
+                    case "pin_set_audio_pin":
+                        return oldPinNode.getAttribute("name") === "name";
+                    case "device_set_analog_period":
+                    case "pins_on_pulsed":
+                    case "device_set_pull":
+                    case "device_set_pin_events":
+                    case "pin_neopixel_matrix_width":
+                        return oldPinNode.getAttribute("name") === "pin";
+                    case "device_set_servo_pulse":
+                        return oldPinNode.getAttribute("name") === "value";
+                    case "spi_pins":
+                        return ["mosi", "miso", "sck"].includes(oldPinNode.getAttribute("name"));
+                }
+                return false;
+            })
+                .forEach(oldPinNode => {
+                const valueNode = node.ownerDocument.createElement("value");
+                valueNode.setAttribute("name", oldPinNode.getAttribute("name"));
+                const pinShadowNode = node.ownerDocument.createElement("shadow");
+                let pinBlockType;
+                switch (oldPinNode.textContent.split(".")[0]) {
+                    case "DigitalPin":
+                        pinBlockType = "digital_pin_shadow";
+                        break;
+                    case "AnalogPin":
+                        pinBlockType = "analog_pin_shadow";
+                        break;
+                }
+                if (!pinBlockType)
+                    return;
+                pinShadowNode.setAttribute("type", pinBlockType);
+                const fieldNode = node.ownerDocument.createElement("field");
+                fieldNode.setAttribute("name", "pin");
+                fieldNode.textContent = oldPinNode.textContent;
+                pinShadowNode.appendChild(fieldNode);
+                valueNode.appendChild(pinShadowNode);
+                node.replaceChild(valueNode, oldPinNode);
+            });
+        });
+    }
     if (pxt.semver.majorCmp(pkgTargetVersion || "0.0.0", "5.0.12") <= 0) {
         // Eighth note misspelling
         /*
@@ -4041,12 +4089,54 @@ function patchBlocks(pkgTargetVersion, dom) {
     if (pxt.semver.majorCmp(pkgTargetVersion || "0.0.0", "1.0.0") >= 0)
         return;
     // showleds
-    const nodes = pxt.U.toArray(dom.querySelectorAll("block[type=device_show_leds]"))
+    /**
+    <block type="device_show_leds">
+        <field name="LED00">FALSE</field>
+        <field name="LED10">FALSE</field>
+        <field name="LED20">FALSE</field>
+        <field name="LED30">FALSE</field>
+        <field name="LED40">FALSE</field>
+        <field name="LED01">FALSE</field>
+        <field name="LED11">FALSE</field>
+        <field name="LED21">FALSE</field>
+        <field name="LED31">TRUE</field>
+        <field name="LED41">FALSE</field>
+        <field name="LED02">FALSE</field>
+        <field name="LED12">FALSE</field>
+        <field name="LED22">FALSE</field>
+        <field name="LED32">FALSE</field>
+        <field name="LED42">FALSE</field>
+        <field name="LED03">FALSE</field>
+        <field name="LED13">TRUE</field>
+        <field name="LED23">FALSE</field>
+        <field name="LED33">FALSE</field>
+        <field name="LED43">FALSE</field>
+        <field name="LED04">FALSE</field>
+        <field name="LED14">FALSE</field>
+        <field name="LED24">FALSE</field>
+        <field name="LED34">FALSE</field>
+        <field name="LED44">FALSE</field>
+    </block>
+
+    converts to
+
+    <block type="device_show_leds">
+        <field name="LEDS">`
+            . . . . .
+            . . . # .
+            . . . . .
+            . # . . .
+            . . . . .
+            `
+        </field>
+    </block>
+    */
+    pxt.U.toArray(dom.querySelectorAll("block[type=device_show_leds]"))
         .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_build_image]")))
         .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=device_build_image]")))
         .concat(pxt.U.toArray(dom.querySelectorAll("block[type=device_build_big_image]")))
-        .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=device_build_big_image]")));
-    nodes.forEach(node => {
+        .concat(pxt.U.toArray(dom.querySelectorAll("shadow[type=device_build_big_image]")))
+        .forEach(node => {
         // don't rewrite if already upgraded, eg. field LEDS already present
         if (pxt.U.toArray(node.children).filter(child => child.tagName == "field" && "LEDS" == child.getAttribute("name"))[0])
             return;
@@ -4071,33 +4161,33 @@ function patchBlocks(pkgTargetVersion, dom) {
     });
     // radio
     /*
-<block type="radio_on_packet" x="174" y="120">
-<mutation callbackproperties="receivedNumber" renamemap="{}"></mutation>
-<field name="receivedNumber">receivedNumber</field>
-</block>
-<block type="radio_on_packet" disabled="true" x="127" y="263">
-<mutation callbackproperties="receivedString,receivedNumber" renamemap="{&quot;receivedString&quot;:&quot;name&quot;,&quot;receivedNumber&quot;:&quot;value&quot;}"></mutation>
-<field name="receivedString">name</field>
-<field name="receivedNumber">value</field>
-</block>
-<block type="radio_on_packet" disabled="true" x="162" y="420">
-<mutation callbackproperties="receivedString" renamemap="{}"></mutation>
-<field name="receivedString">receivedString</field>
-</block>
+    <block type="radio_on_packet" x="174" y="120">
+        <mutation callbackproperties="receivedNumber" renamemap="{}"></mutation>
+        <field name="receivedNumber">receivedNumber</field>
+    </block>
+    <block type="radio_on_packet" disabled="true" x="127" y="263">
+        <mutation callbackproperties="receivedString,receivedNumber" renamemap="{&quot;receivedString&quot;:&quot;name&quot;,&quot;receivedNumber&quot;:&quot;value&quot;}"></mutation>
+        <field name="receivedString">name</field>
+        <field name="receivedNumber">value</field>
+    </block>
+    <block type="radio_on_packet" disabled="true" x="162" y="420">
+        <mutation callbackproperties="receivedString" renamemap="{}"></mutation>
+        <field name="receivedString">receivedString</field>
+    </block>
 
-converts to
+    converts to
 
-<block type="radio_on_number" x="196" y="208">
-<field name="HANDLER_receivedNumber" id="DCy(W;1)*jLWQUpoy4Mm" variabletype="">receivedNumber</field>
-</block>
-<block type="radio_on_value" x="134" y="408">
-<field name="HANDLER_name" id="*d-Jm^MJXO]Djs(dTR*?" variabletype="">name</field>
-<field name="HANDLER_value" id="A6HQjH[k^X43o3h775+G" variabletype="">value</field>
-</block>
-<block type="radio_on_string" x="165" y="583">
-<field name="HANDLER_receivedString" id="V9KsE!h$(iO?%W:[32CV" variabletype="">receivedString</field>
-</block>
-*/
+    <block type="radio_on_number" x="196" y="208">
+        <field name="HANDLER_receivedNumber" id="DCy(W;1)*jLWQUpoy4Mm" variabletype="">receivedNumber</field>
+    </block>
+    <block type="radio_on_value" x="134" y="408">
+        <field name="HANDLER_name" id="*d-Jm^MJXO]Djs(dTR*?" variabletype="">name</field>
+        <field name="HANDLER_value" id="A6HQjH[k^X43o3h775+G" variabletype="">value</field>
+    </block>
+    <block type="radio_on_string" x="165" y="583">
+        <field name="HANDLER_receivedString" id="V9KsE!h$(iO?%W:[32CV" variabletype="">receivedString</field>
+    </block>
+    */
     const varids = {};
     function addField(node, renameMap, name) {
         const f = node.ownerDocument.createElement("field");

package/built/fieldeditors.js

@@ -4,18 +4,25 @@
 /// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
 Object.defineProperty(exports, "__esModule", { value: true });
 const field_gestures_1 = require("./field_gestures");
+const field_pinPicker_1 = require("./field_pinPicker");
 pxt.editor.initFieldExtensionsAsync = function (opts) {
     pxt.debug('loading pxt-microbit field editors...');
     const res = {
-        fieldEditors: [{
+        fieldEditors: [
+            {
                 selector: "gestures",
                 editor: field_gestures_1.FieldGestures
-            }]
+            },
+            {
+                selector: "pinpicker",
+                editor: field_pinPicker_1.FieldPinPicker
+            }
+        ]
     };
     return Promise.resolve(res);
 };
 
-},{"./field_gestures":2}],2:[function(require,module,exports){
+},{"./field_gestures":2,"./field_pinPicker":3}],2:[function(require,module,exports){
 "use strict";
 /// <reference path="../node_modules/pxt-core/localtypings/pxtblockly.d.ts"/>
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -95,4 +102,87 @@ class FieldGestures extends pxtblockly.FieldImages {
 }
 exports.FieldGestures = FieldGestures;
 
-},{}]},{},[1,2]);
+},{}],3:[function(require,module,exports){
+"use strict";
+/// <reference path="../node_modules/pxt-core/localtypings/pxtblockly.d.ts"/>
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FieldPinPicker = void 0;
+const pxtblockly = pxt.blocks.requirePxtBlockly();
+const Blockly = pxt.blocks.requireBlockly();
+const WARNING_ID = "pinpicker_warning";
+class FieldPinPicker extends pxtblockly.FieldGridPicker {
+    constructor() {
+        super(...arguments);
+        this.changeListener = (e) => {
+            if (e.type === Blockly.Events.BLOCK_MOVE && e.blockId === this.sourceBlock_.id) {
+                this.updateWarning();
+            }
+        };
+    }
+    init() {
+        super.init();
+        const sourceBlock = this.sourceBlock_;
+        if (sourceBlock.isShadow() || sourceBlock.isInFlyout) {
+            return;
+        }
+        sourceBlock.workspace.addChangeListener(this.changeListener);
+    }
+    doValueUpdate_(newValue) {
+        super.doValueUpdate_(newValue);
+        this.updateWarning();
+    }
+    updateWarning() {
+        this.hideWarning();
+        const sourceBlock = this.sourceBlock_;
+        if (!sourceBlock || !this.value_ || sourceBlock.isShadow() || sourceBlock.isInFlyout) {
+            return;
+        }
+        const pin = this.value_.split(".")[1];
+        if (!isAnalogWriteOnlyPin(pin)) {
+            return;
+        }
+        const parent = sourceBlock.outputConnection.targetBlock();
+        if (!parent || parent.type !== "device_get_analog_pin") {
+            return;
+        }
+        this.showWarning(pin);
+    }
+    showWarning(pin) {
+        if (!this.sourceBlock_) {
+            return;
+        }
+        this.sourceBlock_.setWarningText(pxt.U.lf("{0} is a write only analog pin", pin), WARNING_ID);
+    }
+    hideWarning() {
+        if (!this.sourceBlock_) {
+            return;
+        }
+        this.sourceBlock_.setWarningText(null, WARNING_ID);
+    }
+    dispose() {
+        var _a, _b;
+        super.dispose();
+        (_b = (_a = this.sourceBlock_) === null || _a === void 0 ? void 0 : _a.workspace) === null || _b === void 0 ? void 0 : _b.removeChangeListener(this.changeListener);
+    }
+}
+exports.FieldPinPicker = FieldPinPicker;
+function isAnalogWriteOnlyPin(pin) {
+    switch (pin) {
+        case "P5":
+        case "P6":
+        case "P7":
+        case "P8":
+        case "P9":
+        case "P11":
+        case "P12":
+        case "P13":
+        case "P14":
+        case "P15":
+        case "P16":
+            return true;
+        default:
+            return false;
+    }
+}
+
+},{}]},{},[1,2,3]);

package/built/target-strings.json

@@ -1 +1 @@
-{"A Blocks / JavaScript code editor for the micro:bit powered by Microsoft MakeCode.":"A Blocks / JavaScript code editor for the micro:bit powered by Microsoft MakeCode.","A micro-servo library":"A micro-servo library","Adds new blocks for message communication in the radio category":"Adds new blocks for message communication in the radio category","BETA -  Camera, remote control and other Bluetooth services. App required.":"BETA -  Camera, remote control and other Bluetooth services. App required.","Behind the MakeCode Hardware":"Behind the MakeCode Hardware","Blocks to JavaScript":"Blocks to JavaScript","Bluetooth services":"Bluetooth services","Buy":"Buy","Can't import microbit.co.uk scripts...":"Can't import microbit.co.uk scripts...","Coding Cards":"Coding Cards","Coding for Teachers":"Coding for Teachers","Color manipulation":"Color manipulation","Courses":"Courses","Data logging to flash memory. micro:bit (V2) only.":"Data logging to flash memory. micro:bit (V2) only.","Data logging to flash.":"Data logging to flash.","Deep Dive":"Deep Dive","Disable Bluetooth Event Service":"Disable Bluetooth Event Service","Download cancelled":"Download cancelled","Download failed, please try again":"Download failed, please try again","Download for V2 only":"Download for V2 only","Fashion":"Fashion","Fonts for displays (V2 only).":"Fonts for displays (V2 only).","Games":"Games","Go Back":"Go Back","Go to the old editor":"Go to the old editor","Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V1😢. You can go back and try to make your program smaller, or you can download your program onto a micro:bit V2.":"Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V1😢. You can go back and try to make your program smaller, or you can download your program onto a micro:bit V2.","Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V2😢. You can go back and try to make your program smaller, or continue to use the simulator to run your code.":"Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V2😢. You can go back and try to make your program smaller, or continue to use the simulator to run your code.","Hardware":"Hardware","Importing microbit.co.uk programs is not supported in this editor anymore. Please open this script in the https://makecode.microbit.org/v0 editor.":"Importing microbit.co.uk programs is not supported in this editor anymore. Please open this script in the https://makecode.microbit.org/v0 editor.","Jacdac":"Jacdac","JustWorks pairing (default): Pairing is automatic once the pairing is initiated.":"JustWorks pairing (default): Pairing is automatic once the pairing is initiated.","Live Coding":"Live Coding","MicroCode for the new micro:bit (V2)":"MicroCode for the new micro:bit (V2)","Microsoft MakeCode for micro:bit":"Microsoft MakeCode for micro:bit","Music":"Music","New? Start here!":"New? Start here!","No Pairing Required: Anyone can connect via Bluetooth.":"No Pairing Required: Anyone can connect via Bluetooth.","Oops, there was a problem downloading your code":"Oops, there was a problem downloading your code","Passkey pairing: Pairing requires 6 digit key to pair.":"Passkey pairing: Pairing requires 6 digit key to pair.","Radio Games":"Radio Games","Record sound clips. micro:bit (V2) only":"Record sound clips. micro:bit (V2) only","Reference":"Reference","Science":"Science","Science Experiments":"Science Experiments","Settings storage in internal flash":"Settings storage in internal flash","Support":"Support","The microbit core library":"The microbit core library","The microphone library":"The microphone library","The radio services":"The radio services","Tools":"Tools","Toys":"Toys","Turtle":"Turtle","Tutorials":"Tutorials","Tutorials for the new micro:bit (V2)":"Tutorials for the new micro:bit (V2)","makecode.microbit.org":"makecode.microbit.org","{id:extension-tag}Gaming":"Gaming","{id:extension-tag}Lights and Display":"Lights and Display","{id:extension-tag}Networking":"Networking","{id:extension-tag}Robotics":"Robotics","{id:extension-tag}Science":"Science","{id:extension-tag}Software":"Software","{id:type}Image":"Image","{id:type}LedSprite":"LedSprite","{id:var}image":"image","{id:var}sprite":"sprite"}
+{"A Blocks / JavaScript code editor for the micro:bit powered by Microsoft MakeCode.":"A Blocks / JavaScript code editor for the micro:bit powered by Microsoft MakeCode.","A micro-servo library":"A micro-servo library","Adds new blocks for message communication in the radio category":"Adds new blocks for message communication in the radio category","BETA -  Camera, remote control and other Bluetooth services. App required.":"BETA -  Camera, remote control and other Bluetooth services. App required.","Behind the MakeCode Hardware":"Behind the MakeCode Hardware","Blocks to JavaScript":"Blocks to JavaScript","Bluetooth services":"Bluetooth services","Buy":"Buy","Can't import microbit.co.uk scripts...":"Can't import microbit.co.uk scripts...","Coding Cards":"Coding Cards","Coding for Teachers":"Coding for Teachers","Color manipulation":"Color manipulation","Courses":"Courses","Data logging to flash memory. micro:bit (V2) only.":"Data logging to flash memory. micro:bit (V2) only.","Data logging to flash.":"Data logging to flash.","Deep Dive":"Deep Dive","Disable Bluetooth Event Service":"Disable Bluetooth Event Service","Download cancelled":"Download cancelled","Download failed, please try again":"Download failed, please try again","Download for V2 only":"Download for V2 only","Fashion":"Fashion","Fonts for displays (V2 only).":"Fonts for displays (V2 only).","Games":"Games","Go Back":"Go Back","Go to the old editor":"Go to the old editor","Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V1😢. You can go back and try to make your program smaller, or you can download your program onto a micro:bit V2.":"Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V1😢. You can go back and try to make your program smaller, or you can download your program onto a micro:bit V2.","Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V2😢. You can go back and try to make your program smaller, or continue to use the simulator to run your code.":"Great coding skills! Unfortunately, your program is too large to fit on a micro:bit V2😢. You can go back and try to make your program smaller, or continue to use the simulator to run your code.","Hardware":"Hardware","Importing microbit.co.uk programs is not supported in this editor anymore. Please open this script in the https://makecode.microbit.org/v0 editor.":"Importing microbit.co.uk programs is not supported in this editor anymore. Please open this script in the https://makecode.microbit.org/v0 editor.","Jacdac":"Jacdac","JustWorks pairing (default): Pairing is automatic once the pairing is initiated.":"JustWorks pairing (default): Pairing is automatic once the pairing is initiated.","Live Coding":"Live Coding","MicroCode for the new micro:bit (V2)":"MicroCode for the new micro:bit (V2)","Microsoft MakeCode for micro:bit":"Microsoft MakeCode for micro:bit","Music":"Music","New? Start here!":"New? Start here!","No Pairing Required: Anyone can connect via Bluetooth.":"No Pairing Required: Anyone can connect via Bluetooth.","Oops, there was a problem downloading your code":"Oops, there was a problem downloading your code","Passkey pairing: Pairing requires 6 digit key to pair.":"Passkey pairing: Pairing requires 6 digit key to pair.","Radio Games":"Radio Games","Record sound clips. micro:bit (V2) only":"Record sound clips. micro:bit (V2) only","Reference":"Reference","Science":"Science","Science Experiments":"Science Experiments","Settings storage in internal flash":"Settings storage in internal flash","Support":"Support","The microbit core library":"The microbit core library","The microphone library":"The microphone library","The radio services":"The radio services","Tools":"Tools","Toys":"Toys","Turtle":"Turtle","Tutorials":"Tutorials","Tutorials for the new micro:bit (V2)":"Tutorials for the new micro:bit (V2)","makecode.microbit.org":"makecode.microbit.org","{0} is a write only analog pin":"{0} is a write only analog pin","{id:extension-tag}Gaming":"Gaming","{id:extension-tag}Lights and Display":"Lights and Display","{id:extension-tag}Networking":"Networking","{id:extension-tag}Robotics":"Robotics","{id:extension-tag}Science":"Science","{id:extension-tag}Software":"Software","{id:type}Image":"Image","{id:type}LedSprite":"LedSprite","{id:var}image":"image","{id:var}sprite":"sprite"}