Merge branch 'master' into kiki-lee-lyla

microsoft · Sep 27, 2023 · ef78f29 · ef78f29
2 parents 82dc6c2 + ce78a6f
commit ef78f29
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 44 deletions.
diff --git a/docs/arcade-devices.md b/docs/arcade-devices.md
@@ -76,6 +76,24 @@ These boards run MakeCode Arcade games. Choose a board to find out more about it
         "url": "https://learn.adafruit.com/makecode-arcade-m4",
         "variant": "hw---samd51"
     },
+    {
+        "name": "micro:bit Newbit Shield",
+        "description": "Use the micro:bit with an expansion board from Kittenbot",
+        "imageUrl": "/static/hardware/newbit.png",
+        "url": "https://www.kittenbot.cc/products/newbit-arcade-shield"
+    },
+    {
+        "name": "micro:bit Retro Shield",
+        "description": "Use the micro:bit with an expansion board from Elecfreaks",
+        "imageUrl": "/static/hardware/retro-shield.jpg",
+        "url": "https://shop.elecfreaks.com/products/micro-bit-retro-programming-arcade"
+    },
+    {
+        "name": "micro:bit Game:Bit Shield",
+        "description": "Use the micro:bit with an expansion board from iCShop",
+        "imageUrl": "/static/hardware/bit-shield.png",
+        "url": "https://www.icshop.com.tw/products/368112100137"
+    },
     {
         "name": "Add Board",
         "description": "Are you looking to build your own hardware to run Arcade games? This in-depth guide provides the technical details and specifications to get started.",
@@ -87,9 +105,9 @@ These boards run MakeCode Arcade games. Choose a board to find out more about it
 
 ## Adding a New Board to Arcade
 
-![Schematics screenshot](/static/hardware/minipcb.png)
+![Schematics screenshot](/static/hardware/screen-framed.png)
 
-If you want to design a board with Arcade support, refer to [Adding Board page](/hardware/adding).
+If you want to design a board with Arcade support, refer to the [Adding Board](/hardware/adding) page.
 
-There is some minimal documentation about adding new MCUs in the
+There are a few resources about adding new MCUs in the
 [Arcade Hardware Development](/hardware/dev) page.
diff --git a/docs/diy-hardware.md b/docs/diy-hardware.md
@@ -14,18 +14,22 @@ Choose one of these projects to create your own Arcade game console, cabinet, or
         "variant": "hw---rpi"
     },
     {
-        "name": "Cardboard Panel",
-        "description": "Turn a cardboard box into a tabletop arcade.",
-        "imageUrl": "/static/hardware/controlpanel.jpg",
-        "url": "/hardware/raspberry-pi/cardboard-control-panel",
-        "variant": "hw---rpi"
+        "name": "Shoebox Controller",
+        "description": "Turn a shoebox into a USB game controller for a PC.",
+        "imageUrl": "/static/hardware/shoebox.jpg",
+        "url": "/hardware/shoebox-controller"
     },
     {
-        "name": "Arcade table",
-        "description": "Turn an IKEA FLISAT table into an arcade.",
-        "imageUrl": "/static/hardware/raspberry-pi/ikea-flisat-table/gallery.jpg",
-        "url": "/hardware/raspberry-pi/ikea-flisat-table",
-        "variant": "hw---rpi"
+        "name": "Kiosk",
+        "description": "Showcase games on your project Arcade in the Kiosk.",
+        "imageUrl": "/static/hardware/kiosk/kiosk-thumb.png",
+        "url": "/hardware/kiosk"
+    },
+    {
+        "name": "Makey Makey",
+        "description": "Turn your banana keyboard into an Arcade game controller.",
+        "imageUrl": "/static/hardware/makey-makey.jpg",
+        "url": "https://makeymakey.com/blogs/how-to-instructions/getting-started-with-microsoft-makecode-arcade"
     },
     {
         "name": "Adafruit Joy Bonnet",
@@ -35,20 +39,18 @@ Choose one of these projects to create your own Arcade game console, cabinet, or
         "variant": "hw---rpi"
     },
     {
-        "name": "Shoebox Controller",
-        "description": "Turn a shoebox into a USB game controller for a PC.",
-        "imageUrl": "/static/hardware/shoebox.jpg",
-        "url": "/hardware/shoebox-controller"
+        "name": "Cardboard Panel",
+        "description": "Turn a cardboard box into a tabletop arcade.",
+        "imageUrl": "/static/hardware/controlpanel.jpg",
+        "url": "/hardware/raspberry-pi/cardboard-control-panel",
+        "variant": "hw---rpi"
     },
     {
-        "name": "Kiosk",
-        "description": "Showcase games on your project Arcade in the Kiosk.",
-        "imageUrl": "/static/hardware/kiosk/kiosk-thumb.png",
-        "url": "/hardware/kiosk"
+        "name": "Arcade table",
+        "description": "Turn an IKEA FLISAT table into an arcade.",
+        "imageUrl": "/static/hardware/raspberry-pi/ikea-flisat-table/gallery.jpg",
+        "url": "/hardware/raspberry-pi/ikea-flisat-table",
+        "variant": "hw---rpi"
     }
 ]
-```
-
-## Other ways to play Arcade
-
-* [Makey Makey](/hardware/makey-makey), turn your banana keyboard into an arcade console!
+```
diff --git a/docs/hardware.md b/docs/hardware.md
@@ -2,7 +2,7 @@
 
 ## Boards
 
