merge master

* bump

* bump pxt

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v1.2.22"
+    "appref": "v1.2.26"
 }

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" });
         }
     </script>

docs/stable-ref.json

@@ -0,0 +1,3 @@
+{
+    "appref": "v1.2"
+}

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/input.ts

@@ -121,10 +121,9 @@ namespace sensors.internal {
 
         powerMM = control.mmap("/dev/lms_power", 2, 0)
 
-        devPoller = new Poller(250, () => { return hashDevices(); },
+        devPoller = new Poller(500,
-            (prev, curr) => {
+            () => { return hashDevices(); },
-                detectDevices();
+            (prev, curr) => { detectDevices(); });
-            });
     }
 
     export function getActiveSensors(): Sensor[] {
@@ -431,11 +430,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)
         }
 

package.json

@@ -45,8 +45,8 @@
     "@types/web-bluetooth": "0.0.4"
   },
   "dependencies": {
-    "pxt-common-packages": "6.16.11",
+    "pxt-common-packages": "6.16.18",
-    "pxt-core": "5.25.16"
+    "pxt-core": "5.28.8"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

sim/state/color.ts

@@ -3,7 +3,6 @@
 namespace pxsim {
 
     export enum ColorSensorMode {
-        None = -1,
         Reflected = 0,
         Ambient = 1,
         Colors = 2,

sim/state/gyro.ts

@@ -1,6 +1,5 @@
 namespace pxsim {
     export const enum GyroSensorMode {
-        None = -1,
         Angle = 0,
         Rate = 1,
     }

sim/state/infrared.ts

@@ -44,7 +44,6 @@ namespace pxsim {
     }
 
     export enum InfraredSensorMode {
-        None = -1,
         Proximity = 0,
         Seek = 1,
         RemoteControl = 2

targetconfig.json

@@ -27,6 +27,6 @@
         "Tutorial Videos": "videos"
     },
     "electronManifest": {
-        "latest": "v1.2.22"
+        "latest": "v1.2.26"
     }
 }