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

Merge pull request #78 from Microsoft/waitUntiltopauseUntil

Browse Source 
renaming all "wait until" to "pause until"
This commit is contained in:
Peli de Halleux 2017-12-13 15:52:46 -08:00 committed by GitHub
commit 557926d631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/core/_locales/core-jsdoc-strings.json
View File

@ -18,8 +18,8 @@
"brick.Button.isPressed": "Check if button is currently pressed or not.", "brick.Button.isPressed": "Check if button is currently pressed or not.",
"brick.Button.onEvent": "Do something when a button or sensor is clicked, up or down.", "brick.Button.onEvent": "Do something when a button or sensor is clicked, up or down.",
"brick.Button.onEvent|param|body": "code to run when the event is raised", "brick.Button.onEvent|param|body": "code to run when the event is raised",
"brick.Button.waitUntil": "Waits until the event is raised", "brick.Button.pauseUntil": "Waits until the event is raised",
"brick.Button.waitUntil|param|ev": "the event to wait for", "brick.Button.pauseUntil|param|ev": "the event to wait for",
"brick.Button.wasPressed": "See if the button was pressed again since the last time you checked.", "brick.Button.wasPressed": "See if the button was pressed again since the last time you checked.",
"brick._imagePicker": "An image", "brick._imagePicker": "An image",
"brick._imagePicker|param|image": "the image", "brick._imagePicker|param|image": "the image",

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

@ -19,7 +19,7 @@
"Output.D|block": "D", "Output.D|block": "D",
"brick.Button.isPressed|block": "`icons.brickButtons` %button|is pressed", "brick.Button.isPressed|block": "`icons.brickButtons` %button|is pressed",
"brick.Button.onEvent|block": "on `icons.brickButtons` %button|%event", "brick.Button.onEvent|block": "on `icons.brickButtons` %button|%event",
"brick.Button.waitUntil|block": "wait until `icons.brickButtons` %button|%event", "brick.Button.pauseUntil|block": "pause until `icons.brickButtons` %button|%event",
"brick.Button.wasPressed|block": "`icons.brickButtons` %button|was pressed", "brick.Button.wasPressed|block": "`icons.brickButtons` %button|was pressed",
"brick._imagePicker|block": "%image", "brick._imagePicker|block": "%image",
"brick.buttonDown|block": "down", "brick.buttonDown|block": "down",

6
libs/core/buttons.ts
View File

@ -132,13 +132,13 @@ namespace brick {
* Waits until the event is raised * Waits until the event is raised
* @param ev the event to wait for * @param ev the event to wait for
*/ */
//% help=input/button/wait-until //% help=input/button/pause-until
//% blockId=buttonWaitUntil block="wait until `icons.brickButtons` %button|%event" //% blockId=buttonWaitUntil block="pause until `icons.brickButtons` %button|%event"
//% parts="brick" //% parts="brick"
//% blockNamespace=brick //% blockNamespace=brick
//% weight=98 blockGap=8 //% weight=98 blockGap=8
//% group="Buttons" //% group="Buttons"
waitUntil(ev: ButtonEvent) { pauseUntil(ev: ButtonEvent) {
control.waitForEvent(this._id, ev); control.waitForEvent(this._id, ev);
} }
} }

2
libs/infrared-sensor/_locales/infrared-sensor-jsdoc-strings.json
View File

