From 85e9ac181c14f012e0795bd7537cc4f505ff2980 Mon Sep 17 00:00:00 2001 From: Galen Nickel Date: Thu, 10 May 2018 17:01:52 -0700 Subject: [PATCH 1/9] Add paperback link to 'csintro' formats (#770) --- docs/courses/csintro.md | 3 ++- .../csintro/icons/paperback-book-24x24.png | Bin 0 -> 221 bytes 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/static/courses/csintro/icons/paperback-book-24x24.png diff --git a/docs/courses/csintro.md b/docs/courses/csintro.md index 892f1e31..7ae64718 100644 --- a/docs/courses/csintro.md +++ b/docs/courses/csintro.md @@ -11,7 +11,7 @@ This course takes approximately 14 weeks to complete, spending about 1 week on e ### ~ hint **Download it** -The entire course is also available as a download. Choose any of these formats: +The entire course is also available as a download or as a book. Choose any of these formats: ||| |-|-| @@ -19,6 +19,7 @@ The entire course is also available as a download. Choose any of these formats: | [![](/static/courses/csintro/icons/microsoft-onenote-24x24.png)](https://aka.ms/MakeCodeforMicroBitNotebook) | [- **OneNote** - Intro to CS with MakeCode for micro:bit](https://aka.ms/MakeCodeforMicroBitNotebook) | | [![](/static/courses/csintro/icons/adobe-pdf-file-icon-24x24.png)](https://1drv.ms/b/s!AqsgsTyHBmRBgQ1Fjzm5y5wKG75M) | [- **PDF** - Intro to CS with MakeCode for micro:bit](https://1drv.ms/b/s!AqsgsTyHBmRBgQ1Fjzm5y5wKG75M) | | [![](/static/courses/csintro/icons/apple-itunes-ibook-24x24.png)](https://itunes.apple.com/us/book/making-with-micro-bit/id1255260221?mt=11) | [- **iBooks** - Making with micro:bit](https://itunes.apple.com/us/book/making-with-micro-bit/id1255260221?mt=11) | +| [![](/static/courses/csintro/icons/paperback-book-24x24.png)](http://www.lulu.com/shop/mary-douglas-kiang/making-with-makecode-microbit/paperback/product-23457217.html) | [- **Paperback** - Making with MakeCode and Micro:bit](http://www.lulu.com/shop/mary-douglas-kiang/making-with-makecode-microbit/paperback/product-23457217.html) | ### ~ ### Lesson structure diff --git a/docs/static/courses/csintro/icons/paperback-book-24x24.png b/docs/static/courses/csintro/icons/paperback-book-24x24.png new file mode 100644 index 0000000000000000000000000000000000000000..4c085bb5c4e10da456be455791ab8a4cdf1f882d GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONu*lQJF~q|E?c{^J4F(*pE1h?>yPuJK?PR z6|-q=-%jkF!d&}v!h{(!^S*8Ix_b5)dl#$!vBZ-v^aX$F>xxN-+Qc literal 0 HcmV?d00001 From 18635f0b0bf924aba58d8045ea04fb38bfa1fa31 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 14 May 2018 15:48:18 +0100 Subject: [PATCH 2/9] Added SBRICK package (#772) --- docs/packages.md | 4 ++++ targetconfig.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/packages.md b/docs/packages.md index 6415cc9e..a1483e46 100644 --- a/docs/packages.md +++ b/docs/packages.md @@ -127,6 +127,10 @@ "name": "Pimoroni Scrollbit", "url":"/pkg/pimoroni/pxt-scrollbit", "cardType": "package" + }, { + "name": "SBRICK", + "url":"/pkg/vengit/pxt-sbrick", + "cardType": "package" }] ``` diff --git a/targetconfig.json b/targetconfig.json index 9fbf2cba..a1e2c3b3 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -25,7 +25,8 @@ "sunfounder/pxt-sloth", "4tronix/BitBot", "pimoroni/pxt-scrollbit", - "emwta/pxt-iBit" + "emwta/pxt-iBit", + "vengit/pxt-sbrick" ], "preferredRepos": [ From a450cbbfca1624eb044949fc2cbf53c9fff12260 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini <16690124+samelhusseini@users.noreply.github.com> Date: Mon, 14 May 2018 13:49:55 -0700 Subject: [PATCH 3/9] Remove acc ref, add alpha ref. (#774) --- docs/acc-ref.json | 3 --- docs/alpha-ref.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 docs/acc-ref.json create mode 100644 docs/alpha-ref.json diff --git a/docs/acc-ref.json b/docs/acc-ref.json deleted file mode 100644 index a5516f82..00000000 --- a/docs/acc-ref.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "appref": "v0.13" -} diff --git a/docs/alpha-ref.json b/docs/alpha-ref.json new file mode 100644 index 00000000..15845fd0 --- /dev/null +++ b/docs/alpha-ref.json @@ -0,0 +1,3 @@ +{ + "appref": "v1" +} From b128298a37f787c9506fcfb953a20f05886c99f0 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Mon, 14 May 2018 14:08:21 -0700 Subject: [PATCH 4/9] 0.14.35 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 159252d6..6e106d87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.34", + "version": "0.14.35", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7c3fdd4f..7985918f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.34", + "version": "0.14.35", "description": "micro:bit target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", From c0a3096dde0eba85aaad91c9920b57959fc30163 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Tue, 15 May 2018 17:55:13 -0700 Subject: [PATCH 5/9] Update locales --- libs/core/_locales/core-jsdoc-strings.json | 2 +- libs/core/shims.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json index 27b36748..52efa1ce 100644 --- a/libs/core/_locales/core-jsdoc-strings.json +++ b/libs/core/_locales/core-jsdoc-strings.json @@ -169,7 +169,7 @@ "basic.showString|param|text": "the text to scroll on the screen, eg: \"Hello!\"", "control": "Runtime and event utilities.", "control.assert": "If the condition is false, display msg on serial console, and panic with code 098.", - "control.deviceName": "Gets a friendly name for the device derived from the its serial number", + "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.eventSourceId": "Returns the value of a C++ runtime constant", "control.eventTimestamp": "Gets the timestamp of the last event executed on the bus", diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index 8caa1405..026162e3 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -428,7 +428,7 @@ declare namespace control { function eventTimestamp(): number; /** - * Gets a friendly name for the device derived from the its serial number + * Make a friendly name for the device based on its serial number */ //% blockId="control_device_name" block="device name" weight=10 blockGap=8 //% advanced=true shim=control::deviceName From 6f98d52b37a14af44a0fc8875d7761f8c2ab91f7 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Tue, 15 May 2018 17:55:28 -0700 Subject: [PATCH 6/9] bump pxt-core to 0.19.6, --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7985918f..00683055 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,6 @@ "semantic-ui-less": "2.2.14" }, "dependencies": { - "pxt-core": "0.19.4" + "pxt-core": "0.19.6" } } From f75199fb4e37351d912ee13a05ded2b399f2c30d Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Tue, 15 May 2018 17:55:35 -0700 Subject: [PATCH 7/9] 0.14.36 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e106d87..866af1f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.35", + "version": "0.14.36", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 00683055..46f46cdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.35", + "version": "0.14.36", "description": "micro:bit target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript", From 7099e2d1313000c8fd71d3c76311537728284aa2 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 15 May 2018 20:01:51 -0700 Subject: [PATCH 8/9] updated pxt --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46f46cdd..3ca62070 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,6 @@ "semantic-ui-less": "2.2.14" }, "dependencies": { - "pxt-core": "0.19.6" + "pxt-core": "0.19.7" } } From b57810a7d0f03cbe7401744515a5a6f8d3414d60 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 15 May 2018 20:05:56 -0700 Subject: [PATCH 9/9] 0.14.37 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 866af1f3..b72e361f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.36", + "version": "0.14.37", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3ca62070..9ddbc1e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pxt-microbit", - "version": "0.14.36", + "version": "0.14.37", "description": "micro:bit target for Microsoft MakeCode (PXT)", "keywords": [ "JavaScript",