c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updating to latest pxt

Browse Source
This commit is contained in:
Peli de Halleux
2017-11-09 10:24:12 -08:00
parent 387ad763f8
commit 170e6b700b
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/base/_locales/base-jsdoc-strings.json
View File

@@ -151,6 +151,6 @@
"serial.writeNumber": "Write a number to the serial port.", "serial.writeNumber": "Write a number to the serial port.",
"serial.writeString": "Write some text to the serial port.", "serial.writeString": "Write some text to the serial port.",
"serial.writeValue": "Write a name:value pair as a line of text to the serial port.", "serial.writeValue": "Write a name:value pair as a line of text to the serial port.",
"serial.writeValue|param|name": "name of the value stream, eg: x", "serial.writeValue|param|name": "name of the value stream, eg: \"x\"",
"serial.writeValue|param|value": "to write" "serial.writeValue|param|value": "to write"
} }

2
libs/base/_locales/base-strings.json
View File

@@ -30,7 +30,7 @@
"control.waitMicros|block": "wait (µs)%micros", "control.waitMicros|block": "wait (µs)%micros",
"control|block": "control", "control|block": "control",
"loops.forever|block": "forever", "loops.forever|block": "forever",
"loops.pause|block": "pause %ms=timePicker|ms", "loops.pause|block": "pause %pause=timePicker|ms",
"loops.timePicker|block": "%ms", "loops.timePicker|block": "%ms",
"loops|block": "loops", "loops|block": "loops",
"parseInt|block": "parse to integer %text", "parseInt|block": "parse to integer %text",

10
libs/base/shims.d.ts vendored
View File

@@ -79,7 +79,7 @@ declare namespace loops {
* @param ms how long to pause for, eg: 100, 200, 500, 1000, 2000 * @param ms how long to pause for, eg: 100, 200, 500, 1000, 2000
*/ */
//% help=loops/pause weight=99 //% help=loops/pause weight=99
//% async block="pause %ms=timePicker|ms" //% async block="pause %pause=timePicker|ms"
//% blockId=device_pause shim=loops::pause //% blockId=device_pause shim=loops::pause
function pause(ms: int32): void; function pause(ms: int32): void;
} }
@@ -99,8 +99,8 @@ declare namespace control {
*/ */
//% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src|with value %value" //% weight=20 blockGap=8 blockId="control_on_event" block="on event|from %src|with value %value"
//% blockExternalInputs=1 //% blockExternalInputs=1
//% help="control/on-event" shim=control::onEvent //% help="control/on-event" flags.defl=16 shim=control::onEvent
function onEvent(src: int32, value: int32, handler: () => void): void; function onEvent(src: int32, value: int32, handler: () => void, flags?: int32): void;
/** /**
* Reset the device. * Reset the device.
@@ -144,14 +144,14 @@ declare namespace serial {
* Write some text to the serial port. * Write some text to the serial port.
*/ */
//% help=serial/write-string //% help=serial/write-string
//% weight=87 //% weight=87 blockHidden=true
//% blockId=serial_writestring block="serial|write string %text" shim=serial::writeString //% blockId=serial_writestring block="serial|write string %text" shim=serial::writeString
function writeString(text: string): void; function writeString(text: string): void;
/** /**
* Send a buffer across the serial connection. * Send a buffer across the serial connection.
*/ */
//% help=serial/write-buffer weight=6 //% help=serial/write-buffer weight=6 blockHidden=true
//% blockId=serial_writebuffer block="serial|write buffer %buffer" shim=serial::writeBuffer //% blockId=serial_writebuffer block="serial|write buffer %buffer" shim=serial::writeBuffer
function writeBuffer(buffer: Buffer): void; function writeBuffer(buffer: Buffer): void;
} }

3
libs/core/linux.cpp
View File

@@ -352,7 +352,8 @@ void raiseEvent(int id, int event) {
pthread_mutex_unlock(&eventMutex); pthread_mutex_unlock(&eventMutex);
} }
void registerWithDal(int id, int event, Action a) { void registerWithDal(int id, int event, Action a, int flags) {
// TODO support flags
setBinding(id, event, a); setBinding(id, event, a);
} }