merging ble changes

docs/docs.md

@@ -5,7 +5,8 @@
 ### Things to do
 
 * **[Getting Started](/getting-started)**
-* [Ten projects](/projects)
+* [Projects](/projects)
+* [Lessons](/lessons)
 
 ### Micro:bit reference
 
@@ -16,16 +17,15 @@
 
 * [Blocks language](/blocks)
 * [JavaScript language](/javascript)
-* [Streaming data](/streaming)
 
 ### More questions?
 
 * [Frequently Asked Question](/faq)
-* [Embedding project](/share)
 * [Help Translate](/translate)
-* [Release notes](/release-notes)
+* [Embedding project](/share)
 
 ### Developers
 
 * [Command Line Interface](/cli)
 * Learn about [packages](/packages)
+* [Release notes](/release-notes)

docs/reference/bluetooth.md

@@ -2,6 +2,14 @@
 
 Support for additional Bluetooth services.
 
+### ~hint
+![](/static/bluetooth/Bluetooth_SIG.png)
+
+For another device like a smartphone to use any of the Bluetooth "services" which the micro:bit has, it must first be [paired with the micro:bit](/reference/bluetooth/bluetooth-pairing). Once paired, the other device may connect to the micro:bit and exchange data relating to many of the micro:bit's features.
+
+### ~
+
+
 ```cards
 bluetooth.startAccelerometerService();
 bluetooth.startButtonService();
@@ -9,20 +17,34 @@ bluetooth.startIOPinService();
 bluetooth.startLEDService();
 bluetooth.startMagnetometerService();
 bluetooth.startTemperatureService();
-bluetooth.uartRead("");
+bluetooth.onBluetoothConnected(() => {});
-bluetooth.uartWrite("");
+bluetooth.onBluetoothDisconnected(() => {});
-bluetooth.onBluetoothConnected(() => {
+```
 
-});
+## UART 
-bluetooth.onBluetoothDisconnected(() => {
 
-});
+```cards
+bluetooth.startUartService();
+bluetooth.uartReadUntil("");
+bluetooth.uartWriteString("");
+bluetooth.uartWriteNumber(0);
+bluetooth.uartWriteValue("", 0);
 ```
 
 ```package
 microbit-bluetooth
 ```
 
