diff --git a/docs/jacdac.md b/docs/jacdac.md index bd70bbb5e68..61219a733ad 100644 --- a/docs/jacdac.md +++ b/docs/jacdac.md @@ -10,7 +10,7 @@ Connect and Code. Instantly. [{ "name": "Getting started", "description": "Connect and Code. Instantly in MakeCode.", - "url":"https://microsoft.github.io/jacdac-docs/clients/makecode/", + "url":"https://jacdac.github.io/jacdac-docs/clients/makecode/", "imageUrl": "/static/jacdac/getting-started.jpg" }] ``` @@ -22,37 +22,37 @@ Connect and Code. Instantly. { "name": "Button smasher", "description": "How many times can you smash the button in 10 seconds?", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/button-smasher/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/button-smasher/", "imageUrl": "/static/jacdac/button-smasher.jpg" }, { "name": "Slider Sound Bender", "description": "Create twisted sounds using a slider module.", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/", "imageUrl": "/static/jacdac/slider-sound-bender.jpg" }, { "name": "Light Sound Bender", "description": "Create twisted sounds using light levels", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/", "imageUrl": "/static/jacdac/light-sound-bender.jpg" }, { "name": "Rotary Sound Bender", "description": "Create twisted sounds using a rotary encoder module.", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/", "imageUrl": "/static/jacdac/rotary-sound-bender.jpg" }, { "name": "Sound LED", "description": "Show the sound level on a LED ring", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/sound-led/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/sound-led/", "imageUrl": "/static/jacdac/sound-led.jpg" }, { "name": "Magnetic Sound Bender", "description": "Create twisted sounds using a magnet", - "url": "https://microsoft.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/", + "url": "https://jacdac.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/", "imageUrl": "/static/jacdac/magnetic-sound-bender.jpg" } ] diff --git a/docs/projects/SUMMARY.md b/docs/projects/SUMMARY.md index 8e37a647a64..207476e4fcb 100644 --- a/docs/projects/SUMMARY.md +++ b/docs/projects/SUMMARY.md @@ -148,13 +148,13 @@ * [ARM University - micro:course](https://github.com/arm-university/micro-course) * [A-Z Robotics](https://tinkerspark.teachable.com/) * [Jacdac](/jacdac) - * [Getting started](https://microsoft.github.io/jacdac-docs/clients/makecode/) - * [Button smasher](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/button-smasher/) - * [Slider Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/) - * [Light Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/) - * [Rotary Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/) - * [Sound LED](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/sound-led/) - * [Magnetic Sound Bender](https://microsoft.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/) + * [Getting started](https://jacdac.github.io/jacdac-docs/clients/makecode/) + * [Button smasher](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/button-smasher/) + * [Slider Sound Bender](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/slider-sound-bender/) + * [Light Sound Bender](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/light-sound-bender/) + * [Rotary Sound Bender](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/rotary-sound-bender/) + * [Sound LED](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/sound-led/) + * [Magnetic Sound Bender](https://jacdac.github.io/jacdac-docs/clients/makecode/projects/magnetic-sound-bender/) * [MicroCode for the new micro:bit (V2)](/microcode) * [Getting Started](https://microbit-apps.github.io/microcode-classic/docs/manual) * [Samples](https://microbit-apps.github.io/microcode-classic/docs/samples) diff --git a/pxtarget.json b/pxtarget.json index 66646c512c1..c53322adcab 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -250,12 +250,6 @@ "parts": true, "partsAspectRatio": 0.69, "messageSimulators": { - "jacdac": { - "url": "https://microsoft.github.io/jacdac-docs/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$", - "localHostUrl": "http://localhost:8000/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$", - "aspectRatio": 1.22, - "permanent": true - }, "robot": { "url": "https://microsoft.github.io/microbit-robot/?parentOrigin=$PARENT_ORIGIN$", "localHostUrl": "http://localhost:3000/microbit-robot/?parentOrigin=$PARENT_ORIGIN$", diff --git a/targetconfig.json b/targetconfig.json index 2f454cad1b5..7d405db1f23 100644 --- a/targetconfig.json +++ b/targetconfig.json @@ -315,74 +315,9 @@ "muselab/pxt-muselab-oled-v2": { "tags": [ "Lights and Display" ] }, "microsoft/pxt-jacdac": { "tags": [ "Science" ], - "upgrades": [ "min:v1.8.13" ] - }, - "microsoft/pxt-jacdac/accelerometer": {}, - "microsoft/pxt-jacdac/acidity": {}, - "microsoft/pxt-jacdac/air-pressure": {}, - "microsoft/pxt-jacdac/air-quality-index": {}, - "microsoft/pxt-jacdac/arcade-gamepad": {}, - "microsoft/pxt-jacdac/azure-iot-hub-health": {}, - "microsoft/pxt-jacdac/button": {}, - "microsoft/pxt-jacdac/buzzer": {}, - "microsoft/pxt-jacdac/character-screen": {}, - "microsoft/pxt-jacdac/codal-message-bus": {}, - "microsoft/pxt-jacdac/color": {}, - "microsoft/pxt-jacdac/compass": {}, - "microsoft/pxt-jacdac/dc-current-measurement": {}, - "microsoft/pxt-jacdac/dc-voltage-measurement": {}, - "microsoft/pxt-jacdac/distance": {}, - "microsoft/pxt-jacdac/dmx": {}, - "microsoft/pxt-jacdac/dot-matrix": {}, - "microsoft/pxt-jacdac/dual-motors": {}, - "microsoft/pxt-jacdac/e-co2": {}, - "microsoft/pxt-jacdac/flex": {}, - "microsoft/pxt-jacdac/gamepad": {}, - "microsoft/pxt-jacdac/gyroscope": {}, - "microsoft/pxt-jacdac/heart-rate": {}, - "microsoft/pxt-jacdac/hid-joystick": {}, - "microsoft/pxt-jacdac/hid-keyboard": {}, - "microsoft/pxt-jacdac/hid-mouse": {}, - "microsoft/pxt-jacdac/humidity": {}, - "microsoft/pxt-jacdac/illuminance": {}, - "microsoft/pxt-jacdac/led": {}, - "microsoft/pxt-jacdac/led-single": {}, - "microsoft/pxt-jacdac/led-strip": {}, - "microsoft/pxt-jacdac/light-bulb": {}, - "microsoft/pxt-jacdac/light-level": {}, - "microsoft/pxt-jacdac/magnetic-field-level": {}, - "microsoft/pxt-jacdac/magnetometer": {}, - "microsoft/pxt-jacdac/model-runner": {}, - "microsoft/pxt-jacdac/motion": {}, - "microsoft/pxt-jacdac/motor": {}, - "microsoft/pxt-jacdac/multitouch": {}, - "microsoft/pxt-jacdac/potentiometer": {}, - "microsoft/pxt-jacdac/pulse-oximeter": {}, - "microsoft/pxt-jacdac/rain-gauge": {}, - "microsoft/pxt-jacdac/real-time-clock": {}, - "microsoft/pxt-jacdac/reflected-light": {}, - "microsoft/pxt-jacdac/relay": {}, - "microsoft/pxt-jacdac/rng": {}, - "microsoft/pxt-jacdac/rotary-encoder": {}, - "microsoft/pxt-jacdac/sensor-aggregator": {}, - "microsoft/pxt-jacdac/servo": {}, - "microsoft/pxt-jacdac/seven-segment-display": {}, - "microsoft/pxt-jacdac/soil-moisture": {}, - "microsoft/pxt-jacdac/solenoid": {}, - "microsoft/pxt-jacdac/sound-level": {}, - "microsoft/pxt-jacdac/speech-synthesis": {}, - "microsoft/pxt-jacdac/switch": {}, - "microsoft/pxt-jacdac/tcp": {}, - "microsoft/pxt-jacdac/temperature": {}, - "microsoft/pxt-jacdac/traffic-light": {}, - "microsoft/pxt-jacdac/tvoc": {}, - "microsoft/pxt-jacdac/uv-index": {}, - "microsoft/pxt-jacdac/vibration-motor": {}, - "microsoft/pxt-jacdac/water-level": {}, - "microsoft/pxt-jacdac/weight-scale": {}, - "microsoft/pxt-jacdac/wifi": {}, - "microsoft/pxt-jacdac/wind-direction": {}, - "microsoft/pxt-jacdac/wind-speed": {}, + "upgrades": [ "move:jacdac/pxt-jacdac" ], + "hidden": true + }, "coolguy-official/pxt-coolguy": {}, "bouw-je-bep/bouw-je-bep": { "tags": [ "Robotics" ] }, "birdbraintechnologies/pxt-finch": { "tags": [ "Robotics" ] }, @@ -507,79 +442,12 @@ "jacdac/pxt-jacdac": { "simx": { "sha": "0cd760f1d1575b8dcd8ec8abcbb780fc10ec6937", - "devUrl": "https://jacdac.github.io/pxt-jacdac/" + "devUrl": "https://jacdac.github.io/jacdac-docs/tools/makecode-sim/" } - }, - "jacdac/pxt-jacdac/accelerometer": {}, - "jacdac/pxt-jacdac/acidity": {}, - "jacdac/pxt-jacdac/air-pressure": {}, - "jacdac/pxt-jacdac/air-quality-index": {}, - "jacdac/pxt-jacdac/arcade-gamepad": {}, - "jacdac/pxt-jacdac/azure-iot-hub-health": {}, - "jacdac/pxt-jacdac/button": {}, - "jacdac/pxt-jacdac/buzzer": {}, - "jacdac/pxt-jacdac/character-screen": {}, - "jacdac/pxt-jacdac/codal-message-bus": {}, - "jacdac/pxt-jacdac/color": {}, - "jacdac/pxt-jacdac/compass": {}, - "jacdac/pxt-jacdac/dc-current-measurement": {}, - "jacdac/pxt-jacdac/dc-voltage-measurement": {}, - "jacdac/pxt-jacdac/distance": {}, - "jacdac/pxt-jacdac/dmx": {}, - "jacdac/pxt-jacdac/dot-matrix": {}, - "jacdac/pxt-jacdac/dual-motors": {}, - "jacdac/pxt-jacdac/e-co2": {}, - "jacdac/pxt-jacdac/flex": {}, - "jacdac/pxt-jacdac/gamepad": {}, - "jacdac/pxt-jacdac/gyroscope": {}, - "jacdac/pxt-jacdac/heart-rate": {}, - "jacdac/pxt-jacdac/hid-joystick": {}, - "jacdac/pxt-jacdac/hid-keyboard": {}, - "jacdac/pxt-jacdac/hid-mouse": {}, - "jacdac/pxt-jacdac/humidity": {}, - "jacdac/pxt-jacdac/illuminance": {}, - "jacdac/pxt-jacdac/led": {}, - "jacdac/pxt-jacdac/led-single": {}, - "jacdac/pxt-jacdac/led-strip": {}, - "jacdac/pxt-jacdac/light-bulb": {}, - "jacdac/pxt-jacdac/light-level": {}, - "jacdac/pxt-jacdac/magnetic-field-level": {}, - "jacdac/pxt-jacdac/magnetometer": {}, - "jacdac/pxt-jacdac/model-runner": {}, - "jacdac/pxt-jacdac/motion": {}, - "jacdac/pxt-jacdac/motor": {}, - "jacdac/pxt-jacdac/multitouch": {}, - "jacdac/pxt-jacdac/potentiometer": {}, - "jacdac/pxt-jacdac/pulse-oximeter": {}, - "jacdac/pxt-jacdac/rain-gauge": {}, - "jacdac/pxt-jacdac/real-time-clock": {}, - "jacdac/pxt-jacdac/reflected-light": {}, - "jacdac/pxt-jacdac/relay": {}, - "jacdac/pxt-jacdac/rng": {}, - "jacdac/pxt-jacdac/rotary-encoder": {}, - "jacdac/pxt-jacdac/sensor-aggregator": {}, - "jacdac/pxt-jacdac/servo": {}, - "jacdac/pxt-jacdac/seven-segment-display": {}, - "jacdac/pxt-jacdac/soil-moisture": {}, - "jacdac/pxt-jacdac/solenoid": {}, - "jacdac/pxt-jacdac/sound-level": {}, - "jacdac/pxt-jacdac/speech-synthesis": {}, - "jacdac/pxt-jacdac/switch": {}, - "jacdac/pxt-jacdac/tcp": {}, - "jacdac/pxt-jacdac/temperature": {}, - "jacdac/pxt-jacdac/traffic-light": {}, - "jacdac/pxt-jacdac/tvoc": {}, - "jacdac/pxt-jacdac/uv-index": {}, - "jacdac/pxt-jacdac/vibration-motor": {}, - "jacdac/pxt-jacdac/water-level": {}, - "jacdac/pxt-jacdac/weight-scale": {}, - "jacdac/pxt-jacdac/wifi": {}, - "jacdac/pxt-jacdac/wind-direction": {}, - "jacdac/pxt-jacdac/wind-speed": {} + } }, "approvedEditorExtensionUrls": [ - "https://microsoft.github.io/ml4f/", - "https://microsoft.github.io/jacdac-docs/tools/makecode-editor-extension" + "https://microsoft.github.io/ml4f/" ], "extensionsToolboxDisallowDelete": [ ]