From 3ae48a4156f48349daf9c9537b39f71dd2b86328 Mon Sep 17 00:00:00 2001
From: Joey Wunderlich <jwunderl@users.noreply.github.com>
Date: Wed, 27 Sep 2023 10:08:02 -0700
Subject: [PATCH 1/2] enable n4 hardware (#6090)

---
 libs/hw---n4/pxt.json | 1 -
 pxtarget.json         | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/hw---n4/pxt.json b/libs/hw---n4/pxt.json
index 3ae1b552403..3bb0712770c 100644
--- a/libs/hw---n4/pxt.json
+++ b/libs/hw---n4/pxt.json
@@ -35,7 +35,6 @@
             "DEVICE_WEBUSB": 0
         }
     },
-    "experimentalHw": true,
     "dalDTS": {
         "corePackage": "../core---nrf52"
     }
diff --git a/pxtarget.json b/pxtarget.json
index 81ec5b087f0..5025d6e5e0d 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -126,6 +126,7 @@
         "base": [
             "libs/hw",
             "libs/hw---n3",
+            "libs/hw---n4",
             "libs/hw---samd51",
             "libs/hw---stm32f401",
             "libs/hw---rp2040"

From 2e523015a5268719afddd3cee9e2cb1a23fd0eca Mon Sep 17 00:00:00 2001
From: Joey Wunderlich <jwunderl@users.noreply.github.com>
Date: Wed, 27 Sep 2023 10:09:22 -0700
Subject: [PATCH 2/2] port hardware options to targetconfig (#6089)

* port hardware options to targetconfig

* add variant for micro:bit shield entries, reorder based off usage
---
 targetconfig.json | 93 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/targetconfig.json b/targetconfig.json
index f137d47043c..bd54651e379 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -251,6 +251,99 @@
             }
         ]
     },
+    "hardwareOptions": [
+        {
+            "name": "Meowbit",
+            "description": "A retro game console for STEM education from Kittenbot team",
+            "imageUrl": "/static/hardware/meowbit.png",
+            "url": "https://www.kittenbot.cc/collections/frontpage/products/meowbit-codable-console-for-microsoft-makecode-arcade",
+            "variant": "hw---stm32f401"
+        },
+        {
+            "name": "Retro Arcade for Education",
+            "description": "The Retro has a big screen, colorful protective case, d-pad and vibration motor",
+            "imageUrl": "/static/hardware/elecfreaksarcade.jpg",
+            "url": "https://shop.elecfreaks.com/products/elecfreaks-retro-makecode-arcade-for-education",
+            "variant": "hw---stm32f401"
+        },
+        {
+            "name": "TinkerGen GameGo",
+            "description": "A fun-sized console to play the games you code.",
+            "imageUrl": "/static/hardware/gamego.jpg",
+            "url": "https://www.tinkergen.com/gamego",
+            "variant": "hw---stm32f401"
+        },
+        {
+            "name": "Kitronik ARCADE",
+            "description": "ARCADE is a programmable gamepad for use with MakeCode Arcade.",
+            "imageUrl": "/static/hardware/kitronik.jpg",
+            "url": "https://www.kitronik.co.uk/arcade",
+            "variant": "hw---samd51"
+        },
+        {
+            "name": "Adafruit PyBadge",
+            "description": "It's a badge, it's an arcade, it's a PyBadge",
+            "imageUrl": "/static/hardware/pybadge.jpg",
+            "url": "https://www.adafruit.com/product/4200",
+            "variant": "hw---samd51"
+        },
+        {
+            "name": "BrainPad Arcade",
+            "description": "Learn how BrainPad Arcade lets you run games on a small handheld console.",
+            "imageUrl": "/static/hardware/ghiarcade.jpg",
+            "url": "https://brainpad.com/arcade",
+            "variant": "hw---stm32f401"
+        },
+        {
+            "name": "Adafruit PyGamer",
+            "description": "The upgraded PyBadge",
+            "imageUrl": "/static/hardware/pygamer.jpg",
+            "url": "https://www.adafruit.com/product/4242",
+            "variant": "hw---samd51"
+        },
+        {
+            "name": "Ovobot Xtron Pro",
+            "description": "A programmable modular console to create games, design wearables and make creative projects.",
+            "imageUrl": "/static/hardware/xtronpro.png",
+            "url": "https://www.ovobot.cc/en/product/detail/xtron-pro/",
+            "variant": "hw---stm32f401"
+        },
+        {
+            "name": "Adafruit EdgeBadge",
+            "description": "It's the PyBadge with a zest of Machine learning",
+            "imageUrl": "/static/hardware/edgebadge.jpg",
+            "url": "https://www.adafruit.com/product/4400",
+            "variant": "hw---samd51"
+        },
+        {
+            "name": "Adafruit M4",
+            "description": "Learn how to run your games on micro-controllers from Adafruit",
+            "imageUrl": "/static/hardware/adafruitm4.jpg",
+            "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",
+            "variant": "hw---n4"
+        },
+        {
+            "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",
+            "variant": "hw---n4"
+        },
+        {
+            "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",
+            "variant": "hw---n4"
+        }
+    ],
     "galleries": {
         "Beginner Skillmaps": "beginner-maps",
         "Next Level Skillmaps": "inter-maps",