+### Advanced
+ 
+For more advanced information on the micro:bit Bluetooth UART service including information on using a smartphone, see the [Lancaster University micro:bit runtime technical documentation](http://lancaster-university.github.io/microbit-docs/ble/uart-service/)
+
 ### See Also
 
-[startAccelerometerService](/reference/bluetooth/start-accelerometer-service), [startButtonService](/reference/bluetooth/start-button-service), [startIOPinService](/reference/bluetooth/start-io-pin-service), [startLEDService](/reference/bluetooth/start-led-service), [startMagnetometerService](/reference/bluetooth/start-magnetometer-service), [startTemperatureService](/reference/bluetooth/start-temperature-service), [uartRead](/reference/bluetooth/uart-read), [uartWrite](/reference/bluetooth/uart-write), [onBluetoothConnected](/reference/bluetooth/on-bluetooth-connected), [onBluetoothDisconnected](/reference/bluetooth/on-bluetooth-disconnected)
+[startAccelerometerService](/reference/bluetooth/start-accelerometer-service), [startButtonService](/reference/bluetooth/start-button-service), [startIOPinService](/reference/bluetooth/start-io-pin-service), [startLEDService](/reference/bluetooth/start-led-service), [startMagnetometerService](/reference/bluetooth/start-magnetometer-service), [startTemperatureService](/reference/bluetooth/start-temperature-service), 
+[startUartService](/reference/bluetooth/start-uart-service),
+[uartReadUntil](/reference/bluetooth/uart-read-until), 
+[uartWriteString](/reference/bluetooth/uart-write-string), 
+[uartWriteNumber](/reference/bluetooth/uart-write-number), 
+[uartWriteValue](/reference/bluetooth/uart-write-value), 
+[onBluetoothConnected](/reference/bluetooth/on-bluetooth-connected), [onBluetoothDisconnected](/reference/bluetooth/on-bluetooth-disconnected)

docs/reference/bluetooth/uart-read-until.md

@@ -12,7 +12,7 @@ The [Bluetooth UART service](start-uart-service.md) allows another device such a
 With the Bluetooth UART service running, this block allows a micro:bit to read data which has been received from a Bluetooth connected device, terminating reading and returning the value obtained as soon as a specified delimiter character is encountered. This means that connected devices can send data to the micro:bit and indicate that the complete message has been sent by appending the message with the delimiter character.
 
 ```sig
-bluetooth.uartRead("");
+bluetooth.uartReadUntil("");
 ```
 
 ### Example: Starting the Bluetooth UART service and then reading data received from another device which is terminated by ":" character and then displaying it
@@ -25,7 +25,7 @@ bluetooth.onBluetoothConnected(() => {
     basic.showString("C");
     connected = 1;
     while (connected == 1) {
-        uartData = bluetooth.uartRead(":");
+        uartData = bluetooth.uartReadUntil(":");
         basic.showString(uartData);
     }
 });

docs/reference/bluetooth/uart-write-number.md

@@ -0,0 +1,28 @@
+# UART Write Number
+
+### ~hint
+![](/static/bluetooth/Bluetooth_SIG.png)
+
+For another device like a smartphone to use any of the Bluetooth "services" which the micro:bit has, it must first be [paired with the micro:bit](/reference/bluetooth/bluetooth-pairing). Once paired, the other device may connect to the micro:bit and exchange data relating to many of the micro:bit's features.
+
+### ~
+
+The [Bluetooth UART service](/reference/bluetooth/start-uart-service.md) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
+
+With the Bluetooth UART service running, this block allows a micro:bit to send data to a Bluetooth connected device.
+
+```sig
+bluetooth.uartWriteNumber(42);
+```
+
+### Advanced
+ 
+For more advanced information on the micro:bit Bluetooth UART service including information on using a smartphone, see the [Lancaster University micro:bit runtime technical documentation](http://lancaster-university.github.io/microbit-docs/ble/uart-service/)
+
+### See also
+
+[About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
+
+```package
+microbit-bluetooth
+```

docs/reference/bluetooth/uart-write-string.md

@@ -1,4 +1,4 @@
-# UART Write 
+# UART Write String
 
 ### ~hint
 ![](/static/bluetooth/Bluetooth_SIG.png)
@@ -7,12 +7,12 @@ For another device like a smartphone to use any of the Bluetooth "services" whic
 
 ### ~
 
-The [Bluetooth UART service](start-uart-service.md) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
+The [Bluetooth UART service](/reference/bluetooth/start-uart-service.md) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
 
 With the Bluetooth UART service running, this block allows a micro:bit to send data to a Bluetooth connected device.
 
 ```sig
-bluetooth.uartWrite("");
+bluetooth.uartWriteString("");
 ```
 
 ### Example: Starting the Bluetooth UART service and then sending "HELLO" whenever button A is pressed and another device has connected over Bluetooth
@@ -29,7 +29,7 @@ bluetooth.onBluetoothDisconnected(() => {
 });
 input.onButtonPressed(Button.A, () => {
     if (connected == 1) {
-        bluetooth.uartWrite("HELLO");
+        bluetooth.uartWriteString("HELLO");
     }
 });
 ```

docs/reference/bluetooth/uart-write-value.md

@@ -0,0 +1,28 @@
+# UART Write Value
+
+### ~hint
+![](/static/bluetooth/Bluetooth_SIG.png)
+
+For another device like a smartphone to use any of the Bluetooth "services" which the micro:bit has, it must first be [paired with the micro:bit](/reference/bluetooth/bluetooth-pairing). Once paired, the other device may connect to the micro:bit and exchange data relating to many of the micro:bit's features.
+
+### ~
+
+The [Bluetooth UART service](/reference/bluetooth/start-uart-service.md) allows another device such as a smartphone to exchange any data it wants to with the micro:bit, in small chunks. 
+
+With the Bluetooth UART service running, this block allows a micro:bit to send data to a Bluetooth connected device.
+
+```sig
+bluetooth.uartWriteValue("x", 42);
+```
+
+### Advanced
+ 
+For more advanced information on the micro:bit Bluetooth UART service including information on using a smartphone, see the [Lancaster University micro:bit runtime technical documentation](http://lancaster-university.github.io/microbit-docs/ble/uart-service/)
+
+### See also
+
+[About Bluetooth](/reference/bluetooth/about-bluetooth), [micro:bit Bluetooth profile overview ](http://lancaster-university.github.io/microbit-docs/ble/profile/), [micro:bit Bluetooth profile reference](http://lancaster-university.github.io/microbit-docs/resources/bluetooth/microbit-profile-V1.9-Level-2.pdf),  [Bluetooth on micro:bit resources](http://bluetooth-mdw.blogspot.co.uk/p/bbc-microbit.html), [Bluetooth SIG](https://www.bluetooth.com)
+
+```package
+microbit-bluetooth
+```

docs/translate.md

@@ -16,13 +16,9 @@ You will find two files in that project:
 
 ## Translating the blocks and reference documentation
 
-The project below contains the resources from the blocks and functions using in the https://codethemicrobit.com.
+You will find package files under ``/microbit`` , one for the block definition and one for the descriptions:
 
-* [https://crowdin.com/project/pxt-microbit](https://crowdin.com/project/pxt-microbit)
+* ``core-strings.json``: contains the block definitions
-
+* ``core-jsdoc-strings.json``: contains the descriptions
-You will find two files for each package available in the micro:bit, one for the block definition and one for the descriptions:
-
-* ``microbit-strings.json``: contains the block definitions
-* ``microbit-jsdoc-strings.json``: contains the descriptions
 
 The block definition should be carefully translated using the [block definition syntax](https://www.pxt.io/defining-blocks).

libs/bluetooth/bluetooth.cpp

@@ -4,22 +4,6 @@
 
 using namespace pxt;
 
-enum Delimiters {
-    //% block="new line"
-    NewLine = 1,
-    //% block=","
-    Comma = 2,
-    //% block="$"
-    Dollar = 3,
-    //% block=":"
-    Colon = 4,
-    //% block="."
-    Fullstop = 5,
-    //% block="#"
-    Hash = 6,
-};
-
-
 /**
  * Support for additional Bluetooth services.
  */
@@ -27,52 +11,13 @@ enum Delimiters {
 namespace bluetooth {
     MicroBitUARTService *uart = NULL;
 
-    /**
-    *  Starts the Bluetooth IO pin service.
-    */
-    //% help=bluetooth/start-io-pin-service
-    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
-    //% parts="bluetooth"
-    void startIOPinService() {
-        new MicroBitIOPinService(*uBit.ble, uBit.io);
-    }
-
-    /**
-    *  Starts the Bluetooth LED service
-    */
-    //% help=bluetooth/start-led-service
-    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
-    //% parts="bluetooth"
-    void startLEDService() {
-        new MicroBitLEDService(*uBit.ble, uBit.display);
-    }
-
-    /**
-    *  Starts the Bluetooth temperature service
-    */
-    //% help=bluetooth/start-temperature-service
-    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
-    //% parts="bluetooth"
-    void startTemperatureService() {    
-        new MicroBitTemperatureService(*uBit.ble, uBit.thermometer);        
-    }
-
-    /**
-    *  Starts the Bluetooth magnetometer service
-    */
-    //% help=bluetooth/start-magnetometer-service
-    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service" blockGap=8
-    //% parts="bluetooth"
-    void startMagnetometerService() {    
-        new MicroBitMagnetometerService(*uBit.ble, uBit.compass); 
-    }
 
     /**
     *  Starts the Bluetooth accelerometer service
     */
     //% help=bluetooth/start-accelerometer-service
-    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service" blockGap=8
+    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service"
-    //% parts="bluetooth"
+    //% parts="bluetooth" weight=90 blockGap=8
     void startAccelerometerService() {
         new MicroBitAccelerometerService(*uBit.ble, uBit.accelerometer);        
     }   
@@ -82,17 +27,58 @@ namespace bluetooth {
     */
     //% help=bluetooth/start-button-service
     //% blockId=bluetooth_start_button_service block="bluetooth button service" blockGap=8
-    //% parts="bluetooth"
+    //% parts="bluetooth" weight=89
     void startButtonService() {
         new MicroBitButtonService(*uBit.ble);      
     }
 
+    /**
+    *  Starts the Bluetooth IO pin service.
+    */
+    //% help=bluetooth/start-io-pin-service
+    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
+    //% parts="bluetooth" weight=88
+    void startIOPinService() {
+        new MicroBitIOPinService(*uBit.ble, uBit.io);
+    }
+
+    /**
+    *  Starts the Bluetooth LED service
+    */
+    //% help=bluetooth/start-led-service
+    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
+    //% parts="bluetooth" weight=87
+    void startLEDService() {
+        new MicroBitLEDService(*uBit.ble, uBit.display);
+    }
+
+    /**
+    *  Starts the Bluetooth temperature service
+    */
+    //% help=bluetooth/start-temperature-service
+    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
+    //% parts="bluetooth" weight=86
+    void startTemperatureService() {    
+        new MicroBitTemperatureService(*uBit.ble, uBit.thermometer);        
+    }
+
+    /**
+    *  Starts the Bluetooth magnetometer service
+    */
+    //% help=bluetooth/start-magnetometer-service
+    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service"
+    //% parts="bluetooth" weight=85
+    void startMagnetometerService() {    
+        new MicroBitMagnetometerService(*uBit.ble, uBit.compass); 
+    }
+
+
     /**
     *  Starts the Bluetooth UART service
     */
     //% help=bluetooth/start-uart-service
-    //% blockId=bluetooth_start_uart_service block="bluetooth uart service" blockGap=8
+    //% blockId=bluetooth_start_uart_service block="bluetooth uart service"
-    //% parts="bluetooth"
+    //% parts="bluetooth" advanced=true
     void startUartService() {
         if (uart) return;
         // 61 octet buffer size is 3 x (MTU - 3) + 1
@@ -102,13 +88,13 @@ namespace bluetooth {
     }
     
     //%
-    void uartWrite(StringData *data) {
+    void uartWriteString(StringData *data) {
         startUartService();
     	uart->send(ManagedString(data));
     }    
 
     //%
-    StringData* uartRead(StringData *del) {
+    StringData* uartReadUntil(StringData *del) {
         startUartService();
         return uart->readUntil(ManagedString(del)).leakData();
     }    
@@ -134,6 +120,4 @@ namespace bluetooth {
     void onBluetoothDisconnected(Action body) {
         registerWithDal(MICROBIT_ID_BLE, MICROBIT_BLE_EVT_DISCONNECTED, body);
     }  
-  
-  
 }

libs/bluetooth/bluetooth.ts

@@ -1,42 +1,48 @@
-namespace bluetooth {
+/**
-    /**
+ * Support for additional Bluetooth services.
-     * Returns the delimiter corresponding string
  */
-    //% blockId="bluetooth_uart_delimiter_conv" block="%del"
+//% color=#0082FB weight=20
-    //% weight=1 parts="bluetooth"
+namespace bluetooth {
-    export function delimiters(del: Delimiters): string {
-        // even though it might not look like, this is more
-        // (memory) efficient than the C++ implementation, because the
-        // strings are statically allocated and take no RAM 
-        switch (del) {
-            case Delimiters.NewLine: return "\n"
-            case Delimiters.Comma: return ","
-            case Delimiters.Dollar: return "$"
-            case Delimiters.Colon: return ":"
-            case Delimiters.Fullstop: return "."
-            case Delimiters.Hash: return "#"
-            default: return "\n"
-        }
-    }
-
     /**
     *  Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.
     */
-    //% help=bluetooth/uart-write
+    //% help=bluetooth/uart-write-string weight=80
-    //% blockId=bluetooth_uart_write block="bluetooth uart write %data" blockGap=8
+    //% blockId=bluetooth_uart_write block="bluetooth uart|write string %data" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::uartWrite
+    //% parts="bluetooth" shim=bluetooth::uartWriteString advanced=true
-    export function uartWrite(data: string): void {
+    export function uartWriteString(data: string): void {
         // dummy implementation for simulator
         console.log("UART Write: " + data)
     }
 
+    /**
+     * Prints a numeric value to the serial
+     */
+    //% help=bluetooth/uart-write-number weight=79
+    //% weight=89 blockGap=8 advanced=true
+    //% blockId=bluetooth_uart_writenumber block="bluetooth uart|write number %value"
+    export function uartWriteNumber(value: number): void {
+        uartWriteString(value.toString());
+    }
+
+    /**
+     * Writes a ``name: value`` pair line to the serial.
+     * @param name name of the value stream, eg: x
+     * @param value to write
+     */
+    //% weight=88 weight=78
+    //% help=bluetooth/uart-write-value advanced=true
+    //% blockId=bluetooth_uart_writevalue block="bluetooth uart|write value %name|= %value"
+    export function uartWriteValue(name: string, value: number): void {
+        uartWriteString(name + ":" + value + "\r\n");
+    }
+
     /**
      *  Reads from the Bluetooth UART service buffer, returning its contents when the specified delimiter character is encountered.
      */
-    //% help=bluetooth/uart-read
+    //% help=bluetooth/uart-read-until weight=75
-    //% blockId=bluetooth_uart_read block="bluetooth uart read %del=bluetooth_uart_delimiter_conv" blockGap=8
+    //% blockId=bluetooth_uart_read block="bluetooth uart|read until %del=serial_delimiter_conv"
-    //% parts="bluetooth" shim=bluetooth::uartRead
+    //% parts="bluetooth" shim=bluetooth::uartReadUntil advanced=true
-    export function uartRead(del: string): string {
+    export function uartReadUntil(del: string): string {
         // dummy implementation for simulator
         return "???"
     }

libs/bluetooth/enums.d.ts

@@ -1,20 +1,4 @@
 // Auto-generated. Do not edit.
-
-
-    declare enum Delimiters {
-    //% block="new line"
-    NewLine = 1,
-    //% block=","
-    Comma = 2,
-    //% block="$"
-    Dollar = 3,
-    //% block=":"
-    Colon = 4,
-    //% block="."
-    Fullstop = 5,
-    //% block="#"
-    Hash = 6,
-    }
 declare namespace bluetooth {
 }
 

libs/bluetooth/shims.d.ts

@@ -7,44 +7,12 @@
     //% color=#0082FB weight=20
 declare namespace bluetooth {
 
-    /**
-     *  Starts the Bluetooth IO pin service.
-     */
-    //% help=bluetooth/start-io-pin-service
-    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startIOPinService
-    function startIOPinService(): void;
-
-    /**
-     *  Starts the Bluetooth LED service
-     */
-    //% help=bluetooth/start-led-service
-    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startLEDService
-    function startLEDService(): void;
-
-    /**
-     *  Starts the Bluetooth temperature service
-     */
-    //% help=bluetooth/start-temperature-service
-    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startTemperatureService
-    function startTemperatureService(): void;
-
-    /**
-     *  Starts the Bluetooth magnetometer service
-     */
-    //% help=bluetooth/start-magnetometer-service
-    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startMagnetometerService
-    function startMagnetometerService(): void;
-
     /**
      *  Starts the Bluetooth accelerometer service
      */
     //% help=bluetooth/start-accelerometer-service
-    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service" blockGap=8
+    //% blockId=bluetooth_start_accelerometer_service block="bluetooth accelerometer service"
-    //% parts="bluetooth" shim=bluetooth::startAccelerometerService
+    //% parts="bluetooth" weight=90 blockGap=8 shim=bluetooth::startAccelerometerService
     function startAccelerometerService(): void;
 
     /**
@@ -52,15 +20,47 @@ declare namespace bluetooth {
      */
     //% help=bluetooth/start-button-service
     //% blockId=bluetooth_start_button_service block="bluetooth button service" blockGap=8
-    //% parts="bluetooth" shim=bluetooth::startButtonService
+    //% parts="bluetooth" weight=89 shim=bluetooth::startButtonService
     function startButtonService(): void;
 
+    /**
+     *  Starts the Bluetooth IO pin service.
+     */
+    //% help=bluetooth/start-io-pin-service
+    //% blockId=bluetooth_start_io_pin_service block="bluetooth io pin service" blockGap=8
+    //% parts="bluetooth" weight=88 shim=bluetooth::startIOPinService
+    function startIOPinService(): void;
+
+    /**
+     *  Starts the Bluetooth LED service
+     */
+    //% help=bluetooth/start-led-service
+    //% blockId=bluetooth_start_led_service block="bluetooth led service" blockGap=8
+    //% parts="bluetooth" weight=87 shim=bluetooth::startLEDService
+    function startLEDService(): void;
+
+    /**
+     *  Starts the Bluetooth temperature service
+     */
+    //% help=bluetooth/start-temperature-service
+    //% blockId=bluetooth_start_temperature_service block="bluetooth temperature service" blockGap=8
+    //% parts="bluetooth" weight=86 shim=bluetooth::startTemperatureService
+    function startTemperatureService(): void;
+
+    /**
+     *  Starts the Bluetooth magnetometer service
+     */
+    //% help=bluetooth/start-magnetometer-service
+    //% blockId=bluetooth_start_magnetometer_service block="bluetooth magnetometer service"
+    //% parts="bluetooth" weight=85 shim=bluetooth::startMagnetometerService
+    function startMagnetometerService(): void;
+
     /**
      *  Starts the Bluetooth UART service
      */
     //% help=bluetooth/start-uart-service
-    //% blockId=bluetooth_start_uart_service block="bluetooth uart service" blockGap=8
+    //% blockId=bluetooth_start_uart_service block="bluetooth uart service"
-    //% parts="bluetooth" shim=bluetooth::startUartService
+    //% parts="bluetooth" advanced=true shim=bluetooth::startUartService
     function startUartService(): void;
 
     /**

libs/core/enums.d.ts

@@ -311,6 +311,22 @@ declare namespace motors {
     //% block=9600
     BaudRate9600 = 9600,
     }
+
+
+    declare enum Delimiters {
+    //% block="new line"
+    NewLine = 1,
+    //% block=","
+    Comma = 2,
+    //% block="$"
+    Dollar = 3,
+    //% block=":"
+    Colon = 4,
+    //% block="."
+    Fullstop = 5,
+    //% block="#"
+    Hash = 6,
+    }
 declare namespace serial {
 }
 

libs/core/serial.cpp

@@ -1,6 +1,6 @@
 #include "ksbit.h"
 
-enum class SerialPin {
+enum SerialPin {
     P0 = MICROBIT_ID_IO_P0,
     P1 = MICROBIT_ID_IO_P1,
     P2 = MICROBIT_ID_IO_P2,
@@ -12,36 +12,52 @@ enum class SerialPin {
     //P16 = MICROBIT_ID_IO_P16
 };
 
-enum class BaudRate {
+enum BaudRate {
   //% block=115200
   BaudRate115200 = 115200,
   //% block=9600
   BaudRate9600 = 9600
 };
 
+enum Delimiters {
+    //% block="new line"
+    NewLine = 1,
+    //% block=","
+    Comma = 2,
+    //% block="$"
+    Dollar = 3,
+    //% block=":"
+    Colon = 4,
+    //% block="."
+    Fullstop = 5,
+    //% block="#"
+    Hash = 6,
+};
+
 //% weight=2 color=30
 //% advanced=true
 namespace serial {
     // note that at least one // followed by % is needed per declaration!
 
     /**
-     * Reads a line of text from the serial port.
+     * Reads a line of text from the serial port and returns the buffer when the delimiter is met.
+     * @param delimiter text delimiter that separates each text chunk
      */
-    //% help=serial/read-line
+    //% help=serial/read-until
-    //% blockId=serial_read_line block="serial read line"
+    //% blockId=serial_read_until block="serial|read until %delimiter=serial_delimiter_conv"
-    //% weight=20
+    //% weight=19
-    StringData* readLine() {
+    StringData* readUntil(StringData* delimiter) {
-      return uBit.serial.readUntil(ManagedString("\n")).leakData();
+      return uBit.serial.readUntil(ManagedString(delimiter)).leakData();
     }
 
     /**
-     * Sends a piece of text through Serial connection.
+     * Reads a line of text from the serial port.
      */
-    //% help=serial/write-string
+    //% help=serial/read-line
-    //% weight=87
+    //% blockId=serial_read_line block="serial|read line"
-    //% blockId=serial_writestring block="serial write string %text"
+    //% weight=20 blockGap=8
-    void writeString(StringData *text) {
+    StringData* readLine() {
-      uBit.serial.send(ManagedString(text));
+      return readUntil(ManagedString("\n").leakData());
     }
 
     /**
@@ -49,12 +65,22 @@ namespace serial {
     * @param delimiters the characters to match received characters against. eg:"\n"
     */
     // help=serial/on-data-received
-    // weight=19
+    // weight=18
     void onDataReceived(StringData* delimiters, Action body) {
       uBit.serial.eventOn(ManagedString(delimiters));
       registerWithDal(MICROBIT_ID_SERIAL, MICROBIT_SERIAL_EVT_DELIM_MATCH, body);
     }
 
+    /**
+     * Sends a piece of text through Serial connection.
+     */
+    //% help=serial/write-string
+    //% weight=87
+    //% blockId=serial_writestring block="serial|write string %text"
+    void writeString(StringData *text) {
+      uBit.serial.send(ManagedString(text));
+    }
+
     /**
     * Dynamically configuring the serial instance to use pins other than USBTX and USBRX.
     * @param tx the new transmission pins
@@ -63,7 +89,7 @@ namespace serial {
     */
     //% weight=10
     //% help=serial/redirect-to
-    //% blockId=serial_redirect block="serial redirect to|TX %tx|RX %rx|at baud rate %rate"
+    //% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate"
     //% blockExternalInputs=1
     void redirect(SerialPin tx, SerialPin rx, BaudRate rate) {
       uBit.serial.redirect((PinName)tx, (PinName)rx);

libs/core/serial.ts

@@ -46,4 +46,24 @@ namespace serial {
     export function onLineReceived(body: Action): void {
        // serial.onDataReceived("\n", body);
     }
+
+    /**
+     * Returns the delimiter corresponding string
+     */
+    //% blockId="serial_delimiter_conv" block="%del"
+    //% weight=1
+    export function delimiters(del: Delimiters): string {
+        // even though it might not look like, this is more
+        // (memory) efficient than the C++ implementation, because the
+        // strings are statically allocated and take no RAM 
+        switch (del) {
+            case Delimiters.NewLine: return "\n"
+            case Delimiters.Comma: return ","
+            case Delimiters.Dollar: return "$"
+            case Delimiters.Colon: return ":"
+            case Delimiters.Fullstop: return "."
+            case Delimiters.Hash: return "#"
+            default: return "\n"
+        }
+    }
 }

libs/core/shims.d.ts

@@ -671,12 +671,21 @@ declare namespace pins {
     //% advanced=true
 declare namespace serial {
 
+    /**
+     * Reads a line of text from the serial port and returns the buffer when the delimiter is met.
+     * @param delimiter text delimiter that separates each text chunk
+     */
+    //% help=serial/read-until
+    //% blockId=serial_read_until block="serial|read until %delimiter=serial_delimiter_conv"
+    //% weight=19 shim=serial::readUntil
+    function readUntil(delimiter: string): string;
+
     /**
      * Reads a line of text from the serial port.
      */
     //% help=serial/read-line
-    //% blockId=serial_read_line block="serial read line"
+    //% blockId=serial_read_line block="serial|read line"
-    //% weight=20 shim=serial::readLine
+    //% weight=20 blockGap=8 shim=serial::readLine
     function readLine(): string;
 
     /**
@@ -684,7 +693,7 @@ declare namespace serial {
      */
     //% help=serial/write-string
     //% weight=87
-    //% blockId=serial_writestring block="serial write string %text" shim=serial::writeString
+    //% blockId=serial_writestring block="serial|write string %text" shim=serial::writeString
     function writeString(text: string): void;
 
     /**
@@ -695,7 +704,7 @@ declare namespace serial {
      */
     //% weight=10
     //% help=serial/redirect-to
-    //% blockId=serial_redirect block="serial redirect to|TX %tx|RX %rx|at baud rate %rate"
+    //% blockId=serial_redirect block="serial|redirect to|TX %tx|RX %rx|at baud rate %rate"
     //% blockExternalInputs=1 shim=serial::redirect
     function redirect(tx: SerialPin, rx: SerialPin, rate: BaudRate): void;
 }

pxtarget.json

@@ -80,6 +80,13 @@
                     "microbit-pins": "",
                     "microbit-serial": ""
                 }
+            }, 
+            {
+                "type": "api",
+                "map": {
+                    "bluetooth\\.uartRead\\((.*?)\\)" : "bluetooth.uartReadUntil($1)",
+                    "bluetooth\\.uartWrite\\((.*?)\\)" : "bluetooth.uartWriteUntil($1)"
+                }
             }
         ]
     },

sim/state/misc.ts

@@ -168,7 +168,7 @@ namespace pxsim.bluetooth {
     export function uartWrite(s : string): void {
         // TODO
     }
-    export function uartRead(): string {
+    export function uartReadUntil(del: string): string {
         // TODO
         return ""
     }

sim/state/serial.ts

@@ -43,6 +43,10 @@ namespace pxsim.serial {
         return board().serialState.readSerial();
     }
 
+    export function readUntil(del: string): string {
+        return readLine();
+    }
+
     export function onDataReceived(delimiters: string, handler: RefAction) {
         let b = board();
         b.bus.listen(DAL.MICROBIT_ID_SERIAL, DAL.MICROBIT_SERIAL_EVT_DELIM_MATCH, handler);