From 3fcd6255558c5b5e3b96960dabc795e54e0141f9 Mon Sep 17 00:00:00 2001 From: Amerlander Date: Tue, 21 Jan 2020 19:38:36 +0100 Subject: [PATCH] Fix Image the second (#72) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 2.0.1 * Pointing beta-ref to v2 * Bumping pxt-core to 5.15.10 * 2.0.2 * this repo is empty (#2201) * Update radio event parm usage descriptions (#2165) * add browser db prefix for v2 (#2208) * 2.0.3 * Releasing 2.0.3 to live (#2209) * dynamically sniff offline app version (#2059) * Revert "dynamically sniff offline app version (#2059)" (#2211) This reverts commit b480b34f7e8828794297613a12534f54573a3011. * Updating electron to 2.0.3 (#2210) * Updating offline reference to 2.0.3 (#2212) * Bumping version to 2.1.0 * 2.1.1 * Spelling (#2214) * Update write-received-packet-to-serial.md (#2217) A support ticket pointed out issues that they'd encountered when trying to follow this document: - `sendValue` only supports an 8 character string. This is documented in the `sendValue` docs but a longer string had been used here - Only `radio.onReceivedNumber` is used so the sample output is not consistent with the users experience. I've changed it so that all packets are handled * Use gcPreAllocateBlock() to fix #2177, #2215 (#2216) * Use gcPreAllocateBlock() to fix #2177, #2215 * bump pcp 6.9.4 * 2.1.2 * Correct dice example (#2262) Changed random(6) to random(5) so the number reflect real dice. * add 4tronix minibit (#2249) * Update targetconfig.json (#2258) remove mock-iot-extension as it is just an experimental development by The Foundation * Update calibrate-compass.md (#2265) Based on user feedback in Slack https://microbit-community.slack.com/archives/C1ZMKRFHD/p1563274019078400?thread_ts=1563268925.077500&cid=C1ZMKRFHD * add wukong (#2239) * Decrease size of GC heap to allow more DAL allocs (#2246) * 2.1.3 * add Kitronik view text (#2125) * Release 2.0.6 to live (#2308) * Update nexus:bit entry (#2315) * update nexus:bit entry * update nexus:bit entry * Logic Lab mini-course (#2307) * Logic Lab mini-course * example syntax * Updating Readme with branch information. * bump pxt for ios <=9 fix (#2311) * Update pxt/common-packages and fix build (#2323) * fix build off of pxt/ and pxt-common-packages master * check in generated files * add-pxt-bmp280 (#2325) * Bumping pxt-core to 5.19.8 & common-packages to 6.14.9 * 2.1.4 * Error codes page update (#2327) * Start adding new codes * few tiny edits * Add more errors and rearrange * Update docs/device/error-codes.md Co-Authored-By: Michał Moskal * juggle category * set error range in hint Co-Authored-By: Michał Moskal * Update docs/device/error-codes.md Co-Authored-By: Mark * fix build (#2360) * fix broken build * just try the more 'official' fix if possible * back to the way that actually works.. * bump pxt to include accessibility changes (#2404) * 2.1.5 * make hc mode sim color have higher contrast (#2409) * Show project settings (#2401) * markdown link fix (#2400) * add HTS221 (#2384) * Editor controllers fixes (#2412) * updated strings * bump pxt * anotehr attempt * 2.1.6 * turn on samples when reading accelerometer (#2413) * 2.1.7 * hide pin p19/p20 (#2268) * Fix remove life animation causing microbit stuck (#2314) On the real microbit board, if the program execute other game blocks while the remove life animation is playing, it would cause strange behavior or even make the game stuck. * Port of Programmable Logic lesson for Logic Lab course (#2359) * port of programmable logic lesson * trigger rebuild * express as logical equation in snippet * go logical for snippet inputs * emit enum as bitmask (#2414) * 2.1.8 * add alt attributes to download screens (#2415) * add alt attributes to download screens, fixes microsoft/pxt-microbit#2291 * better descriptions * fixing links in translate page * Modify the LED coordinates to be between 0 and 4. (#2416) Without this change, there is a 11/36 chance no LED lights as [`Math.random(a,b)`](https://docs.python.org/2/library/random.html#random.uniform) (thus the `pick random` block) chooses a number in the (inclusive, closed) interval `[a, b]`. * Set LED plot row/column ranges for 'Reaction Time' (#2420) * add LIS2MDL (#2385) * add LIS2DW12 (#2386) * add LPS22 (#2387) * add LSM6DSO (#2388) * add gator environment (#2326) * add STTS751 (#2389) * add inventura extension (#2421) * add new sparkfun extensions (#2238) * add new sparkfun extensions * remove gator environment pending fixes * add dfplayer mini extension (#2417) * Update 'servo calibrator' link (#2424) * I2C Addressing Note (#2428) * I2C on-board sensor address note * note for 7bit to 8bit shift * Add nested summaries for newer courses (#2425) * bump pxt (#2432) * bump pxt * bump * bump * fix version * 2.1.9 * bump package.json (#2433) * 2.1.10 * bump pxt (#2434) * 2.1.11 * bump for diff3 (#2435) * enable experiment * bump pxt * 2.1.12 * Add the Stu Lowe coding cards (#2438) * Add the Stu Lowe coding cards * Move 'Coding Cards' below 'Hardware' * Add isDeleted (#2445) * add xinabox OD01 and breakout display section (#2397) * add xinabox OD01 and breakout display section * Update targetconfig.json * Update extensions.md * Link to power supply limitations (#2443) Fixes: #2442 * Pxt v5.23.17 (#2446) * bump pxt * regen docs * fix version syntax * restore extension * removed dup * 2.1.13 * add-sw01 (#2393) * Locking old issues * add Keyestudio robot car (#2452) * Allow globals in reclaimed bluetooth memory (#2455) * isTouchingEdge() should not return true for deleted sprite (#2449) * add query variant to hide toolbar (#2458) * Adding link to stable refs (#2460) * Update extensions.md (#2456) Move the :VIEW Text32 from other to Display now there is a display sections * 2.1.14 * fixing radio stack (#2461) * fixing radio stack * updated shims * 2.1.15 * Stable points to latest 2.0.9 (#2469) * Releasing 2.0.9 to live (#2470) * Fixing signal strength (#2474) * Pointing to 2.0.10 * Releasing 2.0.10 (#2476) With radio strength signal fix for hot or cold * Removing old bitbot as we have a new bitbot package (#2479) * updated pxt (#2465) * updated pxt * bump pxt * updated react * updated ptx * Remove empty variable element from XML * Bump pxt-core to 5.25.15 * bump pxt * Bump pxt to 5.25.17 * Add precision to music slider * 2.1.16 * add drive:bit (#2484) * micro:bit RSSI fix (#2480) * read rssi from packet * updated shims * fix build * fix help * move deprecated function to ts * some formatting * restore rssi block * restory notations * actually copy bytes * removing logging code * simpler wake up code * comment * fix build * bump pxt * go back to safety * bump microbit * restor package.json * revert jquery v * use macro * check length * bump pxt (#2490) * 2.1.17 * Use default resize function for microbit gesture dropdown (#2491) * Name Badge project page (#2477) * Name Bagde project page * gotta please the summary check * link typo, ugh * Revert "Name Badge project page (#2477)" This reverts commit 2e2860632b399485e6b32a2806de34a59c4af9d8. * add freenove starter kit (#2493) * radio.setFrequencyBand support (#2495) * setfrequencyband support * revert line change * add bounds check * Name Badge project page (#2496) * Name Bagde project page * gotta please the summary check * link typo, ugh * get rid of the pptx * Simplify the Fahrenheit from Celsius computation. (#2497) As the micro:bit introduces floating point arithmetic for both the existing `f = 18 * c / 10 + 32` computation and the new `f = 1.8 * c + 32` computation, there isn't any benefit for the former. * Enable Polish localization (#2499) * bump package * 2.1.18 * shrink maintenance gif * 2.1.19 * Rotary phone dial (#2502) * some write up * adding images * text * more text * adding vids * adding escape room * remove newer lesson * remove .mp4 * Card page edits * adding image * adding to toys * rotary edits * fix typo * bump pxt 5.28.7 (#2503) * bump pxt * bump to pxt 5.28.8 * 2.1.20 * bump pxt 5.28.9 (#2504) * 2.1.21 * bump pxt 5.28.10 * 2.1.22 * bump pxt 5.28.11 * 2.1.23 * bump pxt 5.28.12 * 2.1.24 * Update README.md * robot unicorn (#2512) * robot unicorn * Edits to the unicorn * fix missing radio and boardname * bump pxt 5.28.18 (#2517) * bump pxt 5.28.18 * updated summary * 2.1.25 * bump pxt 5.28.21 * 2.1.26 * bump to pxt5.28.23 * 2.1.27 * Add redirect to pins info to serial heading (#2520) * Add redirect to pins info to serial heading * adding links * vump to pxt 5.28.24 * 2.1.28 * bump to pxt 5.28.26 * 2.1.29 * add build instructions * updated build notes * bump pxt 5.28.27 * 2.1.30 * missing svg * remove crowdin project to disable upload from master branch * reeanble crowdin, no upload * 2.1.31 * bump pxt common to 6.16.25 * missing radio package * Fix GC heap reclamation (#2528) * bump to pxt 5.28.31 * bump pxt 5.28.32 * 2.1.32 * 2.1.33 * fix typo * pxt-microbit-next? (#2543) Since the repo https://github.com/microsoft/pxt-microbit-next doesn't exist, I am assuming that the word `next` is not meant to be here. * Extensions: Add Inksmith Climate Action Kit (#2535) * Fixes for typos found in Crowdin - 11252019 (#2538) * Extension: add Kitronik Halo HD (#2541) * Extension: Add EBOTICS MIBO (#2542) * add Bright Wearables Brightboard (#2537) * Docs: Change default value in Javascript. (#2540) * Change default value in Javascript. Per @microbit-mark 's suggestion, add an example of how to change the default interval value by switching to Javascript. * edits to new example * bump pxt 5.30.6 * 2.1.34 * update git and vscode settings * revert changes to 2.1.28 * package-lock * v2.1.34 * Change Hero Image * add RVR (#2516) * Extension: add minicruise (#2545) * Fix minutes display for 'Digital Watch' project (#2547) * Fix minutes display for 'Digital Watch' project * minutes less than 10 * bump pxt * 2.1.35 * updated pxt * 2.1.36 * package lock * Tutorial Typo Fix * staging Servo library support * bumppxt * 2.1.37 * update error guide link (#2554) * adding radio firefly (#2549) * Update 'Metal Detector' example (#2559) * bump pxt * 2.1.38 * typoFix * package lock * Update Pins * Update Pins * Add C7, C8 and C9 Serial Pins * Add C7, C8 and C9 Serial Pins * Pins update * Add maqueen (#2560) * Extensions: Add DFRobot Maqueen * fix * revert pin C7, C8 and C9 * Update README.md * add extension doc file * revert pxt bump * Docs: Extensions remove headliner * Remove outdated #ifdef (#2564) * Extensions: add servobit (#2557) Co-authored-by: Abhijith Chatra * bump to pxt 5.31.8, common 6.18.2 * 2.1.39 * enable github editor experiment (#2568) * Fix missing sim function * bump to pxt 5.31.10 * 2.1.40 * Modify snippets/examples relying of fp div (#2571) * Extensions: add DFRobot natural science board (#2574) * Extensions: add Kitronik clip dtector (#2576) Co-authored-by: Abhijith Chatra * missing image * Fix lesson images * fix images 2 * Add SpeedPicker to Motor Blocks * add sixth motor pin (M_GND3) Co-authored-by: Abhijith Chatra Co-authored-by: Peli de Halleux Co-authored-by: Galen Nickel Co-authored-by: Joey Wunderlich Co-authored-by: Danny Yates Co-authored-by: Sam Kent <32453267+microbit-sam@users.noreply.github.com> Co-authored-by: Michał Moskal Co-authored-by: Daryl Zuniga Co-authored-by: Eric Kimsey Co-authored-by: Mark Co-authored-by: Richard Knoll Co-authored-by: Peter Brodersen Co-authored-by: Leo Co-authored-by: Asher Kach Co-authored-by: Franklin Tse Co-authored-by: Neal McBurnett Co-authored-by: Kitronik Ltd Co-authored-by: shakao <34112083+shakao@users.noreply.github.com> Co-authored-by: Helen Leigh <48659173+helenleigh@users.noreply.github.com> Co-authored-by: Gerard Braad Co-authored-by: Nicole Parrot --- docs/calliope/firststeps/firstSteps.md | 4 +- docs/projects.md | 8 +- docs/projects/coin-flipper.md | 2 +- docs/projects/dice.md | 2 +- docs/projects/flashing-heart.md | 6 +- docs/projects/love-meter.md | 2 +- docs/projects/mini-chat.md | 2 +- docs/projects/multi-dice.md | 2 +- docs/projects/name-tag.md | 4 +- docs/projects/rock-paper-scissors.md | 2 +- docs/projects/smiley-buttons.md | 2 +- docs/projects/snap-the-dot.md | 2 +- editor/extension.tsx | 10 +- faviconDescription.json | 2 +- libs/core/motors.cpp | 2 + libs/core/pinscompat.ts | 4 +- libs/core/shims.d.ts | 4 +- sim/visuals/microbit.ts | 1220 ++++++++++++------------ 18 files changed, 634 insertions(+), 646 deletions(-) diff --git a/docs/calliope/firststeps/firstSteps.md b/docs/calliope/firststeps/firstSteps.md index 111f8ff0..a35ed168 100644 --- a/docs/calliope/firststeps/firstSteps.md +++ b/docs/calliope/firststeps/firstSteps.md @@ -14,7 +14,7 @@ For example drag and drop some blocks and try your program on the Simulator with Click the Download button in the editor. This will download a 'hex' file, which is a compact format of your program that your mini can read. Once the file has been downloaded, just copy it to your Calliope mini just like copying a file to a USB stick. -![Connecting Image](/docs/calliope/firststeps/connecting.jpg) +![Connecting Image](/calliope/firststeps/connecting.jpg) ## Introduction @unplugged @@ -32,7 +32,7 @@ Be careful to insure that the ridge on the plug is facing upwards. If the plug slides easily into the socket then you are attaching it correctly. Otherwise, turn the plug round and re-insert it into the socket. Slide it to "on“ and your Calliope mini is powered by the batteries. -![Powering Image](/docs/calliope/firststeps/powerItUp.png) +![Powering Image](/calliope/firststeps/powerItUp.png) ## Introduction @unplugged diff --git a/docs/projects.md b/docs/projects.md index f7ae1ffb..bd0d0e2d 100644 --- a/docs/projects.md +++ b/docs/projects.md @@ -5,18 +5,18 @@ { "name": "First Steps", "url": "/calliope/firststeps", - "imageUrl": "/docs/calliope/firststeps/connecting.jpg", - "largeImageUrl": "/docs/calliope/firststeps/firstSteps.jpg" + "imageUrl": "/calliope/firststeps/connecting.jpg", + "largeImageUrl": "/calliope/firststeps/firstSteps.jpg" }, { "name": "Tutorials", "url": "/calliope/tutorials", - "imageUrl": "/docs/calliope/tutorials/01_flashing_heart.gif" + "imageUrl": "/calliope/tutorials/01_flashing_heart.gif" }, { "name": "Calliope Links", "url": "/calliope/links", - "imageUrl": "/docs/calliope/links/thumbnail_shop.gif" + "imageUrl": "/calliope/links/thumbnail_shop.gif" } ] ``` diff --git a/docs/projects/coin-flipper.md b/docs/projects/coin-flipper.md index 7c9464e5..f82a7480 100644 --- a/docs/projects/coin-flipper.md +++ b/docs/projects/coin-flipper.md @@ -4,7 +4,7 @@ Let's create a coin flipping program to simulate a real coin toss. We'll use icon images to represent a ``heads`` or ``tails`` result. -![Simulating coin toss](/docs/calliope/tutorials/08_coin_flipper_animation.gif) +![Simulating coin toss](/calliope/tutorials/08_coin_flipper_animation.gif) ## Step 1 diff --git a/docs/projects/dice.md b/docs/projects/dice.md index 3de037ea..5ed9faf6 100644 --- a/docs/projects/dice.md +++ b/docs/projects/dice.md @@ -5,7 +5,7 @@ Let's turn the @boardname@ into a dice! (Want to learn how the accelerometer works? [Watch this video](https://youtu.be/byngcwjO51U)). -![A mini dice](/docs/calliope/tutorials/04_dice_animation.gif) +![A mini dice](/calliope/tutorials/04_dice_animation.gif) ## Step 1 @fullscreen diff --git a/docs/projects/flashing-heart.md b/docs/projects/flashing-heart.md index a8083b80..2dca5dd0 100644 --- a/docs/projects/flashing-heart.md +++ b/docs/projects/flashing-heart.md @@ -6,13 +6,13 @@ Learn how to use the LEDs and make a flashing heart! (Want to learn how lights work? [Watch this video](https://youtu.be/qqBmvHD5bCw)). -![Heart shape in the LEDs](/docs/calliope/tutorials/01_flashing_heart_animation.gif) +![Heart shape in the LEDs](/calliope/tutorials/01_flashing_heart_animation.gif) ## Step 1 @fullscreen Place the ``||basic:show leds||`` block in the ``||basic:forever||`` block and draw a heart. -![An animation that shows how to drag a block and paint a heart](/docs/calliope/tutorials/add_show_led.gif) +![An animation that shows how to drag a block and paint a heart](/calliope/tutorials/add_show_led.gif) ## Step 2 @fullscreen @@ -39,7 +39,7 @@ basic.forever(function() { Look at the virtual @boardname@, you should see the heart and your drawing blink on the screen. -![Heart shape in the LEDs](/docs/calliope/tutorials/01_flashing_heart_animation.gif) +![Heart shape in the LEDs](/calliope/tutorials/01_flashing_heart_animation.gif) ## Step 4 @fullscreen diff --git a/docs/projects/love-meter.md b/docs/projects/love-meter.md index df09b3a0..84e25a75 100644 --- a/docs/projects/love-meter.md +++ b/docs/projects/love-meter.md @@ -5,7 +5,7 @@ Make a love meter, how sweet! The @boardname@ is feeling the love, then sometimes not so much! Tell everyone who you are. Show you name on the LEDs. -![Love meter banner message](/docs/calliope/tutorials/05_love_meter_animation.gif) +![Love meter banner message](/calliope/tutorials/05_love_meter_animation.gif) ## Step 1 diff --git a/docs/projects/mini-chat.md b/docs/projects/mini-chat.md index c2aaa8a5..4695e152 100644 --- a/docs/projects/mini-chat.md +++ b/docs/projects/mini-chat.md @@ -2,7 +2,7 @@ ## Introduction @unplugged -![Two @boardname@ connected via radio](/docs/calliope/tutorials/06_mini_chat_animation.gif) +![Two @boardname@ connected via radio](/calliope/tutorials/06_mini_chat_animation.gif) Use the **radio** to send and receive messages with other @boardname@. diff --git a/docs/projects/multi-dice.md b/docs/projects/multi-dice.md index 7c3d9b1f..4d79de69 100644 --- a/docs/projects/multi-dice.md +++ b/docs/projects/multi-dice.md @@ -2,7 +2,7 @@ ## Introduction @unplugged -![Multiple @boardname@ throwing a dice](/docs/calliope/tutorials/10_multi_dice_animation.gif) +![Multiple @boardname@ throwing a dice](/calliope/tutorials/10_multi_dice_animation.gif) Build a multi-player dice game using the **radio**. The **radio** blocks let you send wireless messages between a @boardname@ and another @boardname@. diff --git a/docs/projects/name-tag.md b/docs/projects/name-tag.md index c2cae4d2..3f32ade3 100644 --- a/docs/projects/name-tag.md +++ b/docs/projects/name-tag.md @@ -4,7 +4,7 @@ Tell everyone who you are. Show you name on the LEDs. -![Name scrolling on the LEDs](/docs/calliope/tutorials/02_nametag_animation.gif) +![Name scrolling on the LEDs](/calliope/tutorials/02_nametag_animation.gif) ## Step 1 @fullscreen @@ -20,7 +20,7 @@ basic.forever(() => { Look at the simulator and make sure it shows your name on the screen. -![Name scrolling on the LEDs](/docs/calliope/tutorials/02_nametag_animation.gif) +![Name scrolling on the LEDs](/calliope/tutorials/02_nametag_animation.gif) ## Step 3 @fullscreen diff --git a/docs/projects/rock-paper-scissors.md b/docs/projects/rock-paper-scissors.md index 7a3465f6..3fc332ed 100644 --- a/docs/projects/rock-paper-scissors.md +++ b/docs/projects/rock-paper-scissors.md @@ -2,7 +2,7 @@ ## Introduction @unplugged -![Animation of the Rock Paper Scissors game](/docs/calliope/tutorials/07_stone_paper_scissors_animation.gif) +![Animation of the Rock Paper Scissors game](/calliope/tutorials/07_stone_paper_scissors_animation.gif) Use the accelerometer and the screen to build a **Rock Paper Scissors** game that you can play with your friends! diff --git a/docs/projects/smiley-buttons.md b/docs/projects/smiley-buttons.md index 43257e76..271560f6 100644 --- a/docs/projects/smiley-buttons.md +++ b/docs/projects/smiley-buttons.md @@ -5,7 +5,7 @@ Code the buttons on the @boardname@ to show that it's happy or sad. (Want to learn how the buttons works? [Watch this video](https://youtu.be/t_Qujjd_38o)). -![Pressing the A and B buttons](/docs/calliope/tutorials/03_smiley_button_animation.gif) +![Pressing the A and B buttons](/calliope/tutorials/03_smiley_button_animation.gif) ## Step 1 @fullscreen diff --git a/docs/projects/snap-the-dot.md b/docs/projects/snap-the-dot.md index 91ba3222..715c7260 100644 --- a/docs/projects/snap-the-dot.md +++ b/docs/projects/snap-the-dot.md @@ -2,7 +2,7 @@ ## Introduction @unplugged -![Animation of the snap the dot game](/docs/calliope/tutorials/09_snap_the_dot_animation.gif) +![Animation of the snap the dot game](/calliope/tutorials/09_snap_the_dot_animation.gif) Snap the dot is a game of skill where the player has to press **A** exactly when the dot reaches the center of the screen. diff --git a/editor/extension.tsx b/editor/extension.tsx index 0c838415..30d282db 100644 --- a/editor/extension.tsx +++ b/editor/extension.tsx @@ -897,7 +897,7 @@ function webUsbPairDialogAsync(confirmAsync: (options: any) => Promise):
{lf("First time here?")}
{lf("You must have version 0249 or above of the firmware")}
- +
{lf("Check your firmware version here and update if needed")} @@ -909,7 +909,7 @@ function webUsbPairDialogAsync(confirmAsync: (options: any) => Promise):
- +
@@ -924,7 +924,7 @@ function webUsbPairDialogAsync(confirmAsync: (options: any) => Promise):
- +
@@ -990,7 +990,7 @@ function showUploadInstructionsAsync(fn: string, url: string, confirmAsync: (opt
- +
@@ -1005,7 +1005,7 @@ function showUploadInstructionsAsync(fn: string, url: string, confirmAsync: (opt
- +
diff --git a/faviconDescription.json b/faviconDescription.json index d4eb3879..a3fa76c9 100644 --- a/faviconDescription.json +++ b/faviconDescription.json @@ -1,6 +1,6 @@ { "masterPicture": "docs/static/microbit.simplified.svg", - "iconsPath": "/docs/static/icons", + "iconsPath": "/static/icons", "design": { "ios": { "pictureAspect": "backgroundAndMargin", diff --git a/libs/core/motors.cpp b/libs/core/motors.cpp index 6e2f1903..c6e2733b 100644 --- a/libs/core/motors.cpp +++ b/libs/core/motors.cpp @@ -27,6 +27,7 @@ namespace motors { */ //% blockId=motor_on block="motor on at %percent" //% parts=dcmotor weight=90 blockGap=8 + //% percent.shadow="speedPicker" void motorPower(int power) { uBit.soundmotor.motorOn(power); } @@ -48,6 +49,7 @@ namespace motors { * Controls two motors attached to the board. Switches to dual-motor mode! */ //% blockId=block_dual_motor block="motor %motor|at %percent" + //% percent.shadow="speedPicker" //% weight=80 void dualMotorPower(Motor motor, int duty_percent) { switch(motor) { diff --git a/libs/core/pinscompat.ts b/libs/core/pinscompat.ts index aa20b6e9..2a728f78 100644 --- a/libs/core/pinscompat.ts +++ b/libs/core/pinscompat.ts @@ -125,13 +125,13 @@ namespace pins { * Pin P1 */ //% fixedInstance whenUsed - export const P1: PwmPin = new MicrobitPin(DigitalPin.P1); + export const P1: AnalogInPin = new MicrobitPin(DigitalPin.P1); /** * Pin P2 */ //% fixedInstance whenUsed - export const P2: PwmPin = new MicrobitPin(DigitalPin.P2); + export const P2: AnalogInPin = new MicrobitPin(DigitalPin.P2); /** * Pin P3 diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts index e8172511..6f89f2d4 100644 --- a/libs/core/shims.d.ts +++ b/libs/core/shims.d.ts @@ -599,7 +599,8 @@ declare namespace motors { * @param power %percent of power sent to the motor. Negative power goes backward. eg: 50 */ //% blockId=motor_on block="motor on at %percent" - //% parts=dcmotor weight=90 blockGap=8 shim=motors::motorPower + //% parts=dcmotor weight=90 blockGap=8 + //% percent.shadow="speedPicker" shim=motors::motorPower function motorPower(power: int32): void; /** @@ -613,6 +614,7 @@ declare namespace motors { * Controls two motors attached to the board. Switches to dual-motor mode! */ //% blockId=block_dual_motor block="motor %motor|at %percent" + //% percent.shadow="speedPicker" //% weight=80 shim=motors::dualMotorPower function dualMotorPower(motor: Motor, duty_percent: int32): void; } diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts index f9dcb3b3..19e79fd5 100644 --- a/sim/visuals/microbit.ts +++ b/sim/visuals/microbit.ts @@ -145,622 +145,602 @@ namespace pxsim.visuals { } `; const BOARD_SVG = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ` const pinNames = [ "BTN_A", "BTN_B", @@ -768,7 +748,7 @@ namespace pxsim.visuals { "C_GND1", "C_GND2", "C_GND3", "C_GND4", "C_VCC1", "C_VCC2", "C_P0", "C_P2", "C_P4", "C_P6", "C_P8", "C_P10", "C_P12", "C_P14", "C_P16", "C_P18", "C_P1", "C_P3", "C_P5", "C_P7", "C_P9", "C_P11", "C_P13", "C_P15", "C_P17", "C_P19", - "M_GND1", "M_GND2", "M_OUT1", "M_OUT2", "M_VM", + "M_GND1", "M_GND2", "M_GND3", "M_OUT1", "M_OUT2", "M_VM", "G_A0_GND", "G_A0_VCC", "G_A0_SDA", "G_A0_SCL", "G_A1_RX", "G_A1_TX", "G_A1_VCC", "G_A1_GND" ]; @@ -778,7 +758,7 @@ namespace pxsim.visuals { "GND", "GND", "GND", "GND", "+3v3", "+3v3", "C0", "C2", "C4", "C6", "C8", "C10", "C12", "C14", "C16", "C18", "C1", "C3", "C5", "C7", "C9", "C11", "C13", "C15", "C17", "C19", - "GND", "GND", "MOTOR B", "MOTOR A", "MOTOR VM", + "GND", "GND", "GND", "MOTOR B", "MOTOR A", "MOTOR VM", "GND", "+3v3", "C18, I2C - SDA", "C19, I2C - SCL", "C16, Serial - RX", "C17, Serial - TX", "+3v3", "GND" ]; @@ -1009,6 +989,10 @@ namespace pxsim.visuals { "M_GND2": [ 156.46077728271484, 141.70752716064453 + ], + "M_GND3": [ + 168.83547210693360, + 141.70752716064453 ], "M_OUT1": [ 144.08607482910156,