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

Removing icons (#114)

Browse Source 
* removing icons

* added "pause for light"
This commit is contained in:
Peli de Halleux
2017-12-19 11:37:33 -08:00
committed by GitHub
parent 9e427898ae
commit 919a03951c
14 changed files with 139 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,13 +47,13 @@
"console|block": "console",
"control.raiseEvent|block": "raise event|from %src|with value %value",
"control|block": "control",
"motors.Motor.angle|block": "`icons.motorLarge` %motor|angle",
"motors.Motor.speed|block": "`icons.motorLarge` %motor|speed",
"motors.MotorBase.move|block": "move `icons.motorLarge` %motor|for %value|%unit|at %speed|%",
"motors.Motor.angle|block": "%motor|angle",
"motors.Motor.speed|block": "%motor|speed",
"motors.MotorBase.move|block": "move %motor|for %value|%unit|at %speed|%",
"motors.MotorBase.pauseUntilReady|block": "%motor|pause until ready",
"motors.MotorBase.setBrake|block": "set `icons.motorLarge` %motor|brake %brake",
"motors.MotorBase.setReversed|block": "set `icons.motorLarge` %motor|reversed %reversed",
"motors.MotorBase.setSpeed|block": "set speed of `icons.motorLarge` %motor|to %speed|%",
"motors.MotorBase.setBrake|block": "set %motor|brake %brake",
"motors.MotorBase.setReversed|block": "set %motor|reversed %reversed",
"motors.MotorBase.setSpeed|block": "set speed of %motor|to %speed|%",
"motors.SynchedMotorPair.steer|block": "steer %chassis|%steering|%|at speed %speed|%|by %value|%unit",
"motors.SynchedMotorPair.tank|block": "tank %chassis|left %speedLeft|%|right %speedRight|%|by %value|%unit",
"motors.largeAB|block": "large A+B",

2
libs/core/input.ts
View File

@ -196,7 +196,7 @@ namespace sensors.internal {
private lowThreshold: number;
private highThreshold: number;
private level: number;
private state: ThresholdState;
public state: ThresholdState;
constructor(id: number, min = 0, max = 100, lowThreshold = 20, highThreshold = 80) {
this.id = id;

12
libs/core/output.ts
View File

@ -159,7 +159,7 @@ namespace motors {
* Sets the automatic brake on or off when the motor is off
* @param brake a value indicating if the motor should break when off
*/
//% blockId=outputMotorSetBrakeMode block="set `icons.motorLarge` %motor|brake %brake"
//% blockId=outputMotorSetBrakeMode block="set %motor|brake %brake"
//% brake.fieldEditor=toggleonoff
//% weight=60 blockGap=8
//% group="Motion"
@ -171,7 +171,7 @@ namespace motors {
/**
* Reverses the motor polarity
*/
//% blockId=motorSetReversed block="set `icons.motorLarge` %motor|reversed %reversed"
//% blockId=motorSetReversed block="set %motor|reversed %reversed"
//% reversed.fieldEditor=toggleonoff
//% weight=59
//% group="Motion"
@ -204,7 +204,7 @@ namespace motors {
* Sets the speed of the motor.
* @param speed the speed from ``100`` full forward to ``-100`` full backward, eg: 50
*/
//% blockId=motorSetSpeed block="set speed of `icons.motorLarge` %motor|to %speed|%"
//% blockId=motorSetSpeed block="set speed of %motor|to %speed|%"
//% on.fieldEditor=toggleonoff
//% weight=99 blockGap=8
//% speed.min=-100 speed.max=100
@ -224,7 +224,7 @@ namespace motors {
* @param unit the meaning of the value
* @param speed the speed from ``100`` full forward to ``-100`` full backward, eg: 50
*/
//% blockId=motorMove block="move `icons.motorLarge` %motor|for %value|%unit|at %speed|%"
//% blockId=motorMove block="move %motor|for %value|%unit|at %speed|%"
//% weight=98 blockGap=8
//% speed.min=-100 speed.max=100
//% group="Motion"
@ -322,7 +322,7 @@ namespace motors {
* Gets motor actual speed.
* @param motor the port which connects to the motor
*/
//% blockId=motorSpeed block="`icons.motorLarge` %motor|speed"
//% blockId=motorSpeed block="%motor|speed"
//% weight=72 blockGap=8
//% group="Sensors"
speed(): number {
@ -334,7 +334,7 @@ namespace motors {
* Gets motor ration angle.
* @param motor the port which connects to the motor
*/
//% blockId=motorTachoCount block="`icons.motorLarge` %motor|angle"
//% blockId=motorTachoCount block="%motor|angle"
//% weight=70
//% group="Sensors"
angle(): number {