From b5c53b26d8e9abd92d694c537964349ca872eb17 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 17 Mar 2016 11:33:11 -0700 Subject: [PATCH 1/4] added enum annotations --- libs/microbit/input.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/microbit/input.ts b/libs/microbit/input.ts index 7bcfc67c..608263b4 100644 --- a/libs/microbit/input.ts +++ b/libs/microbit/input.ts @@ -4,12 +4,12 @@ enum Button { //% enumval=MICROBIT_ID_BUTTON_B B, //% enumval=MICROBIT_ID_BUTTON_AB - //% blockId="A+B" + //% blockId="A+B" block="A+B" AB, } enum Dimension { - //% enumval=0 blockId=x + //% enumval=0 blockId=x X, //% enumval=1 blockId=y Y, From 8fe1bf8c5fd154f5f1641a97d187dc444441f8b7 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 17 Mar 2016 22:37:36 -0700 Subject: [PATCH 2/4] added logos --- libs/microbit/kind.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/microbit/kind.json b/libs/microbit/kind.json index 050bc40c..73a3639d 100644 --- a/libs/microbit/kind.json +++ b/libs/microbit/kind.json @@ -21,7 +21,12 @@ "target": { "id": "microbit", "name": "microbit", - "title": "micro:bit", + "title": "Javascript for BBC micro:bit", + "theme": { + "logoUrl": "https://www.microbit.co.uk/", + "logo":"BBC micro:bit", + "footerLogo": "image/svg+xml" + }, "cloud": true, "blocksprj": { "id": "blocksprj", @@ -69,4 +74,4 @@ "hasHex": true } } -} +} \ No newline at end of file From 78a0b314cd1f64269a9a3291936e6e74232cfef3 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 18 Mar 2016 00:04:08 -0700 Subject: [PATCH 3/4] updated target --- libs/microbit/kind.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/microbit/kind.json b/libs/microbit/kind.json index 73a3639d..105d22f6 100644 --- a/libs/microbit/kind.json +++ b/libs/microbit/kind.json @@ -20,8 +20,8 @@ "dependencies": {}, "target": { "id": "microbit", - "name": "microbit", - "title": "Javascript for BBC micro:bit", + "name": "BBC micro:bit", + "title": "JavaScript for BBC micro:bit", "theme": { "logoUrl": "https://www.microbit.co.uk/", "logo":"BBC micro:bit", @@ -68,7 +68,8 @@ "README.md": "Describe your project here!" } }, - "koduvscode": true, + "koduUrl": "https://www.kodugamelab.com/bbc-microbit/", + "visualStudioCode": true, "compile": { "isNative": false, "hasHex": true From 4b75349d2658176e633fee78a510c2228a50ad5e Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 18 Mar 2016 00:10:54 -0700 Subject: [PATCH 4/4] fix A+B button simulation --- sim/libmbit.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sim/libmbit.ts b/sim/libmbit.ts index 28effcc2..8dd45886 100644 --- a/sim/libmbit.ts +++ b/sim/libmbit.ts @@ -213,16 +213,22 @@ namespace ks.rt.micro_bit { /* input */ export function onButtonPressed(button : number, handler: RefAction) : void { let ens = enums(); - board().bus.listen(button, ens.MICROBIT_BUTTON_EVT_CLICK, handler); + let b = board(); + if (button == ens.MICROBIT_ID_BUTTON_AB && !board().usesButtonAB) { + b.usesButtonAB = true; + b.updateView(); + } + b.bus.listen(button, ens.MICROBIT_BUTTON_EVT_CLICK, handler); } export function isButtonPressed(button: number): boolean { var ens = enums(); + let b = board(); if (button == ens.MICROBIT_ID_BUTTON_AB && !board().usesButtonAB) { - board().usesButtonAB = true; - runtime.queueDisplayUpdate(); + b.usesButtonAB = true; + b.updateView(); } - var bts = board().buttons; + var bts = b.buttons; if (button == ens.MICROBIT_ID_BUTTON_A) return bts[0].pressed; if (button == ens.MICROBIT_ID_BUTTON_B) return bts[1].pressed; return bts[2].pressed || (bts[0].pressed && bts[1].pressed);