Make settings compile

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/reference/brick/exit-program.md

@@ -1,18 +0,0 @@
-# exit Program
-
-Stops the program and returns to the brick menu
-
-```sig
-brick.exitProgram();
-```
-
-## Example
-
-Do a sequence of motor commands and stop the program.
-
-```blocks
-motors.largeA.run(50)
-pause(500)
-motors.stopAll()
-brick.exitProgram();
-```

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"
@@ -55,13 +56,12 @@ namespace sensors {
     export class ColorSensor extends internal.UartSensor {
         thresholdDetector: sensors.ThresholdDetector;
         calibrating: boolean;
-        private _curr: number;
 
         constructor(port: number) {
             super(port)
+            this._setMode(ColorSensorMode.None);
             this.thresholdDetector = new sensors.ThresholdDetector(this.id());
             this.calibrating = false;
-            this._curr = 0;
         }
 
         _colorEventValue(value: number) {
@@ -104,18 +104,17 @@ namespace sensors {
                         "yellow",
                         "red",
                         "white",
-                        "brown"][this._curr];
+                        "brown"][this._query()];
                 case ColorSensorMode.AmbientLightIntensity:
                 case ColorSensorMode.ReflectedLightIntensity:
-                    return `${this._curr}%`;
+                    return `${this._query()}%`;
                 default:
-                    return this._curr.toString();
+                    return this._query().toString();
             }
         }
 
         _update(prev: number, curr: number) {
             if (this.calibrating) return; // simply ignore data updates while calibrating
-            this._curr = curr;
             if (this.mode == ColorSensorMode.Color || this.mode == ColorSensorMode.RgbRaw || this.mode == ColorSensorMode.RefRaw)
                 control.raiseEvent(this._id, this._colorEventValue(curr));
             else
@@ -179,23 +178,7 @@ namespace sensors {
         color(): ColorSensorColor {
             this.poke();
             this.setMode(ColorSensorMode.Color)
-            return this._curr;
-        }
-
-        /**
-         * 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;
+            return this.getNumber(NumberFormat.UInt8LE, 0)
         }
 
         /**
@@ -271,7 +254,7 @@ namespace sensors {
                 case LightIntensityMode.ReflectedRaw:
                     return this.reflectedLightRaw();
                 default:
-                    return this._curr;
+                    return this.getNumber(NumberFormat.UInt8LE, 0)
             }
         }
 
@@ -298,7 +281,7 @@ namespace sensors {
         reflectedLightRaw(): number {
             this.poke();
             this.setMode(ColorSensorMode.RefRaw);
-            return this._curr;
+            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/battery.ts

@@ -26,7 +26,6 @@ namespace brick {
      */
     //% blockId=brickBatteryProperty block="battery %property"
     //% group="Battery"
-    //% blockGap=8
     //% help=brick/battery-property
     export function batteryInfo(property: BatteryProperty): number {
         const info = sensors.internal.getBatteryInfo();

libs/core/buttons.ts

@@ -85,7 +85,7 @@ namespace brick {
         //% blockId=buttonIsPressed
         //% parts="brick"
         //% blockNamespace=brick
-        //% weight=81
+        //% weight=81 blockGap=8
         //% group="Buttons"
         //% button.fieldEditor="brickbuttons"
         isPressed() {

libs/core/input.ts

@@ -1,7 +1,4 @@
 namespace sensors.internal {
-    const UART_PORT_CHANGED = 1
-    const UART_DATA_READY = 8
-
     export class Poller {
         private query: () => number;
         private update: (previous: number, current: number) => void;
@@ -39,7 +36,6 @@ namespace sensors.internal {
 
         private poll() {
             control.runInBackground(() => {
-                pause(this.interval);
                 this.lastQuery = this.lastPause = control.millis();
                 this.previousValue = this.currentValue = this.query();
                 this.update(this.previousValue, this.currentValue);
@@ -64,6 +60,8 @@ namespace sensors.internal {
     let uartMM: MMap
     let IICMM: MMap
     let powerMM: MMap
+    let devcon: Buffer
+    let devPoller: Poller
     let sensorInfos: SensorInfo[];
 
     let batteryInfo: {
@@ -106,10 +104,11 @@ namespace sensors.internal {
         }
     }
 
-    export function init() {
+    function init() {
         if (sensorInfos) return
         sensorInfos = []
         for (let i = 0; i < DAL.NUM_INPUTS; ++i) sensorInfos.push(new SensorInfo(i))
+        devcon = output.createBuffer(DevConOff.Size)
 
         analogMM = control.mmap("/dev/lms_analog", AnalogOff.Size, 0)
         if (!analogMM) control.fail("no analog sensor")
@@ -122,10 +121,10 @@ namespace sensors.internal {
 
         powerMM = control.mmap("/dev/lms_power", 2, 0)
 
-        forever(function () {
-            pause(500)
-            detectDevices();
-        })
+        devPoller = new Poller(250, () => { return hashDevices(); },
+            (prev, curr) => {
+                detectDevices();
+            });
     }
 
     export function getActiveSensors(): Sensor[] {
@@ -133,6 +132,16 @@ namespace sensors.internal {
         return sensorInfos.filter(si => si.sensor && si.sensor.isActive()).map(si => si.sensor);
     }
 
+    function readUartInfo(port: number, mode: number) {
+        let buf = output.createBuffer(UartCtlOff.Size)
+        buf[UartCtlOff.Port] = port
+        buf[UartCtlOff.Mode] = mode
+        uartMM.ioctl(IO.UART_READ_MODE_INFO, buf)
+        return buf
+        //let info = `t:${buf[TypesOff.Type]} c:${buf[TypesOff.Connection]} m:${buf[TypesOff.Mode]} n:${buf.slice(0, 12).toHex()}`
+        //serial.writeLine("UART " + port + " / " + mode + " - " + info)
+    }
+
     export function readIICID(port: number) {
         const buf = output.createBuffer(IICStr.Size)
         buf[IICStr.Port] = port
@@ -264,26 +273,35 @@ void      cUiUpdatePower(void)
         };
     }
 
-    function detectDevices() {
-        control.dmesg(`detect devices`)
+    function hashDevices(): number {
         const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
-        let devcon: Buffer = undefined;
+        let r = 0;
+        for (let i = 0; i < conns.length; ++i) {
+            r = (r << 8 | conns[i]);
+        }
+        return r;
+    }
+
+    let nonActivated = 0;
+    function detectDevices() {
+        //control.dmesg(`detect devices (${nonActivated} na)`)
+        const conns = 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)
+            if (newConn == sensorInfo.connType) {
+                // control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`)
                 continue;
-
+            }
+            numChanged++
             sensorInfo.connType = newConn
             sensorInfo.devType = DAL.DEVICE_TYPE_NONE
-            sensorInfo.sensor = undefined;
-
             if (newConn == DAL.CONN_INPUT_UART) {
                 control.dmesg(`new UART connection at ${sensorInfo.port}`)
-                const status = getUartStatus(sensorInfo.port);
-                if (status & UART_PORT_CHANGED) {
-                    if (!devcon) devcon = output.createBuffer(DevConOff.Size)
-                    updateUartMode(devcon, sensorInfo.port, 0);
-                }
+                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
@@ -294,31 +312,32 @@ void      cUiUpdatePower(void)
                 // TODO? for now assume touch
                 sensorInfo.devType = DAL.DEVICE_TYPE_TOUCH
             } else if (newConn == DAL.CONN_NONE || newConn == 0) {
-                control.dmesg(`disconnected port ${sensorInfo.port}`)
-                // clear sensor
-                sensorInfo.sensor = undefined;
+                //control.dmesg(`disconnect at port ${sensorInfo.port}`)
             } else {
                 control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
-                // clear sensor
-                sensorInfo.sensor = undefined;
             }
         }
 
-        if (devcon)
-            setUartModes(devcon);
-
-        for (const sensorInfo of sensorInfos.filter(si => si.connType == DAL.CONN_INPUT_UART && si.devType == DAL.CONN_NONE)) {
-            const uinfo = readUartInfo(sensorInfo.port, 0);
-            sensorInfo.devType = uinfo[TypesOff.Type];
-            control.dmesg(`UART type ${sensorInfo.devType}`)
+        if (uartSensors.length > 0) {
+            setUartModes();
+            for (const sensorInfo of uartSensors) {
+                let uinfo = readUartInfo(sensorInfo.port, 0)
+                sensorInfo.devType = uinfo[TypesOff.Type]
+                control.dmesg(`UART type ${sensorInfo.devType}`)
+            }
         }
 
-        // assign sensors
-        for (const sensorInfo of sensorInfos.filter(si => !si.sensor)) {
+        if (numChanged == 0 && nonActivated == 0)
+            return
+
+        //control.dmesg(`updating sensor status`)
+        nonActivated = 0;
+        for (const sensorInfo of sensorInfos) {
             if (sensorInfo.devType == DAL.DEVICE_TYPE_IIC_UNKNOWN) {
                 sensorInfo.sensor = sensorInfo.sensors.filter(s => s._IICId() == sensorInfo.iicid)[0]
                 if (!sensorInfo.sensor) {
                     control.dmesg(`sensor not found for iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
+                    nonActivated++;
                 } else {
                     control.dmesg(`sensor connected iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
                     sensorInfo.sensor._activated()
@@ -327,29 +346,14 @@ void      cUiUpdatePower(void)
                 sensorInfo.sensor = sensorInfo.sensors.filter(s => s._deviceType() == sensorInfo.devType)[0]
                 if (!sensorInfo.sensor) {
                     control.dmesg(`sensor not found for type=${sensorInfo.devType} at ${sensorInfo.port}`)
+                    nonActivated++;
                 } else {
                     control.dmesg(`sensor connected type=${sensorInfo.devType} at ${sensorInfo.port}`)
                     sensorInfo.sensor._activated()
                 }
             }
         }
-
-        // check uart sensors
-        for (const sensorInfo of sensorInfos.filter(si => si.connType == DAL.CONN_INPUT_UART && !!si.sensor)) {
-            const status = getUartStatus(sensorInfo.port);
-            control.dmesg(`UART status ${status} at ${sensorInfo.port}`)
-        }
-    }
-
-    // this function will return a meaningful result only when stats & CHANGED
-    // it is cleared afterwards
-    function readUartInfo(port: number, mode: number) {
-        const buf = output.createBuffer(UartCtlOff.Size)
-        buf[UartCtlOff.Port] = port
-        buf[UartCtlOff.Mode] = mode
-        uartMM.ioctl(IO.UART_READ_MODE_INFO, buf)
-        control.dmesg(`UART_READ_MODE t:${buf[TypesOff.Type]} c:${buf[TypesOff.Connection]} m:${buf[TypesOff.Mode]} n:${buf.slice(0, 12).toHex()}`);
-        return buf
+        //control.dmesg(`detect devices done`)
     }
 
     export class Sensor extends control.Component {
@@ -454,7 +458,7 @@ void      cUiUpdatePower(void)
 
         reset() {
             if (this.isActive()) uartReset(this._port);
-            this.realmode = -1;
+            this.realmode = 0;
         }
     }
 
@@ -508,8 +512,8 @@ void      cUiUpdatePower(void)
     export const iicsensor = new IICSensor(3)
 
     function uartReset(port: number) {
+        if (port < 0) return
         control.dmesg(`UART reset at ${port}`)
-        const devcon = output.createBuffer(DevConOff.Size)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_NONE)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
@@ -517,22 +521,23 @@ void      cUiUpdatePower(void)
     }
 
     function getUartStatus(port: number) {
+        if (port < 0) return 0
         return uartMM.getNumber(NumberFormat.Int8LE, UartOff.Status + port)
     }
 
-    function waitNonZeroUartStatus(port: number): number {
-        let retry = 20;
-        while (retry-- > 0) {
-            const s = getUartStatus(port)
-            if (s) return s;
-            control.dmesg(`UART status 0, waiting...`)
+    function waitNonZeroUartStatus(port: number) {
+        while (true) {
+            if (port < 0) return 0
+            let s = getUartStatus(port)
+            if (s) return s
             pause(25)
         }
-        return 0
     }
 
     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
@@ -540,11 +545,10 @@ void      cUiUpdatePower(void)
             if ((status & UART_DATA_READY) != 0 && (status & UART_PORT_CHANGED) == 0)
                 break
 
-            const devcon = output.createBuffer(DevConOff.Size)
             devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
             devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
             devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
-            control.dmesg(`UART_CLEAR_CHANGED status ${status} ${devcon.toHex()}`)
+
             uartMM.ioctl(IO.UART_CLEAR_CHANGED, devcon)
 
             uartMM.setNumber(NumberFormat.Int8LE, UartOff.Status + port,
@@ -553,8 +557,8 @@ void      cUiUpdatePower(void)
         }
     }
 
-    function setUartModes(devcon: Buffer) {
-        control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
+    function setUartModes() {
+        control.dmesg(`UART set modes`)
         uartMM.ioctl(IO.UART_SET_CONN, devcon)
         const ports: number[] = [];
         for (let port = 0; port < DAL.NUM_INPUTS; ++port) {
@@ -566,23 +570,22 @@ void      cUiUpdatePower(void)
         while (ports.length) {
             const port = ports.pop();
             const status = waitNonZeroUartStatus(port)
-            control.dmesg(`UART status ${status} at ${port}`);
+            control.dmesg(`UART set mode ${status} at ${port}`);
         }
     }
 
-    function updateUartMode(devcon: Buffer, port: number, mode: number) {
-        control.dmesg(`UART update mode to ${mode} at ${port}`)
+    function updateUartMode(port: number, mode: number) {
+        control.dmesg(`UART set mode to ${mode} at ${port}`)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 33)
         devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
     }
 
     function setUartMode(port: number, mode: number) {
-        control.dmesg(`UART set mode ${mode} at ${port}`);
+        const UART_PORT_CHANGED = 1
         while (true) {
-            const devcon = output.createBuffer(DevConOff.Size)
-            updateUartMode(devcon, port, mode);
-            control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
+            if (port < 0) return
+            updateUartMode(port, mode);
             uartMM.ioctl(IO.UART_SET_CONN, devcon)
             let status = waitNonZeroUartStatus(port)
             if (status & UART_PORT_CHANGED) {
@@ -590,8 +593,7 @@ void      cUiUpdatePower(void)
                 uartClearChange(port)
             } else {
                 control.dmesg(`UART status ${status}`);
-                if (status & UART_DATA_READY)
-                    break;
+                break;
             }
             pause(10)
         }
@@ -614,7 +616,6 @@ void      cUiUpdatePower(void)
 
     export function setIICMode(port: number, type: number, mode: number) {
         if (port < 0) return;
-        const devcon = output.createBuffer(DevConOff.Size)
         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)
@@ -623,7 +624,7 @@ void      cUiUpdatePower(void)
 
     export function transactionIIC(port: number, deviceAddress: number, writeBuf: number[], readLen: number) {
         if (port < 0) return;
-        const iicdata = output.createBuffer(IICDat.Size)
+        let iicdata = output.createBuffer(IICDat.Size)
         iicdata.setNumber(NumberFormat.Int8LE, IICDat.Port, port)
         iicdata.setNumber(NumberFormat.Int8LE, IICDat.Repeat, 0)
         iicdata.setNumber(NumberFormat.Int16LE, IICDat.Time, 0)

libs/core/output.cpp

@@ -1,6 +1,9 @@
 #include "pxt.h"
 #include "ev3const.h"
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
 namespace output {
 
 /**
@@ -17,6 +20,7 @@ Buffer createBuffer(int size) {
 namespace pxt {
 
 void target_init() {
+    mkdir(SETTINGSDIR, 0777);
 }
 
 }

libs/core/output.ts

@@ -55,7 +55,7 @@ namespace motors {
         Size = 12
     }
 
-    export function init() {
+    function init() {
         if (pwmMM) return
         pwmMM = control.mmap("/dev/lms_pwm", 0, 0)
         if (!pwmMM) control.fail("no PWM file")
@@ -159,7 +159,6 @@ namespace motors {
         private _accelerationTime: number;
         private _decelerationSteps: number;
         private _decelerationTime: number;
-        private _inverted: boolean;
 
         protected static output_types: number[] = [0x7, 0x7, 0x7, 0x7];
 
@@ -177,7 +176,6 @@ namespace motors {
             this._accelerationTime = 0;
             this._decelerationSteps = 0;
             this._decelerationTime = 0;
-            this._inverted = false;
         }
 
         /**
@@ -227,11 +225,9 @@ namespace motors {
         //% help=motors/motor/set-inverted
         setInverted(inverted: boolean) {
             this.init();
-            this._inverted = inverted;
-        }
-
-        protected invertedFactor(): number {
-            return this._inverted ? -1 : 1;
+            const b = mkCmd(this._port, DAL.opOutputPolarity, 1)
+            b.setNumber(NumberFormat.Int8LE, 2, inverted ? 0 : 1);
+            writePWM(b)
         }
 
         /** 
@@ -298,9 +294,8 @@ namespace motors {
         }
 
         private normalizeSchedule(speed: number, step1: number, step2: number, step3: number, unit: MoveUnit): MoveSchedule {
-            // motor polarity is not supported at the firmware level for sync motor operations
             const r: MoveSchedule = {
-                speed: Math.clamp(-100, 100, speed | 0) * this.invertedFactor(),
+                speed: Math.clamp(-100, 100, speed >> 0),
                 useSteps: true,
                 steps: [step1 || 0, step2 || 0, step3 || 0]
             }
@@ -567,7 +562,6 @@ namespace motors {
 
         private __init() {
             this.setOutputType(this._large);
-            this.setInverted(false);
         }
 
         /**
@@ -747,7 +741,7 @@ namespace motors {
         //% help=motors/synced/steer
         steer(turnRatio: number, speed: number, value: number = 0, unit: MoveUnit = MoveUnit.MilliSeconds) {
             this.init();
-            speed = Math.clamp(-100, 100, speed >> 0) * this.invertedFactor();
+            speed = Math.clamp(-100, 100, speed >> 0);
             if (!speed) {
                 this.stop();
                 return;

libs/core/platform.cpp

@@ -120,7 +120,7 @@ void stopLMS() {
         if (!pid)
             continue;
         char namebuf[100];
-        snprintf(namebuf, 100, "/proc/%d/cmdline", pid);
+        snprintf(namebuf, 1000, "/proc/%d/cmdline", pid);
         FILE *f = fopen(namebuf, "r");
         if (f) {
             fread(namebuf, 1, 99, f);
@@ -195,42 +195,5 @@ void target_startup() {
 
 void initKeys() {}
 
-static const char *progPath = "/mnt/ramdisk/prjs/BrkProg_SAVE";
-
-// These are disabled except when building File_manager.pdf
-// %
-void deletePrjFile(String filename) {
-    const char *d = filename->getUTF8Data();
-    if (strlen(d) > 500 || strchr(d, '/'))
-        return;
-    char buf[1024];
-    snprintf(buf, sizeof(buf), "%s/%s", progPath, d);
-    unlink(buf);
-}
-
-// %
-RefCollection *listPrjFiles() {
-    auto res = Array_::mk();
-    registerGCObj(res);
-
-    auto dp = opendir(progPath);
-
-    for (;;) {
-        dirent *ep = dp ? readdir(dp) : NULL;
-        if (!ep)
-            break;
-        if (ep->d_name[0] == '.')
-            continue;
-        auto str = mkString(ep->d_name, -1);
-        registerGCObj(str);
-        res->head.push((TValue)str);
-        unregisterGCObj(str);
-    }
-    if (dp)
-        closedir(dp);
-    unregisterGCObj(res);
-
-    return res;
-}
 
 }

libs/core/platform.h

@@ -1,3 +1,5 @@
 #define PXT_GC_THREAD_LIST 1
 
 #define PXT_IN_ISR() false
+
+#define SETTINGSDIR "/mnt/ramdisk/settings"

libs/ev3/brick.ts

@@ -1,13 +0,0 @@
-namespace brick {
-    /**
-     * Exits the program to the main menu. (in the simulator restarts it)
-     */
-    //% blockId=loopstop block="exit program"
-    //% help=reference/brick/exit-program
-    //% weight=10
-    //% blockGap=8
-    //% group="Buttons"
-    export function exitProgram() {
-        control.reset();
-    }
-}

libs/ev3/ns.ts

@@ -1,6 +1,6 @@
 
 //% color="#68C3E2" weight=100 icon="\uf106"
-//% groups='["Buttons", "Screen", "Power"]'
+//% groups='["Buttons", "Screen", "Battery"]'
 //% labelLineWidth=60
 namespace brick {
 }

libs/ev3/pxt.json

@@ -2,9 +2,8 @@
     "name": "ev3",
     "description": "The EV3 library",
     "files": [
-        "README.md",        
+        "README.md",
         "ns.ts",
-        "brick.ts",
         "startup.ts",
         "images.jres",
         "images.ts",
@@ -24,7 +23,8 @@
         "touch-sensor": "file:../touch-sensor",
         "ultrasonic-sensor": "file:../ultrasonic-sensor",
         "gyro-sensor": "file:../gyro-sensor",
-        "infrared-sensor": "file:../infrared-sensor"
+        "infrared-sensor": "file:../infrared-sensor",
+        "settings": "file:../settings"
     },
     "palette": [
        "#ffffff",

libs/ev3/startup.ts

@@ -2,6 +2,9 @@
 console.addListener(function(priority: ConsolePriority, msg: string) {
     control.dmesg(msg.substr(0, msg.length - 1))
 })
-
-// boot sequence
-brick.showBoot();
+// pulse green, play startup sound, turn off light
+brick.setStatusLight(StatusLight.GreenPulse);
+// We pause for 100ms to give time to read sensor values, so they work in on_start block
+pause(400)
+// and we're ready
+brick.setStatusLight(StatusLight.Off);

libs/screen/targetoverrides.ts

@@ -129,8 +129,8 @@ namespace brick {
 
         screenMode = ScreenMode.Ports;
         renderPorts();
-        control.runInParallel(function () {
-            while (screenMode == ScreenMode.Ports) {
+        control.runInParallel(function() {
+            while(screenMode == ScreenMode.Ports) {
                 renderPorts();
                 pause(50);
             }
@@ -140,20 +140,8 @@ namespace brick {
     function renderPorts() {
         const col = 44;
         const lineHeight8 = image.font8.charHeight + 2;
-        const h = screen.height;
-        const w = screen.width;
-        const blink = (control.millis() >> 5) % (h - 1);
-
         clearScreen();
 
-        for (let i = 0; i < 4; ++i) {
-            const x = i * col + 2;
-            screen.print("ABCD"[i], x, 1 * lineHeight8, 1, image.font8)
-            screen.print((i + 1).toString(), x, h - lineHeight8, 1, image.font8)
-        }
-        screen.drawLine(0, 5 * lineHeight8, screen.width, 5 * lineHeight8, 1);
-        screen.drawLine(0, h - 5 * lineHeight8, screen.width, h - 5 * lineHeight8, 1)
-
         function scale(x: number) {
             if (Math.abs(x) >= 5000) {
                 const k = Math.floor(x / 1000);
@@ -167,38 +155,25 @@ namespace brick {
         const datas = motors.getAllMotorData();
         for (let i = 0; i < datas.length; ++i) {
             const data = datas[i];
-            const x = i * col + 2;
             if (!data.actualSpeed && !data.count) continue;
-            screen.print(`${scale(data.actualSpeed)}%`, x, 3 * lineHeight8, 1, image.font8)
-            screen.print(`${scale(data.count)}>`, x, 4 * lineHeight8, 1, image.font8)
+            const x = i * col;
+            screen.print("ABCD"[i], x + 2, 1 * lineHeight8, 1, image.font8)
+            screen.print(`${scale(data.actualSpeed)}%`, x + 2, 3 * lineHeight8, 1, image.font8)
+            screen.print(`${scale(data.count)}>`, x + 2, 4 * lineHeight8, 1, image.font8)
         }
+        screen.drawLine(0, 5 * lineHeight8, screen.width, 5 * lineHeight8, 1);
 
         // sensors
         const sis = sensors.internal.getActiveSensors();
+        const h = screen.height;
+        screen.drawLine(0, h - 5 * lineHeight8, screen.width, h - 5 * lineHeight8, 1)
         for (let i = 0; i < sis.length; ++i) {
             const si = sis[i];
-            const x = (si.port() - 1) * col + 2;
+            const x = (si.port() - 1) * col;
             const inf = si._info();
-            if (inf)
-                screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : image.font8);
+            screen.print(si.port() + "", x, h - 4 * lineHeight8, 1, image.font8)
+            screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : image.font8);
         }
-
-        // alive dot
-        screen.setPixel(w - 1, blink, 1);
-        screen.setPixel(w - 1, blink - 1, 1);
-        screen.setPixel(w - 2, blink - 1, 1);
-        screen.setPixel(w - 2, blink, 1);
-    }
-
-    export function showBoot() {
-        // pulse green, play startup sound, turn off light
-        brick.setStatusLight(StatusLight.GreenPulse);
-        // We pause for 100ms to give time to read sensor values, so they work in on_start block
-        sensors.internal.init();
-        motors.init();
-        pause(800)
-        // and we're ready
-        brick.setStatusLight(StatusLight.Off);
     }
 
     /**

libs/settings/pxt.json

@@ -0,0 +1,4 @@
+{
+    "name": "settings",
+    "additionalFilePath": "../../node_modules/pxt-common-packages/libs/settings---files"
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "1.4.8",
+  "version": "1.4.2",
   "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.7",
+    "pxt-core": "5.25.6"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

pxtarget.json

@@ -18,7 +18,8 @@
         "libs/screen",
         "libs/ev3",
         "libs/storage",
-        "libs/broadcast"
+        "libs/broadcast",
+        "libs/settings"
     ],
     "simulator": {
         "autoRun": true,
@@ -75,6 +76,7 @@
             "category": "loops"
         },
         "bannedCategories": [
+            "image"
         ]
     },
     "compileService": {

scripts/file_manager.ts

@@ -1,97 +0,0 @@
-//% shim=pxt::listPrjFiles
-function getPrjs() {
-    let programs = [
-        "pxt",
-        "my amazing robot",
-    ]
-    for (let i = 1; i < 6; ++i)
-        programs.push("Untitled-" + i)
-    return programs
-}
-
-//% shim=pxt::deletePrjFile
-function delPrj(fn: string) {
-    return
-}
-
-const programs = getPrjs()
-    .filter(s => s.substr(s.length - 4, 4) == ".rbf")
-    .map(s => s.substr(0, s.length - 4))
-    .filter(s => s != "File_manager")
-
-programs.push("")
-programs.push("Cancel")
-programs.push("Delete 0 files")
-
-let todel: boolean[] = []
-let scrollTop = 0
-let cursor = 0
-let confirm = false
-function showMenu() {
-    if (cursor < scrollTop + 2)
-        scrollTop = cursor - 2
-    else if (cursor > scrollTop + 11)
-        scrollTop = cursor - 11
-    if (scrollTop < 0)
-        scrollTop = 0
-    let num = 0
-    for (let i = 0; i < todel.length; ++i)
-        if (todel[i]) num++
-    programs[programs.length - 1] =
-        confirm ? "Enter to confirm" : "Delete " + num + " file(s)"
-
-    brick.clearScreen()
-
-    const h = brick.lineHeight()
-    for (let i = 0; i < 13; ++i) {
-        const y = i * h
-        const idx = scrollTop + i
-        const fg = idx == cursor ? 0 : 1
-        const bg = idx == cursor ? 1 : 0
-        // screen.fillRect(0, y, screen.width, h, bg);
-        let text = (idx == cursor ? ">" : " ")
-            + (todel[idx] ? "*" : " ")
-            + " "
-            + (programs[scrollTop + i] || "")
-        screen.print(text, 0, y, fg, brick.font);
-    }
-}
-function move(d: number) {
-    confirm = false
-    const nc = cursor + d
-    if (0 <= nc && nc < programs.length)
-        cursor = nc
-    showMenu()
-}
-brick.buttonDown.onEvent(ButtonEvent.Pressed, () => move(1))
-brick.buttonUp.onEvent(ButtonEvent.Pressed, () => move(-1))
-brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    if (cursor < programs.length - 3) {
-        todel[cursor] = !todel[cursor]
-        move(1)
-    } else if (cursor == programs.length - 3) {
-        // nothing
-    } else if (cursor == programs.length - 2) {
-        control.reset()
-    } else if (cursor == programs.length - 1) {
-        if (todel.every(x => !x))
-            return
-        if (confirm) {
-            brick.clearScreen()
-            brick.showString("deleting...", 6)
-            for (let i = 0; i < todel.length; ++i) {
-                if (todel[i]) {
-                    delPrj(programs[i] + ".elf")
-                    delPrj(programs[i] + ".rbf")
-                }
-            }
-            pause(1000)
-            control.reset()
-        } else {
-            confirm = true
-            showMenu()
-        }
-    }
-})
-showMenu()
-

sim/state/motornode.ts

@@ -9,6 +9,7 @@ namespace pxsim {
         private angle: number = 0;
         private tacho: number = 0;
         private speed: number = 0;
+        private polarity: number = 1; // -1, 1 or -1
 
         private started: boolean;
         private speedCmd: DAL;
@@ -30,7 +31,7 @@ namespace pxsim {
         }
 
         getSpeed() {
-            return Math.round(this.speed);
+            return Math.round(this.speed * (!this._synchedMotor && this.polarity == 0 ? -1 : 1));
         }
 
         getAngle() {
@@ -81,6 +82,16 @@ namespace pxsim {
             return this.id == NodeType.LargeMotor;
         }
 
+        setPolarity(polarity: number) {
+            // Either 1 or 255 (reverse)
+            /*
+                -1 : Motor will run backward  
+                0 : Motor will run opposite direction  
+                1 : Motor will run forward             
+            */
+            this.polarity = polarity;
+        }
+
         reset() {
             // not sure what reset does...
         }

sim/state/output.ts

@@ -119,7 +119,11 @@ namespace pxsim {
                             return 2;
                         }
                         case DAL.opOutputPolarity: {
-                            console.error("opOutputPolarity not supported");
+                            // reverse
+                            const port = buf.data[1];
+                            const polarity = pxsim.BufferMethods.getNumber(buf, BufferMethods.NumberFormat.Int8LE, 2);
+                            const motors = ev3board().getMotor(port);
+                            motors.forEach(motor => motor.setPolarity(polarity));
                             return 2;
                         }
                         case DAL.opOutputSetType: {

targetconfig.json

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