Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
5a32907daa | |||
c3f539f396 | |||
991813fff7 | |||
85a8f1c2c5 | |||
ea33b81b2a | |||
c8381d7626 | |||
62b5941143 | |||
1d5d18dc88 | |||
bc4b71e0d6 | |||
5c47ce2f91 | |||
aad9f0fd8a | |||
fb4a0c2e16 | |||
88767e37fd | |||
1acb304e48 | |||
8844559987 | |||
7a7435b4c7 | |||
5e532dc2fd | |||
6a577287c1 | |||
8bd884e155 | |||
c0bd3a7d5d | |||
cb0da08063 | |||
f116b5d1da | |||
20be398c2c | |||
ccf6164d87 | |||
58294883d7 | |||
00194d4aa6 | |||
ec900f805e | |||
5f5bdd7294 | |||
38b2fc7b95 |
@ -73,6 +73,12 @@ Verify that the program you just created shows eyes on the Brick Display, and th
|
|||||||
|
|
||||||
**Well done!**
|
**Well done!**
|
||||||
|
|
||||||
|
## Run it Again
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
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
|
## Connect a Large Motor @unplugged
|
||||||
|
|
||||||
Now you will learn to control the Large Motor.
|
Now you will learn to control the Large Motor.
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"appref": "v1.2.22"
|
"appref": "v1.2.26"
|
||||||
}
|
}
|
||||||
|
@ -388,12 +388,12 @@
|
|||||||
}
|
}
|
||||||
function downloadWin64() {
|
function downloadWin64() {
|
||||||
// TODO: Keep this link up-to-date with the desired release version
|
// 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" });
|
tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
|
||||||
}
|
}
|
||||||
function downloadMac64() {
|
function downloadMac64() {
|
||||||
// TODO: Keep this link up-to-date with the desired release version
|
// 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" });
|
tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
3
docs/stable-ref.json
Normal file
3
docs/stable-ref.json
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"appref": "v1.2"
|
||||||
|
}
|
@ -1,5 +1,4 @@
|
|||||||
const enum ColorSensorMode {
|
const enum ColorSensorMode {
|
||||||
None = 0,
|
|
||||||
//% block="reflected light intensity"
|
//% block="reflected light intensity"
|
||||||
ReflectedLightIntensity = 0,
|
ReflectedLightIntensity = 0,
|
||||||
//% block="ambient light intensity"
|
//% block="ambient light intensity"
|
||||||
@ -56,12 +55,13 @@ namespace sensors {
|
|||||||
export class ColorSensor extends internal.UartSensor {
|
export class ColorSensor extends internal.UartSensor {
|
||||||
thresholdDetector: sensors.ThresholdDetector;
|
thresholdDetector: sensors.ThresholdDetector;
|
||||||
calibrating: boolean;
|
calibrating: boolean;
|
||||||
|
private _curr: number;
|
||||||
|
|
||||||
constructor(port: number) {
|
constructor(port: number) {
|
||||||
super(port)
|
super(port)
|
||||||
this.thresholdDetector = new sensors.ThresholdDetector(this.id());
|
this.thresholdDetector = new sensors.ThresholdDetector(this.id());
|
||||||
this.calibrating = false;
|
this.calibrating = false;
|
||||||
this.setMode(ColorSensorMode.ReflectedLightIntensity);
|
this._curr = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
_colorEventValue(value: number) {
|
_colorEventValue(value: number) {
|
||||||
@ -104,17 +104,18 @@ namespace sensors {
|
|||||||
"yellow",
|
"yellow",
|
||||||
"red",
|
"red",
|
||||||
"white",
|
"white",
|
||||||
"brown"][this._query()];
|
"brown"][this._curr];
|
||||||
case ColorSensorMode.AmbientLightIntensity:
|
case ColorSensorMode.AmbientLightIntensity:
|
||||||
case ColorSensorMode.ReflectedLightIntensity:
|
case ColorSensorMode.ReflectedLightIntensity:
|
||||||
return `${this._query()}%`;
|
return `${this._curr}%`;
|
||||||
default:
|
default:
|
||||||
return this._query().toString();
|
return this._curr.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_update(prev: number, curr: number) {
|
_update(prev: number, curr: number) {
|
||||||
if (this.calibrating) return; // simply ignore data updates while calibrating
|
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)
|
if (this.mode == ColorSensorMode.Color || this.mode == ColorSensorMode.RgbRaw || this.mode == ColorSensorMode.RefRaw)
|
||||||
control.raiseEvent(this._id, this._colorEventValue(curr));
|
control.raiseEvent(this._id, this._colorEventValue(curr));
|
||||||
else
|
else
|
||||||
@ -176,9 +177,25 @@ namespace sensors {
|
|||||||
//% group="Color Sensor"
|
//% group="Color Sensor"
|
||||||
//% blockGap=8
|
//% blockGap=8
|
||||||
color(): ColorSensorColor {
|
color(): ColorSensorColor {
|
||||||
this.setMode(ColorSensorMode.Color)
|
|
||||||
this.poke();
|
this.poke();
|
||||||
return this.getNumber(NumberFormat.UInt8LE, 0)
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -194,8 +211,8 @@ namespace sensors {
|
|||||||
//% group="Color Sensor"
|
//% group="Color Sensor"
|
||||||
//% blockGap=8
|
//% blockGap=8
|
||||||
rgbRaw(): number[] {
|
rgbRaw(): number[] {
|
||||||
this.setMode(ColorSensorMode.RgbRaw);
|
|
||||||
this.poke();
|
this.poke();
|
||||||
|
this.setMode(ColorSensorMode.RgbRaw);
|
||||||
return [this.getNumber(NumberFormat.UInt16LE, 0), this.getNumber(NumberFormat.UInt16LE, 2), this.getNumber(NumberFormat.UInt16LE, 4)];
|
return [this.getNumber(NumberFormat.UInt16LE, 0), this.getNumber(NumberFormat.UInt16LE, 2), this.getNumber(NumberFormat.UInt16LE, 4)];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -248,13 +265,13 @@ namespace sensors {
|
|||||||
//% weight=87 blockGap=8
|
//% weight=87 blockGap=8
|
||||||
//% group="Color Sensor"
|
//% group="Color Sensor"
|
||||||
light(mode: LightIntensityMode) {
|
light(mode: LightIntensityMode) {
|
||||||
this.setMode(<ColorSensorMode><number>mode)
|
|
||||||
this.poke();
|
this.poke();
|
||||||
|
this.setMode(<ColorSensorMode><number>mode)
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
case LightIntensityMode.ReflectedRaw:
|
case LightIntensityMode.ReflectedRaw:
|
||||||
return this.reflectedLightRaw();
|
return this.reflectedLightRaw();
|
||||||
default:
|
default:
|
||||||
return this.getNumber(NumberFormat.UInt8LE, 0)
|
return this._curr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -279,9 +296,9 @@ namespace sensors {
|
|||||||
*/
|
*/
|
||||||
//%
|
//%
|
||||||
reflectedLightRaw(): number {
|
reflectedLightRaw(): number {
|
||||||
this.setMode(ColorSensorMode.RefRaw);
|
|
||||||
this.poke();
|
this.poke();
|
||||||
return this.getNumber(NumberFormat.UInt16LE, 0);
|
this.setMode(ColorSensorMode.RefRaw);
|
||||||
|
return this._curr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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)
|
2
libs/core/dal.d.ts
vendored
2
libs/core/dal.d.ts
vendored
@ -309,8 +309,6 @@ declare const enum DAL {
|
|||||||
DEVICE_TYPE_NXT_LIGHT = 2,
|
DEVICE_TYPE_NXT_LIGHT = 2,
|
||||||
DEVICE_TYPE_NXT_SOUND = 3,
|
DEVICE_TYPE_NXT_SOUND = 3,
|
||||||
DEVICE_TYPE_NXT_COLOR = 4,
|
DEVICE_TYPE_NXT_COLOR = 4,
|
||||||
DEVICE_TYPE_NXT_ULTRASONIC = 5,
|
|
||||||
DEVICE_TYPE_NXT_TEMPERATURE = 6,
|
|
||||||
DEVICE_TYPE_TACHO = 7,
|
DEVICE_TYPE_TACHO = 7,
|
||||||
DEVICE_TYPE_MINITACHO = 8,
|
DEVICE_TYPE_MINITACHO = 8,
|
||||||
DEVICE_TYPE_NEWTACHO = 9,
|
DEVICE_TYPE_NEWTACHO = 9,
|
||||||
|
@ -11,8 +11,6 @@
|
|||||||
#define DEVICE_TYPE_NXT_LIGHT 2
|
#define DEVICE_TYPE_NXT_LIGHT 2
|
||||||
#define DEVICE_TYPE_NXT_SOUND 3
|
#define DEVICE_TYPE_NXT_SOUND 3
|
||||||
#define DEVICE_TYPE_NXT_COLOR 4
|
#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_TACHO 7
|
||||||
#define DEVICE_TYPE_MINITACHO 8
|
#define DEVICE_TYPE_MINITACHO 8
|
||||||
#define DEVICE_TYPE_NEWTACHO 9
|
#define DEVICE_TYPE_NEWTACHO 9
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
namespace sensors.internal {
|
namespace sensors.internal {
|
||||||
|
const UART_PORT_CHANGED = 1
|
||||||
|
const UART_DATA_READY = 8
|
||||||
|
|
||||||
export class Poller {
|
export class Poller {
|
||||||
private query: () => number;
|
private query: () => number;
|
||||||
private update: (previous: number, current: number) => void;
|
private update: (previous: number, current: number) => void;
|
||||||
@ -36,6 +39,7 @@ namespace sensors.internal {
|
|||||||
|
|
||||||
private poll() {
|
private poll() {
|
||||||
control.runInBackground(() => {
|
control.runInBackground(() => {
|
||||||
|
pause(this.interval);
|
||||||
this.lastQuery = this.lastPause = control.millis();
|
this.lastQuery = this.lastPause = control.millis();
|
||||||
this.previousValue = this.currentValue = this.query();
|
this.previousValue = this.currentValue = this.query();
|
||||||
this.update(this.previousValue, this.currentValue);
|
this.update(this.previousValue, this.currentValue);
|
||||||
@ -60,8 +64,6 @@ namespace sensors.internal {
|
|||||||
let uartMM: MMap
|
let uartMM: MMap
|
||||||
let IICMM: MMap
|
let IICMM: MMap
|
||||||
let powerMM: MMap
|
let powerMM: MMap
|
||||||
let devcon: Buffer
|
|
||||||
let devPoller: Poller
|
|
||||||
let sensorInfos: SensorInfo[];
|
let sensorInfos: SensorInfo[];
|
||||||
|
|
||||||
let batteryInfo: {
|
let batteryInfo: {
|
||||||
@ -82,7 +84,7 @@ namespace sensors.internal {
|
|||||||
poller: Poller;
|
poller: Poller;
|
||||||
|
|
||||||
constructor(p: number) {
|
constructor(p: number) {
|
||||||
this.port = p; // 0-based
|
this.port = p
|
||||||
this.connType = DAL.CONN_NONE
|
this.connType = DAL.CONN_NONE
|
||||||
this.devType = DAL.DEVICE_TYPE_NONE
|
this.devType = DAL.DEVICE_TYPE_NONE
|
||||||
this.iicid = ''
|
this.iicid = ''
|
||||||
@ -104,11 +106,10 @@ namespace sensors.internal {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function init() {
|
export function init() {
|
||||||
if (sensorInfos) return
|
if (sensorInfos) return
|
||||||
sensorInfos = []
|
sensorInfos = []
|
||||||
for (let i = 0; i < DAL.NUM_INPUTS; ++i) sensorInfos.push(new SensorInfo(i))
|
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)
|
analogMM = control.mmap("/dev/lms_analog", AnalogOff.Size, 0)
|
||||||
if (!analogMM) control.fail("no analog sensor")
|
if (!analogMM) control.fail("no analog sensor")
|
||||||
@ -121,10 +122,10 @@ namespace sensors.internal {
|
|||||||
|
|
||||||
powerMM = control.mmap("/dev/lms_power", 2, 0)
|
powerMM = control.mmap("/dev/lms_power", 2, 0)
|
||||||
|
|
||||||
devPoller = new Poller(500, () => { return hashDevices(); },
|
forever(function () {
|
||||||
(prev, curr) => {
|
pause(500)
|
||||||
detectDevices();
|
detectDevices();
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getActiveSensors(): Sensor[] {
|
export function getActiveSensors(): Sensor[] {
|
||||||
@ -132,16 +133,6 @@ namespace sensors.internal {
|
|||||||
return sensorInfos.filter(si => si.sensor && si.sensor.isActive()).map(si => si.sensor);
|
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) {
|
export function readIICID(port: number) {
|
||||||
const buf = output.createBuffer(IICStr.Size)
|
const buf = output.createBuffer(IICStr.Size)
|
||||||
buf[IICStr.Port] = port
|
buf[IICStr.Port] = port
|
||||||
@ -273,90 +264,61 @@ void cUiUpdatePower(void)
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function hashDevices(): number {
|
|
||||||
const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
|
|
||||||
let r = 0;
|
|
||||||
for (let i = 0; i < conns.length; ++i) {
|
|
||||||
r = (r << 8 | conns[i]);
|
|
||||||
}
|
|
||||||
//control.dmesg(`devices hash: ${r}`);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
let nonActivated = 0;
|
|
||||||
function detectDevices() {
|
function detectDevices() {
|
||||||
control.dmesg(`detect devices (${nonActivated} na)`)
|
control.dmesg(`detect devices`)
|
||||||
const inDcm = analogMM.slice(AnalogOff.InDcm, DAL.NUM_INPUTS)
|
const conns = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
|
||||||
const inConn = analogMM.slice(AnalogOff.InConn, DAL.NUM_INPUTS)
|
let devcon: Buffer = undefined;
|
||||||
let numChanged = 0;
|
|
||||||
const uartSensors: SensorInfo[] = [];
|
|
||||||
|
|
||||||
for (const sensorInfo of sensorInfos) {
|
for (const sensorInfo of sensorInfos) {
|
||||||
const newConn = inConn[sensorInfo.port]
|
const newConn = conns[sensorInfo.port]
|
||||||
if (newConn == sensorInfo.connType) {
|
if (newConn == sensorInfo.connType)
|
||||||
// control.dmesg(`connection unchanged ${newConn} at ${sensorInfo.port}`)
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
numChanged++
|
|
||||||
sensorInfo.connType = newConn
|
sensorInfo.connType = newConn
|
||||||
sensorInfo.devType = DAL.DEVICE_TYPE_NONE;
|
sensorInfo.devType = DAL.DEVICE_TYPE_NONE
|
||||||
switch (newConn) {
|
sensorInfo.sensor = undefined;
|
||||||
case DAL.CONN_INPUT_UART: {
|
|
||||||
control.dmesg(`new UART connection at ${sensorInfo.port}`)
|
if (newConn == DAL.CONN_INPUT_UART) {
|
||||||
updateUartMode(sensorInfo.port, 0);
|
control.dmesg(`new UART connection at ${sensorInfo.port}`)
|
||||||
uartSensors.push(sensorInfo);
|
const status = getUartStatus(sensorInfo.port);
|
||||||
break;
|
if (status & UART_PORT_CHANGED) {
|
||||||
}
|
if (!devcon) devcon = output.createBuffer(DevConOff.Size)
|
||||||
case DAL.CONN_NXT_IIC: {
|
updateUartMode(devcon, sensorInfo.port, 0);
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
} 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(`disconnected port ${sensorInfo.port}`)
|
||||||
|
// clear sensor
|
||||||
|
sensorInfo.sensor = undefined;
|
||||||
|
} else {
|
||||||
|
control.dmesg(`unknown connection type: ${newConn} at ${sensorInfo.port}`)
|
||||||
|
// clear sensor
|
||||||
|
sensorInfo.sensor = undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uartSensors.length > 0) {
|
if (devcon)
|
||||||
setUartModes();
|
setUartModes(devcon);
|
||||||
for (const sensorInfo of uartSensors) {
|
|
||||||
let uinfo = readUartInfo(sensorInfo.port, 0)
|
for (const sensorInfo of sensorInfos.filter(si => si.connType == DAL.CONN_INPUT_UART && si.devType == DAL.CONN_NONE)) {
|
||||||
sensorInfo.devType = uinfo[TypesOff.Type]
|
const uinfo = readUartInfo(sensorInfo.port, 0);
|
||||||
control.dmesg(`UART type ${sensorInfo.devType}`)
|
sensorInfo.devType = uinfo[TypesOff.Type];
|
||||||
}
|
control.dmesg(`UART type ${sensorInfo.devType}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (numChanged == 0 && nonActivated == 0)
|
// assign sensors
|
||||||
return
|
for (const sensorInfo of sensorInfos.filter(si => !si.sensor)) {
|
||||||
|
|
||||||
//control.dmesg(`updating sensor status`)
|
|
||||||
nonActivated = 0;
|
|
||||||
for (const sensorInfo of sensorInfos) {
|
|
||||||
if (sensorInfo.devType == DAL.DEVICE_TYPE_IIC_UNKNOWN) {
|
if (sensorInfo.devType == DAL.DEVICE_TYPE_IIC_UNKNOWN) {
|
||||||
sensorInfo.sensor = sensorInfo.sensors.filter(s => s._IICId() == sensorInfo.iicid)[0]
|
sensorInfo.sensor = sensorInfo.sensors.filter(s => s._IICId() == sensorInfo.iicid)[0]
|
||||||
if (!sensorInfo.sensor) {
|
if (!sensorInfo.sensor) {
|
||||||
control.dmesg(`sensor not found for iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
|
control.dmesg(`sensor not found for iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
|
||||||
nonActivated++;
|
|
||||||
} else {
|
} else {
|
||||||
control.dmesg(`sensor connected iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
|
control.dmesg(`sensor connected iicid=${sensorInfo.iicid} at ${sensorInfo.port}`)
|
||||||
sensorInfo.sensor._activated()
|
sensorInfo.sensor._activated()
|
||||||
@ -365,14 +327,29 @@ void cUiUpdatePower(void)
|
|||||||
sensorInfo.sensor = sensorInfo.sensors.filter(s => s._deviceType() == sensorInfo.devType)[0]
|
sensorInfo.sensor = sensorInfo.sensors.filter(s => s._deviceType() == sensorInfo.devType)[0]
|
||||||
if (!sensorInfo.sensor) {
|
if (!sensorInfo.sensor) {
|
||||||
control.dmesg(`sensor not found for type=${sensorInfo.devType} at ${sensorInfo.port}`)
|
control.dmesg(`sensor not found for type=${sensorInfo.devType} at ${sensorInfo.port}`)
|
||||||
nonActivated++;
|
|
||||||
} else {
|
} else {
|
||||||
control.dmesg(`sensor connected type=${sensorInfo.devType} at ${sensorInfo.port}`)
|
control.dmesg(`sensor connected type=${sensorInfo.devType} at ${sensorInfo.port}`)
|
||||||
sensorInfo.sensor._activated()
|
sensorInfo.sensor._activated()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//control.dmesg(`detect devices done`)
|
|
||||||
|
// 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
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Sensor extends control.Component {
|
export class Sensor extends control.Component {
|
||||||
@ -446,20 +423,20 @@ void cUiUpdatePower(void)
|
|||||||
constructor(port: number) {
|
constructor(port: number) {
|
||||||
super(port)
|
super(port)
|
||||||
this.mode = 0
|
this.mode = 0
|
||||||
this.realmode = 0;
|
this.realmode = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
_activated() {
|
_activated() {
|
||||||
this.realmode = 0;
|
this.realmode = 0
|
||||||
this._setMode(this.mode)
|
this._setMode(this.mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
protected _setMode(m: number) {
|
protected _setMode(m: number) {
|
||||||
|
//control.dmesg(`_setMode p=${this.port} m: ${this.realmode} -> ${m}`)
|
||||||
let v = m | 0
|
let v = m | 0
|
||||||
this.mode = v
|
this.mode = v
|
||||||
if (!this.isActive()) return
|
if (!this.isActive()) return
|
||||||
if (this.realmode != this.mode) {
|
if (this.realmode != this.mode) {
|
||||||
control.dmesg(`_setMode p=${this._port} m: ${this.realmode} -> ${v}`)
|
|
||||||
this.realmode = v
|
this.realmode = v
|
||||||
setUartMode(this._port, v)
|
setUartMode(this._port, v)
|
||||||
}
|
}
|
||||||
@ -477,7 +454,7 @@ void cUiUpdatePower(void)
|
|||||||
|
|
||||||
reset() {
|
reset() {
|
||||||
if (this.isActive()) uartReset(this._port);
|
if (this.isActive()) uartReset(this._port);
|
||||||
this.realmode = 0;
|
this.realmode = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -531,8 +508,8 @@ void cUiUpdatePower(void)
|
|||||||
export const iicsensor = new IICSensor(3)
|
export const iicsensor = new IICSensor(3)
|
||||||
|
|
||||||
function uartReset(port: number) {
|
function uartReset(port: number) {
|
||||||
if (port < 0) return
|
|
||||||
control.dmesg(`UART reset at ${port}`)
|
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.Connection + port, DAL.CONN_NONE)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, 0)
|
||||||
@ -540,23 +517,22 @@ void cUiUpdatePower(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getUartStatus(port: number) {
|
function getUartStatus(port: number) {
|
||||||
if (port < 0) return 0
|
|
||||||
return uartMM.getNumber(NumberFormat.Int8LE, UartOff.Status + port)
|
return uartMM.getNumber(NumberFormat.Int8LE, UartOff.Status + port)
|
||||||
}
|
}
|
||||||
|
|
||||||
function waitNonZeroUartStatus(port: number) {
|
function waitNonZeroUartStatus(port: number): number {
|
||||||
while (true) {
|
let retry = 20;
|
||||||
if (port < 0) return 0
|
while (retry-- > 0) {
|
||||||
let s = getUartStatus(port)
|
const s = getUartStatus(port)
|
||||||
if (s) return s
|
if (s) return s;
|
||||||
|
control.dmesg(`UART status 0, waiting...`)
|
||||||
pause(25)
|
pause(25)
|
||||||
}
|
}
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function uartClearChange(port: number) {
|
function uartClearChange(port: number) {
|
||||||
control.dmesg(`UART clear change`);
|
control.dmesg(`UART clear change`);
|
||||||
const UART_DATA_READY = 8
|
|
||||||
const UART_PORT_CHANGED = 1
|
|
||||||
while (true) {
|
while (true) {
|
||||||
let status = getUartStatus(port)
|
let status = getUartStatus(port)
|
||||||
if (port < 0) break
|
if (port < 0) break
|
||||||
@ -564,10 +540,11 @@ void cUiUpdatePower(void)
|
|||||||
if ((status & UART_DATA_READY) != 0 && (status & UART_PORT_CHANGED) == 0)
|
if ((status & UART_DATA_READY) != 0 && (status & UART_PORT_CHANGED) == 0)
|
||||||
break
|
break
|
||||||
|
|
||||||
|
const devcon = output.createBuffer(DevConOff.Size)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 0)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + 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.ioctl(IO.UART_CLEAR_CHANGED, devcon)
|
||||||
|
|
||||||
uartMM.setNumber(NumberFormat.Int8LE, UartOff.Status + port,
|
uartMM.setNumber(NumberFormat.Int8LE, UartOff.Status + port,
|
||||||
@ -576,8 +553,8 @@ void cUiUpdatePower(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function setUartModes() {
|
function setUartModes(devcon: Buffer) {
|
||||||
control.dmesg(`UART set modes`)
|
control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
|
||||||
uartMM.ioctl(IO.UART_SET_CONN, devcon)
|
uartMM.ioctl(IO.UART_SET_CONN, devcon)
|
||||||
const ports: number[] = [];
|
const ports: number[] = [];
|
||||||
for (let port = 0; port < DAL.NUM_INPUTS; ++port) {
|
for (let port = 0; port < DAL.NUM_INPUTS; ++port) {
|
||||||
@ -593,7 +570,7 @@ void cUiUpdatePower(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateUartMode(port: number, mode: number) {
|
function updateUartMode(devcon: Buffer, port: number, mode: number) {
|
||||||
control.dmesg(`UART update mode to ${mode} at ${port}`)
|
control.dmesg(`UART update mode to ${mode} at ${port}`)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_INPUT_UART)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 33)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, 33)
|
||||||
@ -602,18 +579,19 @@ void cUiUpdatePower(void)
|
|||||||
|
|
||||||
function setUartMode(port: number, mode: number) {
|
function setUartMode(port: number, mode: number) {
|
||||||
control.dmesg(`UART set mode ${mode} at ${port}`);
|
control.dmesg(`UART set mode ${mode} at ${port}`);
|
||||||
const UART_PORT_CHANGED = 1
|
|
||||||
while (true) {
|
while (true) {
|
||||||
if (port < 0) return
|
const devcon = output.createBuffer(DevConOff.Size)
|
||||||
updateUartMode(port, mode);
|
updateUartMode(devcon, port, mode);
|
||||||
|
control.dmesg(`UART_SET_CONN ${devcon.toHex()}`)
|
||||||
uartMM.ioctl(IO.UART_SET_CONN, devcon)
|
uartMM.ioctl(IO.UART_SET_CONN, devcon)
|
||||||
let status = waitNonZeroUartStatus(port)
|
let status = waitNonZeroUartStatus(port)
|
||||||
if (status & UART_PORT_CHANGED) {
|
if (status & UART_PORT_CHANGED) {
|
||||||
control.dmesg(`UART clear changed at ${port}`)
|
control.dmesg(`UART clear changed at ${port}`)
|
||||||
uartClearChange(port)
|
uartClearChange(port)
|
||||||
} else {
|
} else {
|
||||||
control.dmesg(`UART status ${status} at ${port}`);
|
control.dmesg(`UART status ${status}`);
|
||||||
break;
|
if (status & UART_DATA_READY)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
pause(10)
|
pause(10)
|
||||||
}
|
}
|
||||||
@ -627,16 +605,16 @@ void cUiUpdatePower(void)
|
|||||||
DAL.MAX_DEVICE_DATALENGTH)
|
DAL.MAX_DEVICE_DATALENGTH)
|
||||||
}
|
}
|
||||||
|
|
||||||
function getUartNumber(fmt: NumberFormat, off: number, port: number): number {
|
function getUartNumber(fmt: NumberFormat, off: number, port: number) {
|
||||||
if (port < 0) return 0
|
if (port < 0) return 0
|
||||||
const index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2)
|
let index = uartMM.getNumber(NumberFormat.UInt16LE, UartOff.Actual + port * 2)
|
||||||
return uartMM.getNumber(fmt,
|
return uartMM.getNumber(fmt,
|
||||||
UartOff.Raw + DAL.MAX_DEVICE_DATALENGTH * 300 * port + DAL.MAX_DEVICE_DATALENGTH * index + off)
|
UartOff.Raw + DAL.MAX_DEVICE_DATALENGTH * 300 * port + DAL.MAX_DEVICE_DATALENGTH * index + off)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setIICMode(port: number, type: number, mode: number) {
|
export function setIICMode(port: number, type: number, mode: number) {
|
||||||
if (port < 0) return;
|
if (port < 0) return;
|
||||||
control.dmesg(`iic set type ${type} mode ${mode} at ${port}`)
|
const devcon = output.createBuffer(DevConOff.Size)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_NXT_IIC)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Connection + port, DAL.CONN_NXT_IIC)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, type)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Type + port, type)
|
||||||
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
|
devcon.setNumber(NumberFormat.Int8LE, DevConOff.Mode + port, mode)
|
||||||
@ -645,7 +623,7 @@ void cUiUpdatePower(void)
|
|||||||
|
|
||||||
export function transactionIIC(port: number, deviceAddress: number, writeBuf: number[], readLen: number) {
|
export function transactionIIC(port: number, deviceAddress: number, writeBuf: number[], readLen: number) {
|
||||||
if (port < 0) return;
|
if (port < 0) return;
|
||||||
let iicdata = output.createBuffer(IICDat.Size)
|
const iicdata = output.createBuffer(IICDat.Size)
|
||||||
iicdata.setNumber(NumberFormat.Int8LE, IICDat.Port, port)
|
iicdata.setNumber(NumberFormat.Int8LE, IICDat.Port, port)
|
||||||
iicdata.setNumber(NumberFormat.Int8LE, IICDat.Repeat, 0)
|
iicdata.setNumber(NumberFormat.Int8LE, IICDat.Repeat, 0)
|
||||||
iicdata.setNumber(NumberFormat.Int16LE, IICDat.Time, 0)
|
iicdata.setNumber(NumberFormat.Int16LE, IICDat.Time, 0)
|
||||||
@ -914,4 +892,4 @@ namespace sensors {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ namespace motors {
|
|||||||
Size = 12
|
Size = 12
|
||||||
}
|
}
|
||||||
|
|
||||||
function init() {
|
export function init() {
|
||||||
if (pwmMM) return
|
if (pwmMM) return
|
||||||
pwmMM = control.mmap("/dev/lms_pwm", 0, 0)
|
pwmMM = control.mmap("/dev/lms_pwm", 0, 0)
|
||||||
if (!pwmMM) control.fail("no PWM file")
|
if (!pwmMM) control.fail("no PWM file")
|
||||||
|
@ -21,7 +21,6 @@ namespace console._screen {
|
|||||||
console.addListener(log);
|
console.addListener(log);
|
||||||
brick.buttonUp.onEvent(ButtonEvent.Bumped, () => scroll(-3))
|
brick.buttonUp.onEvent(ButtonEvent.Bumped, () => scroll(-3))
|
||||||
brick.buttonDown.onEvent(ButtonEvent.Bumped, () => scroll(3))
|
brick.buttonDown.onEvent(ButtonEvent.Bumped, () => scroll(3))
|
||||||
brick.showConsole();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,5 +2,6 @@
|
|||||||
console.addListener(function(priority: ConsolePriority, msg: string) {
|
console.addListener(function(priority: ConsolePriority, msg: string) {
|
||||||
control.dmesg(msg.substr(0, msg.length - 1))
|
control.dmesg(msg.substr(0, msg.length - 1))
|
||||||
})
|
})
|
||||||
|
|
||||||
// boot sequence
|
// boot sequence
|
||||||
brick.showBoot();
|
brick.showBoot();
|
@ -27,7 +27,6 @@ namespace brick {
|
|||||||
ShowLines,
|
ShowLines,
|
||||||
Image,
|
Image,
|
||||||
Ports,
|
Ports,
|
||||||
Console,
|
|
||||||
Custom
|
Custom
|
||||||
}
|
}
|
||||||
let screenMode = ScreenMode.None;
|
let screenMode = ScreenMode.None;
|
||||||
@ -142,6 +141,8 @@ namespace brick {
|
|||||||
const col = 44;
|
const col = 44;
|
||||||
const lineHeight8 = image.font8.charHeight + 2;
|
const lineHeight8 = image.font8.charHeight + 2;
|
||||||
const h = screen.height;
|
const h = screen.height;
|
||||||
|
const w = screen.width;
|
||||||
|
const blink = (control.millis() >> 5) % (h - 1);
|
||||||
|
|
||||||
clearScreen();
|
clearScreen();
|
||||||
|
|
||||||
@ -181,27 +182,23 @@ namespace brick {
|
|||||||
if (inf)
|
if (inf)
|
||||||
screen.print(inf, x, h - 2 * lineHeight8, 1, inf.length > 4 ? image.font5 : 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() {
|
export function showBoot() {
|
||||||
// pulse green, play startup sound, turn off light
|
// pulse green, play startup sound, turn off light
|
||||||
brick.setStatusLight(StatusLight.GreenPulse);
|
brick.setStatusLight(StatusLight.GreenPulse);
|
||||||
// We pause for 100ms to give time to read sensor values, so they work in on_start block
|
// We pause for 100ms to give time to read sensor values, so they work in on_start block
|
||||||
pause(400)
|
sensors.internal.init();
|
||||||
|
motors.init();
|
||||||
|
pause(800)
|
||||||
// and we're ready
|
// and we're ready
|
||||||
brick.setStatusLight(StatusLight.Off);
|
brick.setStatusLight(StatusLight.Off);
|
||||||
// always show port by default if no UI is set
|
|
||||||
control.runInParallel(function () {
|
|
||||||
// show ports if nothing is has been shown
|
|
||||||
if (screenMode != ScreenMode.None) return;
|
|
||||||
showPorts();
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function showConsole() {
|
|
||||||
console.sendToScreen();
|
|
||||||
screenMode = ScreenMode.Console;
|
|
||||||
clearScreen();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pxt-ev3",
|
"name": "pxt-ev3",
|
||||||
"version": "1.4.7",
|
"version": "1.4.8",
|
||||||
"description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
|
"description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
|
||||||
"private": false,
|
"private": false,
|
||||||
"keywords": [
|
"keywords": [
|
||||||
@ -45,8 +45,8 @@
|
|||||||
"@types/web-bluetooth": "0.0.4"
|
"@types/web-bluetooth": "0.0.4"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pxt-common-packages": "6.16.10",
|
"pxt-common-packages": "6.16.18",
|
||||||
"pxt-core": "5.25.13"
|
"pxt-core": "5.28.8"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "node node_modules/pxt-core/built/pxt.js travis"
|
"test": "node node_modules/pxt-core/built/pxt.js travis"
|
||||||
|
@ -27,6 +27,6 @@
|
|||||||
"Tutorial Videos": "videos"
|
"Tutorial Videos": "videos"
|
||||||
},
|
},
|
||||||
"electronManifest": {
|
"electronManifest": {
|
||||||
"latest": "v1.2.22"
|
"latest": "v1.2.26"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user