Merging microbit/master

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

@@ -161,6 +161,8 @@
   "pins.spiWrite|param|value": "Data to be sent to the SPI slave",
   "serial": "Reading and writing data over a serial connection.",
   "serial.readLine": "Reads a line of text from the serial port.",
+  "serial.readUntil": "Reads a line of text from the serial port and returns the buffer when the delimiter is met.",
+  "serial.readUntil|param|delimiter": "text delimiter that separates each text chunk",
   "serial.redirect": "Dynamically configuring the serial instance to use pins other than USBTX and USBRX.",
   "serial.redirect|param|rx": "the new reception pin",
   "serial.redirect|param|tx": "the new transmission pins",

libs/core/_locales/core-strings.json

@@ -70,11 +70,22 @@
   "pins.setPull|block": "set pull|pin %pin|to %pull",
   "pins.spiWrite|block": "spi write %value",
   "pins|block": "pins",
-  "serial.readLine|block": "serial read line",
-  "serial.redirect|block": "serial redirect to|TX %tx|RX %rx|at baud rate %rate",
+  "serial.readLine|block": "serial|read line",
+  "serial.readUntil|block": "serial|read until %delimiter=serial_delimiter_conv",
+  "serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
   "serial.writeLine|block": "serial|write line %text",
   "serial.writeNumber|block": "serial|write number %value",
-  "serial.writeString|block": "serial write string %text",
+  "serial.writeString|block": "serial|write string %text",
   "serial.writeValue|block": "serial|write value %name|= %value",
-  "serial|block": "serial"
+  "serial|block": "serial",
+  "{id:category}Basic": "Basic",
+  "{id:category}Control": "Control",
+  "{id:category}Game": "Game",
+  "{id:category}Images": "Images",
+  "{id:category}Input": "Input",
+  "{id:category}Led": "Led",
+  "{id:category}Math": "Math",
+  "{id:category}Music": "Music",
+  "{id:category}Pins": "Pins",
+  "{id:category}Serial": "Serial"
 }

libs/core/music.ts

@@ -211,7 +211,7 @@ namespace music {
      * Change the tempo by the specified amount
      * @param bpm The change in beats per minute to the tempo, eg: 20
      */
-    //% help=music/change-tempo weight=39
+    //% help=music/change-tempo-by weight=39
     //% blockId=device_change_tempo block="change tempo by (bpm)|%value" blockGap=8
     export function changeTempoBy(bpm: number): void {
         init();