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

3 activies from curriculum (#194)

Browse Source 
* 3 activies from curriculum

* fixing style
This commit is contained in:
Peli de Halleux
2018-01-05 18:24:23 -08:00
committed by GitHub
parent 9f9ce29476
commit ea46f1cbc7
7 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
"MoveUnit.Degrees|block": "degrees",
"MoveUnit.MilliSeconds|block": "milliseconds",
"MoveUnit.Rotations|block": "rotations",
"MoveUnit.Seconds|block": "seconds",
"Output.AB|block": "A+B",
"Output.AD|block": "A+D",
"Output.ALL|block": "All",

16
libs/core/output.ts
View File

@ -30,6 +30,8 @@ enum MoveUnit {
Rotations,
//% block="degrees"
Degrees,
//% block="seconds"
Seconds,
//% block="milliseconds"
MilliSeconds
}
@ -246,6 +248,10 @@ namespace motors {
stepsOrTime = value >> 0;
useSteps = true;
break;
case MoveUnit.Seconds:
stepsOrTime = (value * 1000) >> 0;
useSteps = false;
break;
default:
stepsOrTime = value;
useSteps = false;
@ -265,7 +271,7 @@ namespace motors {
readPWM(buf)
const flags = buf.getNumber(NumberFormat.UInt8LE, 2);
// TODO: FIX with ~ support
for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
const flag = 1 << i;
if ((this._port & flag) && (flags & flag))
return false;
@ -505,7 +511,7 @@ namespace motors {
this.steerFor(turnRatio, speed, value, unit);
}
/**
* Turns the motor and the follower motor by a number of rotations
* @param turnRatio the ratio of power sent to the follower motor, from ``-200`` to ``200``, eg: 0
@ -554,6 +560,10 @@ namespace motors {
stepsOrTime = value >> 0;
useSteps = true;
break;
case MoveUnit.Seconds:
stepsOrTime = (value * 1000) >> 0;
useSteps = false;
break;
default:
stepsOrTime = value >> 0;
useSteps = false;
@ -567,7 +577,7 @@ namespace motors {
stepsOrTime: stepsOrTime,
useBrake: this._brake
});
}
}
/**
* Returns the name(s) of the motor