-These boards run MakeCode Arcade games. Choose a board to find out more about it and where you can get one!
+These boards run MakeCode Arcade games. They are based on our guidelines, adhere to open source hardware reference designs (see Adding a New Board to Arcade section below), and have been user tested.  However, each hardware manufacturer is responsible for ensuring the compatibility, reliability, safety and compliance of their products. Microsoft provides no representations or warranties on these products and disclaims liability for any risks associated with their use.
 
 ```codecard
 [
@@ -76,6 +76,31 @@ These boards run MakeCode Arcade games. Choose a board to find out more about it
         "url": "https://learn.adafruit.com/makecode-arcade-m4",
         "variant": "hw---samd51"
     },
+    {
+        "name": "micro:bit Newbit Shield",
+        "description": "Use the micro:bit with an expansion board from Kittenbot",
+        "imageUrl": "/static/hardware/newbit.png",
+        "url": "https://www.kittenbot.cc/products/newbit-arcade-shield"
+    },
+    {
+        "name": "micro:bit Retro Shield",
+        "description": "Use the micro:bit with an expansion board from Elecfreaks",
+        "imageUrl": "/static/hardware/retro-shield.jpg",
+        "url": "https://shop.elecfreaks.com/products/micro-bit-retro-programming-arcade"
+    },
+    {
+        "name": "micro:bit Game:Bit Shield",
+        "description": "Use the micro:bit with an expansion board from iCShop",
+        "imageUrl": "/static/hardware/bit-shield.png",
+        "url": "https://www.icshop.com.tw/products/368112100137"
+    }
+]
+```
+
+## Other ways to play Arcade
+
+```codecard
+[
     {
         "name": "Adafruit Joy Bonnet",
         "description": "Learn how to run your games on Raspberry Pi Zero and Adafruit Joy Bonnet.",
@@ -110,23 +135,19 @@ These boards run MakeCode Arcade games. Choose a board to find out more about it
         "variant": "hw---rpi"
     },
     {
-        "name": "Add Board",
-        "description": "Are you looking to build your own hardware to run Arcade games? This in-depth guide provides the technical details and specifications to get started.",
-        "url": "/hardware/adding",
-        "imageUrl": "/static/hardware/minipcb.png"
+        "name": "Makey Makey",
+        "description": "Turn your banana keyboard into an Arcade game controller.",
+        "imageUrl": "/static/hardware/makey-makey.jpg",
+        "url": "https://makeymakey.com/blogs/how-to-instructions/getting-started-with-microsoft-makecode-arcade"
     }
 ]
 ```
 
-## Other ways to play Arcade
-
-* [Makey Makey](/hardware/makey-makey), turn your banana keyboard into an arcade console!
-
 ## Adding a New Board to Arcade
 
-![Schematics screenshot](/static/hardware/minipcb.png)
+![Schematics screenshot](/static/hardware/screen-framed.png)
 
-If you want to design a board with Arcade support, refer to [Adding Board page](/hardware/adding).
+If you want to design a board with Arcade support, refer to the [Adding Board](/hardware/adding) page.
 
-There is some minimal documentation about adding new MCUs in the
+There are a few resources about adding new MCUs in the
 [Arcade Hardware Development](/hardware/dev) page.
diff --git a/docs/hardware/adding.md b/docs/hardware/adding.md
@@ -1,10 +1,12 @@
 # Creating your own Arcade hardware
 
-## ~ alert
+### ~ alert
+
+#### Contact the MakeCode Team
 
-**If you want to produce an Arcade-compatible product please let us know at [email protected].**
+**If you want to produce an Arcade compatible product please let us know at [email protected].**
 
-## ~
+### ~
 
 ## Overview #overview
 

diff --git a/docs/hardware/dev.md b/docs/hardware/dev.md
@@ -1,5 +1,7 @@
 # Arcade Hardware Development
 
+![Schematics screenshot](/static/hardware/minipcb-framed.png)
+
 ## Creating a new board based on a supported MCU
 
 * [Creating new hardware](/hardware/adding)

diff --git a/docs/index-ref.json b/docs/index-ref.json
@@ -1,3 +1,3 @@
 {
-    "appref": "v1.12.39"
+    "appref": "v1.12.41"
 }
diff --git a/docs/kiosk-data/sfx/notification.ogg b/docs/kiosk-data/sfx/notification.ogg
diff --git a/docs/kiosk-data/sfx/select.ogg b/docs/kiosk-data/sfx/select.ogg
diff --git a/docs/kiosk-data/sfx/swipe.ogg b/docs/kiosk-data/sfx/swipe.ogg
diff --git a/docs/kiosk-data/sfx/switch.ogg b/docs/kiosk-data/sfx/switch.ogg
diff --git a/docs/static/hardware/bit-shield.png b/docs/static/hardware/bit-shield.png
diff --git a/docs/static/hardware/makey-makey.jpg b/docs/static/hardware/makey-makey.jpg
diff --git a/docs/static/hardware/minipcb-framed.png b/docs/static/hardware/minipcb-framed.png
diff --git a/docs/static/hardware/newbit.png b/docs/static/hardware/newbit.png
diff --git a/docs/static/hardware/retro-shield.jpg b/docs/static/hardware/retro-shield.jpg
diff --git a/docs/static/hardware/screen-framed.png b/docs/static/hardware/screen-framed.png
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pxt-arcade",
-    "version": "1.13.37",
+    "version": "1.13.39",
     "description": "Small arcade editor for MakeCode",
     "keywords": [
         "JavaScript",
@@ -32,7 +32,7 @@
     },
     "dependencies": {
         "pxt-common-packages": "10.4.10",
-        "pxt-core": "9.1.13"
+        "pxt-core": "9.1.15"
     },
     "optionalDependencies": {
         "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.5"