diff --git a/docs/coding/reverse-beeper-3.md b/docs/coding/reverse-beeper-3.md index 634485b2..7e12d9d2 100644 --- a/docs/coding/reverse-beeper-3.md +++ b/docs/coding/reverse-beeper-3.md @@ -3,13 +3,13 @@ ```blocks let beep = false beep = true -control.runInBackground(function () { +control.runInParallel(function () { motors.largeBC.setSpeed(-20) sensors.ultrasonic4.pauseUntil(UltrasonicSensorEvent.ObjectNear) motors.largeBC.stop() beep = false }) -control.runInBackground(function () { +control.runInParallel(function () { while (beep) { if (sensors.ultrasonic4.distance() < 20) { music.playTone(440, sensors.ultrasonic4.distance()) diff --git a/docs/examples/core-set/puppy-labview.md b/docs/examples/core-set/puppy-labview.md index d45c0504..140097ba 100644 --- a/docs/examples/core-set/puppy-labview.md +++ b/docs/examples/core-set/puppy-labview.md @@ -81,7 +81,7 @@ function IS(t: number) { function UP() { if (motors.largeA.angle() > -50) { - control.runInBackground(function () { + control.runInParallel(function () { motors.largeD.clearCounts() motors.largeD.setSpeed(-35); pauseUntil(() => motors.largeD.angle() < -25); diff --git a/libs/base/_locales/base-jsdoc-strings.json b/libs/base/_locales/base-jsdoc-strings.json index 3d209b44..6cbd0a28 100644 --- a/libs/base/_locales/base-jsdoc-strings.json +++ b/libs/base/_locales/base-jsdoc-strings.json @@ -134,7 +134,7 @@ "control.panic": "Display an error code and stop the program.", "control.panic|param|code": "an error number to display. eg: 5", "control.reset": "Reset the device.", - "control.runInBackground": "Run other code in the background.", + "control.runInParallel": "Run other code in the parallel.", "control.waitForEvent": "Blocks the calling thread until the specified event is raised.", "control.waitMicros": "Block the current fiber for the given microseconds", "control.waitMicros|param|micros": "number of micro-seconds to wait. eg: 4", diff --git a/libs/base/_locales/base-strings.json b/libs/base/_locales/base-strings.json index 347db075..6a2455bf 100644 --- a/libs/base/_locales/base-strings.json +++ b/libs/base/_locales/base-strings.json @@ -25,7 +25,7 @@ "control.onEvent|block": "on event|from %src|with value %value", "control.panic|block": "panic %code", "control.reset|block": "reset", - "control.runInBackground|block": "run in background", + "control.runInParallel|block": "run in parallel", "control.waitForEvent|block": "wait for event|from %src|with value %value", "control.waitMicros|block": "wait (µs)%micros", "control|block": "control", diff --git a/libs/base/shims.d.ts b/libs/base/shims.d.ts index 9de0837e..9e19da92 100644 --- a/libs/base/shims.d.ts +++ b/libs/base/shims.d.ts @@ -118,11 +118,11 @@ declare namespace control { function waitMicros(micros: int32): void; /** - * Run other code in the background. + * Run other code in the parallel. */ - //% help=control/run-in-background blockAllowMultiple=1 afterOnStart=true - //% blockId="control_run_in_background" block="run in background" blockGap=8 shim=control::runInBackground - function runInBackground(a: () => void): void; + //% help=control/run-in-parallel handlerStatement=1 + //% blockId="control_run_in_parallel" block="run in parallel" blockGap=8 shim=control::runInParallel + function runInParallel(a: () => void): void; /** * Blocks the calling thread until the specified event is raised. diff --git a/libs/core/input.ts b/libs/core/input.ts index 7e651800..e0290f3a 100644 --- a/libs/core/input.ts +++ b/libs/core/input.ts @@ -11,7 +11,7 @@ namespace sensors.internal { // This is implementation for the simulator. - control.runInBackground(() => { + control.runInParallel(() => { let prev = query() changeHandler(prev, prev) while (true) { diff --git a/libs/core/linux.cpp b/libs/core/linux.cpp index 3b682e5c..fc737c78 100644 --- a/libs/core/linux.cpp +++ b/libs/core/linux.cpp @@ -271,7 +271,7 @@ void setupThread(Action a, TValue arg = 0, void (*runner)(Thread *) = NULL, TVal } } -void runInBackground(Action a) { +void runInParallel(Action a) { setupThread(a); } diff --git a/libs/music/sounds.ts b/libs/music/sounds.ts index b7cc6c0c..b073970f 100644 --- a/libs/music/sounds.ts +++ b/libs/music/sounds.ts @@ -291,7 +291,7 @@ namespace music { export function playSoundEffect(sound: Sound) { if (!sound || numSoundsPlaying >= soundsLimit) return; numSoundsPlaying++; - control.runInBackground(() => { + control.runInParallel(() => { sound.play(); numSoundsPlaying--; }); diff --git a/package.json b/package.json index b95942cf..97720de9 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "webfonts-generator": "^0.4.0" }, "dependencies": { - "pxt-common-packages": "0.15.7", - "pxt-core": "3.0.12" + "pxt-common-packages": "0.17.1", + "pxt-core": "3.0.14" }, "scripts": { "test": "node node_modules/pxt-core/built/pxt.js travis"