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

merging master

Browse Source
This commit is contained in:
Peli de Halleux
2016-11-09 13:20:18 -08:00
parent 94e72784b9 b6b18b7ceb
commit 0b144539f3
22 changed files with 498 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/core/shims.d.ts vendored
View File

@ -524,12 +524,26 @@ declare namespace led {
declare namespace motors {
/**
* Controls the power sent to a single motor
* Turns on the motor at a certain percent of power.
* @param power %percent of power sent to the motor. Negative power goes backward. eg: 50
*/
//% blockId=motor_on block="motor on at %percent|%"
//% parts=dcmotor shim=motors::motorOn
function motorOn(power: number): void;
//% blockId=motor_on block="motor on at %percent"
//% parts=dcmotor weight=90 blockGap=8 shim=motors::motorPower
function motorPower(power: number): void;
/**
* Send break, coast or sleep commands to the motor
*/
//% blockId=motor_command block="motor %command"
//% parts=dcmotor weight=85 shim=motors::motorCommand
function motorCommand(command: MotorCommand): void;
/**
* Controls two motors attached to the board.
*/
//% blockId=block_dual_motor block="motor %motor|at %percent"
//% weight=80 shim=motors::dualMotorPower
function dualMotorPower(motor: Motor, duty_percent: number): void;
}
declare namespace music {
@ -541,7 +555,7 @@ declare namespace music {
//% help=music/play-tone weight=90
//% blockId=device_play_note block="play|tone %note=device_note|for %duration=device_beat" icon="\uf025" blockGap=8
//% parts="speaker" async shim=music::playTone
function playTone(freqency: number, ms: number): void;
function playTone(frequency: number, ms: number): void;
/**
* Plays a tone through ``speaker``.