From 2a30a2dd76f1249d5e0cf6d8ec5c391b70ce405e Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 22 Jan 2020 21:17:07 +0100 Subject: [PATCH] Updating Simulator Pins (#75) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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) * Fix Touch Pins in Simulator * pinTexts type Update 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 --- package-lock.json | 32 ++++----- sim/state/edgeconnector.ts | 2 +- sim/visuals/microbit.ts | 144 +++++++++++++++++++++++++++---------- 3 files changed, 122 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 415071e5..44d1955f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -123,11 +123,11 @@ } }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", + "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" @@ -679,9 +679,9 @@ } }, "caniuse-db": { - "version": "1.0.30001019", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001019.tgz", - "integrity": "sha512-AdQItnPLQ32qEWPAfp3lGIYXxjbHOtcabhmvqEv831kc8WyYdibpdnnUu+gQXxEwDf1Job597aCbqf+EYAnuTA==" + "version": "1.0.30001022", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001022.tgz", + "integrity": "sha512-2RQQgO+yDEaqF4ltwrCja7oZst+FVnXHQLSJgZ678tausEljBq3/U20Fedvze+Hxqm8XLV+9OgGbtdgS7ksnRw==" }, "caseless": { "version": "0.12.0", @@ -1237,9 +1237,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.328", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.328.tgz", - "integrity": "sha512-x4XefnFxDxFwaQ01d/pppJP9meWhOIJ/gtI6/4jqkpsadq79uL7NYSaX64naLmJqvzUBjSrO3IM2+1b/W9KdPg==" + "version": "1.3.338", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.338.tgz", + "integrity": "sha512-wlmfixuHEc9CkfOKgcqdtzBmRW4NStM9ptl5oPILY2UDyHuSXb3Yit+yLVyLObTgGuMMU36hhnfs2GDJId7ctA==" }, "elliptic": { "version": "6.5.2", @@ -1419,9 +1419,9 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" }, "fast-json-stable-stringify": { "version": "2.1.0", @@ -3518,9 +3518,9 @@ } }, "pxt-core": { - "version": "5.31.8", - "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-5.31.8.tgz", - "integrity": "sha512-9+x7LGHER1C1X67G1F6VSSG1xpSDtuF5NoWVbel3zC7v/wzv2zHjn+CE4R2Mj4DM5fGp39vtfcTXKbPp/Kec8w==", + "version": "5.32.3", + "resolved": "https://registry.npmjs.org/pxt-core/-/pxt-core-5.32.3.tgz", + "integrity": "sha512-5HnyCbkEbhgj+/o8Bv6ib07dEquhMYmXGo/DaSFXM3ZCN1XBqCiqRXlDo2t/nxZiAxvSRIUBy8uOaQl/CafvqQ==", "requires": { "applicationinsights-js": "^1.0.20", "bluebird": "3.5.1", diff --git a/sim/state/edgeconnector.ts b/sim/state/edgeconnector.ts index 80bf91e4..15a250b7 100644 --- a/sim/state/edgeconnector.ts +++ b/sim/state/edgeconnector.ts @@ -61,7 +61,7 @@ namespace pxsim.pins { let pin = getPin(pinId); if (!pin) return; pin.mode = PinFlags.Analog | PinFlags.Output; - pin.value = value ? 1 : 0; + pin.value = value ? value : 0; runtime.queueDisplayUpdate(); } diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts index 19e79fd5..e8c0032e 100644 --- a/sim/visuals/microbit.ts +++ b/sim/visuals/microbit.ts @@ -71,7 +71,7 @@ namespace pxsim.visuals { .sim-text-pin { font-family:"Lucida Console", Monaco, monospace; font-size:20px; - fill:#fff; + fill:#3cb5b5; pointer-events: none; } @@ -244,130 +244,191 @@ namespace pxsim.visuals { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - @@ -822,7 +883,7 @@ namespace pxsim.visuals { private buttonsOuter: SVGElement[]; private pins: SVGElement[]; private pinGradients: SVGLinearGradientElement[]; - private pinTexts: SVGTextElement[]; + private pinTexts:{ [key: number]: SVGTextElement }; private ledsOuter: SVGElement[]; private leds: SVGElement[]; private systemLed: SVGCircleElement; @@ -1210,7 +1271,7 @@ namespace pxsim.visuals { private updatePin(pin: Pin, index: number) { if (!pin) return; - let text = this.pinTexts[index]; + let text = this.pinTexts[pin.id]; let v = ""; if (pin.mode & PinFlags.Analog) { v = Math.floor(100 - (pin.value || 0) / 1023 * 100) + "%"; @@ -1222,10 +1283,10 @@ namespace pxsim.visuals { } else if (pin.mode & PinFlags.Touch) { v = pin.touched ? "0%" : "100%"; - if (text) text.textContent = ""; + if (text) text.textContent = "TOUCHED"; } else { v = "100%"; - if (text) text.textContent = ""; + if (text) text.textContent = "unused"; } if (v) svg.setGradientValue(this.pinGradients[index], v); } @@ -1452,7 +1513,12 @@ namespace pxsim.visuals { return lg; }) - this.pinTexts = [67, 165, 275].map(x => svg.child(this.g, "text", { class: "sim-text-pin", x: x, y: 345 })); + 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 }) + } // BTN A, B const btnids = ["BTN_A", "BTN_B"]; @@ -1593,7 +1659,7 @@ namespace pxsim.visuals { return false; }); }) - this.pins.slice(0, 3).forEach((btn, 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;