@ -1,9 +1,9 @@
{ {
"sensors.InfraredSensor.onEvent": "Registers code to run when an object is getting near.", "sensors.InfraredSensor.onEvent": "Registers code to run when an object is getting near.",
"sensors.InfraredSensor.onEvent|param|handler": "the code to run when detected", "sensors.InfraredSensor.onEvent|param|handler": "the code to run when detected",
"sensors.InfraredSensor.pauseUntil": "Waits for the event to occur",
"sensors.InfraredSensor.proximity": "Get the promixity measured by the infrared sensor, from ``0`` (close) to ``100`` (far)", "sensors.InfraredSensor.proximity": "Get the promixity measured by the infrared sensor, from ``0`` (close) to ``100`` (far)",
"sensors.InfraredSensor.remoteCommand": "Get the remote commandreceived the infrared sensor.", "sensors.InfraredSensor.remoteCommand": "Get the remote commandreceived the infrared sensor.",
"sensors.InfraredSensor.waitUntil": "Waits for the event to occur",
"sensors.RemoteInfraredBeaconButton.isPressed": "Check if a remote button is currently pressed or not.", "sensors.RemoteInfraredBeaconButton.isPressed": "Check if a remote button is currently pressed or not.",
"sensors.RemoteInfraredBeaconButton.onEvent": "Do something when a button or sensor is clicked, up or down", "sensors.RemoteInfraredBeaconButton.onEvent": "Do something when a button or sensor is clicked, up or down",
"sensors.RemoteInfraredBeaconButton.onEvent|param|body": "code to run when the event is raised", "sensors.RemoteInfraredBeaconButton.onEvent|param|body": "code to run when the event is raised",

2
libs/infrared-sensor/_locales/infrared-sensor-strings.json
View File

@ -2,9 +2,9 @@
"InfraredSensorEvent.ObjectDetected|block": "object detected", "InfraredSensorEvent.ObjectDetected|block": "object detected",
"InfraredSensorEvent.ObjectNear|block": "object near", "InfraredSensorEvent.ObjectNear|block": "object near",
"sensors.InfraredSensor.onEvent|block": "on `icons.infraredSensor` %sensor|%event", "sensors.InfraredSensor.onEvent|block": "on `icons.infraredSensor` %sensor|%event",
"sensors.InfraredSensor.pauseUntil|block": "pause until `icons.infraredSensor` %sensor| %event",
"sensors.InfraredSensor.proximity|block": "`icons.infraredSensor` %sensor|proximity", "sensors.InfraredSensor.proximity|block": "`icons.infraredSensor` %sensor|proximity",
"sensors.InfraredSensor.remoteCommand|block": "`icons.infraredSensor` %sensor|remote command", "sensors.InfraredSensor.remoteCommand|block": "`icons.infraredSensor` %sensor|remote command",
"sensors.InfraredSensor.waitUntil|block": "wait until `icons.infraredSensor` %sensor| %event",
"sensors.RemoteInfraredBeaconButton.isPressed|block": "`icons.infraredSensor` %button|is pressed", "sensors.RemoteInfraredBeaconButton.isPressed|block": "`icons.infraredSensor` %button|is pressed",
"sensors.RemoteInfraredBeaconButton.onEvent|block": "on `icons.infraredSensor` %button|%event", "sensors.RemoteInfraredBeaconButton.onEvent|block": "on `icons.infraredSensor` %button|%event",
"sensors.RemoteInfraredBeaconButton.wasPressed|block": "`icons.infraredSensor` %button|was pressed", "sensors.RemoteInfraredBeaconButton.wasPressed|block": "`icons.infraredSensor` %button|was pressed",

4
libs/infrared-sensor/ir.ts
View File

@ -205,7 +205,7 @@ namespace sensors {
* Waits for the event to occur * Waits for the event to occur
*/ */
//% help=input/ultrasonic/wait //% help=input/ultrasonic/wait
//% block="wait until `icons.infraredSensor` %sensor| %event" //% block="pause until `icons.infraredSensor` %sensor| %event"
//% blockId=infraredwait //% blockId=infraredwait
//% parts="infraredsensor" //% parts="infraredsensor"
//% sensor.fieldEditor="imagedropdown" //% sensor.fieldEditor="imagedropdown"
@ -213,7 +213,7 @@ namespace sensors {
//% blockNamespace=sensors //% blockNamespace=sensors
//% weight=99 blockGap=8 //% weight=99 blockGap=8
//% group="Infrared Sensor" //% group="Infrared Sensor"
waitUntil(event: InfraredSensorEvent) { pauseUntil(event: InfraredSensorEvent) {
control.waitForEvent(this._id, event); control.waitForEvent(this._id, event);
} }

2
libs/touch-sensor/_locales/touch-sensor-jsdoc-strings.json
View File

@ -3,6 +3,6 @@
"sensors.TouchSensor.isPressed": "Check if touch sensor is touched.", "sensors.TouchSensor.isPressed": "Check if touch sensor is touched.",
"sensors.TouchSensor.onEvent": "Do something when a touch sensor is touched...", "sensors.TouchSensor.onEvent": "Do something when a touch sensor is touched...",
"sensors.TouchSensor.onEvent|param|body": "code to run when the event is raised", "sensors.TouchSensor.onEvent|param|body": "code to run when the event is raised",
"sensors.TouchSensor.waitUntil": "Wait until the touch sensor is touched", "sensors.TouchSensor.pauseUntil": "Wait until the touch sensor is touched",
"sensors.TouchSensor.wasPressed": "Check if touch sensor is touched since it was last checked." "sensors.TouchSensor.wasPressed": "Check if touch sensor is touched since it was last checked."
} }

2
libs/touch-sensor/_locales/touch-sensor-strings.json
View File

@ -4,7 +4,7 @@
"TouchSensorEvent.Released|block": "released", "TouchSensorEvent.Released|block": "released",
"sensors.TouchSensor.isPressed|block": "`icons.touchSensor` %sensor|is pressed", "sensors.TouchSensor.isPressed|block": "`icons.touchSensor` %sensor|is pressed",
"sensors.TouchSensor.onEvent|block": "on `icons.touchSensor` %sensor|%event", "sensors.TouchSensor.onEvent|block": "on `icons.touchSensor` %sensor|%event",
"sensors.TouchSensor.waitUntil|block": "wait until `icons.touchSensor` %sensor|%event", "sensors.TouchSensor.pauseUntil|block": "pause until `icons.touchSensor` %sensor|%event",
"sensors.TouchSensor.wasPressed|block": "`icons.touchSensor` %sensor|was pressed", "sensors.TouchSensor.wasPressed|block": "`icons.touchSensor` %sensor|was pressed",
"sensors.touchSensor1|block": "1", "sensors.touchSensor1|block": "1",
"sensors.touchSensor2|block": "2", "sensors.touchSensor2|block": "2",

8
libs/touch-sensor/touch.ts
View File

@ -58,16 +58,16 @@ namespace sensors {
* @param sensor the touch sensor that needs to be clicked or used * @param sensor the touch sensor that needs to be clicked or used
* @param event the kind of button gesture that needs to be detected * @param event the kind of button gesture that needs to be detected
*/ */
//% help=input/touch-sensor/wait-until //% help=input/touch-sensor/pause-until
//% blockId=touchWaitUntil block="wait until `icons.touchSensor` %sensor|%event" //% blockId=touchWaitUntil block="pause until `icons.touchSensor` %sensor|%event"
//% parts="touch" //% parts="touch"
//% sensor.fieldEditor="imagedropdown" //% sensor.fieldEditor="imagedropdown"
//% sensor.fieldOptions.columns=4 //% sensor.fieldOptions.columns=4
//% blockNamespace=sensors //% blockNamespace=sensors
//% weight=98 blockGap=8 //% weight=98 blockGap=8
//% group="Touch Sensor" //% group="Touch Sensor"
waitUntil(ev: TouchSensorEvent) { pauseUntil(ev: TouchSensorEvent) {
this.button.waitUntil(<ButtonEvent><number>ev); this.button.pauseUntil(<ButtonEvent><number>ev);
} }
/** /**

2
libs/ultrasonic-sensor/_locales/ultrasonic-sensor-jsdoc-strings.json
View File

@ -2,5 +2,5 @@
"sensors.UltraSonicSensor.distance": "Gets the distance from the sonar in centimeters", "sensors.UltraSonicSensor.distance": "Gets the distance from the sonar in centimeters",
"sensors.UltraSonicSensor.onEvent": "Registers code to run when the given color is close", "sensors.UltraSonicSensor.onEvent": "Registers code to run when the given color is close",
"sensors.UltraSonicSensor.onEvent|param|handler": "the code to run when detected", "sensors.UltraSonicSensor.onEvent|param|handler": "the code to run when detected",
"sensors.UltraSonicSensor.waitUntil": "Waits for the event to occur" "sensors.UltraSonicSensor.pauseUntil": "Waits for the event to occur"
} }

2
libs/ultrasonic-sensor/_locales/ultrasonic-sensor-strings.json
View File

@ -4,7 +4,7 @@
"UltrasonicSensorEvent.ObjectNear|block": "object near", "UltrasonicSensorEvent.ObjectNear|block": "object near",
"sensors.UltraSonicSensor.distance|block": "`icons.ultrasonicSensor` %sensor|distance", "sensors.UltraSonicSensor.distance|block": "`icons.ultrasonicSensor` %sensor|distance",
"sensors.UltraSonicSensor.onEvent|block": "on `icons.ultrasonicSensor` %sensor|%event", "sensors.UltraSonicSensor.onEvent|block": "on `icons.ultrasonicSensor` %sensor|%event",
"sensors.UltraSonicSensor.waitUntil|block": "wait until `icons.ultrasonicSensor` %sensor| %event", "sensors.UltraSonicSensor.pauseUntil|block": "pause until `icons.ultrasonicSensor` %sensor| %event",
"sensors.ultrasonic1|block": "1", "sensors.ultrasonic1|block": "1",
"sensors.ultrasonic2|block": "2", "sensors.ultrasonic2|block": "2",
"sensors.ultrasonic3|block": "3", "sensors.ultrasonic3|block": "3",

4
libs/ultrasonic-sensor/ultrasonic.ts
View File

@ -58,7 +58,7 @@ namespace sensors {
* Waits for the event to occur * Waits for the event to occur
*/ */
//% help=input/ultrasonic/wait //% help=input/ultrasonic/wait
//% block="wait until `icons.ultrasonicSensor` %sensor| %event" //% block="pause until `icons.ultrasonicSensor` %sensor| %event"
//% blockId=ultrasonicWait //% blockId=ultrasonicWait
//% parts="ultrasonicsensor" //% parts="ultrasonicsensor"
//% sensor.fieldEditor="imagedropdown" //% sensor.fieldEditor="imagedropdown"
@ -66,7 +66,7 @@ namespace sensors {
//% blockNamespace=sensors //% blockNamespace=sensors
//% weight=99 blockGap=8 //% weight=99 blockGap=8
//% group="Ultrasonic Sensor" //% group="Ultrasonic Sensor"
waitUntil(event: UltrasonicSensorEvent) { pauseUntil(event: UltrasonicSensorEvent) {
control.waitForEvent(this._id, event); control.waitForEvent(this._id, event);
} }