slow down device poller

docs/getting-started/try-tutorial.md

@@ -73,12 +73,6 @@ Verify that the program you just created shows eyes on the Brick Display, and th
 
 **Well done!**
 
-## Run it Again
-
-![EV3 Brick with Try in BrkProg_Save Folder in File Manager](/static/getting-started/try-in-file-manager.png)
-
-Use the Brick Buttons and navigate to the File Manager tab.  Open the **BrkProg_SAVE** folder, select **Try** and click the center button to run it again.
-
 ## Connect a Large Motor @unplugged
 
 Now you will learn to control the Large Motor.

docs/index-ref.json

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

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.26/win64");
+            window.open("https://makecode.com/api/release/ev3/v1.2.22/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.26/mac64");
+            window.open("https://makecode.com/api/release/ev3/v1.2.22/mac64");
             tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
         }
     </script>

docs/stable-ref.json

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

libs/color-sensor/color.ts

@@ -1,4 +1,5 @@
 const enum ColorSensorMode {
+    None = 0,
     //% block="reflected light intensity"
     ReflectedLightIntensity = 0,
     //% block="ambient light intensity"
@@ -60,6 +61,7 @@ namespace sensors {
             super(port)
             this.thresholdDetector = new sensors.ThresholdDetector(this.id());
             this.calibrating = false;
+            this.setMode(ColorSensorMode.ReflectedLightIntensity);
         }
 
         _colorEventValue(value: number) {
@@ -174,27 +176,11 @@ namespace sensors {
         //% group="Color Sensor"
         //% blockGap=8
         color(): ColorSensorColor {
-            this.poke();
             this.setMode(ColorSensorMode.Color)
+            this.poke();
             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
@@ -208,8 +194,8 @@ namespace sensors {
         //% group="Color Sensor"
         //% blockGap=8
         rgbRaw(): number[] {
-            this.poke();
             this.setMode(ColorSensorMode.RgbRaw);
+            this.poke();
             return [this.getNumber(NumberFormat.UInt16LE, 0), this.getNumber(NumberFormat.UInt16LE, 2), this.getNumber(NumberFormat.UInt16LE, 4)];
         }
 
@@ -262,8 +248,8 @@ namespace sensors {
         //% weight=87 blockGap=8
         //% group="Color Sensor"
         light(mode: LightIntensityMode) {
-            this.poke();
             this.setMode(<ColorSensorMode><number>mode)
+            this.poke();
             switch (mode) {
                 case LightIntensityMode.ReflectedRaw:
                     return this.reflectedLightRaw();
@@ -293,8 +279,8 @@ namespace sensors {
          */
         //%
         reflectedLightRaw(): number {
-            this.poke();
             this.setMode(ColorSensorMode.RefRaw);
+            this.poke();
             return this.getNumber(NumberFormat.UInt16LE, 0);
         }
 

libs/color-sensor/docs/reference/sensors/color-sensor/is-color-detected.md

@@ -1,30 +0,0 @@
-# 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/dal.d.ts

@@ -309,6 +309,8 @@ declare const enum DAL {
     DEVICE_TYPE_NXT_LIGHT = 2,
     DEVICE_TYPE_NXT_SOUND = 3,
     DEVICE_TYPE_NXT_COLOR = 4,
+    DEVICE_TYPE_NXT_ULTRASONIC = 5,
+    DEVICE_TYPE_NXT_TEMPERATURE = 6,
     DEVICE_TYPE_TACHO = 7,
     DEVICE_TYPE_MINITACHO = 8,
     DEVICE_TYPE_NEWTACHO = 9,

libs/core/ev3const.h

@@ -11,6 +11,8 @@
 #define DEVICE_TYPE_NXT_LIGHT 2
 #define DEVICE_TYPE_NXT_SOUND 3
 #define DEVICE_TYPE_NXT_COLOR 4
+#define DEVICE_TYPE_NXT_ULTRASONIC 5
+#define DEVICE_TYPE_NXT_TEMPERATURE 6
 #define DEVICE_TYPE_TACHO 7
 #define DEVICE_TYPE_MINITACHO 8
 #define DEVICE_TYPE_NEWTACHO 9

libs/core/input.ts

@@ -82,7 +82,7 @@ namespace sensors.internal {
         poller: Poller;
 
         constructor(p: number) {
-            this.port = p
+            this.port = p; // 0-based
             this.connType = DAL.CONN_NONE
             this.devType = DAL.DEVICE_TYPE_NONE
             this.iicid = ''
@@ -121,9 +121,10 @@ namespace sensors.internal {
 
         powerMM = control.mmap("/dev/lms_power", 2, 0)
 
-        devPoller = new Poller(500,
-            () => { return hashDevices(); },
-            (prev, curr) => { detectDevices(); });
+        devPoller = new Poller(500, () => { return hashDevices(); },
+            (prev, curr) => {
+                detectDevices();
+            });
     }
 
     export function getActiveSensors(): Sensor[] {
@@ -276,47 +277,63 @@ void      cUiUpdatePower(void)
         const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
         let r = 0;
         for (let i = 0; i < conns.length; ++i) {
-            r = conns[i] + (r << 6) + (r << 16) - r;
+            r = (r << 8 | conns[i]);
         }
+        //control.dmesg(`devices hash: ${r}`);
         return r;
     }
 
     let nonActivated = 0;
     function detectDevices() {
-        control.dmesg(`detect devices (hash ${hashDevices()})`)
-        const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
+        control.dmesg(`detect devices (${nonActivated} na)`)
+        const inDcm = analogMM.slice(AnalogOff.InDcm, DAL.NUM_INPUTS)
+        const inConn = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
         let numChanged = 0;
         const uartSensors: SensorInfo[] = [];
 
         for (const sensorInfo of sensorInfos) {
-            const newConn = conns[sensorInfo.port]
-            if (newConn == sensorInfo.connType
-                && sensorInfo.sensor
-                && sensorInfo.sensor.isActive()) {
-                if (newConn == DAL.CONN_INPUT_UART)
-                    uartSensors.push(sensorInfo);
+            const newConn = inConn[sensorInfo.port]
+            if (newConn == sensorInfo.connType) {
+                // control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`)
                 continue;
             }
             numChanged++
             sensorInfo.connType = newConn
-            sensorInfo.devType = DAL.DEVICE_TYPE_NONE
-            if (newConn == DAL.CONN_INPUT_UART) {
-                control.dmesg(`new UART connection at ${sensorInfo.port}`)
-                updateUartMode(sensorInfo.port, 0);
-                uartSensors.push(sensorInfo);
-            } else if (newConn == DAL.CONN_NXT_IIC) {
-                control.dmesg(`new IIC connection at ${sensorInfo.port}`)
-                sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN
-                sensorInfo.iicid = readIICID(sensorInfo.port)
-                control.dmesg(`IIC ID ${sensorInfo.iicid.length}`)
-            } else if (newConn == DAL.CONN_INPUT_DUMB) {
-                control.dmesg(`new DUMB connection at ${sensorInfo.port}`)
-                // TODO? for now assume touch
-                sensorInfo.devType = DAL.DEVICE_TYPE_TOUCH
-            } else if (newConn == DAL.CONN_NONE || newConn == 0) {
-                //control.dmesg(`disconnect at port ${sensorInfo.port}`)
-            } else {
-                control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
+            sensorInfo.devType = DAL.DEVICE_TYPE_NONE;
+            switch (newConn) {
+                case DAL.CONN_INPUT_UART: {
+                    control.dmesg(`new UART connection at ${sensorInfo.port}`)
+                    updateUartMode(sensorInfo.port, 0);
+                    uartSensors.push(sensorInfo);
+                    break;
+                }
+                case DAL.CONN_NXT_IIC: {
+                    control.dmesg(`new NXT IIC connection at ${sensorInfo.port}`)
+                    sensorInfo.devType = DAL.DEVICE_TYPE_IIC_UNKNOWN
+                    sensorInfo.iicid = readIICID(sensorInfo.port)
+                    control.dmesg(`IIC ID ${sensorInfo.iicid.length}`)
+                    break;
+                } case DAL.CONN_NXT_DUMB: { // analog NXT sensor
+                    control.dmesg(`new NXT analog connection at ${sensorInfo.port}`);
+                    sensorInfo.devType = inDcm[sensorInfo.port];
+                    control.dmesg(`NXT analog dev type ${sensorInfo.devType}`);
+                    break;
+                }
+                case DAL.CONN_INPUT_DUMB: {
+                    control.dmesg(`new DUMB connection at ${sensorInfo.port}`)
+                    // TODO? for now assume touch
+                    sensorInfo.devType = DAL.DEVICE_TYPE_TOUCH
+                    break;
+                }
+                case DAL.CONN_NONE:
+                case 0: {
+                    //control.dmesg(`disconnect at port ${sensorInfo.port}`)
+                    break;
+                }
+                default: {
+                    control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
+                    break;
+                }
             }
         }
 
@@ -325,8 +342,7 @@ void      cUiUpdatePower(void)
             for (const sensorInfo of uartSensors) {
                 let uinfo = readUartInfo(sensorInfo.port, 0)
                 sensorInfo.devType = uinfo[TypesOff.Type]
-                const mode = uinfo[TypesOff.Mode];
-                control.dmesg(`UART type ${sensorInfo.devType} mode ${mode}`)
+                control.dmesg(`UART type ${sensorInfo.devType}`)
             }
         }
 
@@ -430,20 +446,20 @@ void      cUiUpdatePower(void)
         constructor(port: number) {
             super(port)
             this.mode = 0
-            this.realmode = -1
+            this.realmode = 0;
         }
 
         _activated() {
-            this.realmode = -1
+            this.realmode = 0;
             this._setMode(this.mode)
         }
 
         protected _setMode(m: number) {
-            //control.dmesg(`_setMode p=${this.port} m: ${this.realmode} -> ${m}`)
             let v = m | 0
             this.mode = v
             if (!this.isActive()) return
             if (this.realmode != this.mode) {
+                control.dmesg(`_setMode p=${this._port} m: ${this.realmode} -> ${v}`)
                 this.realmode = v
                 setUartMode(this._port, v)
             }
@@ -461,7 +477,7 @@ void      cUiUpdatePower(void)
 
         reset() {
             if (this.isActive()) uartReset(this._port);
-            this.realmode = -1;
+            this.realmode = 0;
         }
     }
 
@@ -539,6 +555,8 @@ void      cUiUpdatePower(void)
 
     function uartClearChange(port: number) {
         control.dmesg(`UART clear change`);
+        const UART_DATA_READY = 8
+        const UART_PORT_CHANGED = 1
         while (true) {
             let status = getUartStatus(port)
             if (port < 0) break
@@ -559,7 +577,7 @@ void      cUiUpdatePower(void)
     }
 
     function setUartModes() {
-        control.dmesg(`UART set modes 0x${devcon.toHex()}`)
+        control.dmesg(`UART set modes`)
         uartMM.ioctl(IO.UART_SET_CONN, devcon)
         const ports: number[] = [];
         for (let port = 0; port < DAL.NUM_INPUTS; ++port) {
@@ -572,8 +590,6 @@ void      cUiUpdatePower(void)
             const port = ports.pop();
             const status = waitNonZeroUartStatus(port)
             control.dmesg(`UART status ${status} at ${port}`);
-            if (!(status & UART_DATA_READY))
-                setUartMode(port, devcon[DevConOff.Mode + port]);
         }
     }
 
@@ -584,22 +600,20 @@ void      cUiUpdatePower(void)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
     }
 
-    const UART_PORT_CHANGED = 1
-    const UART_DATA_READY = 8
     function setUartMode(port: number, mode: number) {
+        control.dmesg(`UART set mode ${mode} at ${port}`);
+        const UART_PORT_CHANGED = 1
         while (true) {
             if (port < 0) return
             updateUartMode(port, mode);
-            control.dmesg(`UART set mode 0x${devcon.toHex()}`)
             uartMM.ioctl(IO.UART_SET_CONN, devcon)
             let status = waitNonZeroUartStatus(port)
             if (status & UART_PORT_CHANGED) {
                 control.dmesg(`UART clear changed at ${port}`)
                 uartClearChange(port)
             } else {
-                control.dmesg(`UART status ${status}`);
-                if (status & UART_DATA_READY)
-                    break;
+                control.dmesg(`UART status ${status} at ${port}`);
+                break;
             }
             pause(10)
         }
@@ -613,15 +627,16 @@ void      cUiUpdatePower(void)
             DAL.MAX_DEVICE_DATALENGTH)
     }
 
-    function getUartNumber(fmt: NumberFormat, off: number, port: number) {
+    function getUartNumber(fmt: NumberFormat, off: number, port: number): number {
         if (port < 0) return 0
-        let index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2)
+        const index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2)
         return uartMM.getNumber(fmt,
             UartOff.Raw + DAL.MAX_DEVICE_DATALENGTH * 300 * port + DAL.MAX_DEVICE_DATALENGTH * index + off)
     }
 
     export function setIICMode(port: number, type: number, mode: number) {
         if (port < 0) return;
+        control.dmesg(`iic set type ${type} mode ${mode} at ${port}`)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_NXT_IIC)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, type)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
@@ -899,4 +914,4 @@ namespace sensors {
             }
         }
     }
-}
+}

libs/ev3/console.ts

@@ -21,6 +21,7 @@ namespace console._screen {
             console.addListener(log);
             brick.buttonUp.onEvent(ButtonEvent.Bumped, () => scroll(-3))
             brick.buttonDown.onEvent(ButtonEvent.Bumped, () => scroll(3))
+            brick.showConsole();
         }
     }
 

libs/screen/targetoverrides.ts

@@ -27,6 +27,7 @@ namespace brick {
         ShowLines,
         Image,
         Ports,
+        Console,
         Custom
     }
     let screenMode = ScreenMode.None;
@@ -197,6 +198,12 @@ namespace brick {
         })
     }
 
+    export function showConsole() {
+        console.sendToScreen();
+        screenMode = ScreenMode.Console;
+        clearScreen();
+    }
+
     /**
      * An image
      * @param image the image

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "1.4.8",
+  "version": "1.4.7",
   "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
   "private": false,
   "keywords": [
@@ -45,8 +45,8 @@
     "@types/web-bluetooth": "0.0.4"
   },
   "dependencies": {
-    "pxt-common-packages": "6.16.18",
-    "pxt-core": "5.28.8"
+    "pxt-common-packages": "6.16.10",
+    "pxt-core": "5.25.13"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

sim/state/color.ts

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

sim/state/gyro.ts

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

sim/state/infrared.ts

@@ -44,6 +44,7 @@ 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.26"
+        "latest": "v1.2.22"
     }
 }