From 51a42f7380a850c9b3cf0490914de3c196dee4d3 Mon Sep 17 00:00:00 2001 From: Shigeru KANEMOTO Date: Tue, 17 Oct 2017 01:50:53 +0900 Subject: [PATCH] Apply gridpicker to "spi set pins" block. (#552) Just forgot to include in the pull request https://github.com/Microsoft/pxt-microbit/pull/550 --- libs/core/pins.cpp | 6 ++++++ libs/core/shims.d.ts | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/core/pins.cpp b/libs/core/pins.cpp index 48d18960..1ada7a94 100644 --- a/libs/core/pins.cpp +++ b/libs/core/pins.cpp @@ -429,6 +429,12 @@ namespace pins { */ //% help=pins/spi-pins weight=2 advanced=true //% blockId=spi_pins block="spi set pins|MOSI %mosi|MISO %miso|SCK %sck" + //% mosi.fieldEditor="gridpicker" mosi.fieldOptions.columns=4 + //% mosi.fieldOptions.tooltips="false" mosi.fieldOptions.width="300" + //% miso.fieldEditor="gridpicker" miso.fieldOptions.columns=4 + //% miso.fieldOptions.tooltips="false" miso.fieldOptions.width="300" + //% sck.fieldEditor="gridpicker" sck.fieldOptions.columns=4 + //% sck.fieldOptions.tooltips="false" sck.fieldOptions.width="300" void spiPins(DigitalPin mosi, DigitalPin miso, DigitalPin sck) { if (NULL != spi) { delete spi; diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index daa0a2b5..9fc25673 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -755,7 +755,13 @@ declare namespace pins { * */ //% help=pins/spi-pins weight=2 advanced=true - //% blockId=spi_pins block="spi set pins|MOSI %mosi|MISO %miso|SCK %sck" shim=pins::spiPins + //% blockId=spi_pins block="spi set pins|MOSI %mosi|MISO %miso|SCK %sck" + //% mosi.fieldEditor="gridpicker" mosi.fieldOptions.columns=4 + //% mosi.fieldOptions.tooltips="false" mosi.fieldOptions.width="300" + //% miso.fieldEditor="gridpicker" miso.fieldOptions.columns=4 + //% miso.fieldOptions.tooltips="false" miso.fieldOptions.width="300" + //% sck.fieldEditor="gridpicker" sck.fieldOptions.columns=4 + //% sck.fieldOptions.tooltips="false" sck.fieldOptions.width="300" shim=pins::spiPins function spiPins(mosi: DigitalPin, miso: DigitalPin, sck: DigitalPin): void; }