From 38d2cf06d262f6a77c4c288986982470f0aad42d Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 24 Mar 2016 08:26:55 -0700 Subject: [PATCH] Making all enum consistently singular (breaking) --- libs/microbit/input.ts | 20 ++++++++++---------- libs/microbit/music.ts | 8 ++++---- libs/microbit/pins.ts | 20 ++++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libs/microbit/input.ts b/libs/microbit/input.ts index 49b18235..b9931a0e 100644 --- a/libs/microbit/input.ts +++ b/libs/microbit/input.ts @@ -26,7 +26,7 @@ enum Rotation { Roll, } -enum TouchPins { +enum TouchPin { //% enumval=uBit.io.P0 P0, //% enumval=uBit.io.P1 @@ -76,7 +76,7 @@ enum BasicGesture }; */ -enum Gestures { +enum Gesture { /** * Raised when shaken */ @@ -139,7 +139,7 @@ namespace input { */ //% help=input/on-gesture shim=micro_bit::onGesture weight=84 //% blockId=device_gesture_event block="on |%NAME" icon="\uf135" - export function onGesture(gesture: Gestures, body: Action): void { } + export function onGesture(gesture: Gesture, body: Action): void { } /** * Do something when a pin(``P0``, ``P1`` or both ``P2``) is pressed. @@ -148,7 +148,7 @@ namespace input { */ //% help=input/on-pin-pressed weight=83 shim=micro_bit::onPinPressed //% blockId=device_pin_event block="on pin|%NAME|pressed" icon="\uf094" - export function onPinPressed(name: TouchPins, body: Action): void { } + export function onPinPressed(name: TouchPin, body: Action): void { } /** * Get the button state (pressed or not) for ``A`` and ``B``. @@ -246,7 +246,7 @@ namespace input { * @param name pin used to detect the touch */ //% help=input/pin-is-pressed weight=58 shim=micro_bit::isPinTouched block="pin|%NAME|is pressed" icon="\uf094" - export function pinIsPressed(name: TouchPins): boolean { + export function pinIsPressed(name: TouchPin): boolean { return false; } @@ -256,7 +256,7 @@ namespace input { */ //% help=input/on-screen-up export function onScreenUp(body: Action): void { - onGesture(Gestures.ScreenUp, body); + onGesture(Gesture.ScreenUp, body); } /** @@ -265,7 +265,7 @@ namespace input { */ //% help=input/on-screen-down export function onScreenDown(body: Action): void { - onGesture(Gestures.ScreenDown, body); + onGesture(Gesture.ScreenDown, body); } /** @@ -274,7 +274,7 @@ namespace input { */ //% help=input/on-shake export function onShake(body: Action): void { - onGesture(Gestures.Shake, body); + onGesture(Gesture.Shake, body); } /** @@ -283,7 +283,7 @@ namespace input { */ //% help=input/on-logo-up export function onLogoUp(body: Action): void { - onGesture(Gestures.LogoUp, body); + onGesture(Gesture.LogoUp, body); } /** @@ -292,7 +292,7 @@ namespace input { */ //% help=input/on-logo-down export function onLogoDown(body: Action): void { - onGesture(Gestures.LogoDown, body); + onGesture(Gesture.LogoDown, body); } /** diff --git a/libs/microbit/music.ts b/libs/microbit/music.ts index 34892979..eb7cd6eb 100644 --- a/libs/microbit/music.ts +++ b/libs/microbit/music.ts @@ -1,4 +1,4 @@ -enum Notes { +enum Note { //% enumval=262 C, //% enumval=277 blockId=C# @@ -122,7 +122,7 @@ namespace music { //% help=music/play-tone weight=90 //% blockId=device_play_note block="play|tone (Hz) %note=device_note|for (ms) %duration=device_beat" icon="\uf025" blockGap=8 export function playTone(frequency: number, ms: number): void { - pins.analogSetPitchPin(AnalogPins.P0); + pins.analogSetPitchPin(AnalogPin.P0); pins.analogPitch(frequency, ms); } @@ -133,7 +133,7 @@ namespace music { //% help=music/ring-tone weight=80 //% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8 export function ringTone(frequency: number): void { - pins.analogSetPitchPin(AnalogPins.P0); + pins.analogSetPitchPin(AnalogPin.P0); pins.analogPitch(frequency, 0); } @@ -154,7 +154,7 @@ namespace music { */ //% shim=TD_ID weight=50 help=music/note-frequency //% blockId=device_note block="%note" - export function noteFrequency(name: Notes): number { + export function noteFrequency(name: Note): number { return name; } diff --git a/libs/microbit/pins.ts b/libs/microbit/pins.ts index 1971da6c..27c1ff5a 100644 --- a/libs/microbit/pins.ts +++ b/libs/microbit/pins.ts @@ -1,4 +1,4 @@ -enum DigitalPins { +enum DigitalPin { //% enumval=uBit.io.P0 P0, //% enumval=uBit.io.P1 @@ -39,7 +39,7 @@ enum DigitalPins { P20, } -enum AnalogPins { +enum AnalogPin { //% enumval=uBit.io.P0 P0, //% enumval=uBit.io.P1 @@ -63,7 +63,7 @@ namespace pins { */ //% help=pins/digital-read-pin weight=30 shim=micro_bit::digitalReadPin //% blockId=device_get_digital_pin block="digital read|pin %name" blockGap=8 - export function digitalReadPin(name: DigitalPins): number { + export function digitalReadPin(name: DigitalPin): number { return 0; } @@ -75,7 +75,7 @@ namespace pins { */ //% help=pins/digital-write-pin weight=29 shim=micro_bit::digitalWritePin //% blockId=device_set_digital_pin block="digital write|pin %name|to %value" - export function digitalWritePin(name: DigitalPins, value: number): void { } + export function digitalWritePin(name: DigitalPin, value: number): void { } /** * Read the connector value as analog, that is, as a value comprised between 0 and 1023. @@ -83,7 +83,7 @@ namespace pins { */ //% help=pins/analog-read-pin weight=25 shim=micro_bit::analogReadPin //% blockId=device_get_analog_pin block="analog read|pin %name" blockGap="8" - export function analogReadPin(name: AnalogPins): number { + export function analogReadPin(name: AnalogPin): number { return 0; } @@ -94,7 +94,7 @@ namespace pins { */ //% help=pins/analog-write-pin weight=24 shim=micro_bit::analogWritePin //% blockId=device_set_analog_pin block="analog write|pin %name|to %value" blockGap=8 - export function analogWritePin(name: AnalogPins, value: number): void { } + export function analogWritePin(name: AnalogPin, value: number): void { } /** * Configures the Pulse-width modulation (PWM) of the analog output to the given value in **microseconds** or `1/1000` milliseconds. @@ -104,7 +104,7 @@ namespace pins { */ //% shim=micro_bit::setAnalogPeriodUs help=pins/analog-set-period weight=23 //% blockId=device_set_analog_period block="analog set period|pin %pin|to (µs)%micros" - export function analogSetPeriod(pin: AnalogPins, micros: number): void { } + export function analogSetPeriod(pin: AnalogPin, micros: number): void { } /** * Writes a value to the servo, controlling the shaft accordingly. On a standard servo, this will set the angle of the shaft (in degrees), moving the shaft to that orientation. On a continuous rotation servo, this will set the speed of the servo (with ``0`` being full-speed in one direction, ``180`` being full speed in the other, and a value near ``90`` being no movement). @@ -113,7 +113,7 @@ namespace pins { */ //% help=pins/servo-write-pin weight=20 shim=micro_bit::servoWritePin //% blockId=device_set_servo_pin block="servo write|pin %name|to %value" blockGap=8 - export function servoWritePin(name: AnalogPins, value: number): void { } + export function servoWritePin(name: AnalogPin, value: number): void { } /** * Configures this IO pin as an analog/pwm output, configures the period to be 20 ms, and sets the pulse width, based on the value it is given **microseconds** or `1/1000` milliseconds. @@ -122,7 +122,7 @@ namespace pins { */ //% shim=micro_bit::setServoPulseUs help=pins/serial-set-pulse weight=19 //% blockId=device_set_servo_pulse block="servo set pulse|pin %value|to (µs) %micros" - export function servoSetPulse(pin: AnalogPins, micros: number): void { } + export function servoSetPulse(pin: AnalogPin, micros: number): void { } /** * Re-maps a number from one range to another. That is, a value of ``from low`` would get mapped to ``to low``, a value of ``from high`` to ``to high``, values in-between to values in-between, etc. @@ -143,7 +143,7 @@ namespace pins { * @param name TODO */ //% shim=micro_bit::enablePitch help=pins/analog-set-pitch weight=12 - export function analogSetPitchPin(name: AnalogPins): void { } + export function analogSetPitchPin(name: AnalogPin): void { } /** * Emits a Pulse-width modulation (PWM) signal to the current pitch pin. Use `analog set pitch pin` to define the pitch pin.