From 2b4d71ac8b06f37f91fda3d18ed3e2db833c0f11 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 19 Feb 2017 16:17:58 +0100
Subject: [PATCH] merged fixes from calliope-mini-2016 branch

---
 libs/core/_locales/core-jsdoc-strings.json | 1 +
 libs/core/dal.d.ts                         | 1 +
 libs/core/shims.d.ts                       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json
index b878b887..f25de6d6 100644
--- a/libs/core/_locales/core-jsdoc-strings.json
+++ b/libs/core/_locales/core-jsdoc-strings.json
@@ -180,6 +180,7 @@
   "music.noteFrequency": "Gets the frequency of a note.",
   "music.noteFrequency|param|name": "the note name",
   "music.playTone": "Plays a tone through ``speaker`` for the given duration.",
+  "music.playTone|param|frequency": "pitch of the tone to play in Hertz (Hz)",
   "music.playTone|param|ms": "tone duration in milliseconds (ms)",
   "music.rest": "Rests (plays nothing) for a specified time through pin ``P0``.",
   "music.rest|param|ms": "rest duration in milliseconds (ms)",
diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts
index 3d9b5405..c8760117 100644
--- a/libs/core/dal.d.ts
+++ b/libs/core/dal.d.ts
@@ -192,6 +192,7 @@ declare const enum DAL {
     MICROBIT_SERIAL_EVT_TX_EMPTY = 2,
     MICROBIT_UART_S_EVT_TX_EMPTY = 3,
     // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeRGB.h
+    RGB_LED_MAX_INTENSITY = 255,
     // built/yt/yotta_modules/microbit-dal/inc/drivers/CalliopeSoundMotor.h
     CALLIOPE_SM_DEFAULT_DUTY_M = 50,
     CALLIOPE_SM_DEFAULT_DUTY_S = 100,
diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts
index 5eb56ef5..21e28179 100644
--- a/libs/core/shims.d.ts
+++ b/libs/core/shims.d.ts
@@ -555,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;
 }
 declare namespace pins {