- 
+
+
@@ -27,7 +27,7 @@ export function renderUsbPairDialog(firmwareUrl?: string, failedOnce?: boolean):
- 
+
+
@@ -51,7 +51,7 @@ export function renderUsbPairDialog(firmwareUrl?: string, failedOnce?: boolean):
@@ -73,7 +73,7 @@ export function renderBrowserDownloadInstructions(): JSX.Element {
{lf("Update Firmware")}
{lf("You must have version 0249 or above of the firmware")}
- 
+
{lf("Check Firmware")}
+
-
+
+
@@ -88,7 +88,7 @@ export function renderBrowserDownloadInstructions(): JSX.Element {
- 
+
+
diff --git a/editor/extension.tsx b/editor/extension.tsx
index 1992e32c..740890cb 100644
--- a/editor/extension.tsx
+++ b/editor/extension.tsx
@@ -9,7 +9,7 @@ import * as flash from "./flash";
import * as patch from "./patch";
pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise {
- pxt.debug('loading microbit target extensions...')
+ pxt.debug('loading calliope mini target extensions...')
const manyAny = Math as any;
if (!manyAny.imul)
@@ -24,35 +24,22 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
};
const res: pxt.editor.ExtensionResult = {
- hexFileImporters: [{
- id: "blockly",
- canImport: data => data.meta.cloudId == "microbit.co.uk" && data.meta.editor == "blockly",
- importAsync: (project, data) => {
- pxt.tickEvent('import.legacyblocks.redirect');
- return dialogs.cantImportAsync(project);
- }
- }, {
- id: "td",
- canImport: data => data.meta.cloudId == "microbit.co.uk" && data.meta.editor == "touchdevelop",
- importAsync: (project, data) => {
- pxt.tickEvent('import.legacytd.redirect');
- return dialogs.cantImportAsync(project);
- }
- }]
+ hexFileImporters: []
};
pxt.usb.setFilters([{
- vendorId: 0x1366,
- productId: 0x1025
- },
- {
vendorId: 0x0D28,
- productId: 0x0204
+ productId: 0x0204,
+ classCode: 0xff,
+ subclassCode: 0x03 // the ctrl pipe endpoint
+ }, {
+ vendorId: 0x0D28,
+ productId: 0x0204,
+ classCode: 0xff,
+ subclassCode: 0x00 // the custom CMSIS2 endpoint
}])
res.mkPacketIOWrapper = flash.mkDAPLinkPacketIOWrapper;
res.blocklyPatch = patch.patchBlocks;
- res.renderBrowserDownloadInstructions = dialogs.renderBrowserDownloadInstructions;
- res.renderUsbPairDialog = dialogs.renderUsbPairDialog;
return Promise.resolve(res);
}
diff --git a/editor/flash.ts b/editor/flash.ts
index bc3f4f35..2b470f06 100644
--- a/editor/flash.ts
+++ b/editor/flash.ts
@@ -1,9 +1,11 @@
const imul = (Math as any).imul;
-const timeoutMessage = "timeout"
-const membase = 0x20000000
-const loadAddr = membase
-const dataAddr = 0x20002000
-const stackAddr = 0x20001000
+const timeoutMessage = "timeout";
+const membase = 0x20000000;
+const loadAddr = membase;
+const dataAddr = 0x20002000;
+const stackAddr = 0x20001000;
+const FULL_FLASH_TIMEOUT = 100000; // 100s
+const PARTIAL_FLASH_TIMEOUT = 60000; // 60s
const flashPageBIN = new Uint32Array([
0xbe00be00, // bkpt - LR is set to this
@@ -35,7 +37,7 @@ function log(msg: string) {
let ts = ("00000" + now).slice(-5)
pxt.debug(`dap ${ts}: ${msg}`)
}
-
+const logV = /webusbdbg=1/.test(window.location.href) ? log : (msg: string) => { }
function murmur3_core(data: Uint8Array) {
let h0 = 0x2F9BE6CC;
@@ -57,23 +59,41 @@ function murmur3_core(data: Uint8Array) {
return [h0, h1]
}
+function bufferConcat(a: Uint8Array, b: Uint8Array) {
+ const r = new Uint8Array(a.length + b.length)
+ r.set(a, 0)
+ r.set(b, a.length)
+ return r
+}
+
class DAPWrapper implements pxt.packetio.PacketIOWrapper {
familyID: number;
private dap: DapJS.DAP;
private cortexM: DapJS.CortexM
private cmsisdap: any;
private flashing = false;
+ private flashAborted = false;
private readSerialId = 0;
private pbuf = new pxt.U.PromiseBuffer();
private pageSize = 1024;
private numPages = 256;
- private binName = pxtc.BINARY_HEX;
+ private usesCODAL = false;
+ private forceFullFlash = /webusbfullflash=1/.test(window.location.href);
+ private get useJACDAC() {
+ return this.usesCODAL;
+ }
+
+ onSerial = (buf: Uint8Array, isStderr: boolean) => { };
+ onCustomEvent = (type: string, payload: Uint8Array) => { };
constructor(public readonly io: pxt.packetio.PacketIO) {
- this.familyID = 0x1366; // this is the microbit vendor id, not quite UF2 family id
- this.io.onDeviceConnectionChanged = (connect) =>
+ this.familyID = 0x0D28; // this is the microbit vendor id, not quite UF2 family id
+ this.io.onDeviceConnectionChanged = (connect) => {
+ log(`device connection changed`);
this.disconnectAsync()
.then(() => connect && this.reconnectAsync());
+ }
+
this.io.onData = buf => {
// console.log("RD: " + pxt.Util.toHex(buf))
this.pbuf.push(buf);
@@ -82,96 +102,199 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
this.allocDAP();
}
- icon = "usb";
+ icon = "xicon microbit";
+
+ private pendingSerial: Uint8Array
+ private lastPendingSerial: number
+
+ private processSerialLine(line: Uint8Array) {
+ if (this.onSerial) {
+ try {
+ // catch encoding bugs
+ this.onSerial(line, false)
+ }
+ catch (err) {
+ log(`serial decoding error: ${err.message}`);
+ pxt.tickEvent("hid.flash.serial.decode.error");
+ console.error({ err, line })
+ }
+ }
+ }
+
+ private async readSerial(): Promise {
+ let buf = await this.dapCmdNums(0x83)
+ const len = buf[1]
+ // concat received data with previous data
+ if (len) {
+ buf = buf.slice(2, 2 + len)
+ if (this.pendingSerial) buf = bufferConcat(this.pendingSerial, buf)
+ let ptr = 0
+ let beg = 0
+ while (ptr < buf.length) {
+ if (buf[ptr] == 10 || buf[ptr] == 13) {
+ ptr++;
+ // eat \r\n
+ while (ptr < buf.length && (buf[ptr] == 10 || buf[ptr] == 13))
+ ptr++;
+ const line = buf.slice(beg, ptr)
+ if (line.length)
+ this.processSerialLine(line);
+ beg = ptr
+ }
+ else
+ ptr++
+ }
+ buf = buf.slice(beg)
+ this.pendingSerial = buf.length ? buf : null
+ if (this.pendingSerial) {
+ this.lastPendingSerial = Date.now()
+ //logV(`pending serial ${this.pendingSerial.length}`)
+ }
+ } else if (this.pendingSerial) {
+ const d = Date.now() - this.lastPendingSerial
+ if (d > 500) {
+ this.processSerialLine(this.pendingSerial)
+ this.pendingSerial = null
+ }
+ }
+ return len
+ }
private startReadSerial() {
- log(`start read serial`)
const rid = this.readSerialId;
- const readSerial = () => {
- if (rid != this.readSerialId) {
- log(`stopped read serial ${rid}`)
- return;
- }
- if (this.flashing) {
- setTimeout(readSerial, 500);
- return;
- }
- // done
- this.cmsisdap.cmdNums(0x83, [])
- .then((r: number[]) => {
- const len = r[1]
- let str = ""
- for (let i = 2; i < len + 2; ++i) {
- str += String.fromCharCode(r[i])
+ const startTime = Date.now();
+ log(`start read serial ${rid}`)
+ const readSerialLoop = async () => {
+ try {
+ while (rid === this.readSerialId) {
+ const len = await this.readSerial()
+ const hasData = len > 0
+ //if (hasData)
+ // logV(`serial read ${len} bytes`)
+ await this.jacdacProcess(hasData)
+ }
+ log(`stopped serial reader ${rid}`)
+ } catch (err) {
+ log(`serial error ${rid}: ${err.message}`);
+ console.error(err)
+ if (rid != this.readSerialId) {
+ log(`stopped serial reader ${rid}`)
+ } else {
+ pxt.tickEvent("hid.flash.serial.error");
+ const timeRunning = Date.now() - startTime
+ await this.disconnectAsync(); // force disconnect
+ // if we've been running for a while, try reconnecting
+ if (timeRunning > 1000) {
+ log(`auto-reconnect`)
+ await this.reconnectAsync();
}
- if (str.length > 0) {
- pxt.U.nextTick(readSerial)
- if (this.onSerial) {
- const utf8Str = pxt.U.toUTF8(str);
- this.onSerial(pxt.U.stringToUint8Array(utf8Str), false)
- }
- } else
- setTimeout(readSerial, 50)
- }, (err: any) => {
- log(`read error: ` + err.message);
- this.disconnectAsync(); // force disconnect
- });
+ }
+ }
}
- readSerial();
+
+ readSerialLoop();
}
private stopSerialAsync() {
- log(`stopping serial reader`)
+ log(`cancelling serial reader ${this.readSerialId}`)
this.readSerialId++;
- return Promise.delay(200);
+ return pxt.Util.delay(200);
}
- onSerial: (buf: Uint8Array, isStderr: boolean) => void;
-
private allocDAP() {
log(`alloc dap`);
+ const h = this.io;
this.dap = new DapJS.DAP({
- write: writeAsync,
+ write: data => h.sendPacketAsync(new Uint8Array(data)),
close: this.disconnectAsync,
- read: readAsync,
+ read: () => this.recvPacketAsync(),
//sendMany: sendMany
});
this.cmsisdap = (this.dap as any).dap;
this.cortexM = new DapJS.CortexM(this.dap);
+ }
- const h = this.io;
- const pbuf = this.pbuf;
- function writeAsync(data: ArrayBuffer) {
- //console.log("WR: " + pxt.Util.toHex(new Uint8Array(data)));
- return h.sendPacketAsync(new Uint8Array(data));
+ get binName() {
+ return (this.usesCODAL ? "mbcodal-" : "mbdal-") + pxtc.BINARY_HEX;
+ }
+
+ unsupportedParts() {
+ if (!this.usesCODAL) {
+ return ["logotouch", "builtinspeaker", "microphone", "flashlog"]
+ }
+ return [];
+ }
+
+ async reconnectAsync(): Promise {
+ log(`reconnect`)
+ this.flashAborted = false;
+
+ function stringResponse(buf: Uint8Array) {
+ return pxt.U.uint8ArrayToString(buf.slice(2, 2 + buf[1]))
}
- function readAsync() {
- return pbuf.shiftAsync();
+ await this.stopSerialAsync()
+
+ this.allocDAP(); // clean dap apis
+
+ await this.io.reconnectAsync()
+
+ // before calling into dapjs, we use our dapCmdNums() a few times, which which will make sure the responses
+ // to commends from previous sessions (if any) are flushed
+ const info = await this.dapCmdNums(0x00, 0x04) // info
+ const daplinkVersion = stringResponse(info)
+ log(`daplink version: ${daplinkVersion}`)
+
+ const r = await this.dapCmdNums(0x80)
+ this.usesCODAL = r[2] == 57 && r[3] == 57 && r[5] >= 51;
+ const binVersion = stringResponse(r);
+ log(`bin name: ${this.binName} v:${binVersion}`);
+
+ pxt.tickEvent("hid.flash.connect", { codal: this.usesCODAL ? 1 : 0, daplink: daplinkVersion, bin: binVersion });
+
+ const baud = new Uint8Array(5)
+ baud[0] = 0x82 // set baud
+ pxt.HF2.write32(baud, 1, 115200)
+ await this.dapCmd(baud)
+ // setting the baud rate on serial may reset NRF (depending on daplink version), so delay after
+ await pxt.Util.delay(200);
+
+ // only init after setting baud rate, in case we got reset
+ await this.cortexM.init()
+
+ const res = await this.readWords(0x10000010, 2);
+ this.pageSize = res[0]
+ this.numPages = res[1]
+ log(`page size ${this.pageSize}, num pages ${this.numPages}`);
+
+ await this.checkStateAsync(true);
+ await this.jacdacSetup();
+
+ this.startReadSerial();
+ }
+
+ private async checkStateAsync(resume?: boolean): Promise {
+ const states = ["reset", "lockup", "sleeping", "halted", "running"]
+ try {
+ const state = await this.cortexM.getState();
+ log(`cortex state: ${states[state]}`)
+ if (resume && state == DapJS.CoreState.TARGET_HALTED)
+ await this.cortexM.resume();
+ } catch (e) {
+ log(`cortex state failed`)
+ pxt.tickEvent("hid.checkstate.error")
+ console.debug(e)
}
}
- reconnectAsync(): Promise {
- log(`reconnect`)
- // configure serial at 115200
- return this.stopSerialAsync()
- .then(() => this.io.reconnectAsync())
- .then(() => this.cortexM.init())
- .then(() => this.cmsisdap.cmdNums(0x80, []))
- .then(r => {
- this.binName = (r[2] == 57 && r[3] == 57 && r[5] >= 51 ? "mbcodal-" : "") + pxtc.BINARY_HEX
- })
- .then(() => this.cortexM.memory.readBlock(0x10000010, 2, this.pageSize))
- .then(res => {
- this.pageSize = pxt.HF2.read32(res, 0)
- this.numPages = pxt.HF2.read32(res, 4)
- })
- .then(() => this.cmsisdap.cmdNums(0x82, [0x00, 0xC2, 0x01, 0x00]))
- .then(() => this.startReadSerial());
+ private checkAborted() {
+ if (this.flashAborted)
+ throw new Error(lf("Download cancelled"));
}
disconnectAsync() {
log(`disconnect`)
+ this.flashAborted = true;
return this.stopSerialAsync()
.then(() => this.io.disconnectAsync());
}
@@ -180,72 +303,195 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
log("reflash")
startTime = 0
pxt.tickEvent("hid.flash.start");
+ this.flashAborted = false;
this.flashing = true;
return (this.io.isConnected() ? Promise.resolve() : this.io.reconnectAsync())
+ .then(() => this.stopSerialAsync())
.then(() => this.cortexM.init())
.then(() => this.cortexM.reset(true))
- .then(() => this.cortexM.memory.readBlock(0x10001014, 1, this.pageSize))
- .then(v => {
- if ((pxt.HF2.read32(v, 0) & 0xff) != 0) {
+ .then(() => this.checkStateAsync())
+ .then(() => this.readUICR())
+ .then(uicr => {
+ pxt.tickEvent("hid.flash.uicr", { uicr });
+ // shortcut, do a full flash
+ if (uicr != 0 || this.forceFullFlash) {
pxt.tickEvent("hid.flash.uicrfail");
return this.fullVendorCommandFlashAsync(resp);
}
- return this.quickHidFlashAsync(resp);
+ // check flash checksums
+ return this.computeFlashChecksum(resp)
+ .then(chk => {
+ pxt.tickEvent("hid.flash.checksum", { quick: chk.quick ? 1 : 0, changed: chk.changed ? chk.changed.length : 0 });
+ // let's do a quick flash!
+ if (chk.quick)
+ return this.quickHidFlashAsync(chk.changed);
+ else
+ return this.fullVendorCommandFlashAsync(resp);
+ });
})
+ .then(() => this.checkStateAsync(true))
+ .then(() => pxt.tickEvent("hid.flash.success"))
.finally(() => { this.flashing = false })
- .then(() => Promise.delay(100))
- .then(() => this.disconnectAsync())
+ // don't disconnect here
+ // the micro:bit will automatically disconnect and reconnect
+ // via the webusb events
+ }
+
+ private recvPacketAsync() {
+ if (this.io.recvPacketAsync)
+ return this.io.recvPacketAsync()
+ else
+ return this.pbuf.shiftAsync()
+ }
+
+ private dapCmd(buf: Uint8Array) {
+ return this.io.sendPacketAsync(buf)
+ .then(() => this.recvPacketAsync())
+ .then(resp => {
+ if (resp[0] != buf[0]) {
+ pxt.tickEvent('hid.flash.cmderror', { req: buf[0], resp: resp[0] })
+ const msg = `bad dapCmd response: ${buf[0]} -> ${resp[0]}`
+
+ // in case we got an invalid response, try to get another response, in case the current
+ // response is a left-over from previous communications
+ log(msg + "; retrying")
+ return this.recvPacketAsync()
+ .then(resp => {
+ if (resp[0] == buf[0])
+ return resp
+ throw new Error(msg)
+ }, err => {
+ throw new Error(msg)
+ })
+ }
+ return resp
+ })
+ }
+
+ private dapCmdNums(...nums: number[]) {
+ return this.dapCmd(new Uint8Array(nums))
}
private fullVendorCommandFlashAsync(resp: pxtc.CompileResult): Promise {
log("full flash")
+ pxt.tickEvent("hid.flash.full.start");
const chunkSize = 62;
- let aborted = false;
- return Promise.resolve()
+ let sentPages = 0;
+ return pxt.Util.promiseTimeout(
+ FULL_FLASH_TIMEOUT,
+ Promise.resolve()
+ .then(() => this.dapCmdNums(0x8A /* DAPLinkFlash.OPEN */, 1))
+ .then((res) => {
+ log(`daplinkflash open: ${pxt.U.toHex(res)}`)
+ if (res[1] !== 0) {
+ pxt.tickEvent('hid.flash.full.error.open', { res: res[1] })
+ throw new Error(lf("Download failed, please try again"));
+ }
+ const binFile = resp.outfiles[this.binName];
+ log(`bin file ${this.binName} in ${Object.keys(resp.outfiles).join(', ')}, ${binFile?.length || -1}b`)
+ const hexUint8 = pxt.U.stringToUint8Array(binFile);
+ log(`hex ${hexUint8?.byteLength || -1}b, ~${(hexUint8.byteLength / chunkSize) | 0} chunks of ${chunkSize}b`)
+
+ const sendPages = (offset: number = 0): Promise => {
+ const end = Math.min(hexUint8.length, offset + chunkSize);
+ const nextPageData = hexUint8.slice(offset, end);
+ const cmdData = new Uint8Array(2 + nextPageData.length)
+ cmdData[0] = 0x8C /* DAPLinkFlash.WRITE */
+ cmdData[1] = nextPageData.length
+ cmdData.set(nextPageData, 2)
+ if (sentPages % 128 == 0) // reduce logging
+ log(`next page ${sentPages}: [${offset.toString(16)}, ${end.toString(16)}] (${Math.ceil((hexUint8.length - end) / 1000)}kb left)`)
+ return this.dapCmd(cmdData)
+ .then(() => {
+ this.checkAborted()
+ if (end < hexUint8.length) {
+ sentPages++;
+ return sendPages(end);
+ }
+ return Promise.resolve()
+ });
+ }
+
+ return sendPages();
+ })
+ .then(() => {
+ log(`close`)
+ return this.dapCmdNums(0x8B /* DAPLinkFlash.CLOSE */);
+ })
+ .then(res => {
+ log(`daplinkclose: ${pxt.U.toHex(res)}`)
+ return this.dapCmdNums(0x89 /* DAPLinkFlash.RESET */);
+ })
+ .then((res) => {
+ log(`daplinkreset: ${pxt.U.toHex(res)}`)
+ log(`full flash done`);
+ pxt.tickEvent("hid.flash.full.success");
+ }),
+ timeoutMessage
+ ).catch((e) => {
+ log(`error: abort`)
+ pxt.tickEvent("hid.flash.full.error");
+ this.flashAborted = true;
+ return this.resetAndThrowAsync(e);
+ });
+ }
+
+ private resetAndThrowAsync(e: any) {
+ log(`reset on error`)
+ pxt.tickEvent("hid.flash.reset");
+ console.debug(e)
+ // reset any pending daplink
+ return this.dapCmdNums(0x89 /* DAPLinkFlash.RESET */)
+ .catch((e2: any) => {
+ // Best effort reset, no-op if there's an error
+ })
+ .then(() => this.cortexM.reset(false))
+ .catch((e2: any) => {
+ // Best effort reset, no-op if there's an error
+ })
.then(() => {
- return this.cmsisdap.cmdNums(0x8A /* DAPLinkFlash.OPEN */, [1]);
- })
- .then((res) => {
- const hexUint8 = pxt.U.stringToUint8Array(resp.outfiles[this.binName]);
- const hexArray: number[] = Array.prototype.slice.call(hexUint8);
-
- const sendPages = (offset: number = 0): Promise => {
- const end = Math.min(hexArray.length, offset + chunkSize);
- const nextPage = hexArray.slice(offset, end);
- nextPage.unshift(nextPage.length);
- return this.cmsisdap.cmdNums(0x8C /* DAPLinkFlash.WRITE */, nextPage)
- .then(() => {
- if (!aborted && end < hexArray.length) {
- return sendPages(end);
- }
- return Promise.resolve();
- });
- }
-
- return sendPages();
- })
- .then((res) => {
- return this.cmsisdap.cmdNums(0x8B /* DAPLinkFlash.CLOSE */, []);
- })
- .timeout(60000, timeoutMessage)
- .catch((e) => {
- aborted = true;
- return this.cmsisdap.cmdNums(0x89 /* DAPLinkFlash.RESET */, [])
- .catch((e2: any) => {
- // Best effort reset, no-op if there's an error
- })
- .then(() => {
- return Promise.reject(e);
- });
+ throw e;
});
}
- private quickHidFlashAsync(resp: pxtc.CompileResult): Promise {
+ private readUICR() {
+ return this.readWords(0x10001014, 1)
+ .then(v => {
+ const uicr = v[0] & 0xff;
+ log(`uicr: ${uicr.toString(16)} (${v[0].toString(16)})`);
+ return uicr;
+ });
+ }
+
+ private computeFlashChecksum(resp: pxtc.CompileResult) {
+ const binFile = resp.outfiles[this.binName];
+ if (!binFile)
+ throw new Error(`unable to find ${this.binName} in outfiles ${Object.keys(resp.outfiles).join(', ')}`);
+
+ return this.getFlashChecksumsAsync()
+ .then(checksums => {
+ log(`checksums ${pxt.Util.toHex(checksums)}`);
+ // TODO this is seriously inefficient (130ms on a fast machine)
+ const uf2 = ts.pxtc.UF2.newBlockFile();
+ ts.pxtc.UF2.writeHex(uf2, binFile.split(/\r?\n/));
+ const bytes = pxt.U.stringToUint8Array(ts.pxtc.UF2.serializeFile(uf2));
+ const parsed = ts.pxtc.UF2.parseFile(bytes);
+
+ const aligned = DAPWrapper.pageAlignBlocks(parsed, this.pageSize);
+ const changed = DAPWrapper.onlyChanged(aligned, checksums, this.pageSize);
+ const quick = changed.length < aligned.length / 2;
+ log(`pages: ${aligned.length}, changed ${changed.length}, ${quick ? "quick" : "full"}`);
+ return {
+ quick,
+ changed
+ }
+ });
+ }
+
+ private quickHidFlashAsync(changed: ts.pxtc.UF2.Block[]): Promise {
log("quick flash")
- let logV = (msg: string) => { }
- //let logV = log
- let aborted = false;
+ pxt.tickEvent("hid.flash.quick.start");
const runFlash = (b: ts.pxtc.UF2.Block, dataAddr: number) => {
const cmd = this.cortexM.prepareCommand();
@@ -266,45 +512,39 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
return cmd.go()
})
.then(() => {
- logV("dbg en")
// starts the program
+ logV(`cortex.debug.enable`)
return this.cortexM.debug.enable()
})
}
- let checksums: Uint8Array
- return this.getFlashChecksumsAsync()
- .then(buf => {
- checksums = buf;
- log("write code");
- return this.cortexM.memory.writeBlock(loadAddr, flashPageBIN);
- })
- .then(() => {
- log("convert");
- // TODO this is seriously inefficient (130ms on a fast machine)
- let uf2 = ts.pxtc.UF2.newBlockFile();
- ts.pxtc.UF2.writeHex(uf2, resp.outfiles[this.binName].split(/\r?\n/));
- let bytes = pxt.U.stringToUint8Array(ts.pxtc.UF2.serializeFile(uf2));
- let parsed = ts.pxtc.UF2.parseFile(bytes);
-
- let aligned = DAPWrapper.pageAlignBlocks(parsed, this.pageSize);
- log(`initial: ${aligned.length} pages`);
- aligned = DAPWrapper.onlyChanged(aligned, checksums, this.pageSize);
- log(`incremental: ${aligned.length} pages`);
-
- return Promise.mapSeries(pxt.U.range(aligned.length),
+ return pxt.Util.promiseTimeout(
+ PARTIAL_FLASH_TIMEOUT,
+ Promise.resolve()
+ .then(() => this.cortexM.memory.writeBlock(loadAddr, flashPageBIN))
+ .then(() => pxt.Util.promiseMapAllSeries(pxt.U.range(changed.length),
i => {
- if (aborted) return Promise.resolve();
- let b = aligned[i];
- if (b.targetAddr >= 0x10000000)
+ this.checkAborted();
+ let b = changed[i];
+ if (b.targetAddr >= 0x10000000) {
+ log(`target address 0x${b.targetAddr.toString(16)} > 0x10000000`)
return Promise.resolve();
+ }
- logV("about to write at 0x" + b.targetAddr.toString(16));
-
- let writeBl = Promise.resolve();
+ log(`about to write at 0x${b.targetAddr.toString(16)}`);
let thisAddr = (i & 1) ? dataAddr : dataAddr + this.pageSize;
let nextAddr = (i & 1) ? dataAddr + this.pageSize : dataAddr;
+ let writeBl;
+
+ if (i == 0) {
+ let u32data = new Uint32Array(b.data.length / 4);
+ for (let i = 0; i < b.data.length; i += 4)
+ u32data[i >> 2] = pxt.HF2.read32(b.data, i);
+ writeBl = this.cortexM.memory.writeBlock(thisAddr, u32data);
+ }
+
+
if (i == 0) {
let u32data = new Uint32Array(b.data.length / 4);
@@ -316,7 +556,7 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
return writeBl
.then(() => runFlash(b, thisAddr))
.then(() => {
- let next = aligned[i + 1];
+ let next = changed[i + 1];
if (!next)
return Promise.resolve();
logV("write next");
@@ -330,18 +570,21 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
.then(() => {
logV("done block");
});
- })
- .then(() => {
- log("flash done");
- pxt.tickEvent("hid.flash.done");
- return this.cortexM.reset(false);
- });
- })
- .timeout(25000, timeoutMessage)
- .catch((e) => {
- aborted = true;
- return Promise.reject(e);
- });
+ }))
+ .then(() => {
+ log("quick flash done");
+ return this.cortexM.reset(false);
+ })
+ .then(() => {
+ pxt.tickEvent("hid.flash.quick.success");
+ return this.checkStateAsync(true)
+ }),
+ timeoutMessage
+ ).catch((e) => {
+ pxt.tickEvent("hid.flash.quick.error");
+ this.flashAborted = true;
+ return this.resetAndThrowAsync(e);
+ });
}
private getFlashChecksumsAsync() {
@@ -352,6 +595,21 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
.then(() => this.cortexM.memory.readBlock(dataAddr, pages * 2, this.pageSize))
}
+ private readWords(addr: number, numWords: number) {
+ return this.cortexM.memory.readBlock(addr, numWords, this.pageSize)
+ // assume browser is little-endian
+ .then(u8 => new Uint32Array(u8.buffer))
+ }
+
+ private writeWords(addr: number, buf: Uint32Array) {
+ return this.cortexM.memory.writeBlock(addr, buf)
+ }
+
+ private readBytes(addr: number, numBytes: number) {
+ return this.cortexM.memory.readBlock(addr, (numBytes + 3) >> 2, this.pageSize)
+ .then(u8 => u8.length == numBytes ? u8 : u8.slice(0, numBytes))
+ }
+
static onlyChanged(blocks: ts.pxtc.UF2.Block[], checksums: Uint8Array, pageSize: number) {
return blocks.filter(b => {
let idx = b.targetAddr / pageSize
@@ -392,6 +650,184 @@ class DAPWrapper implements pxt.packetio.PacketIOWrapper {
}
return res
}
+
+ //
+ // jacdac stuff starts here
+ //
+
+ private irqn: number
+ private xchgAddr: number = null
+ private lastXchg: number
+ private currSend: SendItem
+ private sendQ: SendItem[] = []
+ private lastSend: number
+
+ sendCustomEventAsync(type: string, buf: Uint8Array): Promise {
+ if (type == "jacdac") {
+ if (this.xchgAddr == null)
+ return Promise.resolve()
+ if (buf.length & 3) {
+ const tmp = new Uint8Array((buf.length + 3) & ~3)
+ tmp.set(buf)
+ buf = tmp
+ }
+ return new Promise(resolve => {
+ this.sendQ.push({
+ buf,
+ cb: resolve
+ })
+ })
+ }
+ return Promise.reject(new Error("invalid custom event type"))
+ }
+
+ private writeWord(addr: number, val: number) {
+ return this.cortexM.memory.write32(addr, val)
+ }
+
+ private async findJacdacXchgAddr() {
+ const memStart = 0x2000_0000
+ const memStop = memStart + 128 * 1024
+ const checkSize = 1024
+
+ let p0 = 0x20006000
+ let p1 = 0x20006000 + checkSize
+
+ const check = async (addr: number) => {
+ if (addr < memStart)
+ return null
+ if (addr + checkSize > memStop)
+ return null
+ const buf = await this.readWords(addr, checkSize >> 2)
+ for (let i = 0; i < buf.length; ++i) {
+ if (buf[i] == 0x786D444A && buf[i + 1] == 0xB0A6C0E9)
+ return addr + (i << 2)
+ }
+ return 0
+ }
+
+ while (true) {
+ const a0 = await check(p0)
+ if (a0) return a0
+ const a1 = await check(p1)
+ if (a1) return a1
+ if (a0 === null && a1 === null)
+ return null
+ p0 -= checkSize
+ p1 += checkSize
+ }
+ }
+
+ private async jacdacSetup() {
+ this.xchgAddr = null
+ if (!this.useJACDAC) {
+ log(`jacdac: disabled`)
+ return
+ }
+ await pxt.Util.delay(700); // wait for the program to start and setup memory correctly
+ const xchg = await this.findJacdacXchgAddr()
+ if (xchg == null) {
+ log("jacdac: xchg address not found")
+ pxt.tickEvent("hid.flash.jacdac.error.missingxchg");
+ return
+ }
+ const info = await this.readBytes(xchg, 16)
+ this.irqn = info[8]
+ if (info[12 + 2] != 0xff) {
+ log("jacdac: invalid memory; try power-cycling the micro:bit")
+ pxt.tickEvent("hid.flash.jacdac.error.invalidmemory");
+ console.debug({ info, xchg })
+ return
+ }
+ this.xchgAddr = xchg
+ // clear initial lock
+ await this.writeWord(xchg + 12, 0)
+ log(`jacdac: exchange address 0x${xchg.toString(16)}; irqn=${this.irqn}`)
+ pxt.tickEvent("hid.flash.jacdac.connected");
+ }
+
+ private async triggerIRQ(irqn: number) {
+ const addr = 0xE000E200 + (irqn >> 5) * 4
+ await this.writeWord(addr, 1 << (irqn & 31))
+ }
+
+ private async jacdacProcess(hadSerial: boolean) {
+ if (this.xchgAddr == null) {
+ if (!hadSerial)
+ await this.dapDelay(5000)
+ return
+ }
+
+ const now = Date.now()
+ if (this.lastXchg && now - this.lastXchg > 50) {
+ logV("slow xchg: " + (now - this.lastXchg) + "ms")
+ }
+ this.lastXchg = now
+
+ let numev = 0
+ // TODO only read say 32 bytes first, and more if needed
+ let inp = await this.readBytes(this.xchgAddr + 12, 256)
+ if (inp[2]) {
+ await this.writeWord(this.xchgAddr + 12, 0)
+ await this.triggerIRQ(this.irqn)
+ inp = inp.slice(0, inp[2] + 12)
+ this.onCustomEvent("jacdac", inp)
+ numev++
+ }
+
+ let sendFree = false
+ if (this.currSend) {
+ const send = await this.readBytes(this.xchgAddr + 12 + 256, 4)
+ if (!send[2]) {
+ this.currSend.cb()
+ this.currSend = null
+ sendFree = true
+ numev++
+ }
+ }
+
+ if (!this.currSend && this.sendQ.length) {
+ if (!sendFree) {
+ const send = await this.readBytes(this.xchgAddr + 12 + 256, 4)
+ if (!send[2])
+ sendFree = true
+ }
+ if (sendFree) {
+ this.currSend = this.sendQ.shift()
+ const bbody = this.currSend.buf.slice(4)
+ await this.writeWords(this.xchgAddr + 12 + 256 + 4, new Uint32Array(bbody.buffer))
+ const bhead = this.currSend.buf.slice(0, 4)
+ await this.writeWords(this.xchgAddr + 12 + 256, new Uint32Array(bhead.buffer))
+ await this.triggerIRQ(this.irqn)
+ this.lastSend = Date.now()
+ numev++
+ } else {
+ if (this.lastSend) {
+ const d = Date.now() - this.lastSend
+ if (d > 50) {
+ this.lastSend = 0
+ console.error("failed to send packet fast enough")
+ }
+ }
+ }
+ }
+
+ if (numev == 0 && !hadSerial)
+ await this.dapDelay(5000)
+ }
+
+ private dapDelay(micros: number) {
+ if (micros > 0xffff)
+ throw new Error("too large delay")
+ const cmd = new Uint8Array([0x09, 0, 0])
+ pxt.HF2.write16(cmd, 1, micros)
+ return this.dapCmd(cmd)
+ }
+}
+
+interface SendItem {
+ buf: Uint8Array
+ cb: () => void
}
export function mkDAPLinkPacketIOWrapper(io: pxt.packetio.PacketIO): pxt.packetio.PacketIOWrapper {
diff --git a/editor/tsconfig.json b/editor/tsconfig.json
index 47c94f4a..e7a1f77a 100644
--- a/editor/tsconfig.json
+++ b/editor/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "es2017",
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
@@ -12,6 +12,13 @@
"rootDir": ".",
"newLine": "LF",
"sourceMap": false,
- "jsx": "react"
+ "jsx": "react",
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "scripthost",
+ "es2017",
+ "ES2018.Promise"
+ ]
}
}
diff --git a/faviconDescription.json b/faviconDescription.json
index a3fa76c9..d4eb3879 100644
--- a/faviconDescription.json
+++ b/faviconDescription.json
@@ -1,6 +1,6 @@
{
"masterPicture": "docs/static/microbit.simplified.svg",
- "iconsPath": "/static/icons",
+ "iconsPath": "/docs/static/icons",
"design": {
"ios": {
"pictureAspect": "backgroundAndMargin",
diff --git a/fieldeditors/tsconfig.json b/fieldeditors/tsconfig.json
index 9f5342cb..10ae6cd0 100644
--- a/fieldeditors/tsconfig.json
+++ b/fieldeditors/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "es2017",
"noImplicitAny": false,
"noImplicitReturns": true,
"module": "commonjs",
diff --git a/libs/blocksprj/pxt.json b/libs/blocksprj/pxt.json
index c15ee157..4e9dbf9f 100644
--- a/libs/blocksprj/pxt.json
+++ b/libs/blocksprj/pxt.json
@@ -1,8 +1,7 @@
{
"name": "{0} block",
"dependencies": {
- "core": "file:../core",
- "radio": "file:../radio"
+ "core": "file:../core"
},
"description": "",
"files": [
diff --git a/libs/bluetooth/BLEHF2Service.cpp b/libs/bluetooth/BLEHF2Service.cpp
index baa1a0ef..bdf25e6a 100644
--- a/libs/bluetooth/BLEHF2Service.cpp
+++ b/libs/bluetooth/BLEHF2Service.cpp
@@ -1,8 +1,58 @@
#include "MicroBitConfig.h"
-#include "ble/UUID.h"
#include "BLEHF2Service.h"
#include "MicroBitEvent.h"
+//================================================================
+#if MICROBIT_CODAL
+//================================================================
+
+const uint8_t BLEHF2Service::service_base_uuid[ 16] =
+{ 0xb1,0x12,0x00,0x00,0x26,0x79,0x30,0xda,0xa2,0x6e,0x02,0x73,0xb6,0x04,0x38,0x49 };
+
+const uint8_t BLEHF2Service::char_base_uuid[ 16] =
+{ 0xb1,0x12,0x00,0x00,0x26,0x79,0x30,0xda,0xa2,0x6e,0x02,0x73,0xb6,0x04,0x38,0x4a };
+
+const uint16_t BLEHF2Service::serviceUUID = 0xf5e6;
+const uint16_t BLEHF2Service::charUUID[ mbbs_cIdxCOUNT] = { 0xf5e6 };
+
+
+BLEHF2Service::BLEHF2Service(BLEDevice &_ble) :
+ ble(_ble)
+{
+ // Initialise our characteristic values.
+ memset(&txCharacteristicMessage, 0, sizeof(txCharacteristicMessage));
+
+ // Register the base UUID and create the service.
+ RegisterBaseUUID( service_base_uuid);
+ CreateService( serviceUUID);
+
+ RegisterBaseUUID( char_base_uuid);
+ CreateCharacteristic( mbbs_cIdxMESSAGE, charUUID[ mbbs_cIdxMESSAGE],
+ (uint8_t *)&txCharacteristicMessage,
+ sizeof(txCharacteristicMessage), sizeof(txCharacteristicMessage),
+ microbit_propNOTIFY);
+}
+
+void BLEHF2Service::sendSerial(const char *data, int len, bool isError) {
+ if (getConnected())
+ {
+ int32_t sent = 0;
+ while(sent < len) {
+ int32_t n = min(BLEHF2_DATA_LENGTH, len - sent);
+ txCharacteristicMessage.command = (isError ? BLEHF2_FLAG_SERIAL_OUT : BLEHF2_FLAG_SERIAL_ERR) | n;
+ memcpy(&txCharacteristicMessage.data, data + sent, n);
+ notifyChrValue(mbbs_cIdxMESSAGE,(uint8_t *)&txCharacteristicMessage, sizeof(txCharacteristicMessage));
+ sent += n;
+ }
+ }
+}
+
+//================================================================
+#else // MICROBIT_CODAL
+//================================================================
+
+#include "ble/UUID.h"
+
BLEHF2Service::BLEHF2Service(BLEDevice &_ble) :
ble(_ble)
{
@@ -47,4 +97,8 @@ const uint8_t BLEHF2ServiceUUID[] = {
const uint8_t BLEHF2TxCharacteristicUUID[] = {
0xb1,0x12,0xf5,0xe6,0x26,0x79,0x30,0xda,0xa2,0x6e,0x02,0x73,0xb6,0x04,0x38,0x4a
-};
\ No newline at end of file
+};
+
+//================================================================
+#endif // MICROBIT_CODAL
+//================================================================
diff --git a/libs/bluetooth/BLEHF2Service.h b/libs/bluetooth/BLEHF2Service.h
index 20c67788..b4d34458 100644
--- a/libs/bluetooth/BLEHF2Service.h
+++ b/libs/bluetooth/BLEHF2Service.h
@@ -2,7 +2,6 @@
#define BLE_HF2_SERVICE_H
#include "MicroBitConfig.h"
-#include "ble/BLE.h"
#include "MicroBitThermometer.h"
#include "EventModel.h"
#include "pxt.h"
@@ -22,6 +21,65 @@ struct BLEHF2Packet {
uint8_t data[BLEHF2_DATA_LENGTH];
};
+//================================================================
+#if MICROBIT_CODAL
+//================================================================
+
+#include "MicroBitBLEManager.h"
+#include "MicroBitBLEService.h"
+
+class BLEHF2Service : public MicroBitBLEService
+{
+ public:
+
+ /**
+ * Constructor.
+ * Create a representation of the TemperatureService
+ * @param _ble The instance of a BLE device that we're running on.
+ */
+ BLEHF2Service(BLEDevice &_ble);
+
+ /**
+ * Sends text
+ */
+ void sendSerial(const char *data, int len, bool isError);
+
+ private:
+
+ // Bluetooth stack we're running on.
+ BLEDevice &ble;
+
+ // memory for buffers.
+ BLEHF2Packet txCharacteristicMessage;
+
+ // Index for each charactersitic in arrays of handles and UUIDs
+ typedef enum mbbs_cIdx
+ {
+ mbbs_cIdxMESSAGE,
+ mbbs_cIdxCOUNT
+ } mbbs_cIdx;
+
+ // UUIDs for our service and characteristics
+ static const uint8_t service_base_uuid[ 16];
+ static const uint8_t char_base_uuid[ 16];
+ static const uint16_t serviceUUID;
+ static const uint16_t charUUID[ mbbs_cIdxCOUNT];
+
+ // Data for each characteristic when they are held by Soft Device.
+ MicroBitBLEChar chars[ mbbs_cIdxCOUNT];
+
+ public:
+
+ int characteristicCount() { return mbbs_cIdxCOUNT; };
+ MicroBitBLEChar *characteristicPtr( int idx) { return &chars[ idx]; };
+};
+
+//================================================================
+#else // MICROBIT_CODAL
+//================================================================
+
+#include "ble/BLE.h"
+
class BLEHF2Service
{
public:
@@ -50,5 +108,8 @@ class BLEHF2Service
GattAttribute::Handle_t txCharacteristicHandle;
};
+//================================================================
+#endif // MICROBIT_CODAL
+//================================================================
-#endif
\ No newline at end of file
+#endif
diff --git a/libs/bluetooth/bluetooth.cpp b/libs/bluetooth/bluetooth.cpp
index cb3efc5a..155bfcc3 100644
--- a/libs/bluetooth/bluetooth.cpp
+++ b/libs/bluetooth/bluetooth.cpp
@@ -14,7 +14,7 @@ namespace bluetooth {
BLEHF2Service* pHF2 = NULL;
//%
- void __log(String msg) {
+ void __log(int priority, String msg) {
if (NULL == pHF2)
pHF2 = new BLEHF2Service(*uBit.ble);
pHF2->sendSerial(msg->getUTF8Data(), msg->getUTF8Size(), false);
@@ -125,19 +125,18 @@ namespace bluetooth {
startUartService();
int bytes = uart->rxBufferedSize();
auto buffer = mkBuffer(NULL, bytes);
+ auto res = buffer;
+ registerGCObj(buffer);
int read = uart->read(buffer->data, buffer->length);
// read failed
if (read < 0) {
- decrRC(buffer);
- return mkBuffer(NULL, 0);
+ res = mkBuffer(NULL, 0);
+ } else if (read != buffer->length) {
+ // could not fill the buffer
+ res = mkBuffer(buffer->data, read);
}
- // could not fill the buffer
- if (read != buffer->length) {
- auto tmp = mkBuffer(buffer->data, read);
- decrRC(buffer);
- buffer = tmp;
- }
- return buffer;
+ unregisterGCObj(buffer);
+ return res;
}
/**
@@ -184,6 +183,7 @@ namespace bluetooth {
//% blockId=eddystone_advertise_url block="bluetooth advertise url %url|with power %power|connectable %connectable"
//% parts=bluetooth weight=11 blockGap=8
//% help=bluetooth/advertise-url blockExternalInputs=1
+ //% hidden=1 deprecated=1
void advertiseUrl(String url, int power, bool connectable) {
#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_URL)
power = min(MICROBIT_BLE_POWER_LEVELS-1, max(0, power));
@@ -199,7 +199,7 @@ namespace bluetooth {
* @param power power level between 0 and 7, eg: 7
* @param connectable true to keep bluetooth connectable for other services, false otherwise.
*/
- //% parts=bluetooth weight=12 advanced=true
+ //% parts=bluetooth weight=12 advanced=true deprecated=1
void advertiseUidBuffer(Buffer nsAndInstance, int power, bool connectable) {
#if CONFIG_ENABLED(MICROBIT_BLE_EDDYSTONE_UID)
auto buf = nsAndInstance;
@@ -227,6 +227,7 @@ namespace bluetooth {
//% blockId=eddystone_stop_advertising block="bluetooth stop advertising"
//% parts=bluetooth weight=10
//% help=bluetooth/stop-advertising advanced=true
+ //% hidden=1 deprecated=1
void stopAdvertising() {
uBit.bleManager.stopAdvertising();
}
diff --git a/libs/bluetooth/bluetooth.ts b/libs/bluetooth/bluetooth.ts
index 49b76dff..482dc136 100644
--- a/libs/bluetooth/bluetooth.ts
+++ b/libs/bluetooth/bluetooth.ts
@@ -10,10 +10,10 @@ namespace bluetooth {
* Internal use
*/
//% shim=bluetooth::__log
- export function __log(msg: string) {
+ export function __log(priority: number, msg: string) {
return;
}
- console.addListener(function (msg) { __log(msg) });
+ console.addListener(function (_pri, msg) { __log(_pri, msg) });
/**
* Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.
@@ -78,6 +78,7 @@ namespace bluetooth {
//% blockId=eddystone_advertise_uid block="bluetooth advertise UID|namespace (bytes 6-9)%ns|instance (bytes 2-6)%instance|with power %power|connectable %connectable"
//% parts=bluetooth weight=12 blockGap=8
//% help=bluetooth/advertise-uid blockExternalInputs=1
+ //% hidden=1 deprecated=1
export function advertiseUid(ns: number, instance: number, power: number, connectable: boolean) {
const buf = pins.createBuffer(16);
buf.setNumber(NumberFormat.Int32BE, 6, ns);
diff --git a/libs/bluetooth/pxt.json b/libs/bluetooth/pxt.json
index 8c4a4bc2..51cc58c2 100644
--- a/libs/bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@@ -10,12 +10,13 @@
"BLEHF2Service.h",
"BLEHF2Service.cpp"
],
+ "weight": 10,
+ "searchOnly": true,
"icon": "./static/packages/bluetooth/icon.png",
"public": true,
"dependencies": {
"core": "file:../core"
},
- "disablesVariants": ["mbcodal"],
"yotta": {
"config": {
"microbit-dal": {
@@ -29,7 +30,8 @@
"stack_size": 1280,
"gatt_table_size": "0x700"
}
- }
- },
- "installedVersion": "vzlhfd"
-}
\ No newline at end of file
+ },
+ "userConfigs": [
+ ]
+ }
+}
diff --git a/libs/bluetooth/shims.d.ts b/libs/bluetooth/shims.d.ts
index 46f84bf0..4e2b6e69 100644
--- a/libs/bluetooth/shims.d.ts
+++ b/libs/bluetooth/shims.d.ts
@@ -109,7 +109,8 @@ declare namespace bluetooth {
*/
//% blockId=eddystone_advertise_url block="bluetooth advertise url %url|with power %power|connectable %connectable"
//% parts=bluetooth weight=11 blockGap=8
- //% help=bluetooth/advertise-url blockExternalInputs=1 shim=bluetooth::advertiseUrl
+ //% help=bluetooth/advertise-url blockExternalInputs=1
+ //% hidden=1 deprecated=1 shim=bluetooth::advertiseUrl
function advertiseUrl(url: string, power: int32, connectable: boolean): void;
/**
@@ -118,7 +119,7 @@ declare namespace bluetooth {
* @param power power level between 0 and 7, eg: 7
* @param connectable true to keep bluetooth connectable for other services, false otherwise.
*/
- //% parts=bluetooth weight=12 advanced=true shim=bluetooth::advertiseUidBuffer
+ //% parts=bluetooth weight=12 advanced=true deprecated=1 shim=bluetooth::advertiseUidBuffer
function advertiseUidBuffer(nsAndInstance: Buffer, power: int32, connectable: boolean): void;
/**
@@ -134,7 +135,8 @@ declare namespace bluetooth {
*/
//% blockId=eddystone_stop_advertising block="bluetooth stop advertising"
//% parts=bluetooth weight=10
- //% help=bluetooth/stop-advertising advanced=true shim=bluetooth::stopAdvertising
+ //% help=bluetooth/stop-advertising advanced=true
+ //% hidden=1 deprecated=1 shim=bluetooth::stopAdvertising
function stopAdvertising(): void;
}
diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json
index 0e7542c8..5aea2b8b 100644
--- a/libs/core/_locales/core-jsdoc-strings.json
+++ b/libs/core/_locales/core-jsdoc-strings.json
@@ -4,6 +4,7 @@
"AcceleratorRange.OneG": "The accelerator measures forces up to 1 gravity",
"AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
"Array": "Add, remove, and replace items in lists.",
+ "Array._pickRandom": "Return a random value from the array",
"Array._popStatement": "Remove the last element from an array and return it.",
"Array._removeAtStatement": "Remove the element at a certain index.",
"Array._shiftStatement": "Remove the first element from an array and return it. This method changes the length of the array.",
@@ -41,6 +42,7 @@
"Array.reverse": "Reverse the elements in an array. The first array element becomes the last, and the last array element becomes the first.",
"Array.set": "Store a value at a particular index",
"Array.set|param|index": "the zero-based position in the list to store the value, eg: 0",
+ "Array.set|param|value": "the value to insert, eg: 0",
"Array.shift": "Remove the first element from an array and return it. This method changes the length of the array.",
"Array.slice": "Return a section of an array.",
"Array.slice|param|end": "The end of the specified portion of the array. eg: 0",
@@ -124,9 +126,15 @@
"Image.showFrame": "Show a particular frame of the image strip.",
"Image.showFrame|param|frame": "image frame to show",
"Image.showImage": "Shows an frame from the image at offset ``x offset``.",
+ "Image.showImage|param|interval": "time in milliseconds to pause after drawing",
"Image.showImage|param|xOffset": "column index to start displaying the image",
"Image.width": "Gets the width in columns",
"Infinity": "Constant representing positive infinity.",
+ "JSON.parse": "Converts a JavaScript Object Notation (JSON) string into an object.",
+ "JSON.stringify": "Converts a JavaScript value to a JavaScript Object Notation (JSON) string.",
+ "JSON.stringify|param|indent": "Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.",
+ "JSON.stringify|param|replacer": "Not supported; use null.",
+ "JSON.stringify|param|value": "A JavaScript value, usually an object or array, to be converted.",
"Math": "More complex operations with numbers.",
"Math.abs": "Returns the absolute value of a number (the value without regard to whether it is positive or negative).\nFor example, the absolute value of -5 is the same as the absolute value of 5.",
"Math.abs|param|x": "A numeric expression for which the absolute value is needed.",
@@ -225,7 +233,7 @@
"String.split": "Splits the string according to the separators",
"String.split|param|separator": "@param limit",
"String.substr": "Return a substring of the current string.",
- "String.substr|param|length": "number of characters to extract",
+ "String.substr|param|length": "number of characters to extract, eg: 10",
"String.substr|param|start": "first character index; can be negative from counting from the end, eg:0",
"String.toLowerCase": "Converts the string to lower case characters.",
"String.trim": "Return a substring of the current string with whitespace removed from both ends",
@@ -245,30 +253,31 @@
"basic.pause|param|ms": "how long to pause for, eg: 100, 200, 500, 1000, 2000",
"basic.plotLeds": "Draws an image on the LED screen.",
"basic.plotLeds|param|leds": "pattern of LEDs to turn on/off",
+ "basic.rgb": "Converts red, green, blue channels into a RGB color",
"basic.rgbw": "Converts red, green, blue channels into a RGB color",
"basic.rgbw|param|blue": "value of the blue channel between 0 and 255. eg: 255",
"basic.rgbw|param|green": "value of the green channel between 0 and 255. eg: 255",
"basic.rgbw|param|red": "value of the red channel between 0 and 255. eg: 255",
"basic.rgbw|param|white": "value of the white channel between 0 and 255. eg: 0",
+ "basic.rgb|param|blue": "value of the blue channel between 0 and 255. eg: 255",
+ "basic.rgb|param|green": "value of the green channel between 0 and 255. eg: 255",
+ "basic.rgb|param|red": "value of the red channel between 0 and 255. eg: 255",
"basic.setLedColor": "Sets the color on the build-in LED. Set to 0 to turn off.",
"basic.showAnimation": "Shows a sequence of LED screens as an animation.",
"basic.showAnimation|param|interval": "time in milliseconds between each redraw",
"basic.showAnimation|param|leds": "pattern of LEDs to turn on/off",
- "basic.showArrow": "Draws an arrow on the LED screen",
- "basic.showArrow|param|direction": "the direction of the arrow",
- "basic.showArrow|param|interval": "the amount of time (milliseconds) to show the icon. Default is 600.",
"basic.showCompass": "Draws needle on the screen which always points to north",
"basic.showCompass|param|interval": "the amount of time (milliseconds) to show the needle. Default is 600.",
"basic.showIcon": "Draws the selected icon on the LED screen",
"basic.showIcon|param|icon": "the predefined icon id",
- "basic.showIcon|param|interval": "the amount of time (milliseconds) to show the icon. Default is 600.",
+ "basic.showIcon|param|interval": "the amount of time (milliseconds) to block the LED Matrix for showing the icon. Default is 200.",
"basic.showLeds": "Draws an image on the LED screen.",
"basic.showLeds|param|interval": "time in milliseconds to pause after drawing",
"basic.showLeds|param|leds": "the pattern of LED to turn on/off",
"basic.showNumber": "Scroll a number on the screen. If the number fits on the screen (i.e. is a single digit), do not scroll.",
- "basic.showNumber|param|interval": "speed of scroll; eg: 150, 100, 200, -100",
+ "basic.showNumber|param|interval": "speed of scroll; eg: 50, 100, 150, 200",
"basic.showString": "Display text on the display, one character at a time. If the string fits on the screen (i.e. is one letter), does not scroll.",
- "basic.showString|param|interval": "how fast to shift characters; eg: 150, 100, 200, -100",
+ "basic.showString|param|interval": "how fast to shift characters; eg: 50, 100, 150, 200",
"basic.showString|param|text": "the text to scroll on the screen, eg: \"hi!\"",
"basic.turnRgbLedOff": "Sets the color on the build-in LED. Set to 0 to turn off.",
"console": "Reading and writing data to the console output.",
@@ -280,31 +289,48 @@
"console.logValue": "Write a name:value pair as a line of text to the console output.",
"console.logValue|param|name": "name of the value stream, eg: \"x\"",
"console.logValue|param|value": "to write",
+ "console.log|param|value": "to send",
+ "console.minPriority": "Minimum priority to send messages to listeners",
+ "console.removeListener": "Removes a listener",
"control": "Runtime and event utilities.",
+ "control.allocateNotifyEvent": "Allocates the next user notification event",
"control.assert": "If the condition is false, display msg on serial console, and panic with code 098.",
+ "control.benchmark": "Runs the function and returns run time in microseconds.",
"control.createBuffer": "Create a new zero-initialized buffer.",
"control.createBufferFromUTF8": "Create a new buffer with UTF8-encoded string",
"control.createBufferFromUTF8|param|str": "the string to put in the buffer",
"control.createBuffer|param|size": "number of bytes in the buffer",
+ "control.deviceLongSerialNumber": "Derive a unique, consistent 64-bit serial number of this device from internal data.",
"control.deviceName": "Make a friendly name for the device based on its serial number",
"control.deviceSerialNumber": "Derive a unique, consistent serial number of this device from internal data.",
+ "control.dmesg": "Write a message to DMESG debugging buffer.",
+ "control.dmesgPerfCounters": "Dump values of profiling performance counters.",
+ "control.dmesgPtr": "Write a message and value (pointer) to DMESG debugging buffer.",
+ "control.enablePerfCounter": "Enable profiling for current function.",
"control.eventSourceId": "Returns the value of a C++ runtime constant",
"control.eventTimestamp": "Gets the timestamp of the last event executed on the bus",
"control.eventValue": "Gets the value of the last event executed on the bus",
"control.eventValueId": "Returns the value of a C++ runtime constant",
+ "control.gc": "Force GC and dump basic information about heap.",
"control.gcStats": "Get various statistics about the garbage collector (GC)",
+ "control.heapDump": "Force GC and halt waiting for debugger to do a full heap dump.",
+ "control.heapSnapshot": "Record a heap snapshot to debug memory leaks.",
"control.inBackground": "Schedules code that run in the background.",
"control.micros": "Gets current time in microseconds. Overflows every ~18 minutes.",
"control.millis": "Gets the number of milliseconds elapsed since power on.",
"control.onEvent": "Registers an event handler.",
"control.panic": "Display specified error code and stop the program.",
+ "control.profilingEnabled": "Return true if profiling is enabled in the current build.",
"control.raiseEvent": "Raises an event in the event bus.",
"control.raiseEvent|param|mode": "optional definition of how the event should be processed after construction (default is CREATE_AND_FIRE).",
"control.raiseEvent|param|src": "ID of the MicroBit Component that generated the event e.g. MICROBIT_ID_BUTTON_A.",
"control.raiseEvent|param|value": "Component specific code indicating the cause of the event.",
+ "control.ramSize": "Returns estimated size of memory in bytes.",
"control.reset": "Resets the BBC micro:bit.",
"control.runInParallel": "Run other code in the parallel.",
"control.runtimeWarning": "Display warning in the simulator.",
+ "control.setDebugFlags": "Set flags used when connecting an external debugger.",
+ "control.simmessages.onReceived": "Registers the handler for a message on a given channel",
"control.waitForEvent": "Blocks the calling thread until the specified event is raised.",
"control.waitMicros": "Blocks the current fiber for the given microseconds",
"control.waitMicros|param|micros": "number of micro-seconds to wait. eg: 4",
@@ -401,38 +427,39 @@
"input": "Events and data from sensors",
"input.acceleration": "Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)",
"input.acceleration|param|dimension": "x, y, or z dimension, eg: Dimension.X",
+ "input.assumeCalibrationCompass": "Obsolete, compass calibration is automatic.",
+ "input.buttonEventValueId": "Returns the value of a C++ runtime constant",
"input.buttonIsPressed": "Get the button state (pressed or not) for ``A`` and ``B``.",
"input.buttonIsPressed|param|button": "the button to query the request, eg: Button.A",
- "input.calibrate": "Obsolete, use input.calibrateCompass instead.",
"input.calibrateCompass": "Obsolete, compass calibration is automatic.",
+ "input.clearCalibrationCompass": "Obsolete, compass calibration is automatic.",
"input.compassHeading": "Get the current compass heading in degrees.",
+ "input.isCalibratedCompass": "Returns 'true' when the compass is calibrated. Otherwise returns 'false'.",
"input.isGesture": "Tests if a gesture is currently detected.",
"input.isGesture|param|gesture": "the type of gesture to detect, eg: Gesture.Shake",
"input.lightLevel": "Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.",
+ "input.loudness": "gets the level of loudness from 0 (silent) to 255 (loud)",
"input.magneticForce": "Get the magnetic force value in ``micro-Teslas`` (``ÂĩT``). This function is not supported in the simulator.",
"input.magneticForce|param|dimension": "the x, y, or z dimension, eg: Dimension.X",
+ "input.onButtonEvent": "Do something when a button (A, B or both A+B) receives an event.",
+ "input.onButtonEvent|param|body": "code to run when event is raised",
+ "input.onButtonEvent|param|button": "the button",
+ "input.onButtonEvent|param|eventType": "event Type",
"input.onButtonPressed": "Do something when a button (A, B or both A+B) is pushed down and released again.",
"input.onButtonPressed|param|body": "code to run when event is raised",
"input.onButtonPressed|param|button": "the button that needs to be pressed",
"input.onGesture": "Do something when when a gesture is done (like shaking the micro:bit).",
"input.onGesture|param|body": "code to run when gesture is raised",
"input.onGesture|param|gesture": "the type of gesture to track, eg: Gesture.Shake",
- "input.onLogoDown": "Attaches code to run when the logo is oriented downwards and the board is vertical.",
- "input.onLogoDown|param|body": "TODO",
- "input.onLogoUp": "Attaches code to run when the logo is oriented upwards and the board is vertical.",
- "input.onLogoUp|param|body": "TODO",
"input.onPinPressed": "Do something when a pin is touched and released again (while also touching the GND pin).",
"input.onPinPressed|param|body": "the code to run when the pin is pressed",
"input.onPinPressed|param|name": "the pin that needs to be pressed, eg: TouchPin.P0",
"input.onPinReleased": "Do something when a pin is released.",
"input.onPinReleased|param|body": "the code to run when the pin is released",
"input.onPinReleased|param|name": "the pin that needs to be released, eg: TouchPin.P0",
- "input.onScreenDown": "Attaches code to run when the screen is facing down.",
- "input.onScreenDown|param|body": "TODO",
- "input.onScreenUp": "Attaches code to run when the screen is facing up.",
- "input.onScreenUp|param|body": "TODO",
- "input.onShake": "Attaches code to run when the device is shaken.",
- "input.onShake|param|body": "TODO",
+ "input.onPinTouchEvent": "Do something when a pin receives an touch event (while also touching the GND pin).",
+ "input.onPinTouchEvent|param|body": "the code to run when event is fired on pin",
+ "input.onPinTouchEvent|param|name": "the pin, eg: TouchPin.P0",
"input.pinIsPressed": "Get the pin state (pressed or not). Requires to hold the ground to close the circuit.",
"input.pinIsPressed|param|name": "pin used to detect the touch, eg: TouchPin.P0",
"input.rotation": "The pitch or roll of the device, rotation along the ``x-axis`` or ``y-axis``, in degrees.",
@@ -441,7 +468,7 @@
"input.runningTimeMicros": "Gets the number of microseconds elapsed since power on.",
"input.setAccelerometerRange": "Sets the accelerometer sample range in gravities.",
"input.setAccelerometerRange|param|range": "a value describe the maximum strengh of acceleration measured",
- "input.soundLevel": "gets the level of loudness in 0-100%",
+ "input.soundLevel": "gets the level of loudness from 0 (silent) to 255 (loud)",
"input.temperature": "Gets the temperature in Celsius degrees (°C).",
"led": "Control of the LED screen.",
"led.brightness": "Get the screen brightness from 0 (off) to 255 (full bright).",
@@ -482,7 +509,10 @@
"led.unplot|param|x": "the horizontal coordinate of the LED",
"led.unplot|param|y": "the vertical coordinate of the LED",
"light.sendWS2812Buffer": "Sends a color buffer to a light strip",
+ "light.sendWS2812BufferWithBrightness": "Sends a color buffer to a light strip",
"light.setMode": "Sets the light mode of a pin",
+ "loops.everyInterval": "Repeats the code forever in the background.\nAfter each iteration, allows other codes to run for a set duration\nso that it runs on a timer",
+ "loops.everyInterval|param|interval": "time (in ms) to wait between each iteration of the action.",
"motors": "Blocks to control the onboard motors",
"motors.dualMotorPower": "Controls two motors attached to the board. Switches to dual-motor mode!",
"motors.motorCommand": "Send break, coast or sleep commands to the motor. Has no effect in dual-motor mode.",
@@ -522,6 +552,7 @@
"music.startMelody": "Starts playing a melody.\nNotes are expressed as a string of characters with this format: NOTE[octave][:duration]",
"music.startMelody|param|melodyArray": "the melody array to play",
"music.startMelody|param|options": "melody options, once / forever, in the foreground / background",
+ "music.stopAllSounds": "Stop all sounds and melodies currently playing.",
"music.stopMelody": "Stops the melodies",
"music.stopMelody|param|options": "which melody to stop",
"music.tempo": "Returns the tempo in beats per minute. Tempo is the speed (bpm = beats per minute) at which notes play. The larger the tempo value, the faster the notes will play.",
@@ -531,6 +562,9 @@
"parseInt|param|radix": "optional A value between 2 and 36 that specifies the base of the number in text.",
"parseInt|param|text": "A string to convert into an integral number. eg: \"123\"",
"pause": "Pause for the specified time in milliseconds",
+ "pauseUntil": "Busy wait for a condition to be true",
+ "pauseUntil|param|condition": "condition to test for",
+ "pauseUntil|param|timeOut": "if positive, maximum duration to wait for in milliseconds",
"pause|param|ms": "how long to pause for, eg: 100, 200, 500, 1000, 2000",
"pins": "Control currents in Pins for analog/digital signals, servos, i2c, ...",
"pins.C10": "Pin C10",
@@ -597,9 +631,12 @@
"pins.servoWritePin": "Write 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).",
"pins.servoWritePin|param|name": "pin to write to, eg: AnalogPin.P1",
"pins.servoWritePin|param|value": "angle or rotation speed, eg:180,90,0",
+ "pins.setAudioPin": "Set the pin used when producing sounds and melodies. Default is P0.",
+ "pins.setAudioPin|param|name": "pin to modulate pitch from",
"pins.setEvents": "Configure the events emitted by this pin. Events can be subscribed to\nusing ``control.onEvent()``.",
"pins.setEvents|param|name": "pin to set the event mode on, eg: DigitalPin.P0",
"pins.setEvents|param|type": "the type of events for this pin to emit, eg: PinEventType.Edge",
+ "pins.setMatrixWidth": "Set the matrix width for Neopixel strip (already assigned to a pin).\nShould be used in conjunction with `set matrix width` from Neopixel package.",
"pins.setPull": "Configure the pull directiion of of a pin.",
"pins.setPull|param|name": "pin to set the pull mode on, eg: DigitalPin.P0",
"pins.setPull|param|pull": "one of the mbed pull configurations, eg: PinPullMode.PullUp",
@@ -622,8 +659,8 @@
"serial.delimiters": "Return the corresponding delimiter string",
"serial.onDataReceived": "Register an event to be fired when one of the delimiter is matched.",
"serial.onDataReceived|param|delimiters": "the characters to match received characters against.",
- "serial.readBuffer": "Read multiple characters from the receive buffer. Pause until enough characters are present.",
- "serial.readBuffer|param|length": "default buffer length, eg: 64",
+ "serial.readBuffer": "Read multiple characters from the receive buffer. \nIf length is positive, pauses until enough characters are present.",
+ "serial.readBuffer|param|length": "default buffer length",
"serial.readLine": "Read a line of text from the serial port.",
"serial.readString": "Read the buffered received data as a string",
"serial.readUntil": "Read a line of text from the serial port and return the buffer when the delimiter is met.",
@@ -647,5 +684,20 @@
"serial.writeString": "Send a piece of text through the serial connection.",
"serial.writeValue": "Write a name:value pair as a line to the serial port.",
"serial.writeValue|param|name": "name of the value stream, eg: x",
- "serial.writeValue|param|value": "to write"
+ "serial.writeValue|param|value": "to write",
+ "storage": "Provides access to persistent storage functionality.\n\nProvides access to persistent storage functionality.",
+ "storage.getNumber": "Reads a key value pair from the non volatile storage as a number",
+ "storage.getNumber|param|key": "the key for accesing the value",
+ "storage.getValueInt": "Reads a key value pair from the non volatile storage",
+ "storage.getValueInt|param|key": "the key for accesing the value",
+ "storage.putNumber": "Saves a key value pair in the non volatile storage",
+ "storage.putNumber|param|key": "the key for accesing the value",
+ "storage.putNumber|param|value": "value to store",
+ "storage.putValueInt": "Saves a key value pair in the non volatile storage",
+ "storage.putValueInt|param|key": "the key for accesing the value",
+ "storage.putValueInt|param|value": "value to store",
+ "storage.remove": "Removes a key value pair from the non volatile storage",
+ "storage.removeKeyInt": "Deletes the key from the non volatile storage",
+ "storage.removeKeyInt|param|key": "the key for accesing the value",
+ "storage.remove|param|key": "the key for accesing the value"
}
\ No newline at end of file
diff --git a/libs/core/_locales/core-strings.json b/libs/core/_locales/core-strings.json
index fb0ea9f8..cae59eec 100644
--- a/libs/core/_locales/core-strings.json
+++ b/libs/core/_locales/core-strings.json
@@ -7,6 +7,7 @@
"AcceleratorRange.OneG|block": "1g",
"AcceleratorRange.TwoG": "The accelerator measures forces up to 2 gravity",
"AcceleratorRange.TwoG|block": "2g",
+ "Array._pickRandom|block": "get random value from %list",
"Array._popStatement|block": "remove last value from %list",
"Array._removeAtStatement|block": "%list| remove value at %index",
"Array._shiftStatement|block": "remove first value from %list",
@@ -21,14 +22,6 @@
"Array.shift|block": "get and remove first value from %list",
"Array.unshift|block": "%list| insert %value| at beginning",
"Array|block": "Array",
- "ArrowNames.East|block": "East",
- "ArrowNames.NorthEast|block": "North East",
- "ArrowNames.NorthWest|block": "North West",
- "ArrowNames.North|block": "North",
- "ArrowNames.SouthEast|block": "South East",
- "ArrowNames.SouthWest|block": "South West",
- "ArrowNames.South|block": "South",
- "ArrowNames.West|block": "West",
"BaudRate.BaudRate115200|block": "115200",
"BaudRate.BaudRate1200|block": "1200",
"BaudRate.BaudRate14400|block": "14400",
@@ -49,6 +42,10 @@
"BeatFraction.Whole|block": "1",
"Buffer|block": "Buffer",
"Button.AB|block": "A+B",
+ "ButtonEvent.Click|block": "clicked",
+ "ButtonEvent.Down|block": "pressed down",
+ "ButtonEvent.LongClick|block": "long clicked",
+ "ButtonEvent.Up|block": "released up",
"Colors.Blue|block": "blue",
"Colors.Green|block": "green",
"Colors.Indigo|block": "indigo",
@@ -112,46 +109,20 @@
"IconNames.ArrowSouth|block": "arrow south",
"IconNames.ArrowWest|block": "arrow west",
"IconNames.Asleep|block": "asleep",
- "IconNames.Butterfly|block": "butterfly",
- "IconNames.Chessboard|block": "chess board",
"IconNames.Confused|block": "confused",
- "IconNames.Cow|block": "cow",
- "IconNames.Diamond|block": "diamond",
- "IconNames.Duck|block": "duck",
- "IconNames.EigthNote|block": "eigth note",
"IconNames.Fabulous|block": "fabulous",
- "IconNames.Ghost|block": "ghost",
- "IconNames.Giraffe|block": "giraffe",
"IconNames.Happy|block": "happy",
"IconNames.Heart|block": "heart",
- "IconNames.House|block": "house",
- "IconNames.LeftTriangle|block": "left triangle",
"IconNames.Meh|block": "meh",
"IconNames.No|block": "no",
- "IconNames.Pitchfork|block": "pitchfork",
- "IconNames.QuarterNote|block": "quarter note",
- "IconNames.Rabbit|block": "rabbit",
- "IconNames.Rollerskate|block": "roller skate",
"IconNames.Sad|block": "sad",
- "IconNames.Scissors|block": "scissors",
"IconNames.Silly|block": "silly",
- "IconNames.Skull|block": "skull",
- "IconNames.SmallDiamond|block": "small diamond",
"IconNames.SmallHeart|block": "small heart",
- "IconNames.SmallSquare|block": "small square",
- "IconNames.Snake|block": "snake",
- "IconNames.Square|block": "square",
- "IconNames.StickFigure|block": "stick figure",
"IconNames.Surprised|block": "surprised",
- "IconNames.Sword|block": "sword",
- "IconNames.TShirt|block": "t-shirt",
- "IconNames.Target|block": "target",
- "IconNames.Tortoise|block": "tortoise",
- "IconNames.Triangle|block": "triangle",
- "IconNames.Umbrella|block": "umbrella",
"IconNames.Yes|block": "yes",
- "Image.scrollImage|block": "scroll image %sprite(myImage)|with offset %frameoffset|and interval (ms) %delay",
- "Image.showImage|block": "show image %sprite(myImage)|at offset %offset",
+ "Image.scrollImage|block": "scroll image %sprite(myImage)|with offset %frameoffset|and interval (ms) %interval",
+ "Image.showImage|block": "show image %sprite(myImage)|at offset %offset ||and interval (ms) %interval",
+ "JSON|block": "JSON",
"LedSpriteProperty.Blink|block": "blink",
"LedSpriteProperty.Brightness|block": "brightness",
"LedSpriteProperty.Direction|block": "direction",
@@ -248,6 +219,13 @@
"PulseValue.Low|block": "low",
"Rotation.Pitch|block": "pitch",
"Rotation.Roll|block": "roll",
+ "StorageSlots.s1|block": "Slot 1",
+ "StorageSlots.s2|block": "Slot 2",
+ "StorageSlots.s3|block": "Slot 3",
+ "StorageSlots.s4|block": "Slot 4",
+ "StorageSlots.s5|block": "Slot 5",
+ "StorageSlots.s6|block": "Slot 6",
+ "StorageSlots.s7|block": "Slot 7",
"String.charAt|block": "char from %this=text|at %pos",
"String.compare|block": "compare %this=text| to %that",
"String.fromCharCode|block": "text from char code %code",
@@ -264,13 +242,13 @@
"basic.forever|block": "forever",
"basic.pause|block": "pause (ms) %pause",
"basic.rgbw|block": "red %red|green %green|blue %blue|white %white",
+ "basic.rgb|block": "red %red|green %green|blue %blue",
"basic.setLedColor|block": "set led to %color=colorNumberPicker",
- "basic.showArrow|block": "show arrow %i=device_arrow",
"basic.showCompass|block": "show compass needle for $interval|ms",
- "basic.showIcon|block": "show icon %i",
+ "basic.showIcon|block": "show icon %i || for %interval ms",
"basic.showLeds|block": "show leds",
- "basic.showNumber|block": "show|number %number",
- "basic.showString|block": "show|string %text",
+ "basic.showNumber|block": "show|number %number || in an interval of %interval ms",
+ "basic.showString|block": "show|string %text || in an interval of %interval ms",
"basic.turnRgbLedOff|block": "turn build-in LED off",
"basic|block": "basic",
"console|block": "console",
@@ -314,29 +292,34 @@
"game.setScore|block": "set score %points",
"game.startCountdown|block": "start countdown|(ms) %duration",
"game|block": "game",
- "images.arrowImage|block": "arrow image %i",
- "images.arrowNumber|block": "%arrow",
"images.createBigImage|block": "create big image",
"images.createImage|block": "create image",
"images.iconImage|block": "icon image %i",
"images|block": "images",
"input.acceleration|block": "acceleration (mg)|%NAME",
+ "input.assumeCalibrationCompass|block": "assume calibration compass",
+ "input.buttonEventValueId|block": "%id",
"input.buttonIsPressed|block": "button|%NAME|is pressed",
"input.calibrateCompass|block": "calibrate compass",
+ "input.clearCalibrationCompass|block": "clear calibration compass",
"input.compassHeading|block": "compass heading (°)",
+ "input.isCalibratedCompass|block": "is compass calibrated",
"input.isGesture|block": "is %gesture gesture",
"input.lightLevel|block": "light level",
+ "input.loudness|block": "Loudness",
"input.magneticForce|block": "magnetic force (ÂĩT)|%NAME",
+ "input.onButtonEvent|block": "on button %NAME| %eventType=control_button_event_value_id",
"input.onButtonPressed|block": "on button|%NAME|pressed",
"input.onGesture|block": "on |%NAME",
"input.onPinPressed|block": "on pin %name|pressed",
"input.onPinReleased|block": "on pin %NAME|released",
+ "input.onPinTouchEvent|block": "on pin %name| %eventType=control_button_event_value_id",
"input.pinIsPressed|block": "pin %NAME|is pressed",
"input.rotation|block": "rotation (°)|%NAME",
"input.runningTimeMicros|block": "running time (micros)",
"input.runningTime|block": "running time (ms)",
"input.setAccelerometerRange|block": "set accelerometer|range %range",
- "input.soundLevel|block": "Loudness",
+ "input.soundLevel|block": "soundLevel",
"input.temperature|block": "temperature (°C)",
"input|block": "input",
"led.brightness|block": "brightness",
@@ -353,6 +336,8 @@
"led.unplot|block": "unplot|x %x|y %y",
"led|block": "led",
"light|block": "light",
+ "loops.everyInterval|block": "every $interval ms",
+ "loops|block": "loops",
"motors.dualMotorPower|block": "motor %motor|at %percent \\%",
"motors.motorCommand|block": "motor %command",
"motors.motorPower|block": "motor on at %percent \\%",
@@ -371,6 +356,7 @@
"music.setTempo|block": "set tempo to (bpm)|%value",
"music.setVolume|block": "set volume %volume",
"music.startMelody|block": "start melody %melody=device_builtin_melody| repeating %options",
+ "music.stopAllSounds|block": "stop all sounds",
"music.stopMelody|block": "stop melody $options",
"music.tempo|block": "tempo (bpm)",
"music.volume|block": "volume",
@@ -394,7 +380,9 @@
"pins.pulseIn|block": "pulse in (Âĩs)|pin %name|pulsed %value",
"pins.servoSetPulse|block": "servo set pulse|pin %value|to (Âĩs) %micros",
"pins.servoWritePin|block": "servo write|pin %name|to %value",
+ "pins.setAudioPin|block": "set audio pin $name",
"pins.setEvents|block": "set pin %pin|to emit %type|events",
+ "pins.setMatrixWidth|block": "neopixel matrix width|pin %pin %width",
"pins.setPull|block": "set pull|pin %pin|to %pull",
"pins.spiFormat|block": "spi format|bits %bits|mode %mode",
"pins.spiFrequency|block": "spi frequency %frequency",
@@ -421,6 +409,13 @@
"serial.writeString|block": "serial|write string %text",
"serial.writeValue|block": "serial|write value %name|= %value",
"serial|block": "serial",
+ "storage.getNumber|block": "read from number %key",
+ "storage.getValueInt|block": "get number from %key",
+ "storage.putNumber|block": "Save into number %key a value of %value",
+ "storage.putValueInt|block": "Put into %key a value of %value as Int",
+ "storage.removeKeyInt|block": "Clear number %key",
+ "storage.remove|block": "remove %key",
+ "storage|block": "storage",
"{id:category}AnalogInPin": "AnalogInPin",
"{id:category}AnalogOutPin": "AnalogOutPin",
"{id:category}Array": "Array",
@@ -438,8 +433,10 @@
"{id:category}Image": "Image",
"{id:category}Images": "Images",
"{id:category}Input": "Input",
+ "{id:category}JSON": "JSON",
"{id:category}Led": "Led",
"{id:category}Light": "Light",
+ "{id:category}Loops": "Loops",
"{id:category}Math": "Math",
"{id:category}MicrobitPin": "MicrobitPin",
"{id:category}Motors": "Motors",
@@ -450,15 +447,27 @@
"{id:category}Pins": "Pins",
"{id:category}PwmOnlyPin": "PwmOnlyPin",
"{id:category}Serial": "Serial",
+ "{id:category}Storage": "Storage",
"{id:category}String": "String",
"{id:category}Text": "Text",
"{id:category}_py": "_py",
"{id:group}Configuration": "Configuration",
+ "{id:group}Control": "Control",
+ "{id:group}Events": "Events",
+ "{id:group}Get": "Get",
+ "{id:group}LED matrix": "LED matrix",
"{id:group}Melody": "Melody",
"{id:group}Melody Advanced": "Melody Advanced",
"{id:group}Modify": "Modify",
"{id:group}Operations": "Operations",
+ "{id:group}Put": "Put",
+ "{id:group}RGB LED": "RGB LED",
"{id:group}Read": "Read",
+ "{id:group}Remove": "Remove",
+ "{id:group}Sensors": "Sensors",
+ "{id:group}Silence": "Silence",
+ "{id:group}States": "States",
+ "{id:group}System": "System",
"{id:group}Tempo": "Tempo",
"{id:group}Tone": "Tone",
"{id:group}Volume": "Volume"
diff --git a/libs/core/_locales/de/core-jsdoc-strings.json b/libs/core/_locales/de/core-jsdoc-strings.json
index cf9c1879..9fa1157a 100644
--- a/libs/core/_locales/de/core-jsdoc-strings.json
+++ b/libs/core/_locales/de/core-jsdoc-strings.json
@@ -1,210 +1,214 @@
{
- "Math.abs": "Gibt den absoluten Wert einer Zahl aus (den Wert unabhängig davon, ob er positiv oder negativ ist).\nDer absolute Wert von -5 ist zum Beispiel der gleiche wie der von 5.",
- "Math.abs|param|x": "Ein numerischer Ausdruck, fÃŧr den der absolute Wert benÃļtigt wird.",
- "Math.max": "Gibt den grÃļÃeren von zwei vorhandenen numerischen AusdrÃŧcken aus.",
- "Math.min": "Gibt den niedrigeren von zwei vorhandenen numerischen AusdrÃŧcken aus.",
- "Math.pow": "Gibt den Wert eines grundlegenden Ausdrucks bis zu einer bestimmten Stärke aus.",
- "Math.pow|param|x": "Der Basiswert des Ausdrucks.",
- "Math.pow|param|y": "Der exponentielle Wert des Ausdrucks.",
- "Math.random": "Gibt eine pseudozufÃŧllige Zahl zwischen 0 und `max`aus.",
- "Math.randomBoolean": "Erzeugt zufällig einen \"wahr\" oder \"falsch\"-Wert, wie bei einem MÃŧnzwurf.",
- "Math.sign": "Gibt das Vorzeichen von x aus und zeigt an, ob dieses positiv, negativ oder null ist.",
- "Math.sign|param|x": "Der numerische Ausdruck, der getestet werden soll",
- "Math.sqrt": "Gibt die Quadratwurzel einer Zahl aus.",
- "Math.sqrt|param|x": "Ein numerischer Ausdruck.",
- "String.charAt": "Gibt den Buchstaben beim angegebenen Index aus.",
- "String.charAt|param|index": "Der null-basierte index des gewÃŧnschten Zeichens.",
- "String.charCodeAt": "Gibt den Unicode-Wert des Zeichens am vorgegebenen Ort aus.",
- "String.charCodeAt|param|index": "Der null-basierte Index des gewÃŧnschten Zeichens. Wenn kein Zeichen am angegeben Index vorhanden ist, wird NaN ausgegeben.",
- "String.compare": "Bestimmt die relative Reihenfolge zweier Strings (in ASCII).",
- "String.compare|param|that": "Zeichenfolge, die mit der Zielzeichenfolge verglichen werden soll",
- "String.concat": "Gibt eine Zeichenfolge aus, die die Verkettung von zwei oder mehr Zeichenfolgen ist.",
- "String.concat|param|other": "Die Zeichenfolge, die an das Ende einer Zeichenfolge angehängt werden soll.",
- "String.fromCharCode": "Erstelle Sie eine Zeichenfolge aus dem angegebenen ASCII-Zeichencode.",
- "String.isEmpty": "Gibt einen Wert aus, der anzeigt, ob die Zeichenfolge leer ist",
- "String.length": "Gibt die Länge einer Zeichenfolge aus.",
- "String.substr": "Gibt eine Teilzeichenfolge der aktuellen Zeichenfolge aus.",
- "String.substr|param|length": "Anzahl der zu extrahierenden Zeichen",
- "String.substr|param|start": "Erster Zeichenindex, kann beim zählen vom Ende negativ sein, zum Beispiel: 0",
- "basic": "Bietet Zugriff auf grundlegende mini-Funktionalität.",
- "basic.clearScreen": "Schalte alle LEDs aus",
- "basic.color": "Konvertiert den Farbnamen in eine Nummer",
- "basic.forever": "Wiederholt immer wieder den Code im Hintergrund. Bei jeder Iteration ist es mÃļglich, anderen Code auszufÃŧhren.",
- "basic.pause": "Pausiere fÃŧr die angegebene Zeit in Millisekunden",
- "basic.pause|param|ms": "wie lange pausieren, z.B.: 100, 200, 500, 1000, 2000",
- "basic.plotLeds": "Zeichnet ein Bild auf dem LED-Bildschirm.",
- "basic.plotLeds|param|leds": "Muster der LEDs, die ein-/ und ausgeschaltet werden",
- "basic.rgbw": "Konvertiert Rot-, GrÃŧn- und Blau-Kanäle in eine RGB-Farbe",
- "basic.rgbw|param|blue": "Blauwert zwischen 0 und 255, z.B. 255",
- "basic.rgbw|param|green": "GrÃŧnwert zwischen 0 und 255, z.B. 255",
- "basic.rgbw|param|red": "Rotwert zwischen 0 und 255, z.B. 255",
- "basic.rgbw|param|white": "WeiÃwert zwischen 0 und 255, z.B. 0",
- "basic.setLedColor": "Legt die Farbe der eingebauten LED fest. Setze auf 0, um diese abzuschalten.",
- "basic.showAnimation": "Zeigt eine Abfolge von LED-Anzeigen als Animation.",
- "basic.showAnimation|param|interval": "Zeit in Millisekunden zwischen jedem Neuzeichnen",
- "basic.showAnimation|param|leds": "Muster der LEDs, die ein-/ und ausgeschaltet werden",
- "basic.showLeds": "Zeichnet ein Bild auf dem LED-Bildschirm.",
- "basic.showLeds|param|interval": "Zeit in Millisekunden, die nach der Zeichnung gewartet wird",
- "basic.showLeds|param|leds": "Muster der LEDs, die ein- und ausgeschaltet werden",
- "basic.showNumber": "Zeige eine Nummer auf dem Display. Wenn die Nummer auf das Display passt (es sich also um eine einstellige Zahl handelt), scrolle nicht weiter.",
- "basic.showNumber|param|interval": "Scroll-Geschwindigkeit; z.B. 150, 100, 200,-100",
- "basic.showString": "Zeige Text auf dem Display an, Buchstabe fÃŧr Buchstabe. Wenn die Zeichenfolge in das Display passt (also wenn es sich um einen einzelnen Buchstaben handelt), scrolle nicht weiter.",
- "basic.showString|param|interval": "Wie schnell die Zeichen geändert werden; z.B. 150, 100, 200,-100",
- "basic.showString|param|text": "Text auf dem Bildschirm dargestellt werden soll, z.B.: \"Hallo!\"",
- "control": "Laufzeit- und Event-Dienstprogramme.",
- "control.assert": "Wenn die Bedingung falsch ist, zeige eine Nachricht auf der seriellen Konsole und gebe Panic-Code 098 aus",
- "control.deviceName": "Erzeugt einen Namen fÃŧr das Gerät, basierend auf der Seriennummer",
- "control.eventSourceId": "Gibt den Wert einer C++-Laufzeitkonstanten aus",
- "control.eventTimestamp": "Holt den Zeitstempel des letzten Events auf dem Bus",
- "control.eventValue": "Holt den Wert des letzten ausgefÃŧhrten Events auf dem Bus",
- "control.eventValueId": "Gibt den Wert einer C++-Laufzeitkonstanten aus",
- "control.inBackground": "Plant Code, der im Hintergrund wiedergegeben wird.",
- "control.onEvent": "Startet ein Event auf dem Event-Bus.",
- "control.panic": "Zeigt einen spezifizierten Fehlercode und hält das Programm an.",
- "control.raiseEvent": "Startet ein Event auf dem Event-Bus.",
- "control.raiseEvent|param|mode": "optionale Definition davon, wie ein Event nach dem Erstellen ausgefÃŧhrt wird (Standard ist \"CREATE_AND_FIRE).",
- "control.raiseEvent|param|src": "ID der Calliope mini-Komponente, die das Event generiert hat, zum Beispiel CALLIOPE_ID_BUTTON_A.",
- "control.raiseEvent|param|value": "Komponentenspezifischer Code, der den Grund des Events angibt.",
- "control.reset": "Seit den mini zurÃŧck.",
- "control.runtimeWarning": "Zeige Warnmeldung im Simulator.",
- "control.waitMicros": "Sperrt die aktuelle Leitung fÃŧr die Dauer der angegebenen Mikrosekunden",
- "control.waitMicros|param|micros": "Anzahl der Mikrosekunden, die gewartet werden soll, z.B.: 4",
- "game": "Eine Einzel-LED-Sprite-Spielumgebung",
- "game.addLife": "FÃŧgt Leben zum aktuellen Spielstand hinzu",
- "game.addScore": "FÃŧgt zum aktuellen Spielstand Punkte hinzu",
- "game.addScore|param|points": "Anzahl von zu verändernden Punkten, z.B.: 1",
- "game.createSprite": "Erzeugt einen neuen LED-Sprite, der nach rechts zeigt.",
- "game.createSprite|param|x": "horizontale Koordinate des Sprites, z.B. 2",
- "game.createSprite|param|y": "vertikale Koordinate des Sprites, z.B. 2",
- "game.currentTime": "Ruft die verbliebene Zeit (seit `starte Countdown`) oder die aktuelle Zeit (seit das Gerät gestartet wurde oder eine Stoppuhr aktiviert wurde) an.",
- "game.gameOver": "Gibt Ãŧber eine Animation ein Spiel wieder.",
- "game.invalidSprite": "Ruft einen invaliden Sprite ab; wird genutzt, um Locale zu initialisieren.",
- "game.isGameOver": "Zeigt an, ob das Spil die \"Game Over\"-Sequenz angezeigt hat.",
- "game.isRunning": "Holt einen Wert, der anzeigt, ob das Spiel noch läuft. Gibt `falsch`aus, wenn das Spiel zu Ende ist.",
- "game.level": "Ruft das aktuelle Level ab",
- "game.levelUp": "ErhÃļht das Level und zeigt eine Nachricht an.",
- "game.life": "Ruft das aktuelle Leben ab",
- "game.removeLife": "Entfernt ein Leben",
- "game.score": "Ruft den aktuellen Punktestand ab",
- "game.setLife": "Setzt den aktuellen Wert der Leben",
- "game.setScore": "Setzt den aktuellen Wert des Spielstands",
- "game.showScore": "Zeigt den Spielstand auf dem Display.",
- "game.startCountdown": "Startet einen Spiel-Countdown",
- "game.startCountdown|param|ms": "Countdown-Dauer in Millisekunden, z.B.: 10000",
- "game.startStopwatch": "Startet eine Stoppuhr.`aktuelle Zeit`gibt die vergangene Zeit an.",
- "images": "Erstellung, Bearbeitung und Anzeige von LED-Bildern.",
- "images.createBigImage": "Erstellt ein Bild mit zwei Einzelbildern.",
- "images.createImage": "Erstellt ein Bild, das auf den LED-Bildschirm passt.",
- "input": "Ereignisse und Daten der Sensoren",
- "input.acceleration": "Holt den Beschleunigungswert in Milli-Erdanziehung (wenn das Board flach mit dem Display nach oben liegt, X = 0, y = 0 und Z =-1024)",
- "input.buttonIsPressed": "Erhalte den Sie den Tastenstatus (gepresst oder nicht) fÃŧr ``A`` und ``B``.",
- "input.calibrate": "Veraltet, Kompasskalibrierung erfolgt automatisch.",
- "input.compassHeading": "Holt die aktuelle Kompassrichtung in Grad.",
- "input.lightLevel": "Liest die Lichtintensität auf dem LED-Bildschirm im Bereich von ``0`` (dunkel) und `` 255`` (hell).",
- "input.magneticForce": "Ruft den Wert der Magnetkraft in ``Mikro-Tesla`` (``ÂĩT``) ab. Diese Funktion wird im Simulator nicht unterstÃŧtzt.",
- "input.onButtonPressed": "Tue etwas, wenn eine Taste (``A``, ``B`` oder ``A + B``) gedrÃŧckt wird",
- "input.onGesture": "Mache etwas, wenn eine Geste gemacht wird (wie den mini zu schÃŧtteln).",
- "input.onLogoDown": "FÃŧgt Code hinzu, der ausgefÃŧhrt wird, wenn das Logo nach unten zeigt und das Board vertikal ausgerichtet ist.",
- "input.onLogoUp": "FÃŧgt Code hinzu, der ausgefÃŧhrt wird, wenn das Logo nach oben zeigt und das Board vertikal ausgerichtet ist.",
- "input.onPinPressed": "Mache etwas, wenn eine Pin gehalten wird.",
- "input.onPinPressed|param|body": "Code, der ausfÃŧhrt wird, wenn ein Pin gehalten wird",
- "input.onPinReleased": "Mache etwas, wenn der Pin losgelassen wird.",
- "input.onPinReleased|param|body": "Code, der ausgefÃŧhrt werden soll, wenn der Pin losgelassen wird",
- "input.onScreenDown": "Hängt Code an, der ausgefÃŧhrt wird, wenn der Bildschirm nach unten zeigt.",
- "input.onScreenUp": "Hängt Code an, der ausgefÃŧhrt wird, wenn der Bildschirm nach oben zeigt.",
- "input.onShake": "Hängt Code an, der ausgefÃŧhrt wird, wenn der mini geschÃŧttelt wird.",
- "input.pinIsPressed": "Ruft den Pin-Zustand (gehalten oder nicht) ab. Die Erdung muss gehalten werden, um den Stromkreis zu schlieÃen.",
- "input.rotation": "Die Neigung und Drehung des mini Drehung auf ``X-Achse``oder ``Y-Achse``, in Grad.",
- "input.runningTime": "Ruft die Anzahl der Millisekunden auf, die seit dem Einschalten vergangen sind.",
- "input.setAccelerometerRange": "Legt die Stichprobenbereich des Beschleunigungssensors in Schwerkraft fest.",
- "input.setAccelerometerRange|param|range": "Ein Wert, der die maximale Stärke der gemessenen Beschleunigung beschreibt",
- "input.temperature": "Ruft die aktuelle Temperatur in Grad Celsius (°C) ab.",
- "led": "Steuerung des LED-Bildschirms.",
- "led.brightness": "Ruft die Helligkeit des Bildschirms ab, von 0 (aus) bis 255 (volle Helligkeit).",
- "led.enable": "Schaltet das Display an und aus",
- "led.fadeIn": "Blendet die Bildschirmanzeige ein.",
- "led.fadeOut": "Blendet die Bildschirmhelligkeit aus.",
- "led.plot": "Schalte die angegebene LED mit Hilfe von X- und Y-Koordinaten ein (X ist horizontal, Y ist vertikal). (0,0) ist die obere linke Ecke.",
- "led.plotAll": "Schaltet alle LEDs an",
- "led.plotBarGraph": "Zeigt ein vertikales Balkendiagramm an, basierend auf dem `Wert`und dem `Hoch`-Wert. Wenn `Hoch`0 ist, wird das Diagramm automatisch angepasst.",
- "led.plotBarGraph|param|high": "maximalen Wert. Wenn dieser 0 ist, wird der Maximalwert automatisch angepasst, z.B.: 0",
- "led.plotBarGraph|param|value": "aktueller Wert zum Darstellen",
- "led.point": "Ruft den An/Aus-Status einer vorgegebenen LED mittels X-/Y-Koordinaten ab. (0,0) ist oben links.",
- "led.screenshot": "Macht einen Screenshot vom LED-Bildschirm und gibt ein Bild aus.",
- "led.setBrightness": "Lege die Helligkeit des Bildschirms fest, von 0 (aus) bis 255 (volle Helligkeit).",
- "led.setBrightness|param|value": "Helligkeitswert, z.B.: 255, 127, 0",
- "led.setDisplayMode": "Legt den Anzeigemodus von Wiedergabe-LEDs zwischen Schwarz und Weià und Graustufen fest.",
- "led.setDisplayMode|param|mode": "TODO",
- "led.stopAnimation": "Bricht die aktuelle Animation ab und lÃļscht andere ausstehende Animationen.",
- "led.toggle": "Schaltet ein bestimmtes Pixel ein",
- "led.toggleAll": "Invertiert die aktuelle LED-Anzeige",
- "led.unplot": "Schalte die angegebene LED mit x-und y-Koordinaten ab (X ist horizontal, y ist vertikal). (0,0) ist oben links.",
- "motors": "BlÃļcke, die genutzt werden, um Onboard-Motoren zu steuern",
- "motors.dualMotorPower": "Steuert zwei an das Board angeschlossene Motoren. Schaltet auf Dual-Motor-Modus um!",
- "motors.motorCommand": "Schicke Anhalten, Ausrollen oder Anhalten-Befehle an den Motor. Hat im Dual-Motor-Modus keinen Effekt.",
- "motors.motorPower": "Schaltet den Motor bei einer bestimmten Prozentzahl der Kraft an. Schaltet um auf den Single-Motor-Modus!",
- "motors.motorPower|param|power": "%percent der Kraft, die an den Motor geschickt wird. Negative Werte laufen rÃŧckwärts, z.B. 50",
- "music": "Generierung von von Musik durch Pin ``P0``.",
- "music.beat": "Gibt die Dauer eines Taktes in Milli-Sekunden aus",
- "music.changeTempoBy": "Ãndere die Geschwindigkeit um den angegebenen Betrag",
- "music.changeTempoBy|param|bpm": "Die Ãnderung in Schlägen pro Minute auf das Tempo, z.B.: 20",
- "music.noteFrequency": "Ruft die Frequenz einer Note ab.",
- "music.playTone": "Spielt einen Ton fÃŧr den angegebenen Zeitraum auf dem Lautsprecher ab.",
- "music.playTone|param|ms": "Tondauer in Millisekunden (ms)",
- "music.rest": "Ruht (spielt nichts) fÃŧr eine bestimmte Zeit auf Pin ``P0``.",
- "music.rest|param|ms": "Restdauer in Millisekunden (ms)",
- "music.ringTone": "Spielt einen Ton durch den Lautsprecher ab.",
- "music.ringTone|param|frequency": "TonhÃļhe des abzuspielenden Tones in Hertz (Hz)",
- "music.setTempo": "Legt die Geschwindigkeit auf den angegebenen Wert fest.",
- "music.setTempo|param|bpm": "Die neue Geschwindigkeit in Schlägen pro Minute, z.B.: 120",
- "music.tempo": "Gibt die Geschwindigkeit in Schlägen pro Minute aus. Die Geschwindigkeit ist Schnelligkeit (Bpm = Beats pro Minute), in der TÃļne abgespielt werden. Je grÃļÃer der Wert, desto schneller werden die TÃļne abgespielt.",
- "pins": "Steuere die Stromstärke Ãŧber die Pins fÃŧr analoge/digitale Signale, Servos, I2C,...",
- "pins.analogPitch": "Gibt ein Pulsweiten Modulation (PWM)-Signal Ãŧber den aktuellen Pitch-Pin. Benutze `analog set pitch pin`, um den Pitch-Pin festzulegen.",
- "pins.analogReadPin": "Lese den Anschlusswert als Analog aus, d. h. als einen Wert zwischen 0 und 1023.",
- "pins.analogSetPeriod": "Stellt die Pulsweite Modulation (PWM) des Analogausganges auf den angegebenen Wert in ** Mikrosekunden ** oder `1/1000` Millisekunden ein.\nWenn dieser Pin nicht als einen Analogausgang (mit `analog write pin`) konfiguriert ist, hat der Vorgang keine Auswirkungen.",
- "pins.analogSetPeriod|param|micros": "Zeit in Mikrosekunden. z.B.: 20000",
- "pins.analogWritePin": "Legt den Wert des Verbinders auf analog fest. Der Wert muss zwischen 0 und 1023 liegen.",
- "pins.analogWritePin|param|value": "Wert, der auf den Pin geschrieben werden soll, zwischen ``0`` und ``1023`` z.B.: 1023,0",
- "pins.createBuffer": "Erstellt einen Null-initialisierten Zwischenspeicher.",
- "pins.createBuffer|param|size": "Anzahl der Bytes im Zwischenspeicher",
- "pins.digitalReadPin": "Lese den angegebene Pin oder Verbinder als 0 oder 1",
- "pins.digitalWritePin": "Setzt einen Pin- oder Verbinder-Wert auf 0 oder 1.",
- "pins.digitalWritePin|param|value": "Wert, der auf dem Pin 1 gesetzt werden soll, z.B. 0",
- "pins.i2cReadBuffer": "Lese `GrÃļÃe`bytes aus einer 7-bit I2C-Adresse.",
- "pins.i2cReadNumber": "Lese eine Nummer aus einer 7-bit I2C-Adresse.",
- "pins.i2cWriteBuffer": "Schreibt Bytes in eine 7-bit I2C-Adresse.",
- "pins.i2cWriteNumber": "Schreibe eine Nummer in eine 7-bit I2C-Adresse.",
- "pins.map": "Definiert eine Nummer von einer Auswahl zu einer anderen um. Ein Wert ``von niedrig``wird so auf ``zu niedrig``umgeändert, ein Wert ``von hoch`` zu ``zu hoch`` etc.",
- "pins.map|param|fromHigh": "die obere Grenze des aktuellen Wertebereichs, z.B.: 1023",
- "pins.map|param|fromLow": "die untere Grenze des aktuellen Wertebereichs",
- "pins.map|param|toHigh": "die Obergrenze des Wertezielbereichs, z.B.: 4",
- "pins.map|param|toLow": "die Untergrenze des Wertezielbereichs",
- "pins.map|param|value": "Wert in Bereichen zuordnen",
- "pins.onPulsed": "Stellt diesen Pin als einen Digitaleingang ein und generiert Ereignisse, deren Zeitstempel die Dauer darstellt, in der der Pin entweder ``hoch``oder ``niedrig``war.",
- "pins.pulseDuration": "Ruft die Dauer des letzten Impulses in Mikrosendungen ab. Diese Funktion soll von einem `onPulsed`-Handler aufgerufen werden.",
- "pins.pulseIn": "Gibt die Dauer eines Pulses in Mikrosekunden an",
- "pins.pulseIn|param|name": "der Pin, der den Puls misst",
- "pins.pulseIn|param|value": "der Wert des Pulses (Standard hoch)",
- "pins.servoSetPulse": "Konfiguriert diesen IO-Pin als einen analogen/PWM-Ausgang, stellt den Zeitraum auf 20 ms ein und setzt die Pulsweite fest, basieren auf dem angegeben Wert **Mikrosekunden** oder `1/1000`Millisekunden.",
- "pins.servoSetPulse|param|micros": "Impulsdauer in Mikrosekunden, z.B.: 1500",
- "pins.servoSetPulse|param|name": "PIN-Name",
- "pins.servoWritePin": "Schreibt einen Wert in den Servo, der die Welle entsprechend kontroliert. Auf einem Standard-Servo wird so der Winkel der Welle (in Grad) eingestellt, sodass sich die Welle entsprechend anpasst. Auf einem kontinuierlich drehenden Servo wird dadurch die Geschwindigkeit des Servos festgelegt, wobei ``0``die volle Geschwindigkeit in eine Richtung darstellt, ``180``die volle Geschwindigkeit in die andere, und ein Wert von ``90`` einen Stillstand erzeugt.",
- "pins.servoWritePin|param|value": "Winkel oder Rotationsbeschleunigung, z.B.: 180,90,0",
- "pins.setPull": "Stellt die Anziehungskraft des Pins ein.",
- "pins.sizeOf": "Ruft die BytegrÃļÃe im spezifierten Nummernformat ab.",
- "pins.spiWrite": "Schreibe in den SPI-Slave und gebe die Antwort aus",
- "pins.spiWrite|param|value": "Daten, die an den SPI-Slave geschickt werden sollen",
- "serial": "Lesen und Schreiben von Daten Ãŧber eine serielle Verbindung.",
- "serial.delimiters": "Gibt die mit dem Begrenzer korrespondierende Zeichenfolge aus.",
- "serial.onLineReceived": "Registriert ein Event, das ausgefÃŧhrt wird, wenn eine Zeile empfangen wurde",
- "serial.readLine": "Liest eine Textzeile aus der seriellen Schnittstelle.",
- "serial.readUntil": "Liest aus eine Textzeile aus dem seriellen Anschluss und gibt den Puffer aus, wenn die Begrenzung erreicht wurde.",
- "serial.readUntil|param|delimiter": "Text-Begrenzung, die die TextblÃļcke voneinander trennt",
- "serial.redirect": "Konfiguriert dynamisch die serielle Instanz, damit sie andere Pins als USBTX und USBRX benutzt.",
- "serial.writeLine": "Gibt eine Zeile des Textes an die serielle",
- "serial.writeNumber": "Gibt einen numerischen Wert an die serielle",
- "serial.writeString": "Sendet ein StÃŧck Text Ãŧber serielle Verbindung.",
- "serial.writeValue": "Schreibt ein ``Namen: Wert`` Wertepaar auf die serielle Schnittstelle.",
- "serial.writeValue|param|name": "Name des Wertestreams, z.B.: x",
- "serial.writeValue|param|value": "Schreiben"
+ "Math.abs": "Gibt den absoluten Wert einer Zahl aus (den Wert unabhängig davon, ob er positiv oder negativ ist).\nDer absolute Wert von -5 ist zum Beispiel der gleiche wie der von 5.",
+ "Math.abs|param|x": "Ein numerischer Ausdruck, fÃŧr den der absolute Wert benÃļtigt wird.",
+ "Math.max": "Gibt den grÃļÃeren von zwei vorhandenen numerischen AusdrÃŧcken aus.",
+ "Math.min": "Gibt den niedrigeren von zwei vorhandenen numerischen AusdrÃŧcken aus.",
+ "Math.pow": "Gibt den Wert eines grundlegenden Ausdrucks bis zu einer bestimmten Stärke aus.",
+ "Math.pow|param|x": "Der Basiswert des Ausdrucks.",
+ "Math.pow|param|y": "Der exponentielle Wert des Ausdrucks.",
+ "Math.random": "Gibt eine pseudozufÃŧllige Zahl zwischen 0 und `max`aus.",
+ "Math.randomBoolean": "Erzeugt zufällig einen \"wahr\" oder \"falsch\"-Wert, wie bei einem MÃŧnzwurf.",
+ "Math.sign": "Gibt das Vorzeichen von x aus und zeigt an, ob dieses positiv, negativ oder null ist.",
+ "Math.sign|param|x": "Der numerische Ausdruck, der getestet werden soll",
+ "Math.sqrt": "Gibt die Quadratwurzel einer Zahl aus.",
+ "Math.sqrt|param|x": "Ein numerischer Ausdruck.",
+ "String.charAt": "Gibt den Buchstaben beim angegebenen Index aus.",
+ "String.charAt|param|index": "Der null-basierte index des gewÃŧnschten Zeichens.",
+ "String.charCodeAt": "Gibt den Unicode-Wert des Zeichens am vorgegebenen Ort aus.",
+ "String.charCodeAt|param|index": "Der null-basierte Index des gewÃŧnschten Zeichens. Wenn kein Zeichen am angegeben Index vorhanden ist, wird NaN ausgegeben.",
+ "String.compare": "Bestimmt die relative Reihenfolge zweier Strings (in ASCII).",
+ "String.compare|param|that": "Zeichenfolge, die mit der Zielzeichenfolge verglichen werden soll",
+ "String.concat": "Gibt eine Zeichenfolge aus, die die Verkettung von zwei oder mehr Zeichenfolgen ist.",
+ "String.concat|param|other": "Die Zeichenfolge, die an das Ende einer Zeichenfolge angehängt werden soll.",
+ "String.fromCharCode": "Erstelle Sie eine Zeichenfolge aus dem angegebenen ASCII-Zeichencode.",
+ "String.isEmpty": "Gibt einen Wert aus, der anzeigt, ob die Zeichenfolge leer ist",
+ "String.length": "Gibt die Länge einer Zeichenfolge aus.",
+ "String.substr": "Gibt eine Teilzeichenfolge der aktuellen Zeichenfolge aus.",
+ "String.substr|param|length": "Anzahl der zu extrahierenden Zeichen",
+ "String.substr|param|start": "Erster Zeichenindex, kann beim zählen vom Ende negativ sein, zum Beispiel: 0",
+ "basic": "Bietet Zugriff auf grundlegende mini-Funktionalität.",
+ "basic.clearScreen": "Schalte alle LEDs aus",
+ "basic.color": "Konvertiert den Farbnamen in eine Nummer",
+ "basic.forever": "Wiederholt immer wieder den Code im Hintergrund. Bei jeder Iteration ist es mÃļglich, anderen Code auszufÃŧhren.",
+ "basic.pause": "Pausiere fÃŧr die angegebene Zeit in Millisekunden",
+ "basic.pause|param|ms": "wie lange pausieren, z.B.: 100, 200, 500, 1000, 2000",
+ "basic.plotLeds": "Zeichnet ein Bild auf dem LED-Bildschirm.",
+ "basic.plotLeds|param|leds": "Muster der LEDs, die ein-/ und ausgeschaltet werden",
+ "basic.rgbw": "Konvertiert Rot-, GrÃŧn- und Blau-Kanäle in eine RGB-Farbe",
+ "basic.rgbw|param|blue": "Blauwert zwischen 0 und 255, z.B. 255",
+ "basic.rgbw|param|green": "GrÃŧnwert zwischen 0 und 255, z.B. 255",
+ "basic.rgbw|param|red": "Rotwert zwischen 0 und 255, z.B. 255",
+ "basic.rgbw|param|white": "WeiÃwert zwischen 0 und 255, z.B. 0",
+ "basic.rgb": "Konvertiert Rot-, GrÃŧn- und Blau-Kanäle in eine RGB-Farbe",
+ "basic.rgb|param|blue": "Blauwert zwischen 0 und 255, z.B. 255",
+ "basic.rgb|param|green": "GrÃŧnwert zwischen 0 und 255, z.B. 255",
+ "basic.rgb|param|red": "Rotwert zwischen 0 und 255, z.B. 255",
+ "basic.setLedColor": "Legt die Farbe der eingebauten LED fest. Setze auf 0, um diese abzuschalten.",
+ "basic.showAnimation": "Zeigt eine Abfolge von LED-Anzeigen als Animation.",
+ "basic.showAnimation|param|interval": "Zeit in Millisekunden zwischen jedem Neuzeichnen",
+ "basic.showAnimation|param|leds": "Muster der LEDs, die ein-/ und ausgeschaltet werden",
+ "basic.showLeds": "Zeichnet ein Bild auf dem LED-Bildschirm.",
+ "basic.showLeds|param|interval": "Zeit in Millisekunden, die nach der Zeichnung gewartet wird",
+ "basic.showLeds|param|leds": "Muster der LEDs, die ein- und ausgeschaltet werden",
+ "basic.showNumber": "Zeige eine Nummer auf dem Display. Wenn die Nummer auf das Display passt (es sich also um eine einstellige Zahl handelt), scrolle nicht weiter.",
+ "basic.showNumber|param|interval": "Scroll-Geschwindigkeit; z.B. 150, 100, 200,-100",
+ "basic.showString": "Zeige Text auf dem Display an, Buchstabe fÃŧr Buchstabe. Wenn die Zeichenfolge in das Display passt (also wenn es sich um einen einzelnen Buchstaben handelt), scrolle nicht weiter.",
+ "basic.showString|param|interval": "Wie schnell die Zeichen geändert werden; z.B. 150, 100, 200,-100",
+ "basic.showString|param|text": "Text auf dem Bildschirm dargestellt werden soll, z.B.: \"Hallo!\"",
+ "control": "Laufzeit- und Event-Dienstprogramme.",
+ "control.assert": "Wenn die Bedingung falsch ist, zeige eine Nachricht auf der seriellen Konsole und gebe Panic-Code 098 aus",
+ "control.deviceName": "Erzeugt einen Namen fÃŧr das Gerät, basierend auf der Seriennummer",
+ "control.eventSourceId": "Gibt den Wert einer C++-Laufzeitkonstanten aus",
+ "control.eventTimestamp": "Holt den Zeitstempel des letzten Events auf dem Bus",
+ "control.eventValue": "Holt den Wert des letzten ausgefÃŧhrten Events auf dem Bus",
+ "control.eventValueId": "Gibt den Wert einer C++-Laufzeitkonstanten aus",
+ "control.inBackground": "Plant Code, der im Hintergrund wiedergegeben wird.",
+ "control.onEvent": "Startet ein Event auf dem Event-Bus.",
+ "control.panic": "Zeigt einen spezifizierten Fehlercode und hält das Programm an.",
+ "control.raiseEvent": "Startet ein Event auf dem Event-Bus.",
+ "control.raiseEvent|param|mode": "optionale Definition davon, wie ein Event nach dem Erstellen ausgefÃŧhrt wird (Standard ist \"CREATE_AND_FIRE).",
+ "control.raiseEvent|param|src": "ID der Calliope mini-Komponente, die das Event generiert hat, zum Beispiel CALLIOPE_ID_BUTTON_A.",
+ "control.raiseEvent|param|value": "Komponentenspezifischer Code, der den Grund des Events angibt.",
+ "control.reset": "Seit den mini zurÃŧck.",
+ "control.runtimeWarning": "Zeige Warnmeldung im Simulator.",
+ "control.waitMicros": "Sperrt die aktuelle Leitung fÃŧr die Dauer der angegebenen Mikrosekunden",
+ "control.waitMicros|param|micros": "Anzahl der Mikrosekunden, die gewartet werden soll, z.B.: 4",
+ "game": "Eine Einzel-LED-Sprite-Spielumgebung",
+ "game.addLife": "FÃŧgt Leben zum aktuellen Spielstand hinzu",
+ "game.addScore": "FÃŧgt zum aktuellen Spielstand Punkte hinzu",
+ "game.addScore|param|points": "Anzahl von zu verändernden Punkten, z.B.: 1",
+ "game.createSprite": "Erzeugt einen neuen LED-Sprite, der nach rechts zeigt.",
+ "game.createSprite|param|x": "horizontale Koordinate des Sprites, z.B. 2",
+ "game.createSprite|param|y": "vertikale Koordinate des Sprites, z.B. 2",
+ "game.currentTime": "Ruft die verbliebene Zeit (seit `starte Countdown`) oder die aktuelle Zeit (seit das Gerät gestartet wurde oder eine Stoppuhr aktiviert wurde) an.",
+ "game.gameOver": "Gibt Ãŧber eine Animation ein Spiel wieder.",
+ "game.invalidSprite": "Ruft einen invaliden Sprite ab; wird genutzt, um Locale zu initialisieren.",
+ "game.isGameOver": "Zeigt an, ob das Spil die \"Game Over\"-Sequenz angezeigt hat.",
+ "game.isRunning": "Holt einen Wert, der anzeigt, ob das Spiel noch läuft. Gibt `falsch`aus, wenn das Spiel zu Ende ist.",
+ "game.level": "Ruft das aktuelle Level ab",
+ "game.levelUp": "ErhÃļht das Level und zeigt eine Nachricht an.",
+ "game.life": "Ruft das aktuelle Leben ab",
+ "game.removeLife": "Entfernt ein Leben",
+ "game.score": "Ruft den aktuellen Punktestand ab",
+ "game.setLife": "Setzt den aktuellen Wert der Leben",
+ "game.setScore": "Setzt den aktuellen Wert des Spielstands",
+ "game.showScore": "Zeigt den Spielstand auf dem Display.",
+ "game.startCountdown": "Startet einen Spiel-Countdown",
+ "game.startCountdown|param|ms": "Countdown-Dauer in Millisekunden, z.B.: 10000",
+ "game.startStopwatch": "Startet eine Stoppuhr.`aktuelle Zeit`gibt die vergangene Zeit an.",
+ "images": "Erstellung, Bearbeitung und Anzeige von LED-Bildern.",
+ "images.createBigImage": "Erstellt ein Bild mit zwei Einzelbildern.",
+ "images.createImage": "Erstellt ein Bild, das auf den LED-Bildschirm passt.",
+ "input": "Ereignisse und Daten der Sensoren",
+ "input.acceleration": "Holt den Beschleunigungswert in Milli-Erdanziehung (wenn das Board flach mit dem Display nach oben liegt, X = 0, y = 0 und Z =-1024)",
+ "input.buttonIsPressed": "Erhalte den Sie den Tastenstatus (gepresst oder nicht) fÃŧr ``A`` und ``B``.",
+ "input.calibrate": "Veraltet, Kompasskalibrierung erfolgt automatisch.",
+ "input.compassHeading": "Holt die aktuelle Kompassrichtung in Grad.",
+ "input.lightLevel": "Liest die Lichtintensität auf dem LED-Bildschirm im Bereich von ``0`` (dunkel) und `` 255`` (hell).",
+ "input.magneticForce": "Ruft den Wert der Magnetkraft in ``Mikro-Tesla`` (``ÂĩT``) ab. Diese Funktion wird im Simulator nicht unterstÃŧtzt.",
+ "input.onButtonPressed": "Tue etwas, wenn eine Taste (``A``, ``B`` oder ``A + B``) gedrÃŧckt wird",
+ "input.onGesture": "Mache etwas, wenn eine Geste gemacht wird (wie den mini zu schÃŧtteln).",
+ "input.onLogoDown": "FÃŧgt Code hinzu, der ausgefÃŧhrt wird, wenn das Logo nach unten zeigt und das Board vertikal ausgerichtet ist.",
+ "input.onLogoUp": "FÃŧgt Code hinzu, der ausgefÃŧhrt wird, wenn das Logo nach oben zeigt und das Board vertikal ausgerichtet ist.",
+ "input.onPinPressed": "Mache etwas, wenn eine Pin gehalten wird.",
+ "input.onPinPressed|param|body": "Code, der ausfÃŧhrt wird, wenn ein Pin gehalten wird",
+ "input.onPinReleased": "Mache etwas, wenn der Pin losgelassen wird.",
+ "input.onPinReleased|param|body": "Code, der ausgefÃŧhrt werden soll, wenn der Pin losgelassen wird",
+ "input.onScreenDown": "Hängt Code an, der ausgefÃŧhrt wird, wenn der Bildschirm nach unten zeigt.",
+ "input.onScreenUp": "Hängt Code an, der ausgefÃŧhrt wird, wenn der Bildschirm nach oben zeigt.",
+ "input.onShake": "Hängt Code an, der ausgefÃŧhrt wird, wenn der mini geschÃŧttelt wird.",
+ "input.pinIsPressed": "Ruft den Pin-Zustand (gehalten oder nicht) ab. Die Erdung muss gehalten werden, um den Stromkreis zu schlieÃen.",
+ "input.rotation": "Die Neigung und Drehung des mini Drehung auf ``X-Achse``oder ``Y-Achse``, in Grad.",
+ "input.runningTime": "Ruft die Anzahl der Millisekunden auf, die seit dem Einschalten vergangen sind.",
+ "input.setAccelerometerRange": "Legt die Stichprobenbereich des Beschleunigungssensors in Schwerkraft fest.",
+ "input.setAccelerometerRange|param|range": "Ein Wert, der die maximale Stärke der gemessenen Beschleunigung beschreibt",
+ "input.temperature": "Ruft die aktuelle Temperatur in Grad Celsius (°C) ab.",
+ "led": "Steuerung des LED-Bildschirms.",
+ "led.brightness": "Ruft die Helligkeit des Bildschirms ab, von 0 (aus) bis 255 (volle Helligkeit).",
+ "led.enable": "Schaltet das Display an und aus",
+ "led.fadeIn": "Blendet die Bildschirmanzeige ein.",
+ "led.fadeOut": "Blendet die Bildschirmhelligkeit aus.",
+ "led.plot": "Schalte die angegebene LED mit Hilfe von X- und Y-Koordinaten ein (X ist horizontal, Y ist vertikal). (0,0) ist die obere linke Ecke.",
+ "led.plotAll": "Schaltet alle LEDs an",
+ "led.plotBarGraph": "Zeigt ein vertikales Balkendiagramm an, basierend auf dem `Wert`und dem `Hoch`-Wert. Wenn `Hoch`0 ist, wird das Diagramm automatisch angepasst.",
+ "led.plotBarGraph|param|high": "maximalen Wert. Wenn dieser 0 ist, wird der Maximalwert automatisch angepasst, z.B.: 0",
+ "led.plotBarGraph|param|value": "aktueller Wert zum Darstellen",
+ "led.point": "Ruft den An/Aus-Status einer vorgegebenen LED mittels X-/Y-Koordinaten ab. (0,0) ist oben links.",
+ "led.screenshot": "Macht einen Screenshot vom LED-Bildschirm und gibt ein Bild aus.",
+ "led.setBrightness": "Lege die Helligkeit des Bildschirms fest, von 0 (aus) bis 255 (volle Helligkeit).",
+ "led.setBrightness|param|value": "Helligkeitswert, z.B.: 255, 127, 0",
+ "led.setDisplayMode": "Legt den Anzeigemodus von Wiedergabe-LEDs zwischen Schwarz und Weià und Graustufen fest.",
+ "led.setDisplayMode|param|mode": "TODO",
+ "led.stopAnimation": "Bricht die aktuelle Animation ab und lÃļscht andere ausstehende Animationen.",
+ "led.toggle": "Schaltet ein bestimmtes Pixel ein",
+ "led.toggleAll": "Invertiert die aktuelle LED-Anzeige",
+ "led.unplot": "Schalte die angegebene LED mit x-und y-Koordinaten ab (X ist horizontal, y ist vertikal). (0,0) ist oben links.",
+ "motors": "BlÃļcke, die genutzt werden, um Onboard-Motoren zu steuern",
+ "motors.dualMotorPower": "Steuert zwei an das Board angeschlossene Motoren. Schaltet auf Dual-Motor-Modus um!",
+ "motors.motorCommand": "Schicke Anhalten, Ausrollen oder Anhalten-Befehle an den Motor. Hat im Dual-Motor-Modus keinen Effekt.",
+ "motors.motorPower": "Schaltet den Motor bei einer bestimmten Prozentzahl der Kraft an. Schaltet um auf den Single-Motor-Modus!",
+ "motors.motorPower|param|power": "%percent der Kraft, die an den Motor geschickt wird. Negative Werte laufen rÃŧckwärts, z.B. 50",
+ "music": "Generierung von von Musik durch Pin ``P0``.",
+ "music.beat": "Gibt die Dauer eines Taktes in Milli-Sekunden aus",
+ "music.changeTempoBy": "Ãndere die Geschwindigkeit um den angegebenen Betrag",
+ "music.changeTempoBy|param|bpm": "Die Ãnderung in Schlägen pro Minute auf das Tempo, z.B.: 20",
+ "music.noteFrequency": "Ruft die Frequenz einer Note ab.",
+ "music.playTone": "Spielt einen Ton fÃŧr den angegebenen Zeitraum auf dem Lautsprecher ab.",
+ "music.playTone|param|ms": "Tondauer in Millisekunden (ms)",
+ "music.rest": "Ruht (spielt nichts) fÃŧr eine bestimmte Zeit auf Pin ``P0``.",
+ "music.rest|param|ms": "Restdauer in Millisekunden (ms)",
+ "music.ringTone": "Spielt einen Ton durch den Lautsprecher ab.",
+ "music.ringTone|param|frequency": "TonhÃļhe des abzuspielenden Tones in Hertz (Hz)",
+ "music.setTempo": "Legt die Geschwindigkeit auf den angegebenen Wert fest.",
+ "music.setTempo|param|bpm": "Die neue Geschwindigkeit in Schlägen pro Minute, z.B.: 120",
+ "music.tempo": "Gibt die Geschwindigkeit in Schlägen pro Minute aus. Die Geschwindigkeit ist Schnelligkeit (Bpm = Beats pro Minute), in der TÃļne abgespielt werden. Je grÃļÃer der Wert, desto schneller werden die TÃļne abgespielt.",
+ "pins": "Steuere die Stromstärke Ãŧber die Pins fÃŧr analoge/digitale Signale, Servos, I2C,...",
+ "pins.analogPitch": "Gibt ein Pulsweiten Modulation (PWM)-Signal Ãŧber den aktuellen Pitch-Pin. Benutze `analog set pitch pin`, um den Pitch-Pin festzulegen.",
+ "pins.analogReadPin": "Lese den Anschlusswert als Analog aus, d. h. als einen Wert zwischen 0 und 1023.",
+ "pins.analogSetPeriod": "Stellt die Pulsweite Modulation (PWM) des Analogausganges auf den angegebenen Wert in ** Mikrosekunden ** oder `1/1000` Millisekunden ein.\nWenn dieser Pin nicht als einen Analogausgang (mit `analog write pin`) konfiguriert ist, hat der Vorgang keine Auswirkungen.",
+ "pins.analogSetPeriod|param|micros": "Zeit in Mikrosekunden. z.B.: 20000",
+ "pins.analogWritePin": "Legt den Wert des Verbinders auf analog fest. Der Wert muss zwischen 0 und 1023 liegen.",
+ "pins.analogWritePin|param|value": "Wert, der auf den Pin geschrieben werden soll, zwischen ``0`` und ``1023`` z.B.: 1023,0",
+ "pins.createBuffer": "Erstellt einen Null-initialisierten Zwischenspeicher.",
+ "pins.createBuffer|param|size": "Anzahl der Bytes im Zwischenspeicher",
+ "pins.digitalReadPin": "Lese den angegebene Pin oder Verbinder als 0 oder 1",
+ "pins.digitalWritePin": "Setzt einen Pin- oder Verbinder-Wert auf 0 oder 1.",
+ "pins.digitalWritePin|param|value": "Wert, der auf dem Pin 1 gesetzt werden soll, z.B. 0",
+ "pins.i2cReadBuffer": "Lese `GrÃļÃe`bytes aus einer 7-bit I2C-Adresse.",
+ "pins.i2cReadNumber": "Lese eine Nummer aus einer 7-bit I2C-Adresse.",
+ "pins.i2cWriteBuffer": "Schreibt Bytes in eine 7-bit I2C-Adresse.",
+ "pins.i2cWriteNumber": "Schreibe eine Nummer in eine 7-bit I2C-Adresse.",
+ "pins.map": "Definiert eine Nummer von einer Auswahl zu einer anderen um. Ein Wert ``von niedrig``wird so auf ``zu niedrig``umgeändert, ein Wert ``von hoch`` zu ``zu hoch`` etc.",
+ "pins.map|param|fromHigh": "die obere Grenze des aktuellen Wertebereichs, z.B.: 1023",
+ "pins.map|param|fromLow": "die untere Grenze des aktuellen Wertebereichs",
+ "pins.map|param|toHigh": "die Obergrenze des Wertezielbereichs, z.B.: 4",
+ "pins.map|param|toLow": "die Untergrenze des Wertezielbereichs",
+ "pins.map|param|value": "Wert in Bereichen zuordnen",
+ "pins.onPulsed": "Stellt diesen Pin als einen Digitaleingang ein und generiert Ereignisse, deren Zeitstempel die Dauer darstellt, in der der Pin entweder ``hoch``oder ``niedrig``war.",
+ "pins.pulseDuration": "Ruft die Dauer des letzten Impulses in Mikrosendungen ab. Diese Funktion soll von einem `onPulsed`-Handler aufgerufen werden.",
+ "pins.pulseIn": "Gibt die Dauer eines Pulses in Mikrosekunden an",
+ "pins.pulseIn|param|name": "der Pin, der den Puls misst",
+ "pins.pulseIn|param|value": "der Wert des Pulses (Standard hoch)",
+ "pins.servoSetPulse": "Konfiguriert diesen IO-Pin als einen analogen/PWM-Ausgang, stellt den Zeitraum auf 20 ms ein und setzt die Pulsweite fest, basieren auf dem angegeben Wert **Mikrosekunden** oder `1/1000`Millisekunden.",
+ "pins.servoSetPulse|param|micros": "Impulsdauer in Mikrosekunden, z.B.: 1500",
+ "pins.servoSetPulse|param|name": "PIN-Name",
+ "pins.servoWritePin": "Schreibt einen Wert in den Servo, der die Welle entsprechend kontroliert. Auf einem Standard-Servo wird so der Winkel der Welle (in Grad) eingestellt, sodass sich die Welle entsprechend anpasst. Auf einem kontinuierlich drehenden Servo wird dadurch die Geschwindigkeit des Servos festgelegt, wobei ``0``die volle Geschwindigkeit in eine Richtung darstellt, ``180``die volle Geschwindigkeit in die andere, und ein Wert von ``90`` einen Stillstand erzeugt.",
+ "pins.servoWritePin|param|value": "Winkel oder Rotationsbeschleunigung, z.B.: 180,90,0",
+ "pins.setPull": "Stellt die Anziehungskraft des Pins ein.",
+ "pins.sizeOf": "Ruft die BytegrÃļÃe im spezifierten Nummernformat ab.",
+ "pins.spiWrite": "Schreibe in den SPI-Slave und gebe die Antwort aus",
+ "pins.spiWrite|param|value": "Daten, die an den SPI-Slave geschickt werden sollen",
+ "serial": "Lesen und Schreiben von Daten Ãŧber eine serielle Verbindung.",
+ "serial.delimiters": "Gibt die mit dem Begrenzer korrespondierende Zeichenfolge aus.",
+ "serial.onLineReceived": "Registriert ein Event, das ausgefÃŧhrt wird, wenn eine Zeile empfangen wurde",
+ "serial.readLine": "Liest eine Textzeile aus der seriellen Schnittstelle.",
+ "serial.readUntil": "Liest aus eine Textzeile aus dem seriellen Anschluss und gibt den Puffer aus, wenn die Begrenzung erreicht wurde.",
+ "serial.readUntil|param|delimiter": "Text-Begrenzung, die die TextblÃļcke voneinander trennt",
+ "serial.redirect": "Konfiguriert dynamisch die serielle Instanz, damit sie andere Pins als USBTX und USBRX benutzt.",
+ "serial.writeLine": "Gibt eine Zeile des Textes an die serielle",
+ "serial.writeNumber": "Gibt einen numerischen Wert an die serielle",
+ "serial.writeString": "Sendet ein StÃŧck Text Ãŧber serielle Verbindung.",
+ "serial.writeValue": "Schreibt ein ``Namen: Wert`` Wertepaar auf die serielle Schnittstelle.",
+ "serial.writeValue|param|name": "Name des Wertestreams, z.B.: x",
+ "serial.writeValue|param|value": "Schreiben"
}
\ No newline at end of file
diff --git a/libs/core/_locales/de/core-strings.json b/libs/core/_locales/de/core-strings.json
index 37a2c6bd..5fdd3d9b 100644
--- a/libs/core/_locales/de/core-strings.json
+++ b/libs/core/_locales/de/core-strings.json
@@ -1,201 +1,202 @@
{
- "AcceleratorRange.EightG": "Der Bewegungssensor misst Kräfte bis 8g",
- "AcceleratorRange.EightG|block": "8g",
- "AcceleratorRange.FourG": "Der Bewegungssensor misst Kräfte bis 4g",
- "AcceleratorRange.FourG|block": "4g",
- "AcceleratorRange.OneG": "Der Bewegungssensor misst Kräfte bis 1g",
- "AcceleratorRange.OneG|block": "1g",
- "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
- "AcceleratorRange.TwoG|block": "2g",
- "BaudRate.BaudRate115200|block": "115200",
- "BaudRate.BaudRate9600|block": "9600",
- "BeatFraction.Eighth|block": "1/8",
- "BeatFraction.Half|block": "1/2",
- "BeatFraction.Quarter|block": "1/4",
- "BeatFraction.Sixteenth|block": "1/16",
- "BeatFraction.Whole|block": "1",
- "Button.AB|block": "A+B",
- "Colors.Blue|block": "Blau",
- "Colors.Green|block": "GrÃŧn",
- "Colors.Indigo|block": "Indigo",
- "Colors.Orange|block": "Orange",
- "Colors.Purple|block": "Violett",
- "Colors.Red|block": "Rot",
- "Colors.Violet|block": "Veilchenblau",
- "Colors.White|block": "WeiÃ",
- "Colors.Yellow|block": "Gelb",
- "Delimiters.Dollar|block": "$",
- "Delimiters.Hash|block": "#",
- "Delimiters.NewLine|block": "Neue Zeile",
- "Dimension.Strength|block": "Stärke",
- "Dimension.X|block": "x",
- "Dimension.Y|block": "y",
- "Dimension.Z|block": "z",
- "Direction.Left|block": "links",
- "Direction.Right|block": "rechts",
- "DisplayMode.BackAndWhite|block": "Schwarz-WeiÃ",
- "DisplayMode.Greyscale|block": "Graustufen",
- "EventCreationMode.CreateAndFire": "Calliope mini-Event wurde initialisiert, seine Event-Handler werden unverzÃŧglich ausgefÃŧhrt (nicht geeignet fÃŧr die Nutzung bei Unterbrechungen!).",
- "EventCreationMode.CreateOnly": "Calliope mini-Event wurde initialisiert, es wird keine weitere Verarbeitung vorgenommen.",
- "Gesture.FreeFall": "Wird ausgefÃŧhrt, wenn das Board fällt!",
- "Gesture.FreeFall|block": "freier Fall",
- "Gesture.LogoDown": "Wird ausgefÃŧhrt, wenn das Logo nach unten zeigt und das Display vertikal ist.",
- "Gesture.LogoDown|block": "Logo nach unten",
- "Gesture.LogoUp": "Wird ausgefÃŧhrt, wenn das Logo nach oben zeigt und das Display vertikal ist.",
- "Gesture.LogoUp|block": "Logo oben",
- "Gesture.ScreenDown": "Wird ausgefÃŧhrt, wenn das Display nach oben zeigt und das Board horizontal ist.",
- "Gesture.ScreenDown|block": "Display nach unten",
- "Gesture.ScreenUp": "Wird ausgefÃŧhrt, wenn das Display nach unten zeigt und das Board horizontal ist.",
- "Gesture.ScreenUp|block": "Display nach oben",
- "Gesture.Shake": "Wird erhÃļht, wenn geschÃŧttelt",
- "Gesture.Shake|block": "geschÃŧttelt",
- "Gesture.SixG": "Wird ausgefÃŧhrt, ein 6g starker Stoà erkannt wird",
- "Gesture.SixG|block": "6g",
- "Gesture.ThreeG": "Wird ausgefÃŧhrt, ein 3g starker Stoà erkannt wird",
- "Gesture.ThreeG|block": "3g",
- "Gesture.TiltLeft": "Wird ausgefÃŧhrt, wenn das Display nach links zeigt",
- "Gesture.TiltLeft|block": "nach links neigen",
- "Gesture.TiltRight": "Wird ausgefÃŧhrt, wenn das Display nach rechts zeigt",
- "Gesture.TiltRight|block": "nach rechts neigen",
- "LedSpriteProperty.Blink|block": "blinken",
- "LedSpriteProperty.Brightness|block": "Helligkeit",
- "LedSpriteProperty.Direction|block": "Richtung",
- "LedSpriteProperty.X|block": "x",
- "LedSpriteProperty.Y|block": "y",
- "Math.randomBoolean|block": "wähle zufälligen Wahr- oder Falsch-Wert",
- "Math|block": "Mathematik",
- "Motor.AB|block": "A und B",
- "MotorCommand.Break|block": "Pause",
- "MotorCommand.Coast|block": "auslaufen",
- "MotorCommand.Sleep|block": "schlafen",
- "Note.CSharp3|block": "C#3",
- "Note.CSharp4|block": "C#4",
- "Note.CSharp5|block": "C#5",
- "Note.CSharp|block": "C#",
- "Note.FSharp3|block": "F#3",
- "Note.FSharp4|block": "F#4",
- "Note.FSharp5|block": "F#5",
- "Note.FSharp|block": "F#",
- "Note.GSharp3|block": "G#3",
- "Note.GSharp4|block": "G#4",
- "Note.GSharp5|block": "G#5",
- "Note.GSharp|block": "G#",
- "PinPullMode.PullDown|block": "nach unten",
- "PinPullMode.PullUp|block": "nach oben",
- "Rotation.Pitch|block": "Winkel",
- "Rotation.Roll|block": "rollen",
- "String.charAt|block": "Zeichen an Position %pos aus|%this",
- "String.compare|block": "vergleiche %this| mit %that",
- "String.concat|block": "hänge %this| mit %other aneinander",
- "String.fromCharCode|block": "Text aus ASCII-Code %code",
- "String.isEmpty|block": "%this| ist leer",
- "String.length|block": "Länge von %VALUE",
- "String.substr|block": "extrahiere aus %this|beginnend mit %start|%length Zeichen",
- "String|block": "Zeichenfolge",
- "basic.clearScreen|block": "Bildschirminhalt lÃļschen",
- "basic.color|block": "%c",
- "basic.forever|block": "dauerhaft",
- "basic.pause|block": "pausiere (ms) %pause",
- "basic.rgbw|block": "Rot %red|GrÃŧn %green|Blau %blue|Weià %white",
- "basic.setLedColor|block": "setze LED-Farbe auf %color=color_id",
- "basic.showLeds|block": "zeige LEDs",
- "basic.showNumber|block": "zeige|Nummer %number",
- "basic.showString|block": "zeige|Zeichenfolge %text",
- "basic|block": "Grundlagen",
- "control.deviceName|block": "Gerätename",
- "control.deviceSerialNumber|block": "Seriennnummer",
- "control.eventSourceId|block": "%id",
- "control.eventTimestamp|block": "Ereigniszeitstempel",
- "control.eventValueId|block": "%id",
- "control.eventValue|block": "Ereigniswert",
- "control.inBackground|block": "im Hintergrund ausfÃŧhren",
- "control.onEvent|block": "wenn Ereignis|von Quelle %src=control_event_source_id|mit Wert %value=control_event_value_id",
- "control.raiseEvent|block": "Ereignis auslÃļsen|von Quelle %src=control_event_source_id|mit Wert %value=control_event_value_id",
- "control.reset|block": "zurÃŧcksetzen",
- "control.waitMicros|block": "Warte (Âĩs)%micros",
- "control|block": "Steuerung",
- "game.addScore|block": "Ãndere Spielstand um|%points",
- "game.createSprite|block": "erzeuge Sprite an Position|x: %x|y:%y",
- "game.gameOver|block": "Spiel beendet",
- "game.score|block": "Spielstand",
- "game.startCountdown|block": "Countdown| starten (ms) %duration",
- "game|block": "Spiel",
- "images.createBigImage|block": "erstelle groÃes Bild",
- "images.createImage|block": "erstelle Bild",
- "images|block": "Bilder",
- "input.acceleration|block": "Beschleunigung (mg) |%NAME",
- "input.buttonIsPressed|block": "Button|%NAME|ist gedrÃŧckt",
- "input.compassHeading|block": "Kompassausrichtung (°)",
- "input.lightLevel|block": "Lichtstärke",
- "input.magneticForce|block": "Magnetkraft (ÂĩT) |%NAME",
- "input.onButtonPressed|block": "wenn Knopf|%NAME|gedrÃŧckt",
- "input.onGesture|block": "wenn |%NAME",
- "input.onPinPressed|block": "wenn Pin %NAME|gedrÃŧckt",
- "input.onPinReleased|block": "wenn Pin %NAME|losgelassen",
- "input.pinIsPressed|block": "Pin %NAME|ist gedrÃŧckt",
- "input.rotation|block": "Rotation (°)|%NAME",
- "input.runningTime|block": "Laufzeit (ms)",
- "input.setAccelerometerRange|block": "setze Bewegungsmesser auf|%range",
- "input.temperature|block": "Temperatur (°C)",
- "input|block": "Eingabe",
- "led.brightness|block": "Helligkeit",
- "led.plotBarGraph|block": "zeichne Balkendiagramm von %value|bis %high",
- "led.plot|block": "Zeichne|x %x|y %y",
- "led.point|block": "Punkt|x %x|y %y",
- "led.setBrightness|block": "setze Helligkeit auf %value",
- "led.stopAnimation|block": "halte Animation an",
- "led.toggle|block": "Schalte zwischen|x %x|y %y",
- "led.unplot|block": "schalte Pixel|x %x|y %y aus",
- "led|block": "LED",
- "motors.dualMotorPower|block": "Motor %motor an|mit %percent",
- "motors.motorCommand|block": "Motor %command",
- "motors.motorPower|block": "Motor an mit %percent",
- "motors|block": "Motoren",
- "music.beat|block": "%fraction|Takt",
- "music.changeTempoBy|block": "ändere die Geschwindigkeit (bpm)|%value",
- "music.noteFrequency|block": "%note",
- "music.playTone|block": "spiele|Note %note=device_note|fÃŧr %duration=device_beat",
- "music.rest|block": "pausiere (ms)|%duration=device_beat",
- "music.ringTone|block": "Klingelton (Hz) |%note = Device_note",
- "music.setTempo|block": "ändere Geschwindigkeit auf (bpm)|%value",
- "music.tempo|block": "Geschwindkeit (bpm)",
- "music|block": "Musik",
- "pins.analogReadPin|block": "lese analoge Werte von|Pin %name",
- "pins.analogSetPeriod|block": "setze Zeitraum fÃŧr analogen|Pin %pin|auf (Âĩs)%micros",
- "pins.analogWritePin|block": "schreibe analogen|Pin %name|auf %value",
- "pins.digitalReadPin|block": "lese digitale Werte von|Pin %name",
- "pins.digitalWritePin|block": "schreibe digitalen Wert von|pin %name|auf %value",
- "pins.i2cReadNumber|block": "lese Nummer aus I2C|auf Adresse %address|im Format %format=i2c_sizeof",
- "pins.i2cWriteNumber|block": "schreibe Nummer aus I2C|auf Adresse %address|mit Wert %value|im Format %format=i2c_sizeof",
- "pins.map|block": "verteile %value|von niedrig %fromLow|von hoch %fromHigh| bis niedrig %toLow|bis hoch %toHigh",
- "pins.onPulsed|block": "wenn|Pin %pin|gepulst %pulse",
- "pins.pulseDuration|block": "Impulsdauer (Âĩs)",
- "pins.pulseIn|block": "Impuls in (Âĩs)|Pin %name|mit %value",
- "pins.servoSetPulse|block": "setze den Puls von Servo an|Pin %value|auf (Âĩs) %micros",
- "pins.servoWritePin|block": "schreibe Servo an|Pin %name|auf %value",
- "pins.setPull|block": "setze Anziehungskraft von|Pin %pin|auf %pull",
- "pins.spiWrite|block": "schreibe %value in SPI",
- "pins|block": "Pins",
- "serial.delimiters|block": "%del",
- "serial.readLine|block": "serial|read line",
- "serial.readUntil|block": "serial|read until %delimiter=serial_delimiter_conv",
- "serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
- "serial.writeLine|block": "serial|write line %text",
- "serial.writeNumber|block": "serial|write number %value",
- "serial.writeString|block": "serial|write string %text",
- "serial.writeValue|block": "serial|write value %name|= %value",
- "serial|block": "Konsole",
- "{id:category}Basic": "Grundlagen",
- "{id:category}Control": "Steuerung",
- "{id:category}Game": "Spiel",
- "{id:category}Images": "Bilder",
- "{id:category}Input": "Eingabe",
- "{id:category}Led": "LED",
- "{id:category}Math": "Mathematik",
- "{id:category}Motors": "Motoren",
- "{id:category}Music": "Musik",
- "{id:category}Pins": "Pins",
- "{id:category}Serial": "Konsole",
- "{id:category}String": "Zeichenfolge",
- "{id:category}Text": "Text"
+ "AcceleratorRange.EightG": "Der Bewegungssensor misst Kräfte bis 8g",
+ "AcceleratorRange.EightG|block": "8g",
+ "AcceleratorRange.FourG": "Der Bewegungssensor misst Kräfte bis 4g",
+ "AcceleratorRange.FourG|block": "4g",
+ "AcceleratorRange.OneG": "Der Bewegungssensor misst Kräfte bis 1g",
+ "AcceleratorRange.OneG|block": "1g",
+ "AcceleratorRange.TwoG": "Der Bewegungssensor misst Kräfte bis 2g",
+ "AcceleratorRange.TwoG|block": "2g",
+ "BaudRate.BaudRate115200|block": "115200",
+ "BaudRate.BaudRate9600|block": "9600",
+ "BeatFraction.Eighth|block": "1/8",
+ "BeatFraction.Half|block": "1/2",
+ "BeatFraction.Quarter|block": "1/4",
+ "BeatFraction.Sixteenth|block": "1/16",
+ "BeatFraction.Whole|block": "1",
+ "Button.AB|block": "A+B",
+ "Colors.Blue|block": "Blau",
+ "Colors.Green|block": "GrÃŧn",
+ "Colors.Indigo|block": "Indigo",
+ "Colors.Orange|block": "Orange",
+ "Colors.Purple|block": "Violett",
+ "Colors.Red|block": "Rot",
+ "Colors.Violet|block": "Veilchenblau",
+ "Colors.White|block": "WeiÃ",
+ "Colors.Yellow|block": "Gelb",
+ "Delimiters.Dollar|block": "$",
+ "Delimiters.Hash|block": "#",
+ "Delimiters.NewLine|block": "Neue Zeile",
+ "Dimension.Strength|block": "Stärke",
+ "Dimension.X|block": "x",
+ "Dimension.Y|block": "y",
+ "Dimension.Z|block": "z",
+ "Direction.Left|block": "links",
+ "Direction.Right|block": "rechts",
+ "DisplayMode.BackAndWhite|block": "Schwarz-WeiÃ",
+ "DisplayMode.Greyscale|block": "Graustufen",
+ "EventCreationMode.CreateAndFire": "Calliope mini-Event wurde initialisiert, seine Event-Handler werden unverzÃŧglich ausgefÃŧhrt (nicht geeignet fÃŧr die Nutzung bei Unterbrechungen!).",
+ "EventCreationMode.CreateOnly": "Calliope mini-Event wurde initialisiert, es wird keine weitere Verarbeitung vorgenommen.",
+ "Gesture.FreeFall": "Wird ausgefÃŧhrt, wenn das Board fällt!",
+ "Gesture.FreeFall|block": "freier Fall",
+ "Gesture.LogoDown": "Wird ausgefÃŧhrt, wenn das Logo nach unten zeigt und das Display vertikal ist.",
+ "Gesture.LogoDown|block": "Logo nach unten",
+ "Gesture.LogoUp": "Wird ausgefÃŧhrt, wenn das Logo nach oben zeigt und das Display vertikal ist.",
+ "Gesture.LogoUp|block": "Logo oben",
+ "Gesture.ScreenDown": "Wird ausgefÃŧhrt, wenn das Display nach oben zeigt und das Board horizontal ist.",
+ "Gesture.ScreenDown|block": "Display nach unten",
+ "Gesture.ScreenUp": "Wird ausgefÃŧhrt, wenn das Display nach unten zeigt und das Board horizontal ist.",
+ "Gesture.ScreenUp|block": "Display nach oben",
+ "Gesture.Shake": "Wird erhÃļht, wenn geschÃŧttelt",
+ "Gesture.Shake|block": "geschÃŧttelt",
+ "Gesture.SixG": "Wird ausgefÃŧhrt, ein 6g starker Stoà erkannt wird",
+ "Gesture.SixG|block": "6g",
+ "Gesture.ThreeG": "Wird ausgefÃŧhrt, ein 3g starker Stoà erkannt wird",
+ "Gesture.ThreeG|block": "3g",
+ "Gesture.TiltLeft": "Wird ausgefÃŧhrt, wenn das Display nach links zeigt",
+ "Gesture.TiltLeft|block": "nach links neigen",
+ "Gesture.TiltRight": "Wird ausgefÃŧhrt, wenn das Display nach rechts zeigt",
+ "Gesture.TiltRight|block": "nach rechts neigen",
+ "LedSpriteProperty.Blink|block": "blinken",
+ "LedSpriteProperty.Brightness|block": "Helligkeit",
+ "LedSpriteProperty.Direction|block": "Richtung",
+ "LedSpriteProperty.X|block": "x",
+ "LedSpriteProperty.Y|block": "y",
+ "Math.randomBoolean|block": "wähle zufälligen Wahr- oder Falsch-Wert",
+ "Math|block": "Mathematik",
+ "Motor.AB|block": "A und B",
+ "MotorCommand.Break|block": "Pause",
+ "MotorCommand.Coast|block": "auslaufen",
+ "MotorCommand.Sleep|block": "schlafen",
+ "Note.CSharp3|block": "C#3",
+ "Note.CSharp4|block": "C#4",
+ "Note.CSharp5|block": "C#5",
+ "Note.CSharp|block": "C#",
+ "Note.FSharp3|block": "F#3",
+ "Note.FSharp4|block": "F#4",
+ "Note.FSharp5|block": "F#5",
+ "Note.FSharp|block": "F#",
+ "Note.GSharp3|block": "G#3",
+ "Note.GSharp4|block": "G#4",
+ "Note.GSharp5|block": "G#5",
+ "Note.GSharp|block": "G#",
+ "PinPullMode.PullDown|block": "nach unten",
+ "PinPullMode.PullUp|block": "nach oben",
+ "Rotation.Pitch|block": "Winkel",
+ "Rotation.Roll|block": "rollen",
+ "String.charAt|block": "Zeichen an Position %pos aus|%this",
+ "String.compare|block": "vergleiche %this| mit %that",
+ "String.concat|block": "hänge %this| mit %other aneinander",
+ "String.fromCharCode|block": "Text aus ASCII-Code %code",
+ "String.isEmpty|block": "%this| ist leer",
+ "String.length|block": "Länge von %VALUE",
+ "String.substr|block": "extrahiere aus %this|beginnend mit %start|%length Zeichen",
+ "String|block": "Zeichenfolge",
+ "basic.clearScreen|block": "Bildschirminhalt lÃļschen",
+ "basic.color|block": "%c",
+ "basic.forever|block": "dauerhaft",
+ "basic.pause|block": "pausiere (ms) %pause",
+ "basic.rgbw|block": "Rot %red|GrÃŧn %green|Blau %blue|Weià %white",
+ "basic.rgb|block": "Rot %red|GrÃŧn %green|Blau %blue",
+ "basic.setLedColor|block": "setze LED-Farbe auf %color=color_id",
+ "basic.showLeds|block": "zeige LEDs",
+ "basic.showNumber|block": "zeige|Nummer %number",
+ "basic.showString|block": "zeige|Zeichenfolge %text",
+ "basic|block": "Grundlagen",
+ "control.deviceName|block": "Gerätename",
+ "control.deviceSerialNumber|block": "Seriennnummer",
+ "control.eventSourceId|block": "%id",
+ "control.eventTimestamp|block": "Ereigniszeitstempel",
+ "control.eventValueId|block": "%id",
+ "control.eventValue|block": "Ereigniswert",
+ "control.inBackground|block": "im Hintergrund ausfÃŧhren",
+ "control.onEvent|block": "wenn Ereignis|von Quelle %src=control_event_source_id|mit Wert %value=control_event_value_id",
+ "control.raiseEvent|block": "Ereignis auslÃļsen|von Quelle %src=control_event_source_id|mit Wert %value=control_event_value_id",
+ "control.reset|block": "zurÃŧcksetzen",
+ "control.waitMicros|block": "Warte (Âĩs)%micros",
+ "control|block": "Steuerung",
+ "game.addScore|block": "Ãndere Spielstand um|%points",
+ "game.createSprite|block": "erzeuge Sprite an Position|x: %x|y:%y",
+ "game.gameOver|block": "Spiel beendet",
+ "game.score|block": "Spielstand",
+ "game.startCountdown|block": "Countdown| starten (ms) %duration",
+ "game|block": "Spiel",
+ "images.createBigImage|block": "erstelle groÃes Bild",
+ "images.createImage|block": "erstelle Bild",
+ "images|block": "Bilder",
+ "input.acceleration|block": "Beschleunigung (mg) |%NAME",
+ "input.buttonIsPressed|block": "Button|%NAME|ist gedrÃŧckt",
+ "input.compassHeading|block": "Kompassausrichtung (°)",
+ "input.lightLevel|block": "Lichtstärke",
+ "input.magneticForce|block": "Magnetkraft (ÂĩT) |%NAME",
+ "input.onButtonPressed|block": "wenn Knopf|%NAME|gedrÃŧckt",
+ "input.onGesture|block": "wenn |%NAME",
+ "input.onPinPressed|block": "wenn Pin %NAME|gedrÃŧckt",
+ "input.onPinReleased|block": "wenn Pin %NAME|losgelassen",
+ "input.pinIsPressed|block": "Pin %NAME|ist gedrÃŧckt",
+ "input.rotation|block": "Rotation (°)|%NAME",
+ "input.runningTime|block": "Laufzeit (ms)",
+ "input.setAccelerometerRange|block": "setze Bewegungsmesser auf|%range",
+ "input.temperature|block": "Temperatur (°C)",
+ "input|block": "Eingabe",
+ "led.brightness|block": "Helligkeit",
+ "led.plotBarGraph|block": "zeichne Balkendiagramm von %value|bis %high",
+ "led.plot|block": "Zeichne|x %x|y %y",
+ "led.point|block": "Punkt|x %x|y %y",
+ "led.setBrightness|block": "setze Helligkeit auf %value",
+ "led.stopAnimation|block": "halte Animation an",
+ "led.toggle|block": "Schalte zwischen|x %x|y %y",
+ "led.unplot|block": "schalte Pixel|x %x|y %y aus",
+ "led|block": "LED",
+ "motors.dualMotorPower|block": "Motor %motor an|mit %percent",
+ "motors.motorCommand|block": "Motor %command",
+ "motors.motorPower|block": "Motor an mit %percent",
+ "motors|block": "Motoren",
+ "music.beat|block": "%fraction|Takt",
+ "music.changeTempoBy|block": "ändere die Geschwindigkeit (bpm)|%value",
+ "music.noteFrequency|block": "%note",
+ "music.playTone|block": "spiele|Note %note=device_note|fÃŧr %duration=device_beat",
+ "music.rest|block": "pausiere (ms)|%duration=device_beat",
+ "music.ringTone|block": "Klingelton (Hz) |%note = Device_note",
+ "music.setTempo|block": "ändere Geschwindigkeit auf (bpm)|%value",
+ "music.tempo|block": "Geschwindkeit (bpm)",
+ "music|block": "Musik",
+ "pins.analogReadPin|block": "lese analoge Werte von|Pin %name",
+ "pins.analogSetPeriod|block": "setze Zeitraum fÃŧr analogen|Pin %pin|auf (Âĩs)%micros",
+ "pins.analogWritePin|block": "schreibe analogen|Pin %name|auf %value",
+ "pins.digitalReadPin|block": "lese digitale Werte von|Pin %name",
+ "pins.digitalWritePin|block": "schreibe digitalen Wert von|pin %name|auf %value",
+ "pins.i2cReadNumber|block": "lese Nummer aus I2C|auf Adresse %address|im Format %format=i2c_sizeof",
+ "pins.i2cWriteNumber|block": "schreibe Nummer aus I2C|auf Adresse %address|mit Wert %value|im Format %format=i2c_sizeof",
+ "pins.map|block": "verteile %value|von niedrig %fromLow|von hoch %fromHigh| bis niedrig %toLow|bis hoch %toHigh",
+ "pins.onPulsed|block": "wenn|Pin %pin|gepulst %pulse",
+ "pins.pulseDuration|block": "Impulsdauer (Âĩs)",
+ "pins.pulseIn|block": "Impuls in (Âĩs)|Pin %name|mit %value",
+ "pins.servoSetPulse|block": "setze den Puls von Servo an|Pin %value|auf (Âĩs) %micros",
+ "pins.servoWritePin|block": "schreibe Servo an|Pin %name|auf %value",
+ "pins.setPull|block": "setze Anziehungskraft von|Pin %pin|auf %pull",
+ "pins.spiWrite|block": "schreibe %value in SPI",
+ "pins|block": "Pins",
+ "serial.delimiters|block": "%del",
+ "serial.readLine|block": "serial|read line",
+ "serial.readUntil|block": "serial|read until %delimiter=serial_delimiter_conv",
+ "serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
+ "serial.writeLine|block": "serial|write line %text",
+ "serial.writeNumber|block": "serial|write number %value",
+ "serial.writeString|block": "serial|write string %text",
+ "serial.writeValue|block": "serial|write value %name|= %value",
+ "serial|block": "Konsole",
+ "{id:category}Basic": "Grundlagen",
+ "{id:category}Control": "Steuerung",
+ "{id:category}Game": "Spiel",
+ "{id:category}Images": "Bilder",
+ "{id:category}Input": "Eingabe",
+ "{id:category}Led": "LED",
+ "{id:category}Math": "Mathematik",
+ "{id:category}Motors": "Motoren",
+ "{id:category}Music": "Musik",
+ "{id:category}Pins": "Pins",
+ "{id:category}Serial": "Konsole",
+ "{id:category}String": "Zeichenfolge",
+ "{id:category}Text": "Text"
}
\ No newline at end of file
diff --git a/libs/core/basic.cpp b/libs/core/basic.cpp
index ea44b4c9..de787576 100644
--- a/libs/core/basic.cpp
+++ b/libs/core/basic.cpp
@@ -4,14 +4,122 @@
/**
* Provides access to basic micro:bit functionality.
*/
-//% color=#1E90FF weight=116 icon="\uf00a"
namespace basic {
- /**
+
+ /**
+ * Draws an image on the LED screen.
+ * @param leds the pattern of LED to turn on/off
+ * @param interval time in milliseconds to pause after drawing
+ */
+ //% help=basic/show-leds
+ //% weight=85 blockGap=8
+ //% imageLiteral=1 async
+ //% blockId=device_show_leds
+ //% block="show leds" icon="\uf00a"
+ //% parts="ledmatrix"
+ //% group="LED matrix"
+ void showLeds(ImageLiteral_ leds, int interval = 400) {
+ uBit.display.print(MicroBitImage(imageBytes(leds)), 0, 0, 0, interval);
+ }
+
+ /**
+ * Display text on the display, one character at a time. If the string fits on the screen (i.e. is one letter), does not scroll.
+ * @param text the text to scroll on the screen, eg: "hi!"
+ * @param interval how fast to shift characters; eg: 50, 100, 150, 200
+ */
+ //% help=basic/show-string
+ //% weight=100 blockGap=16
+ //% block="show|string %text || in an interval of %interval ms"
+ //% async
+ //% blockId=device_print_message
+ //% parts="ledmatrix"
+ //% text.shadowOptions.toString=true
+ //% expandableArgumentMode="toggle"
+ //% interval.defl=80
+ //% group="LED matrix"
+ void showString(String text, int interval = 80) {
+ if (interval <= 0)
+ interval = 1;
+ int l = text ? text->getUTF8Size() : 0;
+ if (l == 0) {
+ uBit.display.clear();
+ fiber_sleep(interval * 5);
+ } else if (l > 1) {
+ uBit.display.scroll(MSTR(text), interval);
+ } else {
+ uBit.display.printChar(text->getUTF8Data()[0], interval * 5);
+ }
+ }
+
+ /**
+ * Shows a sequence of LED screens as an animation.
+ * @param leds pattern of LEDs to turn on/off
+ * @param interval time in milliseconds between each redraw
+ */
+ //% help=basic/show-animation weight=83 imageLiteral=1 async
+ //% parts="ledmatrix"
+ //% group="LED matrix"
+ void showAnimation(ImageLiteral_ leds, int interval = 400) {
+ uBit.display.animate(MicroBitImage(imageBytes(leds)), interval, 5, 0, 0);
+ }
+
+ /**
+ * Draws an image on the LED screen.
+ * @param leds pattern of LEDs to turn on/off
+ */
+ //% help=basic/plot-leds weight=80
+ //% parts="ledmatrix"
+ //% group="LED matrix"
+ void plotLeds(ImageLiteral_ leds) {
+ MicroBitImage i(imageBytes(leds));
+ uBit.display.print(i, 0, 0, 0, 0);
+ }
+
+ /**
+ * Turn off all LEDs
+ */
+ //% help=basic/clear-screen weight=75
+ //% blockId=device_clear_display block="clear screen"
+ //% parts="ledmatrix"
+ //% group="LED matrix"
+ //% advanced=true
+ void clearScreen() {
+ uBit.display.image.clear();
+ }
+
+
+ /**
+ * Repeats the code forever in the background. On each iteration, allows other codes to run.
+ * @param body code to execute
+ */
+ //% help=basic/forever weight=55 blockGap=16 blockAllowMultiple=1 afterOnStart=true
+ //% blockId=device_forever block="forever" icon="\uf01e"
+ //% group="Control"
+ void forever(Action a) {
+ runForever(a);
+ }
+
+ /**
+ * Pause for the specified time in milliseconds
+ * @param ms how long to pause for, eg: 100, 200, 500, 1000, 2000
+ */
+ //% help=basic/pause weight=50
+ //% async block="pause (ms) %pause" blockGap=16
+ //% blockId=device_pause icon="\uf110"
+ //% pause.shadow=timePicker
+ //% group="Control"
+ void pause(int ms) {
+ fiber_sleep(ms);
+ }
+
+
+ /**
* Sets the color on the build-in LED. Set to 0 to turn off.
*/
//% blockId=device_set_led_color
//% block="set led to %color=colorNumberPicker"
- //% weight=50
+ //% weight=10
+ //% group="RGB LED"
void setLedColor(int color) {
if (!color) {
uBit.rgb.off();
@@ -31,104 +139,12 @@ namespace basic {
* Sets the color on the build-in LED. Set to 0 to turn off.
*/
//% blockId=device_turn_rgb_led_off block="turn build-in LED off"
- //% weight=50
+ //% weight=10
+ //% group="RGB LED"
+ //% advanced=true
void turnRgbLedOff() {
uBit.rgb.off();
}
- /**
- * Draws an image on the LED screen.
- * @param leds the pattern of LED to turn on/off
- * @param interval time in milliseconds to pause after drawing
- */
- //% help=basic/show-leds
- //% weight=95 blockGap=8
- //% imageLiteral=1 async
- //% blockId=device_show_leds
- //% block="show leds" icon="\uf00a"
- //% parts="ledmatrix"
- void showLeds(ImageLiteral_ leds, int interval = 400) {
- uBit.display.print(MicroBitImage(imageBytes(leds)), 0, 0, 0, interval);
- }
- /**
- * Display text on the display, one character at a time. If the string fits on the screen (i.e. is one letter), does not scroll.
- * @param text the text to scroll on the screen, eg: "hi!"
- * @param interval how fast to shift characters; eg: 150, 100, 200, -100
- */
- //% help=basic/show-string
- //% weight=87 blockGap=16
- //% block="show|string %text"
- //% async
- //% blockId=device_print_message
- //% parts="ledmatrix"
- //% text.shadowOptions.toString=true
- void showString(String text, int interval = 150) {
- if (interval <= 0)
- interval = 1;
- int l = text ? text->getUTF8Size() : 0;
- if (l == 0) {
- uBit.display.clear();
- fiber_sleep(interval * 5);
- } else if (l > 1) {
- uBit.display.scroll(MSTR(text), interval);
- } else {
- uBit.display.printChar(text->getUTF8Data()[0], interval * 5);
- }
- }
-
- /**
- * Turn off all LEDs
- */
- //% help=basic/clear-screen weight=79
- //% blockId=device_clear_display block="clear screen"
- //% parts="ledmatrix"
- //% advanced=true
- void clearScreen() {
- uBit.display.image.clear();
- }
-
- /**
- * Shows a sequence of LED screens as an animation.
- * @param leds pattern of LEDs to turn on/off
- * @param interval time in milliseconds between each redraw
- */
- //% help=basic/show-animation imageLiteral=1 async
- //% parts="ledmatrix"
- void showAnimation(ImageLiteral_ leds, int interval = 400) {
- uBit.display.animate(MicroBitImage(imageBytes(leds)), interval, 5, 0, 0);
- }
-
- /**
- * Draws an image on the LED screen.
- * @param leds pattern of LEDs to turn on/off
- */
- //% help=basic/plot-leds weight=80
- //% parts="ledmatrix"
- void plotLeds(ImageLiteral_ leds) {
- MicroBitImage i(imageBytes(leds));
- uBit.display.print(i, 0, 0, 0, 0);
- }
-
- /**
- * Repeats the code forever in the background. On each iteration, allows other codes to run.
- * @param body code to execute
- */
- //% help=basic/forever weight=55 blockGap=16 blockAllowMultiple=1 afterOnStart=true
- //% blockId=device_forever block="forever" icon="\uf01e"
- void forever(Action a) {
- runForever(a);
- }
-
- /**
- * Pause for the specified time in milliseconds
- * @param ms how long to pause for, eg: 100, 200, 500, 1000, 2000
- */
- //% help=basic/pause weight=54
- //% async block="pause (ms) %pause" blockGap=16
- //% blockId=device_pause icon="\uf110"
- //% pause.shadow=timePicker
- void pause(int ms) {
- fiber_sleep(ms);
- }
}
\ No newline at end of file
diff --git a/libs/core/basic.ts b/libs/core/basic.ts
index d832e8fd..b7dc96ad 100644
--- a/libs/core/basic.ts
+++ b/libs/core/basic.ts
@@ -37,17 +37,52 @@ enum Colors {
/**
* Provides access to basic micro:bit functionality.
*/
-//% color=#54C9C9 weight=100
+//% color=#54C9C9 weight=100 icon="\uf00a"
+//% groups=['LED matrix', 'Control', 'RGB LED', 'others']
namespace basic {
+
+ /**
+ * Scroll a number on the screen. If the number fits on the screen (i.e. is a single digit), do not scroll.
+ * @param interval speed of scroll; eg: 50, 100, 150, 200
+ */
+ //% help=basic/show-number
+ //% weight=95
+ //% blockId=device_show_number
+ //% block="show|number %number || in an interval of %interval ms" blockGap=8
+ //% async
+ //% parts="ledmatrix"
+ //% expandableArgumentMode="toggle"
+ //% interval.defl=80
+ //% group="LED matrix"
+ export function showNumber(value: number, interval?: number) {
+ showString(Math.roundWithPrecision(value, 2).toString(), interval);
+ }
/**
* Converts the color name to a number
*/
//% blockId=color_id block="%c" shim=TD_ID
+ //% group="RGB LED"
+ //% weight=1
+ //% deprecated=true
export function color(c: Colors): number {
return c;
}
+ /**
+ * Converts red, green, blue channels into a RGB color
+ * @param red value of the red channel between 0 and 255. eg: 255
+ * @param green value of the green channel between 0 and 255. eg: 255
+ * @param blue value of the blue channel between 0 and 255. eg: 255
+ */
+ //% weight=3
+ //% blockId="core_rgb" block="red %red|green %green|blue %blue"
+ //% group="RGB LED"
+ export function rgb(red: number, green: number, blue: number): number {
+ return ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF);
+ }
+
+
/**
* Converts red, green, blue channels into a RGB color
* @param red value of the red channel between 0 and 255. eg: 255
@@ -55,31 +90,21 @@ namespace basic {
* @param blue value of the blue channel between 0 and 255. eg: 255
* @param white value of the white channel between 0 and 255. eg: 0
*/
- //% weight=1
- //% blockId="core_rgb" block="red %red|green %green|blue %blue|white %white"
+ //% weight=2
+ //% blockId="core_rgbw" block="red %red|green %green|blue %blue|white %white"
+ //% group="RGB LED"
+ //% deprecated=true
export function rgbw(red: number, green: number, blue: number, white:number): number {
return ((white & 0xFF) << 24) | ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF);
}
-
- /**
- * Scroll a number on the screen. If the number fits on the screen (i.e. is a single digit), do not scroll.
- * @param interval speed of scroll; eg: 150, 100, 200, -100
- */
- //% help=basic/show-number
- //% weight=96
- //% blockId=device_show_number block="show|number %number" blockGap=8
- //% async
- //% parts="ledmatrix" interval.defl=150
- export function showNumber(value: number, interval?: number) {
- showString(Math.roundWithPrecision(value, 2).toString(), interval);
- }
+
}
/**
* Pause for the specified time in milliseconds
* @param ms how long to pause for, eg: 100, 200, 500, 1000, 2000
*/
-function pause(ms: number): void {
+ function pause(ms: number): void {
basic.pause(ms);
}
@@ -89,4 +114,4 @@ function pause(ms: number): void {
*/
function forever(a: () => void): void {
basic.forever(a);
-}
+}
\ No newline at end of file
diff --git a/libs/core/blocks-test/pins.blocks b/libs/core/blocks-test/pins.blocks
index 9f7dc325..9e01d01c 100644
--- a/libs/core/blocks-test/pins.blocks
+++ b/libs/core/blocks-test/pins.blocks
@@ -1,10 +1,10 @@
- DigitalPin.C5
+ DigitalPin.P5
PulseValue.Low
- AnalogPin.C6
+ AnalogPin.P9
5
@@ -12,7 +12,7 @@
- AnalogPin.C6
+ AnalogPin.P10
20000
@@ -20,7 +20,7 @@
- DigitalPin.C6
+ DigitalPin.P6
5
@@ -28,7 +28,7 @@
- AnalogPin.C5
+ AnalogPin.P13
5
@@ -36,7 +36,7 @@
- AnalogPin.C6
+ AnalogPin.P8
1500
@@ -65,7 +65,7 @@
0
- DigitalPin.C9
+ DigitalPin.P9
PulseValue.Low
@@ -102,7 +102,7 @@
0
- DigitalPin.C9
+ DigitalPin.P9
@@ -110,7 +110,7 @@
0
- AnalogPin.C6
+ AnalogPin.P9
@@ -120,12 +120,12 @@
- DigitalPin.C11
- DigitalPin.C9
- DigitalPin.C10
+ DigitalPin.P11
+ DigitalPin.P9
+ DigitalPin.P10
- DigitalPin.C9
+ DigitalPin.P9
PinPullMode.PullDown
@@ -141,11 +141,11 @@
- DigitalPin.C8
+ DigitalPin.P8
PinEventType.Touch
- AnalogPin.C6
+ AnalogPin.P9
diff --git a/libs/core/blocks-test/test.blocks b/libs/core/blocks-test/test.blocks
index 9650c840..d1e1be1e 100644
--- a/libs/core/blocks-test/test.blocks
+++ b/libs/core/blocks-test/test.blocks
@@ -150,31 +150,31 @@
DisplayMode.Greyscale
- AnalogPin.C4
+ AnalogPin.P4
1023
- AnalogPin.C5
+ AnalogPin.P13
- DigitalPin.C10
+ DigitalPin.P10
0
- DigitalPin.C15
+ DigitalPin.P15
- AnalogPin.C6
+ AnalogPin.P9
1234
@@ -230,7 +230,7 @@
- AnalogPin.C4
+ AnalogPin.P14
1500
@@ -510,7 +510,7 @@
- DigitalPin.C10
+ DigitalPin.P10
PulseValue.Low
@@ -575,8 +575,8 @@
DigitalPin.P9
- DigitalPin.C14
- DigitalPin.C16
+ DigitalPin.P14
+ DigitalPin.P16
diff --git a/libs/core/codal.cpp b/libs/core/codal.cpp
index 7ddb371e..877b4032 100644
--- a/libs/core/codal.cpp
+++ b/libs/core/codal.cpp
@@ -8,6 +8,21 @@ PXT_ABI(__aeabi_dsub)
PXT_ABI(__aeabi_ddiv)
PXT_ABI(__aeabi_dmul)
+#if MICROBIT_CODAL
+namespace codal {
+int list_fibers(Fiber **dest) {
+ int i = 0;
+ for (Fiber *fib = codal::get_fiber_list(); fib; fib = fib->next) {
+ if (dest)
+ dest[i] = fib;
+ i++;
+ }
+ return i;
+}
+
+} // namespace codal
+#endif
+
extern "C" void target_panic(int error_code) {
#if !MICROBIT_CODAL
// wait for serial to flush
@@ -28,6 +43,7 @@ namespace pxt {
MicroBit uBit;
MicroBitEvent lastEvent;
+bool serialLoggingDisabled;
void platform_init() {
microbit_seed_random();
@@ -152,7 +168,8 @@ int current_time_ms() {
}
static void logwriten(const char *msg, int l) {
- uBit.serial.send((uint8_t *)msg, l);
+ if (!serialLoggingDisabled)
+ uBit.serial.send((uint8_t *)msg, l);
}
static void logwrite(const char *msg) {
diff --git a/libs/core/compass.ts b/libs/core/compass.ts
index ee01e1aa..7afae7cf 100644
--- a/libs/core/compass.ts
+++ b/libs/core/compass.ts
@@ -1,174 +1,4 @@
-let compassImages = [
- images.createImage(`
- . . # . .
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . # . . .
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- # . . . .
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- # . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- # . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- # . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- # . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . # . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . # . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . . # .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . . . #
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . #
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . #
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . #
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . #
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . # .
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `)];
-
-let compassImagesDownside = [
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . # . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . . # .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . .
- . . . . #
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . .
- . . . . #
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . .
- . . # . #
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . .
- . . . . #
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . . #
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
- images.createImage(`
- . . . # .
- . . . . .
- . . # . .
- . . . . .
- . . . . .
- `),
+const compassImagesLeft = [
images.createImage(`
. . # . .
. . . . .
@@ -226,7 +56,66 @@ let compassImagesDownside = [
. # . . .
`)];
+const compassImagesRight = [
+ images.createImage(`
+ . . . . .
+ . . . . .
+ . . # . .
+ . . . . .
+ . . # . .
+ `),
+ images.createImage(`
+ . . . . .
+ . . . . .
+ . . # . .
+ . . . . .
+ . . . # .
+ `),
+ images.createImage(`
+ . . . . .
+ . . . . .
+ . . # . .
+ . . . . .
+ . . . . #
+ `),
+ images.createImage(`
+ . . . . .
+ . . . . .
+ . . # . .
+ . . . . #
+ . . . . .
+ `),
+ images.createImage(`
+ . . . . .
+ . . . . .
+ . . # . #
+ . . . . .
+ . . . . .
+ `),
+ images.createImage(`
+ . . . . .
+ . . . . #
+ . . # . .
+ . . . . .
+ . . . . .
+ `),
+ images.createImage(`
+ . . . . #
+ . . . . .
+ . . # . .
+ . . . . .
+ . . . . .
+ `),
+ images.createImage(`
+ . . . # .
+ . . . . .
+ . . # . .
+ . . . . .
+ . . . . .
+ `)];
+const compassImages = compassImagesLeft.concat(compassImagesRight);
+const compassImagesDownside = compassImagesRight.concat(compassImagesLeft);
namespace basic {
@@ -242,6 +131,7 @@ namespace basic {
//% interval.defl=600
//% parts="ledmatrix"
//% advanced=true
+ //% group="LED matrix"
export function showCompass(interval = 600) {
let i = 0
let startTime = input.runningTime()
@@ -251,22 +141,15 @@ namespace basic {
while ((endTime) > (input.runningTime() + refreshRate)) {
i = Math.round((input.compassHeading() - 11.25) / 22.5)
- if (input.isGesture(Gesture.ScreenDown)) {
- compassImagesDownside[i].showImage(0, refreshRate)
- } else {
- compassImages[i].showImage(0, refreshRate)
- }
+ let images = (input.isGesture(Gesture.ScreenDown)) ? compassImagesDownside : compassImages;
+ images[i].showImage(0, refreshRate)
}
rest = (endTime - input.runningTime())
if(rest > 0) {
i = Math.round((input.compassHeading() - 11.25) / 22.5)
- if (input.isGesture(Gesture.ScreenDown)) {
- compassImagesDownside[i].showImage(0, rest)
- } else {
- compassImages[i].showImage(0, rest)
- }
-
+ let images = (input.isGesture(Gesture.ScreenDown)) ? compassImagesDownside : compassImages;
+ images[i].showImage(0, rest)
}
}
diff --git a/libs/core/console.ts b/libs/core/console.ts
index a747dcfc..882e99e0 100644
--- a/libs/core/console.ts
+++ b/libs/core/console.ts
@@ -1,15 +1,51 @@
///
msg;
- this.bus.queue(ev.id, ev.eventid, ev.value);
- break;
- case "serial":
- const data = (msg).data || "";
- this.serialState.receiveData(data);
- break;
- case "radiopacket":
- const packet = msg;
- this.radioState.receivePacket(packet);
- break;
+ ensureHardwareVersion(version: number) {
+ if (version > this.hardwareVersion) {
+ this.hardwareVersion = version;
+ this.updateView();
}
}
+
initAsync(msg: SimulatorRunMessage): Promise {
super.initAsync(msg);
@@ -124,6 +124,21 @@ namespace pxsim {
const cmpDefs = msg.partDefinitions || {};
const fnArgs = msg.fnArgs;
+ const v2Parts: pxt.Map = {
+ "microphone": true,
+ "logotouch": true,
+ "builtinspeaker": true,
+ "v2": true
+ };
+ if (msg.builtinParts) {
+ const v2PartsUsed = msg.builtinParts.filter(k => v2Parts[k])
+ if (v2PartsUsed.length) {
+ console.log(`detected v2 feature`, v2PartsUsed);
+ cmpsList.push(...v2PartsUsed);
+ this.hardwareVersion = 2;
+ }
+ }
+
const opts: visuals.BoardHostOpts = {
state: this,
boardDef: boardDef,
@@ -134,6 +149,7 @@ namespace pxsim {
maxHeight: "100%",
highContrast: msg.highContrast
};
+
this.viewHost = new visuals.BoardHost(pxsim.visuals.mkBoardView({
visual: boardDef.visual,
boardDef: boardDef,
diff --git a/sim/public/icons/jacdac.svg b/sim/public/icons/jacdac.svg
new file mode 100644
index 00000000..37c092b2
--- /dev/null
+++ b/sim/public/icons/jacdac.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sim/public/sim.manifest b/sim/public/sim.manifest
index 1a7b5996..8086bbc8 100644
--- a/sim/public/sim.manifest
+++ b/sim/public/sim.manifest
@@ -1,9 +1,19 @@
CACHE MANIFEST
CACHE:
-/cdn/bluebird.min.js
/cdn/pxtsim.js
/sim/sim.js
+/sim/sounds/giggle.wav
+/sim/sounds/happy.wav
+/sim/sounds/hello.wav
+/sim/sounds/mysterious.wav
+/sim/sounds/sad.wav
+/sim/sounds/slide.wav
+/sim/sounds/soaring.wav
+/sim/sounds/spring.wav
+/sim/sounds/twinkle.wav
+/sim/sounds/yawn.wav
+
NETWORK:
*
diff --git a/sim/public/simulator.html b/sim/public/simulator.html
index 5eb83fc3..16a01a70 100644
--- a/sim/public/simulator.html
+++ b/sim/public/simulator.html
@@ -19,10 +19,22 @@ body {
margin: 0;
}
-
-
-
+
+
diff --git a/sim/public/sounds/giggle.wav b/sim/public/sounds/giggle.wav
new file mode 100644
index 00000000..5187a7ba
Binary files /dev/null and b/sim/public/sounds/giggle.wav differ
diff --git a/sim/public/sounds/happy.wav b/sim/public/sounds/happy.wav
new file mode 100644
index 00000000..1adfa1f1
Binary files /dev/null and b/sim/public/sounds/happy.wav differ
diff --git a/sim/public/sounds/hello.wav b/sim/public/sounds/hello.wav
new file mode 100644
index 00000000..ad6590dc
Binary files /dev/null and b/sim/public/sounds/hello.wav differ
diff --git a/sim/public/sounds/mysterious.wav b/sim/public/sounds/mysterious.wav
new file mode 100644
index 00000000..ad402666
Binary files /dev/null and b/sim/public/sounds/mysterious.wav differ
diff --git a/sim/public/sounds/sad.wav b/sim/public/sounds/sad.wav
new file mode 100644
index 00000000..7ed59e5a
Binary files /dev/null and b/sim/public/sounds/sad.wav differ
diff --git a/sim/public/sounds/slide.wav b/sim/public/sounds/slide.wav
new file mode 100644
index 00000000..fba1293c
Binary files /dev/null and b/sim/public/sounds/slide.wav differ
diff --git a/sim/public/sounds/soaring.wav b/sim/public/sounds/soaring.wav
new file mode 100644
index 00000000..a0b84c55
Binary files /dev/null and b/sim/public/sounds/soaring.wav differ
diff --git a/sim/public/sounds/spring.wav b/sim/public/sounds/spring.wav
new file mode 100644
index 00000000..6fa3eca9
Binary files /dev/null and b/sim/public/sounds/spring.wav differ
diff --git a/sim/public/sounds/twinkle.wav b/sim/public/sounds/twinkle.wav
new file mode 100644
index 00000000..5091e036
Binary files /dev/null and b/sim/public/sounds/twinkle.wav differ
diff --git a/sim/public/sounds/yawn.wav b/sim/public/sounds/yawn.wav
new file mode 100644
index 00000000..b3f234b1
Binary files /dev/null and b/sim/public/sounds/yawn.wav differ
diff --git a/sim/state/buttonpair.ts b/sim/state/buttonpair.ts
index 419b8d39..25992d5d 100644
--- a/sim/state/buttonpair.ts
+++ b/sim/state/buttonpair.ts
@@ -1,4 +1,14 @@
namespace pxsim.input {
+ export function onButtonEvent(button: number, buttonEvent: number, handler: RefAction): void {
+ let b = board().buttonPairState;
+ if (button == b.props.ID_BUTTON_AB && !b.usesButtonAB) {
+ b.usesButtonAB = true;
+ runtime.queueDisplayUpdate();
+ }
+ pxtcore.registerWithDal(button, buttonEvent, handler);
+ }
+
+ // Deprecated
export function onButtonPressed(button: number, handler: RefAction): void {
let b = board().buttonPairState;
if (button == b.props.ID_BUTTON_AB && !b.usesButtonAB) {
diff --git a/sim/state/compass.ts b/sim/state/compass.ts
index debf76f4..41c82c97 100644
--- a/sim/state/compass.ts
+++ b/sim/state/compass.ts
@@ -8,8 +8,22 @@ namespace pxsim.input {
return b.heading;
}
+ export function assumeCalibrationCompass(){
+ }
+
+ export function clearCalibrationCompass(){
+ }
+
+ export function isCalibratedCompass(): boolean {
+ // let b = board().compassState;
+ // return b.isCalibrated;
+ // TODO
+ return true;
+ }
+
export function magneticForce(): number {
// TODO
return 0;
}
+
}
\ No newline at end of file
diff --git a/sim/state/edgeconnector.ts b/sim/state/edgeconnector.ts
index f403a8bc..32d33e24 100644
--- a/sim/state/edgeconnector.ts
+++ b/sim/state/edgeconnector.ts
@@ -1,17 +1,27 @@
namespace pxsim.input {
+ export function onPinTouchEvent(pinId: number, pinEvent: number, handler: RefAction) {
+ let pin = getPin(pinId);
+ if (!pin) return;
+ pin.isTouched();
+ runtime.queueDisplayUpdate();
+ pxtcore.registerWithDal(pin.id, pinEvent, handler);
+ }
+
+ // Deprecated
export function onPinPressed(pinId: number, handler: RefAction) {
let pin = getPin(pinId);
if (!pin) return;
pin.isTouched();
- runtime.queueDisplayUpdate();
+ runtime.queueDisplayUpdate();
pxtcore.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_CLICK, handler);
}
+ // Deprecated
export function onPinReleased(pinId: number, handler: RefAction) {
let pin = getPin(pinId);
if (!pin) return;
pin.isTouched();
- runtime.queueDisplayUpdate();
+ runtime.queueDisplayUpdate();
pxtcore.registerWithDal(pin.id, DAL.MICROBIT_BUTTON_EVT_UP, handler);
}
@@ -95,51 +105,68 @@ namespace pxsim.pins {
}
export function analogSetPitchPin(pinId: number) {
+ const b = board();
+ if (!b) return;
let pin = getPin(pinId);
if (!pin) return;
- board().edgeConnectorState.pins.filter(p => !!p).forEach(p => p.pitch = false);
+ const ec = b.edgeConnectorState
+ ec.pins.filter(p => !!p).forEach(p => p.pitch = false);
pin.pitch = true;
}
+ export function setSoundOutputPinEnabled(enabled: boolean) {
+ const b = board();
+ if (!b) return;
+ const ec = b.edgeConnectorState
+ ec.pitchEnabled = !enabled;
+ }
+
export function analogSetPitchVolume(volume: number) {
const ec = board().edgeConnectorState;
ec.pitchVolume = Math.max(0, Math.min(0xff, volume | 0));
+ AudioContextManager.setCurrentToneGain((ec.pitchVolume / 0xff) / 10);
}
export function analogPitchVolume() {
const ec = board().edgeConnectorState;
return ec.pitchVolume;
}
-
+
export function analogPitch(frequency: number, ms: number) {
// update analog output
const b = board();
if (!b) return;
const ec = b.edgeConnectorState;
const pins = ec.pins;
- const pin = pins.filter(pin => !!pin && pin.pitch)[0] || pins[0];
+ const pin = ec.pitchEnabled && (pins.filter(pin => !!pin && pin.pitch)[0] || pins[0]);
const pitchVolume = ec.pitchVolume | 0;
- pin.mode = PinFlags.Analog | PinFlags.Output;
- if (frequency <= 0 || pitchVolume <= 0) {
- pin.value = 0;
- pin.period = 0;
- } else {
- const v = 1 << (pitchVolume >> 5);
- pin.value = v;
- pin.period = 1000000 / frequency;
+ if (pin) {
+ pin.mode = PinFlags.Analog | PinFlags.Output;
+ if (frequency <= 0 || pitchVolume <= 0) {
+ pin.value = 0;
+ pin.period = 0;
+ } else {
+ const v = 1 << (pitchVolume >> 5);
+ pin.value = v;
+ pin.period = 1000000 / frequency;
+ }
+ runtime.queueDisplayUpdate();
}
- runtime.queueDisplayUpdate();
let cb = getResume();
- const v = pitchVolume / 0xff;
- AudioContextManager.tone(frequency, v);
+ if (pin) {
+ const v = pitchVolume / 0xff;
+ AudioContextManager.tone(frequency, v / 10);
+ }
if (ms <= 0) cb();
else {
setTimeout(() => {
AudioContextManager.stop();
- pin.value = 0;
- pin.period = 0;
- pin.mode = PinFlags.Unused;
+ if (pin) {
+ pin.value = 0;
+ pin.period = 0;
+ pin.mode = PinFlags.Unused;
+ }
runtime.queueDisplayUpdate();
cb()
}, ms);
@@ -152,4 +179,18 @@ namespace pxsim.pins {
const ec = b.edgeConnectorState;
// TODO support buttons here
}
+}
+namespace pxsim.music {
+ export function setVolume(volume: number): void {
+ pxsim.pins.analogSetPitchVolume(volume);
+ }
+ export function volume(): number {
+ return pxsim.pins.analogPitchVolume();
+ }
+}
+
+namespace pxsim.pins {
+ export function setAudioPin(pinId: number) {
+ pxsim.pins.analogSetPitchPin(pinId);
+ }
}
\ No newline at end of file
diff --git a/sim/state/edgeconnectorsim.ts b/sim/state/edgeconnectorsim.ts
index 55944245..4d0264d5 100644
--- a/sim/state/edgeconnectorsim.ts
+++ b/sim/state/edgeconnectorsim.ts
@@ -87,6 +87,7 @@ namespace pxsim {
export class EdgeConnectorState {
pins: Pin[];
pitchVolume: number;
+ pitchEnabled = true;
constructor(public props: EdgeConnectorProps) {
this.pins = props.pins.map(id => id != undefined ? new Pin(id) : null);
diff --git a/sim/state/microphone.ts b/sim/state/microphone.ts
new file mode 100644
index 00000000..9872a5f5
--- /dev/null
+++ b/sim/state/microphone.ts
@@ -0,0 +1,28 @@
+// move to common packages eventually
+namespace pxsim.input {
+
+ export function soundLevel(): number {
+ const b = microphoneState();
+ if (!b) return 0;
+ b.setUsed();
+ return b.getLevel();
+ }
+
+ export function onSound(sound: number /* SoundThreshold */, body: RefAction) {
+ const b = microphoneState();
+ if (!b) return;
+ b.setUsed();
+ pxtcore.registerWithDal(b.id, sound, body);
+ }
+
+ export function setSoundThreshold(sound: number, threshold: number){
+ const b = microphoneState();
+ if (!b) return;
+ b.setUsed();
+ if (sound === 2 /* SoundThreshold.Loud */)
+ b.setHighThreshold(threshold);
+ else
+ b.setLowThreshold(threshold);
+ }
+
+}
diff --git a/sim/state/misc.ts b/sim/state/misc.ts
index 74063b9a..91fe481e 100644
--- a/sim/state/misc.ts
+++ b/sim/state/misc.ts
@@ -35,46 +35,6 @@ namespace pxsim.basic {
namespace pxsim.control {
export var inBackground = thread.runInBackground;
- export function createBuffer(sz: number) {
- return pxsim.BufferMethods.createBuffer(sz)
- }
-
- export function reset() {
- const cb = getResume();
- pxsim.runtime.restart();
- }
-
- export function waitMicros(micros: number) {
- // TODO
- }
- export function waitForEvent(id: number, evid: number) {
- const cb = getResume();
- board().bus.wait(id, evid, cb);
- }
-
- export function millis(): number {
- return runtime.runningTime();
- }
-
- export function micros(): number {
- return runtime.runningTimeUs();
- }
-
-
- export function deviceName(): string {
- let b = board();
- return b && b.id
- ? b.id.slice(0, 4)
- : "abcd";
- }
-
- export function deviceSerialNumber(): number {
- let b = board();
- return parseInt(b && b.id
- ? b.id.slice(1)
- : "42");
- }
-
export function onEvent(id: number, evid: number, handler: RefAction) {
if (id == DAL.MICROBIT_ID_BUTTON_AB) {
const b = board().buttonPairState;
@@ -86,11 +46,6 @@ namespace pxsim.control {
pxtcore.registerWithDal(id, evid, handler)
}
- export function raiseEvent(id: number, evid: number, mode: number) {
- // TODO mode?
- board().bus.queue(id, evid)
- }
-
export function eventTimestamp() {
return board().bus.getLastEventTime()
}
@@ -100,12 +55,6 @@ namespace pxsim.control {
}
}
-namespace pxsim.pxtcore {
- export function registerWithDal(id: number, evid: number, handler: RefAction) {
- board().bus.listen(id, evid, handler);
- }
-}
-
namespace pxsim.input {
export function calibrateCompass() {
// device calibrates...
@@ -168,6 +117,12 @@ namespace pxsim.pins {
export function setEvents(name: number, event: number) {
}
+
+ export function setMatrixWidth(pin: number, width: number) {
+ const lp = neopixelState(pin);
+ if (!lp) return;
+ lp.width = width;
+ }
}
namespace pxsim.devices {
@@ -246,13 +201,24 @@ namespace pxsim.bluetooth {
}
namespace pxsim.light {
+
export function sendWS2812Buffer(buffer: RefBuffer, pin: number) {
pxsim.sendBufferAsm(buffer, pin)
}
+ export function sendWS2812BufferWithBrightness(buffer: RefBuffer, pin: number, brightness: number) {
+ const clone = new RefBuffer(new Uint8Array(buffer.data))
+ const data = clone.data;
+ for(let i =0; i < data.length; ++i) {
+ data[i] = (data[i] * brightness) >> 8;
+ }
+ pxsim.sendBufferAsm(clone, pin)
+ }
+
export function setMode(pin: number, mode: number) {
const lp = neopixelState(pin);
if (!lp) return;
lp.mode = mode & 0xff;
}
+
}
diff --git a/sim/state/serial.ts b/sim/state/serial.ts
index 31cedecf..e43a2bf6 100644
--- a/sim/state/serial.ts
+++ b/sim/state/serial.ts
@@ -3,6 +3,17 @@ namespace pxsim {
export class SerialState {
serialIn: string[] = [];
+ constructor(private readonly runtime: Runtime, private readonly board: BaseBoard) {
+ this.board.addMessageListener(this.handleMessage.bind(this))
+ }
+
+ private handleMessage(msg: SimulatorMessage) {
+ if (msg.type === "serial") {
+ const data = (msg).data || "";
+ this.receiveData(data);
+ }
+ }
+
public receiveData(data: string) {
this.serialIn.push();
}
@@ -28,12 +39,6 @@ namespace pxsim {
}
}
-namespace pxsim.control {
- export function __log(s: string) {
- board().writeSerial(s + "\r\n");
- }
-}
-
namespace pxsim.serial {
export function writeString(s: string) {
board().writeSerial(s);
diff --git a/sim/state/soundexpression.ts b/sim/state/soundexpression.ts
new file mode 100644
index 00000000..7852d676
--- /dev/null
+++ b/sim/state/soundexpression.ts
@@ -0,0 +1,60 @@
+namespace pxsim.music {
+ function loadWavAsync(path: string): Promise {
+ return new Promise((resolve, reject) => {
+ let httprequest = new XMLHttpRequest();
+ httprequest.responseType = "arraybuffer";
+ httprequest.onreadystatechange = function () {
+ if (httprequest.readyState == XMLHttpRequest.DONE) {
+ if (httprequest.status == 200) {
+ const r = httprequest.response;
+ resolve(new Uint8Array(httprequest.response));
+ }
+ else {
+ reject(httprequest.status);
+ }
+ }
+ };
+ httprequest.open("GET", path, true);
+ httprequest.send();
+ })
+ }
+ const wavPromises: Map> = {}
+ //%
+ export function __playSoundExpression(notes: string, waitTillDone: boolean): void {
+ const cb = getResume();
+ const b = board();
+ // v2 only...
+ b.ensureHardwareVersion(2);
+
+ // load wav file
+ let p: Promise;
+ // defined in sim.html
+ const path = (pxsim).soundExpressionFiles[notes];
+ if (path) {
+ p = wavPromises[notes] || (wavPromises[notes] = loadWavAsync(path));
+ } else
+ p = Promise.resolve(undefined);
+
+ p.then(data => {
+ // failed to load data
+ if (data) {
+ // finally play
+ const buf = new RefBuffer(data);
+ const pp = AudioContextManager.playBufferAsync(buf)
+ if (waitTillDone)
+ // wait until sound is done
+ return pp;
+ }
+ // don't wait
+ cb();
+ return Promise.resolve();
+ }).catch((e) => {
+ console.log(e)
+ cb();
+ })
+ }
+
+ export function __stopSoundExpressions() {
+ AudioContextManager.stopAll();
+ }
+}
\ No newline at end of file
diff --git a/sim/state/storage.ts b/sim/state/storage.ts
new file mode 100644
index 00000000..92c7fa97
--- /dev/null
+++ b/sim/state/storage.ts
@@ -0,0 +1,36 @@
+
+namespace pxsim.storage {
+
+ export function putValue(key: string, value: string) : void {
+ sessionStorage.setItem('simulatorValue_'+key, value);
+ }
+
+ export function putValueInt(key: string, value: number) : void {
+ sessionStorage.setItem('simulatorValue_'+key, value+"");
+ }
+
+ export function getValue(key: string) : string {
+ if(sessionStorage.getItem('simulatorValue_'+key)) {
+ return sessionStorage.getItem('simulatorValue_'+key);
+ } else {
+ return "";
+ }
+ }
+
+ export function getValueInt(key: string) : number {
+ if(sessionStorage.getItem('simulatorValue_'+key)) {
+ return parseFloat(sessionStorage.getItem('simulatorValue_'+key));
+ } else {
+ return 0;
+ }
+ }
+
+ export function removeStr(key: string) : void {
+ sessionStorage.removeItem('simulatorValue_'+key);
+ }
+
+ export function removeInt(key: string) : void {
+ sessionStorage.removeItem('simulatorValue_'+key);
+ }
+
+}
\ No newline at end of file
diff --git a/sim/tsconfig.json b/sim/tsconfig.json
index ba44bb72..dd1e5dd0 100644
--- a/sim/tsconfig.json
+++ b/sim/tsconfig.json
@@ -1,23 +1,31 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "es2017",
"noImplicitAny": true,
"noImplicitReturns": true,
"declaration": true,
"out": "../built/sim.js",
"rootDir": ".",
"newLine": "LF",
+ "moduleResolution": "node",
"sourceMap": false,
- "lib": ["dom", "dom.iterable", "scripthost", "es6"],
- "types": ["bluebird"],
- "typeRoots": ["../node_modules/@types"]
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "scripthost",
+ "es2017"
+ ]
},
"include": [
"*.ts",
"state/*.ts",
"visuals/*.ts",
+ "../node_modules/pxt-common-packages/libs/base/sim/control.ts",
+ "../node_modules/pxt-common-packages/libs/base/sim/controlmessage.ts",
"../node_modules/pxt-common-packages/libs/core/sim/analogSensor.ts",
+ "../node_modules/pxt-common-packages/libs/microphone/sim/state.ts",
"../node_modules/pxt-common-packages/libs/core/sim/neopixel.ts",
- "../node_modules/pxt-common-packages/libs/radio/sim/*.ts"
+ "../node_modules/pxt-common-packages/libs/radio/sim/*.ts",
+ "../node_modules/pxt-common-packages/libs/settings/sim/*.ts"
]
}
diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts
index f1c76eb2..15629386 100644
--- a/sim/visuals/microbit.ts
+++ b/sim/visuals/microbit.ts
@@ -8,10 +8,15 @@ namespace pxsim.visuals {
-webkit-filter: grayscale(1);
filter: grayscale(1);
}
+ .sim-button-group {
+ cursor: pointer;
+ }
.sim-button {
pointer-events: none;
}
-
+ .sim-board, .sim-display, sim-button {
+ fill: #111;
+ }
.sim-button-outer:hover {
stroke:grey;
stroke-width: 3px;
@@ -59,20 +64,21 @@ namespace pxsim.visuals {
}
.sim-text {
- font-family:"Lucida Console", Monaco, monospace;
- font-size:14px;
- fill:#fff;
- pointer-events: none; user-select: none;
- }
- .sim-text.inverted {
- fill:#000;
+ font-family:"Lucida Console", Monaco, monospace;
+ font-size:14px;
+ fill:#fff;
+ pointer-events: none; user-select: none;
}
.sim-text-pin {
- font-family:"Lucida Console", Monaco, monospace;
- font-size:20px;
- fill:#3cb5b5;
- pointer-events: none;
+ font-family:"Lucida Console", Monaco, monospace;
+ pointer-events: none; user-select: none;
+ fill:#3cb5b5;
+ font-size:24px;
+ stroke:#fff;
+ stroke-alignment: outside;
+ paint-order: stroke;
+ stroke-width: 3px;
}
.sim-thermometer {
@@ -84,6 +90,22 @@ namespace pxsim.visuals {
r:8px;
}
+ .inverted {
+ fill:#000;
+ stroke:#fff;
+ stroke-alignment: outside;
+ paint-order: stroke;
+ stroke-width: 3px;
+ }
+ .big {
+ font-size:24px;
+ font-weight: bold;
+ }
+ .centered {
+ transform: translateX(-1.5ch);
+ text-align: center;
+ }
+
/* animations */
.sim-theme-glow {
animation-name: sim-theme-glow-animation;
@@ -686,6 +708,8 @@ namespace pxsim.visuals {
virtualButtonDown?: string;
lightLevelOn?: string;
lightLevelOff?: string;
+ soundLevelOn?: string;
+ soundLevelOff?: string;
}
export var themes: IBoardTheme[] = ["#3ADCFE"].map(accent => {
@@ -702,8 +726,10 @@ namespace pxsim.visuals {
virtualButtonDown: "#FFA500",
virtualButtonOuter: "#333",
virtualButtonUp: "#fff",
- lightLevelOn: "yellow",
- lightLevelOff: "#555"
+ lightLevelOn: "#555",
+ lightLevelOff: "yellow",
+ soundLevelOn: "#3ADCFE",
+ soundLevelOff: "#555"
}
});
@@ -723,14 +749,24 @@ namespace pxsim.visuals {
private style: SVGStyleElement;
private defs: SVGDefsElement;
private g: SVGGElement;
-
+ private pkg: SVGPathElement;
+ private logos: SVGElement[];
+ private headg: SVGGElement;
+ private head: SVGGElement;
+ private headParts: SVGElement;
+ private headInitialized = false;
+ private heads: SVGElement[];
+ private headText: SVGTextElement;
+ private display: SVGElement;
private buttons: SVGElement[];
private buttonsOuter: SVGElement[];
+ private buttonABText: SVGTextElement;
private pins: SVGElement[];
private pinGradients: SVGLinearGradientElement[];
private pinTexts:{ [key: number]: SVGTextElement };
private ledsOuter: SVGElement[];
private leds: SVGElement[];
+ private microphoneLed: SVGElement;
private systemLed: SVGCircleElement;
private antenna: SVGPolylineElement;
private rssi: SVGTextElement;
@@ -740,8 +776,14 @@ namespace pxsim.visuals {
private thermometerGradient: SVGLinearGradientElement;
private thermometer: SVGRectElement;
private thermometerText: SVGTextElement;
+ private soundLevelGradient: SVGLinearGradientElement;
+ private soundLevel: SVGRectElement;
+ private soundLevelText: SVGTextElement;
+ private soundLevelIcon: SVGTextElement;
private shakeButton: SVGElement;
+ private shakeText: SVGTextElement;
public board: pxsim.DalBoard;
+ private domHardwareVersion = 1;
private rgbLed: SVGElement;
private pinNmToCoord: Map = {
"EXT_PWR": [
@@ -1008,7 +1050,7 @@ namespace pxsim.visuals {
this.pinGradients.forEach(lg => svg.setGradientColors(lg, theme.pin, theme.pinActive));
svg.setGradientColors(this.lightLevelGradient, theme.lightLevelOn, theme.lightLevelOff);
-
+ svg.setGradientColors(this.soundLevelGradient, theme.soundLevelOff, theme.soundLevelOn);
svg.setGradientColors(this.thermometerGradient, theme.ledOff, theme.ledOn);
}
@@ -1017,6 +1059,18 @@ namespace pxsim.visuals {
if (!state) return;
let theme = this.props.theme;
+ this.updateMicrophone();
+ this.updatePins();
+ this.updateTilt();
+ this.updateHeading();
+ this.updateLightLevel();
+ this.updateTemperature();
+ this.updateButtonAB();
+ this.updateGestures();
+ this.updateRgbLed();
+ this.updateSpeaker();
+ this.updateRSSI();
+
let bpState = state.buttonPairState;
let buttons = [bpState.aBtn, bpState.bBtn, bpState.abBtn];
buttons.forEach((btn, index) => {
@@ -1046,16 +1100,7 @@ namespace pxsim.visuals {
}
})
}
- this.updatePins();
- this.updateTilt();
- this.updateHeading();
- this.updateLightLevel();
- this.updateTemperature();
- this.updateButtonAB();
- this.updateGestures();
- this.updateRgbLed();
- this.updateSpeaker();
- this.updateRSSI();
+
if (!runtime || runtime.dead) U.addClass(this.element, "grayscale");
else U.removeClass(this.element, "grayscale");
@@ -1090,7 +1135,7 @@ namespace pxsim.visuals {
private updateGestures() {
let state = this.board;
if (state.accelerometerState.useShake && !this.shakeButton) {
- let shake = this.mkBtn(26, MB_HEIGHT - 45);
+ let shake = this.mkBtn(280, MB_HEIGHT - 45);
this.shakeButton = shake.inner;
svg.fill(this.shakeButton, this.props.theme.virtualButtonUp)
svg.buttonEvents(shake.outer,
@@ -1103,11 +1148,17 @@ namespace pxsim.visuals {
this.board.bus.queue(DAL.MICROBIT_ID_GESTURE, 11); // GESTURE_SHAKE
}
)
- let shakeText = svg.child(shake.outer, "text", { x: 15, y: MB_HEIGHT - 10, class: "sim-text inverted" }) as SVGTextElement;
+ let shakeText = svg.child(shake.outer, "text", { x: 280, y: MB_HEIGHT - 5, class: "sim-text big inverted centered" }) as SVGTextElement;
shakeText.textContent = "SHAKE"
}
}
+ private updateMicrophone() {
+ const b = board();
+ if (!b || !b.microphoneState.sensorUsed) return;
+ this.updateSoundLevel();
+ }
+
private updateButtonAB() {
let state = this.board;
if (state.buttonPairState.usesButtonAB && (this.buttons[2]).style.visibility != "visible") {
@@ -1158,7 +1209,7 @@ namespace pxsim.visuals {
}
else if (pin.mode & PinFlags.Touch) {
v = pin.touched ? "0%" : "100%";
- if (text) text.textContent = "";
+ if (text) text.textContent = v;
} else {
v = "100%";
if (text) text.textContent = "";
@@ -1185,65 +1236,218 @@ namespace pxsim.visuals {
if (!this.thermometer) {
let gid = "gradient-thermometer";
this.thermometerGradient = svg.linearGradient(this.defs, gid);
- const ty = MB_HEIGHT - 180;
+ const ty = MB_HEIGHT - 200;
this.thermometer = svg.child(this.g, "rect", {
class: "sim-thermometer",
- x: 28,
+ x: 0,
y: ty,
- width: 10,
- height: 80,
- rx: 5, ry: 5,
+ width: 30,
+ height: 160,
+ rx: 5,
+ ry: 5,
fill: `url(#${gid})`
});
this.thermometerText = svg.child(this.g, "text", {
- class: 'sim-text',
- x: 48, y: ty + 78
+ class: 'sim-text big inverted centered',
+ x: 15,
+ y: ty + 190
}) as SVGTextElement;
this.updateTheme();
let pt = this.element.createSVGPoint();
svg.buttonEvents(this.thermometer,
+ // move
(ev) => {
let cur = svg.cursorPoint(pt, this.element, ev);
- let t = Math.max(0, Math.min(1, (cur.y - ty - 5) / 70))
+ let t = Math.max(0, Math.min(1, (cur.y - ty) / 160))
state.thermometerState.temperature = Math.floor(tmax - t * (tmax - tmin));
this.updateTemperature();
- }, ev => { }, ev => { })
+ },
+ // start
+ ev => { },
+ // stop
+ ev => { },
+ // keydown
+ (ev) => {
+ let charCode = (typeof ev.which == "number") ? ev.which : ev.keyCode
+ if (charCode === 40 || charCode === 37) { // Down/Left arrow
+ state.thermometerState.temperature--;
+ if(state.thermometerState.temperature < tmin) state.thermometerState.temperature = tmin;
+ this.updateTemperature();
+ } else if (charCode === 38 || charCode === 39) { // Up/Right arrow
+ state.thermometerState.temperature++
+ if(state.thermometerState.temperature > tmax) state.thermometerState.temperature = tmax;
+ this.updateTemperature();
+ }
+ })
}
+ accessibility.makeFocusable(this.thermometer);
+ accessibility.setAria(this.thermometer, "slider", pxsim.localization.lf("Temperature Level"));
+ this.thermometer.setAttribute("aria-valuemin", tmin + "");
+ this.thermometer.setAttribute("aria-valuemax", tmax + "");
+ this.thermometer.setAttribute("aria-orientation", "vertical");
+ this.thermometer.setAttribute("aria-valuenow", state.thermometerState.temperature + "");
+ this.thermometer.setAttribute("aria-valuetext", state.thermometerState.temperature + "");
+
let t = Math.max(tmin, Math.min(tmax, state.thermometerState.temperature))
let per = Math.floor((state.thermometerState.temperature - tmin) / (tmax - tmin) * 100)
svg.setGradientValue(this.thermometerGradient, 100 - per + "%");
this.thermometerText.textContent = t + "°C";
+ this.thermometer.setAttribute("aria-valuenow", t.toString());
+ this.thermometer.setAttribute("aria-valuetext", t + "°C");
+ accessibility.setLiveContent(t + "°C");
+ }
+
+ private updateSoundLevel() {
+ let state = this.board;
+ if (!state || !state.microphoneState.sensorUsed) return;
+
+ const tmin = 0 // state.microphoneState.min;
+ const tmax = 255 //state.microphoneState.max;
+ if (!this.soundLevel) {
+ const level = state.microphoneState.getLevel();
+ let gid = "gradient-soundlevel";
+ this.soundLevelGradient = svg.linearGradient(this.defs, gid);
+ const ty = MB_HEIGHT - 200;
+ this.soundLevel = svg.child(this.g, "rect", {
+ class: "sim-thermometer",
+ x: 490,
+ y: ty,
+ width: 30,
+ height: 160,
+ rx: 5,
+ ry: 5,
+ fill: `url(#${gid})`
+ });
+ this.soundLevelText = svg.child(this.g, "text", {
+ class: 'sim-text big inverted centered',
+ x: 505,
+ y: ty + 190
+ }) as SVGTextElement;
+ this.soundLevelIcon = svg.child(this.g, "svg", {
+ x: 495,
+ y: 400,
+ viewbox: "0 0 20 29",
+ role: "img",
+ }) as SVGTextElement;
+ this.soundLevelIcon.setAttribute("aria-hidden", "true");
+ this.soundLevelIcon.setAttribute("focusable", "false");
+ this.soundLevelIcon.setAttribute("style", "pointer-events: none; opacity: 0.8; width: 20px;");
+ svg.child(this.soundLevelIcon, "path", {
+ fill: "white",
+ d: "M 10 19.9375 C 13.011719 19.9375 15.453125 17.503906 15.453125 14.5 L 15.453125 5.4375 C 15.453125 2.433594 13.011719 0 10 0 C 6.988281 0 4.546875 2.433594 4.546875 5.4375 L 4.546875 14.5 C 4.546875 17.503906 6.988281 19.9375 10 19.9375 Z M 19.089844 10.875 L 18.183594 10.875 C 17.679688 10.875 17.273438 11.28125 17.273438 11.78125 L 17.273438 14.5 C 17.273438 18.738281 13.609375 22.136719 9.273438 21.714844 C 5.496094 21.347656 2.726562 17.960938 2.726562 14.175781 L 2.726562 11.78125 C 2.726562 11.28125 2.320312 10.875 1.816406 10.875 L 0.910156 10.875 C 0.40625 10.875 0 11.28125 0 11.78125 L 0 14.054688 C 0 19.132812 3.632812 23.660156 8.636719 24.347656 L 8.636719 26.28125 L 5.453125 26.28125 C 4.953125 26.28125 4.546875 26.6875 4.546875 27.1875 L 4.546875 28.09375 C 4.546875 28.59375 4.953125 29 5.453125 29 L 14.546875 29 C 15.046875 29 15.453125 28.59375 15.453125 28.09375 L 15.453125 27.1875 C 15.453125 26.6875 15.046875 26.28125 14.546875 26.28125 L 11.363281 26.28125 L 11.363281 24.367188 C 16.234375 23.703125 20 19.535156 20 14.5 L 20 11.78125 C 20 11.28125 19.59375 10.875 19.089844 10.875 Z M 19.089844 10.875 "
+ });
+ if (this.props.runtime)
+ this.props.runtime.environmentGlobals[pxsim.localization.lf("sound level")] = state.microphoneState.getLevel();
+ this.updateTheme();
+
+ let pt = this.element.createSVGPoint();
+ svg.buttonEvents(this.soundLevel,
+ // move
+ (ev) => {
+ let cur = svg.cursorPoint(pt, this.element, ev);
+ let t = Math.max(0, Math.min(1, (cur.y - ty) / 160)) * tmax
+ console.log(tmax - t);
+ state.microphoneState.setLevel( Math.floor(tmax - t));
+ // state.microphoneState.setLevel(Math.floor(tmin + t * (tmax - tmin)));
+ this.updateMicrophone();
+ },
+ // start
+ ev => { },
+ // stop
+ ev => { },
+ // keydown
+ (ev) => {
+ let charCode = (typeof ev.which == "number") ? ev.which : ev.keyCode
+ if (charCode === 40 || charCode === 37) { // Down/Left arrow
+ state.microphoneState.setLevel(state.microphoneState.getLevel() - 1);
+ if(state.microphoneState.getLevel() < tmin) state.microphoneState.setLevel(tmin);
+ this.updateMicrophone();
+ } else if (charCode === 38 || charCode === 39) { // Up/Right arrow
+ state.microphoneState.setLevel(state.microphoneState.getLevel() + 1);
+ if(state.microphoneState.getLevel() > tmax) state.microphoneState.setLevel(tmax);
+ this.updateMicrophone();
+ }
+ })
+
+ accessibility.makeFocusable(this.soundLevel);
+ accessibility.setAria(this.soundLevel, "slider", pxsim.localization.lf("Sound Level"));
+ this.soundLevel.setAttribute("aria-valuemin", tmin + "");
+ this.soundLevel.setAttribute("aria-valuemax", tmax + "");
+ this.soundLevel.setAttribute("aria-orientation", "vertical");
+ this.soundLevel.setAttribute("aria-valuenow", level + "");
+ this.soundLevel.setAttribute("aria-valuetext", level + "");
+ }
+
+ let t = Math.max(tmin, Math.min(tmax, state.microphoneState.getLevel()))
+ let per = Math.floor((state.microphoneState.getLevel() - tmin) / (tmax - tmin) * 100)
+ svg.setGradientValue(this.soundLevelGradient, (100 - per) + "%");
+ this.soundLevelText.textContent = t + "";
+ this.soundLevel.setAttribute("aria-valuenow", t.toString());
+ this.soundLevel.setAttribute("aria-valuetext", t + "");
+ accessibility.setLiveContent(t + "");
}
private updateHeading() {
- let xc = 258;
+ const valMin = 0;
+ const valMax = 360;
+ let xc = 501.2;
let yc = 75;
let state = this.board;
if (!state || !state.compassState.usesHeading) return;
- /*
+ // /*
if (!this.headInitialized) {
- let p = this.head.firstChild.nextSibling as SVGPathElement;
- p.setAttribute("d", "m269.9,50.134647l0,0l-39.5,0l0,0c-14.1,0.1 -24.6,10.7 -24.6,24.8c0,13.9 10.4,24.4 24.3,24.7l0,0l39.6,0c14.2,0 40.36034,-22.97069 40.36034,-24.85394c0,-1.88326 -26.06034,-24.54606 -40.16034,-24.64606m-0.2,39l0,0l-39.3,0c-7.7,-0.1 -14,-6.4 -14,-14.2c0,-7.8 6.4,-14.2 14.2,-14.2l39.1,0c7.8,0 14.2,6.4 14.2,14.2c0,7.9 -6.4,14.2 -14.2,14.2l0,0l0,0z");
+ let p = this.heads[1];
+ svg.child(p, "circle", {style: "fill:#DDDDDD55;stroke:#3A3A3A;", cx: "501.2", cy: "75", r: "55" });
+ svg.child(p, "polyline", {style: "fill:#008EEF;stroke:#3A3A3A;", points: "517.7,75 501.1,140.2 484.6,75" });
+ svg.child(p, "polyline", {style: "fill:#FF3951;stroke:#3A3A3A;", points: "484.6,75 501.1,9.5 517.7,75" });
+ svg.child(p, "circle", {style: "fill:#748476;stroke:#3A3A3A;", cx: "501.1", cy: "75", r: "16.5" });
+ svg.child(p, "circle", {style: "fill:#CCDBCE;", cx: "501.1", cy: "75", r: "10" });
+ // p.setAttribute("d", "m269.9,50.134647l0,0l-39.5,0l0,0c-14.1,0.1 -24.6,10.7 -24.6,24.8c0,13.9 10.4,24.4 24.3,24.7l0,0l39.6,0c14.2,0 40.36034,-22.97069 40.36034,-24.85394c0,-1.88326 -26.06034,-24.54606 -40.16034,-24.64606m-0.2,39l0,0l-39.3,0c-7.7,-0.1 -14,-6.4 -14,-14.2c0,-7.8 6.4,-14.2 14.2,-14.2l39.1,0c7.8,0 14.2,6.4 14.2,14.2c0,7.9 -6.4,14.2 -14.2,14.2l0,0l0,0z");
this.updateTheme();
let pt = this.element.createSVGPoint();
- svg.buttonEvents(
- this.head,
+ svg.buttonEvents(this.head,
+ // move
(ev: MouseEvent) => {
let cur = svg.cursorPoint(pt, this.element, ev);
- state.compassState.heading = Math.floor(Math.atan2(cur.y - yc, cur.x - xc) * 180 / Math.PI + 90);
- if (state.compassState.heading < 0) state.compassState.heading += 360;
+ state.compassState.heading = valMax - (Math.floor(Math.atan2(cur.y - yc, cur.x - xc) * 180 / Math.PI) + 90) - valMax;
+ if (state.compassState.heading < valMin) state.compassState.heading += valMax;
this.updateHeading();
+ },
+ // start
+ ev => { },
+ // stop
+ ev => { },
+ // keydown
+ ev => {
+ let charCode = (typeof ev.which == "number") ? ev.which : ev.keyCode
+ if (charCode === 40 || charCode === 37) { // Down/Left arrow
+ state.compassState.heading--;
+ if(state.compassState.heading < valMin) state.compassState.heading += valMax;
+ this.updateHeading();
+ } else if (charCode === 38 || charCode === 39) { // Up/Right arrow
+ state.compassState.heading++;
+ if(state.compassState.heading >= valMax) state.compassState.heading -= valMax;;
+ this.updateHeading();
+ }
});
this.headInitialized = true;
}
+ accessibility.makeFocusable(this.head);
+ accessibility.setAria(this.head, "slider", pxsim.localization.lf("Heading"));
+ this.head.setAttribute("aria-valuemin", valMin + "");
+ this.head.setAttribute("aria-valuemax", valMax + "");
+ this.head.setAttribute("aria-orientation", "vertical");
+ this.head.setAttribute("aria-valuenow", state.compassState.heading + "");
+ this.head.setAttribute("aria-valuetext", state.compassState.heading + "");
+
let txt = state.compassState.heading.toString() + "°";
if (txt != this.headText.textContent) {
- svg.rotateElement(this.head, xc, yc, state.compassState.heading + 180);
+ svg.rotateElement(this.head, xc, yc, valMax - state.compassState.heading - 90);
this.headText.textContent = txt;
- } */
+ }
}
private lastFlashTime: number = 0;
@@ -1282,46 +1486,77 @@ namespace pxsim.visuals {
private updateLightLevel() {
let state = this.board;
+ const valMin = 0;
+ const valMax = 255;
if (!state || !state.lightSensorState.usesLightLevel) return;
if (!this.lightLevelButton) {
let gid = "gradient-light-level";
this.lightLevelGradient = svg.linearGradient(this.defs, gid)
- const cx = 30;
- const cy = 45;
- const r = 20;
+ const cx = 25;
+ const cy = 75;
+ const r = 55;
+
this.lightLevelButton = svg.child(this.g, "circle", {
cx: `${cx}px`, cy: `${cy}px`, r: `${r}px`,
class: 'sim-light-level-button',
fill: `url(#${gid})`
}) as SVGCircleElement;
let pt = this.element.createSVGPoint();
+
svg.buttonEvents(this.lightLevelButton,
+ // move
(ev) => {
let pos = svg.cursorPoint(pt, this.element, ev);
let rs = r / 2;
- let level = Math.max(0, Math.min(255, Math.floor((pos.y - (cy - rs)) / (2 * rs) * 255)));
- if (level != this.board.lightSensorState.lightLevel) {
- this.board.lightSensorState.lightLevel = level;
+ let level = valMax - Math.max(valMin, Math.min(valMax, Math.floor((pos.y - (cy - r)) / (2 * r) * valMax)));
+
+ if (level != state.lightSensorState.lightLevel) {
+ state.lightSensorState.lightLevel = level;
this.applyLightLevel();
}
- }, ev => { },
- ev => { })
- this.lightLevelText = svg.child(this.g, "text", { x: cx - r - 7, y: cy + r + 8, text: '', class: 'sim-text inverted' }) as SVGTextElement;
+ },
+ // start
+ ev => { },
+ // stop
+ ev => { },
+ // keydown
+ ev => {
+ let charCode = (typeof ev.which == "number") ? ev.which : ev.keyCode
+ if (charCode === 40 || charCode === 37) { // Down/Left arrow
+ state.lightSensorState.lightLevel--;
+ if(state.lightSensorState.lightLevel < valMin) state.lightSensorState.lightLevel = valMin;
+ this.applyLightLevel();
+ } else if (charCode === 38 || charCode === 39) { // Up/Right arrow
+ state.lightSensorState.lightLevel++
+ if(state.lightSensorState.lightLevel > valMax) state.lightSensorState.lightLevel = valMax;
+ this.applyLightLevel();
+ }
+ })
+ this.lightLevelText = svg.child(this.g, "text", { x: cx , y: cy + r + 35, text: '', class: 'sim-text inverted big centered' }) as SVGTextElement;
this.updateTheme();
}
- svg.setGradientValue(this.lightLevelGradient, Math.min(100, Math.max(0, Math.floor(state.lightSensorState.lightLevel * 100 / 255))) + '%')
+ accessibility.makeFocusable(this.lightLevelButton);
+ accessibility.setAria(this.lightLevelButton, "slider", pxsim.localization.lf("Light Level"));
+ this.lightLevelButton.setAttribute("aria-valuemin", valMin + "");
+ this.lightLevelButton.setAttribute("aria-valuemax", valMax + "");
+ this.lightLevelButton.setAttribute("aria-orientation", "vertical");
+ this.lightLevelButton.setAttribute("aria-valuenow", state.lightSensorState.lightLevel + "");
+ this.lightLevelButton.setAttribute("aria-valuetext", state.lightSensorState.lightLevel + "");
+
+ svg.setGradientValue(this.lightLevelGradient, Math.min(100, Math.max(0, Math.floor((255 - state.lightSensorState.lightLevel) * 100 / 255))) + '%')
this.lightLevelText.textContent = state.lightSensorState.lightLevel.toString();
}
private applyLightLevel() {
let lv = this.board.lightSensorState.lightLevel;
- svg.setGradientValue(this.lightLevelGradient, Math.min(100, Math.max(0, Math.floor(lv * 100 / 255))) + '%')
+ svg.setGradientValue(this.lightLevelGradient, Math.min(100, Math.max(0, Math.floor((255 - lv) * 100 / 255))) + '%')
this.lightLevelText.textContent = lv.toString();
}
private updateTilt() {
+ return;
if (this.props.disableTilt) return;
let state = this.board;
if (!state || !state.accelerometerState.accelerometer.isActive) return;
@@ -1347,6 +1582,7 @@ namespace pxsim.visuals {
"y": "0px",
"width": MB_WIDTH + "px",
"height": MB_HEIGHT + "px",
+ "fill": "rgba(0,0,0,0)"
});
this.style = svg.child(this.element, "style", {});
this.style.textContent = MB_STYLE;
@@ -1356,6 +1592,15 @@ namespace pxsim.visuals {
this.element.appendChild(this.g);
// filters
+ let ledglow = svg.child(this.defs, "filter", { id: "ledglow", x: "-75%", y: "-75%", width: "300%", height: "300%" });
+ svg.child(ledglow, "feMorphology", { operator: "dilate", radius: "4", in: "SourceAlpha", result: "thicken" });
+ svg.child(ledglow, "feGaussianBlur", { stdDeviation: "5", in: "thicken", result: "blurred" });
+ svg.child(ledglow, "feFlood", { "flood-color": "rgb(255, 17, 77)", result: "glowColor" });
+ svg.child(ledglow, "feComposite", { in: "glowColor", in2: "blurred", operator: "in", result: "ledglow_colored" });
+ let ledglowMerge = svg.child(ledglow, "feMerge", {});
+ svg.child(ledglowMerge, "feMergeNode", { in: "ledglow_colored" });
+ svg.child(ledglowMerge, "feMergeNode", { in: "SourceGraphic" });
+
let glow = svg.child(this.defs, "filter", { id: "filterglow", x: "-5%", y: "-5%", width: "120%", height: "120%" });
svg.child(glow, "feGaussianBlur", { stdDeviation: "5", result: "glow" });
let merge = svg.child(glow, "feMerge", {});
@@ -1368,24 +1613,42 @@ namespace pxsim.visuals {
const top = Number(this.element.getElementById("LED_0_0").getAttribute("y"));
const ledoffw = Number(this.element.getElementById("LED_1_0").getAttribute("x"))-left;
const ledoffh = Number(this.element.getElementById("LED_0_1").getAttribute("y"))-top;
- const ledw = 5.1;
- const ledh = 12.9;
+ // const ledw = 5.1;
+ // const ledh = 12.9;
for (let i = 0; i < 5; ++i) {
let ledtop = i * ledoffh + top;
for (let j = 0; j < 5; ++j) {
let ledleft = j * ledoffw + left;
let k = i * 5 + j;
- this.ledsOuter.push(svg.child(this.g, "rect", { class: "sim-led-back", x: ledleft, y: ledtop, width: ledw, height: ledh }));
- this.leds.push(svg.child(this.g, "rect", { class: "sim-led", x: ledleft - 1, y: ledtop - 1, width: ledw + 2, height: ledh + 2, rx: 2, ry: 2, title: `(${j},${i})` }));
+ this.ledsOuter.push(svg.child(this.g, "rect", { class: "sim-led-back", x: ledleft, y: ledtop, width: 10, height: 20, rx: 2, ry: 2 }));
+ let led = svg.child(this.g, "rect", { class: "sim-led", x: ledleft - 2, y: ledtop - 2, width: 14, height: 24, rx: 3, ry: 3, title: `(${j},${i})` });
+ svg.filter(led, `url(#ledglow)`)
+ this.leds.push(led);
}
}
+
+ // head
+ // this.headg = svg.child(this.g, "g", { style: "transform: translate(100px, 0px);" });
+ this.head = svg.child(this.g, "g", { class: "sim-head" });
+ svg.child(this.head, "circle", { cx: 501.2, cy: 75, r: 100, fill: "transparent" })
+ this.headParts = svg.child(this.head, "g", { class: "sim-button-outer sim-button-group" });
+ this.heads = []
+ // background
+ this.heads.push(svg.path(this.headParts, "sim-button",""));
+ // shapes
+ this.heads.push(svg.child(this.headParts, "g", { class: "sim-theme" }));
+ // this.heads.push(svg.path(this.headParts, "sim-theme", "M230.6,69.7c-2.9,0-5.3,2.4-5.3,5.3c0,2.9,2.4,5.3,5.3,5.3c2.9,0,5.3-2.4,5.3-5.3C235.9,72.1,233.5,69.7,230.6,69.7"));
+ // this.heads.push(svg.path(this.headParts, "sim-theme", "M269.7,80.3c2.9,0,5.3-2.4,5.3-5.3c0-2.9-2.4-5.3-5.3-5.3c-2.9,0-5.3,2.4-5.3,5.3C264.4,77.9,266.8,80.3,269.7,80.3"));
+ this.headText = svg.child(this.g, "text", { x: 500, y: 165, class: "sim-text inverted big centered" })
+
// https://www.microbit.co.uk/device/pins
// P0, P1, P2
this.pins = pinNames.map(n => {
let p = this.element.getElementById(n) as SVGElement;
if(!p) console.log("missing "+n);
U.addClass(p, "sim-pin");
+ // console.log(p);
return p;
});
@@ -1398,11 +1661,18 @@ namespace pxsim.visuals {
return lg;
})
+ // this.pinTexts = [
+ // [-20, 340],
+ // [50, 495],
+ // [450, 495],
+ // [500, 340]
+ // ].map(p => svg.child(this.g, "text", { class: "sim-text-pin", x: p[0], y: p[1] }));
+
this.pinTexts = {
- [DigitalPin.P0]: svg.child(this.g, "text", { class: "sim-text-pin", x: -20, y: 340 }),
- [DigitalPin.P1]: svg.child(this.g, "text", { class: "sim-text-pin", x: 50, y: 495 }),
- [DigitalPin.P2]: svg.child(this.g, "text", { class: "sim-text-pin", x: 450, y: 495 }),
- [DigitalPin.P3]: svg.child(this.g, "text", { class: "sim-text-pin", x: 500, y: 340 })
+ [DigitalPin.P0]: svg.child(this.g, "text", { class: "sim-text-pin big centered", x: 20, y: 315 }),
+ [DigitalPin.P1]: svg.child(this.g, "text", { class: "sim-text-pin big centered", x: 135, y: 530 }),
+ [DigitalPin.P2]: svg.child(this.g, "text", { class: "sim-text-pin big centered", x: 395, y: 530 }),
+ [DigitalPin.P3]: svg.child(this.g, "text", { class: "sim-text-pin big centered", x: 535, y: 315 })
}
// BTN A, B
@@ -1421,8 +1691,8 @@ namespace pxsim.visuals {
return button;
}
- let ab = outerBtn(69, MB_HEIGHT - 45);
- let abtext = svg.child(ab.outer, "text", { x: 67, y: MB_HEIGHT - 10, class: "sim-text inverted" }) as SVGTextElement;
+ let ab = outerBtn(210, MB_HEIGHT - 45);
+ let abtext = svg.child(ab.outer, "text", { x: 210, y: MB_HEIGHT - 5, class: "sim-text big inverted centered" }) as SVGTextElement;
abtext.textContent = "A+B";
(this.buttonsOuter[2]).style.visibility = "hidden";
(this.buttons[2]).style.visibility = "hidden";
@@ -1453,15 +1723,31 @@ namespace pxsim.visuals {
}
private attachEvents() {
+ this.attachIFrameEvents();
+ this.attachAccelerometerEvents();
+ this.attachPinsIOEvents();
+ this.attachPinsTouchEvents();
+ this.attachABEvents();
+ this.attachAPlusBEvents();
+ }
+
+ private attachIFrameEvents() {
Runtime.messagePosted = (msg) => {
switch (msg.type || "") {
case "serial": this.flashSystemLed(); break;
case "radiopacket": this.flashAntenna(); break;
+ case "eventbus":
+ if ((msg).id == DAL.MES_BROADCAST_GENERAL_ID)
+ this.flashAntenna();
+ break;
}
}
- let tiltDecayer = 0;
+ }
+
+ private attachAccelerometerEvents() {
+ let tiltDecayer: any = undefined;
this.element.addEventListener(pointerEvents.move, (ev: MouseEvent) => {
- let state = this.board;
+ const state = this.board;
if (!state.accelerometerState.accelerometer.isActive) return;
if (tiltDecayer) {
@@ -1469,14 +1755,19 @@ namespace pxsim.visuals {
tiltDecayer = 0;
}
- let bbox = this.element.getBoundingClientRect();
- let ax = (ev.clientX - bbox.width / 2) / (bbox.width / 3);
- let ay = (ev.clientY - bbox.height / 2) / (bbox.height / 3);
+ const bbox = this.element.getBoundingClientRect();
- let x = - Math.max(- 1023, Math.min(1023, Math.floor(ax * 1023)));
- let y = - Math.max(- 1023, Math.min(1023, Math.floor(ay * 1023)));
- let z2 = 1023 * 1023 - x * x - y * y;
- let z = Math.floor((z2 > 0 ? -1 : 1) * Math.sqrt(Math.abs(z2)));
+ // ev.clientX and ev.clientY are not defined on mobile iOS
+ const xPos = ev.clientX != null ? ev.clientX : ev.pageX;
+ const yPos = ev.clientY != null ? ev.clientY : ev.pageY;
+
+ const ax = (xPos - bbox.width / 2) / (bbox.width / 3);
+ const ay = (yPos - bbox.height / 2) / (bbox.height / 3);
+
+ const x = - Math.max(- 1023, Math.min(1023, Math.floor(ax * 1023)));
+ const y = - Math.max(- 1023, Math.min(1023, Math.floor(ay * 1023)));
+ const z2 = 1023 * 1023 - x * x - y * y;
+ const z = Math.floor((z2 > 0 ? -1 : 1) * Math.sqrt(Math.abs(z2)));
state.accelerometerState.accelerometer.update(x, y, z);
this.updateTilt();
@@ -1504,10 +1795,15 @@ namespace pxsim.visuals {
}, 50)
}
}, false);
+ }
- this.pins.forEach((pin, index) => {
+ private attachPinsIOEvents() {
+ this.pins.slice(2, 6).forEach((pin, index) => {
+ // var index = i + 2;
if (!this.board.edgeConnectorState.pins[index]) return;
let pt = this.element.createSVGPoint();
+ let xpos = (index === 0 || index === 3) ? 300 : 520;
+ let vMax = (index === 0 || index === 3) ? 1 : 1032;
svg.buttonEvents(pin,
// move
ev => {
@@ -1516,8 +1812,8 @@ namespace pxsim.visuals {
let svgpin = this.pins[index];
if (pin.mode & PinFlags.Input) {
let cursor = svg.cursorPoint(pt, this.element, ev);
- let v = (400 - cursor.y) / 40 * 1023
- pin.value = Math.max(0, Math.min(1023, Math.floor(v)));
+ let v = (xpos - cursor.y) / 70 * (vMax + 1);
+ pin.value = Math.max(0, Math.min(vMax, Math.floor(v)));
}
this.updatePin(pin, index);
},
@@ -1529,8 +1825,8 @@ namespace pxsim.visuals {
U.addClass(svgpin, "touched");
if (pin.mode & PinFlags.Input) {
let cursor = svg.cursorPoint(pt, this.element, ev);
- let v = (400 - cursor.y) / 40 * 1023
- pin.value = Math.max(0, Math.min(1023, Math.floor(v)));
+ let v = (xpos - cursor.y) / 70 * (vMax + 1);
+ pin.value = Math.max(0, Math.min(vMax, Math.floor(v)));
}
this.updatePin(pin, index);
},
@@ -1542,82 +1838,154 @@ namespace pxsim.visuals {
U.removeClass(svgpin, "touched");
this.updatePin(pin, index);
return false;
+ },
+ // keydown
+ (ev: KeyboardEvent) => {
+ let charCode = (typeof ev.which == "number") ? ev.which : ev.keyCode
+ let state = this.board;
+ let pin = state.edgeConnectorState.pins[index];
+
+ if (charCode === 40 || charCode === 37) { // Down/Left arrow
+ pin.value -= 10;
+ if (pin.value < 0) {
+ pin.value = 1023;
+ }
+ this.updatePin(pin, index);
+ } else if (charCode === 38 || charCode === 39) { // Up/Right arrow
+ pin.value += 10;
+ if (pin.value > 1023) {
+ pin.value = 0;
+ }
+ this.updatePin(pin, index);
+ }
});
})
- this.pins.slice(0, 2).forEach((btn, index) => {
- pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
- let state = this.board;
- state.edgeConnectorState.pins[index].touched = true;
- this.updatePin(state.edgeConnectorState.pins[index], index);
- this.board.bus.queue(state.edgeConnectorState.pins[index].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
- }));
- btn.addEventListener(pointerEvents.leave, ev => {
- let state = this.board;
- state.edgeConnectorState.pins[index].touched = false;
- this.updatePin(state.edgeConnectorState.pins[index], index);
- })
- btn.addEventListener(pointerEvents.up, ev => {
- let state = this.board;
- state.edgeConnectorState.pins[index].touched = false;
- this.updatePin(state.edgeConnectorState.pins[index], index);
- this.board.bus.queue(state.edgeConnectorState.pins[index].id, DAL.MICROBIT_BUTTON_EVT_UP);
- this.board.bus.queue(state.edgeConnectorState.pins[index].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
- })
- })
+ }
- let bpState = this.board.buttonPairState;
- let stateButtons = [bpState.aBtn, bpState.bBtn, bpState.abBtn];
- this.buttonsOuter.slice(0, 2).forEach((btn, index) => {
+ private attachPinsTouchEvents() {
+ this.pins.slice(2, 6).forEach((btn, i) => {
+ var index = i + 2;
+ let state = this.board;
+ let pressedTime: number;
pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
let state = this.board;
- stateButtons[index].pressed = true;
- svg.fill(this.buttons[index], this.props.theme.buttonDown);
- this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ // console.log(`down ${state.edgeConnectorState.pins[i].id}`)
+ state.edgeConnectorState.pins[i].touched = true;
+ this.updatePin(state.edgeConnectorState.pins[i], index);
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ pressedTime = runtime.runningTime()
}));
- btn.addEventListener(pointerEvents.leave, ev => {
- let state = this.board;
- stateButtons[index].pressed = false;
- svg.fill(this.buttons[index], this.props.theme.buttonUps[index]);
- })
+ // btn.addEventListener(pointerEvents.leave, ev => {
+ // let state = this.board;
+ // state.edgeConnectorState.pins[i].touched = false;
+ // this.updatePin(state.edgeConnectorState.pins[i], index);
+ // })
btn.addEventListener(pointerEvents.up, ev => {
let state = this.board;
+ // console.log(`up ${state.edgeConnectorState.pins[i].id}, index ${index}`)
+ state.edgeConnectorState.pins[i].touched = false;
+ this.updatePin(state.edgeConnectorState.pins[i], index);
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_UP);
+ const currentTime = runtime.runningTime()
+ if (currentTime - pressedTime > DAL.DEVICE_BUTTON_LONG_CLICK_TIME) {
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_LONG_CLICK);
+ // console.log(`& long click`)
+ } else {
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ // console.log(`& click`)
+ }
+ pressedTime = undefined;
+ })
+ accessibility.enableKeyboardInteraction(btn, undefined, () => {
+ let state = this.board;
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_UP);
+ this.board.bus.queue(state.edgeConnectorState.pins[i].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ });
+ })
+ }
+
+ private attachABEvents() {
+ const bpState = this.board.buttonPairState;
+ const stateButtons: Button[] = [bpState.aBtn, bpState.bBtn];
+ const elButtonOuters = this.buttonsOuter.slice(0, 2);
+ const elButtons = this.buttons.slice(0, 2);
+
+ elButtonOuters.forEach((btn, index) => {
+ let pressedTime: number;
+ pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
+ // console.log(`down ${stateButtons[index].id}`)
+ stateButtons[index].pressed = true;
+ svg.fill(elButtons[index], this.props.theme.buttonDown);
+ this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ pressedTime = runtime.runningTime()
+ }));
+ btn.addEventListener(pointerEvents.leave, ev => {
stateButtons[index].pressed = false;
- svg.fill(this.buttons[index], this.props.theme.buttonUps[index]);
+ svg.fill(elButtons[index], this.props.theme.buttonUps[0]);
+ })
+ btn.addEventListener(pointerEvents.up, ev => {
+ stateButtons[index].pressed = false;
+ svg.fill(elButtons[index], this.props.theme.buttonUps[0]);
+ this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_UP);
+ const currentTime = runtime.runningTime()
+ if (currentTime - pressedTime > DAL.DEVICE_BUTTON_LONG_CLICK_TIME)
+ this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_LONG_CLICK);
+ else
+ this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ pressedTime = undefined;
+ })
+ accessibility.enableKeyboardInteraction(btn, undefined, () => {
+ this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_UP);
this.board.bus.queue(stateButtons[index].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
- })
+ });
})
+ }
+
+ private attachAPlusBEvents() {
+ const bpState = this.board.buttonPairState;
+ let pressedTime: number;
+ // A+B
pointerEvents.down.forEach(evid => this.buttonsOuter[2].addEventListener(evid, ev => {
- let state = this.board;
- stateButtons[0].pressed = true;
- stateButtons[1].pressed = true;
- stateButtons[2].pressed = true;
+ bpState.aBtn.pressed = true;
+ bpState.bBtn.pressed = true;
+ bpState.abBtn.pressed = true;
svg.fill(this.buttons[0], this.props.theme.buttonDown);
svg.fill(this.buttons[1], this.props.theme.buttonDown);
svg.fill(this.buttons[2], this.props.theme.buttonDown);
- this.board.bus.queue(stateButtons[2].id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ pressedTime = runtime.runningTime()
}));
this.buttonsOuter[2].addEventListener(pointerEvents.leave, ev => {
- let state = this.board;
- stateButtons[0].pressed = false;
- stateButtons[1].pressed = false;
- stateButtons[2].pressed = false;
+ bpState.aBtn.pressed = false;
+ bpState.bBtn.pressed = false;
+ bpState.abBtn.pressed = false;
svg.fill(this.buttons[0], this.props.theme.buttonUps[0]);
svg.fill(this.buttons[1], this.props.theme.buttonUps[1]);
svg.fill(this.buttons[2], this.props.theme.virtualButtonUp);
})
this.buttonsOuter[2].addEventListener(pointerEvents.up, ev => {
- let state = this.board;
- stateButtons[0].pressed = false;
- stateButtons[1].pressed = false;
- stateButtons[2].pressed = false;
+ bpState.aBtn.pressed = false;
+ bpState.bBtn.pressed = false;
+ bpState.abBtn.pressed = false;
svg.fill(this.buttons[0], this.props.theme.buttonUps[0]);
svg.fill(this.buttons[1], this.props.theme.buttonUps[1]);
svg.fill(this.buttons[2], this.props.theme.virtualButtonUp);
- this.board.bus.queue(stateButtons[2].id, DAL.MICROBIT_BUTTON_EVT_UP);
- this.board.bus.queue(stateButtons[2].id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_UP);
+ const currentTime = runtime.runningTime()
+ if (currentTime - pressedTime > DAL.DEVICE_BUTTON_LONG_CLICK_TIME)
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_LONG_CLICK);
+ else
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ pressedTime = undefined;
})
+ accessibility.enableKeyboardInteraction(this.buttonsOuter[2], undefined, () => {
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_DOWN);
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_UP);
+ this.board.bus.queue(bpState.abBtn.id, DAL.MICROBIT_BUTTON_EVT_CLICK);
+ });
}
}
}
diff --git a/targetconfig.json b/targetconfig.json
index 4120d635..2c9189c2 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -1,153 +1,169 @@
{
"packages": {
"approvedRepos": [
- "Microsoft/pxt-neopixel",
- "Microsoft/pxt-microturtle",
- "Microsoft/pxt-sonar",
- "Microsoft/pxt-hacking-stem",
- "Microsoft/pxt-bluetooth-temperature-sensor",
- "Microsoft/pxt-bluetooth-midi",
- "Microsoft/pxt-max6675",
- "Microsoft/pxt-midi",
- "Microsoft/pxt-radio-blockchain",
- "Microsoft/pxt-bluetooth-max6675",
- "Microsoft/pxt-filesystem",
- "Microsoft/pxt-ws2812b",
- "MKleinSB/pxt-foldio",
- "MKleinSB/pxt-remember-int",
- "MKleinSB/pxt-BME680",
- "MKleinSB/pxt-automationbit-calliope",
- "MKleinSB/pxt-kitronik-robotics-board-calliope",
- "MKleinSB/pxt-kitronik-zip-tile-calliope",
- "MKleinSB/pxt-calliope-esp",
- "MKleinSB/pxt-calliope-modem",
- "MKleinSB/pxt-fischertechnik-calliope",
- "MKleinSB/pxt-ft-fototransistor-calliope",
- "MKleinSB/pxt-thumbjoystick-calliope",
- "MKleinSB/pxt-envirobit",
- "MKleinSB/pxt-makerbit-ultrasonic-calliope",
- "MKleinSB/pxt-makerbit-motor-calliope",
- "MKleinSB/pxt-bc95",
- "MKleinSB/pxt-kitronik-zip-64",
- "MKleinSB/pxt-makerbit-touch",
- "MKleinSB/pxt-iot-environment-kit",
- "MKleinSB/pxt-serial-rb",
- "MKleinSB/pxt-ds18b20-calliope",
- "MKleinSB/pxt-mpr121",
- "MKleinSB/pxt-graphs",
- "MKleinSB/pxt-IR-Calliope",
- "MKleinSB/pxt-Seeed-Temperatursensor",
- "MKleinSB/pxt-MCP23017",
- "MKleinSB/ScrollText",
- "MKleinSB/pxt-calliope-oled96",
- "KitronikLtd/pxt-kitronik-servo-lite",
- "KitronikLtd/pxt-kitronik-I2C-16-servo",
- "KitronikLtd/pxt-kitronik-stopbit",
- "KitronikLtd/pxt-kitronik-lampbit",
- "KitronikLtd/pxt-kitronik-klimate",
- "KitronikLtd/pxt-kitronik-rtc",
- "KitronikLtd/pxt-kitronik-game-controller",
- "KitronikLtd/pxt-kitronik-robotics-board",
- "KitronikLtd/pxt-kitronik-klef-piano",
- "Tinkertanker/pxt-ir-receiver",
- "Tinkertanker/pxt-iot-environment-kit",
- "Tinkertanker/pxt-realtimeclock-ds1307",
- "Tinkertanker/pxt-tinkercademy-tinker-kit",
- "Tinkertanker/pxt-rotary-encoder-ky040",
- "Tinkertanker/pxt-tinkercademy-microbot",
- "Tinkertanker/pxt-oled-ssd1306",
- "Tinkertanker/pxt-range-vl53l0x",
- "Tinkertanker/pxt-continuous-servo",
- "Tinkertanker/pxt-smarthome",
- "Tinkertanker/microDriver_SHT2x",
- "Tinkertanker/uDriver_PCA9585",
- "Tinkertanker/pxt-alphanumeric-ht16k33",
- "PaulDFoster/pxt-microbit-GY521",
- "chevyng/pxt-ucl-junkrobot",
- "sparkfun/pxt-gator-environment",
- "LaboratoryForPlayfulComputation/pxt-BlockyTalkyBLE",
- "mbitfun/pxt-katakana",
- "jdarling/pxt-pca9685",
- "pizayanz/pxt-linebeacon",
- "vengit/pxt-sbrick",
- "Annikken/pxt-Andee",
- "sparkfun/pxt-gator-light",
- "sparkfun/pxt-gator-temp",
- "makecode-extensions/i2cLCD1602",
- "makecode-extensions/OLED12864_I2C",
- "makecode-extensions/DS1307",
- "makecode-extensions/ScrollText",
- "makecode-extensions/WhaleySansFont",
- "makecode-extensions/BMP280",
- "makecode-extensions/TM1637",
- "makecode-extensions/BMP180",
- "makecode-extensions/BH1750",
- "makecode-extensions/APDS9930",
- "makecode-extensions/AT24XX",
- "makecode-extensions/BME280",
- "makecode-extensions/TM1650",
- "makecode-extensions/NTC",
- "makecode-extensions/DS1302",
"51bit/ColorBit",
"51bit/SFC",
"51bit/SmartTools",
- "lwchkg/pxt-proportional-font",
- "jcubuntu/pxt-iKB1",
- "alankrantas/pxt-DHT11_DHT22",
- "cgs-matthew-pham/pxt-hitechnic-irseeker-v2",
- "letstalkscience/pxt-cozir",
- "monkmakes/pxt-sensor",
- "keigan-motor/pxt-KeiganMotor",
- "alankrantas/pxt-ESP8266_ThingSpeak",
- "sparkfun/pxt-gator-particle",
- "sparkfun/pxt-gator-soil",
- "sparkfun/pxt-gator-microphone",
- "rebeccaclavier/pxt-bmp280",
"51bit/dfplayermini",
- "makecode-extensions/STTS751",
- "makecode-extensions/LSM6DSO",
- "makecode-extensions/LPS22",
+ "Freenove/Makecode-Extension-Starter-Kit",
+ "joernalraun/pxt-remember-int",
+ "KitronikLtd/pxt-kitronik-I2C-16-servo",
+ "KitronikLtd/pxt-kitronik-game-controller",
+ "KitronikLtd/pxt-kitronik-klef-piano",
+ "KitronikLtd/pxt-kitronik-klimate",
+ "KitronikLtd/pxt-kitronik-lampbit",
+ "KitronikLtd/pxt-kitronik-robotics-board",
+ "KitronikLtd/pxt-kitronik-rtc",
+ "KitronikLtd/pxt-kitronik-servo-lite",
+ "KitronikLtd/pxt-kitronik-stopbit",
+ "MKleinSB/ScrollText",
+ "MKleinSB/pxt-BME680",
+ "MKleinSB/pxt-IR-Calliope",
+ "MKleinSB/pxt-MCP23017",
+ "MKleinSB/pxt-OLED-SSD1306",
+ "MKleinSB/pxt-Seeed-Temperatursensor",
+ "MKleinSB/pxt-automationbit-calliope",
+ "MKleinSB/pxt-bc95",
+ "MKleinSB/pxt-callibot",
+ "MKleinSB/pxt-callicolor",
+ "MKleinSB/pxt-callicross",
+ "MKleinSB/pxt-calliope-esp",
+ "MKleinSB/pxt-calliope-oled96",
+ "MKleinSB/pxt-columbuseye",
+ "MKleinSB/pxt-dht11",
+ "MKleinSB/pxt-envirobit",
+ "MKleinSB/pxt-esp-thingspeak",
+ "MKleinSB/pxt-fischertechnik-calliope",
+ "MKleinSB/pxt-foldio",
+ "MKleinSB/pxt-ft-fototransistor-calliope",
+ "MKleinSB/pxt-gatorlog-calliope",
+ "MKleinSB/pxt-graphs",
+ "MKleinSB/pxt-iot-environment-kit",
+ "MKleinSB/pxt-kitronik-robotics-board-calliope",
+ "MKleinSB/pxt-kitronik-zip-64",
+ "MKleinSB/pxt-kitronik-zip-tile-calliope",
+ "MKleinSB/pxt-makerbit-motor-calliope",
+ "MKleinSB/pxt-makerbit-touch",
+ "MKleinSB/pxt-makerbit-ultrasonic-calliope",
+ "MKleinSB/pxt-mpr121",
+ "MKleinSB/pxt-pca9685",
+ "MKleinSB/pxt-seeed-temperature",
+ "MKleinSB/pxt-serial-rb",
+ "MKleinSB/pxt-serialmp3",
+ "MKleinSB/pxt-thumbjoystick-calliope",
+ "Microsoft/pxt-bluetooth-max6675",
+ "Microsoft/pxt-bluetooth-midi",
+ "Microsoft/pxt-bluetooth-temperature-sensor",
+ "Microsoft/pxt-filesystem",
+ "Microsoft/pxt-hacking-stem",
+ "Microsoft/pxt-max6675",
+ "Microsoft/pxt-microturtle",
+ "Microsoft/pxt-midi",
+ "Microsoft/pxt-neopixel",
+ "Microsoft/pxt-radio-blockchain",
+ "Microsoft/pxt-sonar",
+ "Microsoft/pxt-ws2812b",
+ "Tinkertanker/pxt-alphanumeric-ht16k33",
+ "Tinkertanker/pxt-continuous-servo",
+ "Tinkertanker/pxt-iot-environment-kit",
+ "Tinkertanker/pxt-ir-receiver",
+ "Tinkertanker/pxt-oled-ssd1306",
+ "Tinkertanker/pxt-range-vl53l0x",
+ "Tinkertanker/pxt-realtimeclock-ds1307",
+ "Tinkertanker/pxt-rotary-encoder-ky040",
+ "Tinkertanker/pxt-smarthome",
+ "Tinkertanker/pxt-tinkercademy-tinker-kit",
+ "alankrantas/pxt-DHT11_DHT22",
+ "alankrantas/pxt-ESP8266_ThingSpeak",
+ "assirati/pxt-inventura",
+ "calliope-edu/CO2-Sensor-SCD40",
+ "calliope-edu/pxt-SCD30",
+ "calliope-edu/pxt-TCS34725FN",
+ "calliope-edu/pxt-grove",
+ "calliope-edu/pxt-sunlightsensor-si1145",
+ "cgs-matthew-pham/pxt-hitechnic-irseeker-v2",
+ "jcubuntu/pxt-iKB1",
+ "jdarling/pxt-pca9685",
+ "keigan-motor/pxt-KeiganMotor",
+ "letstalkscience/pxt-cozir",
+ "lwchkg/pxt-proportional-font",
+ "makecode-extensions/APDS9930",
+ "makecode-extensions/AT24XX",
+ "makecode-extensions/BH1750",
+ "makecode-extensions/BME280",
+ "makecode-extensions/BMP180",
+ "makecode-extensions/BMP280",
+ "makecode-extensions/DS1302",
+ "makecode-extensions/DS1307",
+ "makecode-extensions/HTS221",
"makecode-extensions/LIS2DW12",
"makecode-extensions/LIS2MDL",
- "makecode-extensions/HTS221",
- "assirati/pxt-inventura",
- "Freenove/Makecode-Extension-Starter-Kit",
+ "makecode-extensions/LPS22",
+ "makecode-extensions/LSM6DSO",
+ "makecode-extensions/NTC",
+ "makecode-extensions/OLED12864_I2C",
+ "makecode-extensions/STTS751",
+ "makecode-extensions/ScrollText",
+ "makecode-extensions/TM1637",
+ "makecode-extensions/TM1650",
+ "makecode-extensions/WhaleySansFont",
+ "makecode-extensions/i2cLCD1602",
+ "monkmakes/pxt-sensor",
"mu-opensource/pxt-muvision",
- "calliope-edu/pxt-grove",
+ "pizayanz/pxt-linebeacon",
+ "rebeccaclavier/pxt-bmp280",
+ "sparkfun/pxt-gator-environment",
+ "sparkfun/pxt-gator-light",
+ "sparkfun/pxt-gator-microphone",
+ "sparkfun/pxt-gator-particle",
+ "sparkfun/pxt-gator-soil",
+ "sparkfun/pxt-gator-temp",
"tinysuperlab/motionkit",
"tinysuperlab/touchkit",
- "MKleinSB/pxt-seeed-temperature",
- "MKleinSB/pxt-dht11",
- "MKleinSB/pxt-esp-thingspeak",
- "MKleinSB/pxt-OLED-SSD1306",
- "MKleinSB/pxt-pca9685",
- "MKleinSB/pxt-mpr121",
- "MKleinSB/pxt-gatorlog-calliope",
- "MKleinSB/pxt-callibot",
- "MKleinSB/pxt-serialmp3",
- "dl1ekm/pxt-calliope-ADS1x15",
- "dl1ekm/pxt-calliope-PCF85063-RTC"
+ "vengit/pxt-sbrick"
],
"preferredRepos": [
- "tinysuperlab/motionkit",
- "tinysuperlab/touchkit",
- "calliope-edu/pxt-grove",
- "Microsoft/pxt-microturtle",
+ "MKleinSB/pxt-KY-040",
+ "MKleinSB/pxt-MAX7219_8x8",
"MKleinSB/pxt-OLED-SSD1306",
- "MKleinSB/pxt-foldio",
- "MKleinSB/pxt-seeed-temperature",
+ "MKleinSB/pxt-OLEDpaint",
+ "MKleinSB/pxt-callibot",
+ "MKleinSB/pxt-callicolor",
+ "MKleinSB/pxt-callicross",
+ "MKleinSB/pxt-callimotor",
+ "MKleinSB/pxt-calliope-buttons",
"MKleinSB/pxt-dht11",
"MKleinSB/pxt-esp-thingspeak",
- "Microsoft/pxt-neopixel",
- "MKleinSB/pxt-pca9685",
- "MKleinSB/pxt-mpr121",
"MKleinSB/pxt-gatorlog-calliope",
- "MKleinSB/pxt-callibot",
+ "MKleinSB/pxt-huskylens",
+ "MKleinSB/pxt-kitronik-zip-tile-calliope",
+ "MKleinSB/pxt-mpr121",
+ "MKleinSB/pxt-pca9685",
+ "MKleinSB/pxt-seeed-temperature",
"MKleinSB/pxt-serialmp3",
+ "Microsoft/pxt-microturtle",
+ "Microsoft/pxt-neopixel",
+ "calliope-edu/CO2-Sensor-SCD40",
+ "calliope-edu/makecode-extension-scd41",
+ "calliope-edu/pxt-HM3301_Dust_Sensor",
+ "calliope-edu/pxt-TCS34725FN",
+ "calliope-edu/pxt-display",
+ "calliope-edu/pxt-grove",
+ "calliope-edu/pxt-rgblcd",
+ "calliope-edu/pxt-sunlightsensor-si1145",
+ "calliope-mini/pxt-SCD30",
"dl1ekm/pxt-calliope-ADS1x15",
- "dl1ekm/pxt-calliope-PCF85063-RTC"
+ "dl1ekm/pxt-calliope-PCF85063-RTC",
+ "tinysuperlab/motionkit",
+ "tinysuperlab/touchkit"
]
},
+ "skillMap": {
+ "defaultPath": "docs:/skillmap/mini",
+ "pathAliases": {
+ "space": "docs:/skillmap/space"
+ }
+ },
"galleries": {
"First Steps": "calliope/firststeps",
"Tutorials": "calliope/tutorials",
diff --git a/theme/style.less b/theme/style.less
index b0c82208..fca946a0 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -99,6 +99,7 @@
@media only screen and (min-width: @largeMonitorBreakpoint) {
}
+
/* Download dialog */
.ui.downloaddialog.modal>.content {
padding: 1rem;
@@ -111,15 +112,15 @@
justify-content: center;
display: flex;
padding: 1rem;
-
+
img {
- height:100px;
+ height:100px;
}
}
}
.instructions {
img {
- margin-bottom:1rem;
+ margin-bottom:1rem;
}
}
}
\ No newline at end of file