1.2.28

* cooperate pause

* fix math

* update lastPause before pausing

* faster cooperation

Co-authored-by: Peli de Halleux <peli@DESKTOP-5B7QRAM.corp.microsoft.com>

docs/coding/ignition.md

@@ -27,7 +27,6 @@ while (true) {
         music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
         music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
     }
-    pause(1);
 }
 ```
 
@@ -43,6 +42,5 @@ while (true) {
         music.playSoundEffectUntilDone(sounds.mechanicalMotorStart)
         music.playSoundEffectUntilDone(sounds.mechanicalMotorIdle);
     }
-    pause(1);
 }
 ```

editor/deploy.ts

@@ -64,6 +64,7 @@ class WebSerialPackageIO implements pxt.HF2.PacketIO {
     private _writer: any;
 
     constructor(private port: SerialPort, private options: SerialOptions) {
+        console.log(`serial: new io`)
     }
 
     async readSerialAsync() {
@@ -90,17 +91,24 @@ class WebSerialPackageIO implements pxt.HF2.PacketIO {
         return !!(<any>navigator).serial;
     }
 
+    static portIos: WebSerialPackageIO[] = [];
     static async mkPacketIOAsync(): Promise<pxt.HF2.PacketIO> {
         const serial = (<any>navigator).serial;
         if (serial) {
             try {
                 const requestOptions: SerialPortRequestOptions = {};
                 const port = await serial.requestPort(requestOptions);
-                const options: SerialOptions = {
+
-                    baudrate: 460800,
+                let io = WebSerialPackageIO.portIos.filter(i => i.port == port)[0];
-                    buffersize: 4096
+                if (!io) {
-                };
+                    const options: SerialOptions = {
-                return new WebSerialPackageIO(port, options);
+                        baudrate: 460800,
+                        buffersize: 4096
+                    };
+                    io = new WebSerialPackageIO(port, options);
+                    WebSerialPackageIO.portIos.push(io);
+                }
+                return io;
             } catch (e) {
                 console.log(`connection error`, e)
             }
@@ -125,11 +133,8 @@ class WebSerialPackageIO implements pxt.HF2.PacketIO {
             });
     }
 
-    private closeAsync() {
+    private async closeAsync() {
-        console.log(`serial: closing port`);
+        // don't close port
-        this.port.close();
-        this._reader = undefined;
-        this._writer = undefined;
         return Promise.delay(500);
     }
 

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

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)

libs/core/cooperate.ts

@@ -0,0 +1,11 @@
+namespace control {
+    let lastPause = 0;
+    const COOPERATION_INTERVAL = 20
+    export function cooperate() {
+        const now = control.millis()
+        if (now - lastPause > COOPERATION_INTERVAL) {
+            lastPause = now
+            pause(1)
+        }
+    }
+}

libs/core/input.ts

@@ -21,8 +21,7 @@ namespace sensors.internal {
             const now = control.millis();
             if (now - this.lastQuery >= this.interval * 2)
                 this.queryAndUpdate(); // sensor poller is not allowed to run
-            if (now - this.lastPause >= this.interval * 5)
+            control.cooperate(); // allow events to trigger
-                pause(1); // allow events to trigger
         }
 
         private queryAndUpdate() {

libs/core/output.ts

@@ -124,7 +124,7 @@ namespace motors {
     export function stopAll() {
         const b = mkCmd(Output.ALL, DAL.opOutputStop, 0)
         writePWM(b);
-        pause(1);
+        control.cooperate();
     }
 
     /**
@@ -136,7 +136,7 @@ namespace motors {
     //% help=motors/reset-all
     export function resetAll() {
         reset(Output.ALL)
-        pause(1);
+        control.cooperate();
     }
 
     interface MoveSchedule {
@@ -269,7 +269,7 @@ namespace motors {
             if (this._brake && this._brakeSettleTime > 0)
                 pause(this._brakeSettleTime);
             else {
-                pause(1);
+                control.cooperate();
             }
         }
 
@@ -280,7 +280,7 @@ namespace motors {
                 // allow robot to settle
                 this.settle();
             } else {
-                pause(1);
+                control.cooperate();
             }
         }
 
@@ -357,7 +357,7 @@ namespace motors {
             // special: 0 is infinity
             if (schedule.steps[0] + schedule.steps[1] + schedule.steps[2] == 0) {
                 this._run(schedule.speed);
-                pause(1);
+                control.cooperate();
                 return;
             }
 

libs/core/pxt.json

@@ -26,7 +26,8 @@
         "icons.jres",
         "ns.ts",
         "platform.h",
-        "integrator.ts"
+        "integrator.ts",
+        "cooperate.ts"
     ],
     "testFiles": [
         "test.ts"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "1.2.25",
+  "version": "1.2.28",
   "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
   "private": false,
   "keywords": [