From 1767e3d10c31a2f91f092e91e3ddfeecc82392d4 Mon Sep 17 00:00:00 2001
From: Peli de Halleux <pelikhan@users.noreply.github.com>
Date: Fri, 7 Sep 2018 08:02:44 -0700
Subject: [PATCH] always show BLE pairing options in settings dialog (#1187)

---
 libs/bluetooth/pxt.json | 48 +----------------------------------------
 libs/core/pxt.json      | 48 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/libs/bluetooth/pxt.json b/libs/bluetooth/pxt.json
index d12347d5..dd8e2e56 100644
--- a/libs/bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@@ -20,53 +20,7 @@
                     "enabled": 1
                 }
             }
-        },
-        "optionalConfig": {
-            "microbit-dal": {
-                "gatt_table_size": "0x700"
-            }
-        },
-        "userConfigs": [
-            {
-                "description": "No Pairing Required: Anyone can connect via Bluetooth.",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 1,
-                            "pairing_mode": 0,
-                            "whitelist": 0,
-                            "security_level": null
-                        }
-                    }
-                }
-            },
-            {
-                "description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": null,
-                            "pairing_mode": null,
-                            "whitelist": null,
-                            "security_level": null
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Passkey pairing: Pairing requires 6 digit key to pair.",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 0,
-                            "pairing_mode": 1,
-                            "whitelist": 1,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
-                        }
-                    }
-                }
-            }
-        ]
+        }
     },
     "installedVersion": "vzlhfd"
 }
\ No newline at end of file
diff --git a/libs/core/pxt.json b/libs/core/pxt.json
index bb091a19..a72b5afe 100644
--- a/libs/core/pxt.json
+++ b/libs/core/pxt.json
@@ -43,7 +43,7 @@
     ],
     "public": true,
     "dependencies": {},
-    "yotta": {
+    "yotta": {        
         "optionalConfig": {
             "microbit-dal": {
                 "bluetooth": {
@@ -58,9 +58,51 @@
                     "open": 0,
                     "pairing_mode": 1,
                     "whitelist": 1,
-                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM"
+                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
+                    "gatt_table_size": "0x700"
                 }
             }
-        }
+        },
+        "userConfigs": [
+            {
+                "description": "No Pairing Required: Anyone can connect via Bluetooth.",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": 1,
+                            "pairing_mode": 0,
+                            "whitelist": 0,
+                            "security_level": null
+                        }
+                    }
+                }
+            },
+            {
+                "description": "JustWorks pairing (default): Pairing is automatic once the pairing is initiated.",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": null,
+                            "pairing_mode": null,
+                            "whitelist": null,
+                            "security_level": null
+                        }
+                    }
+                }
+            },
+            {
+                "description": "Passkey pairing: Pairing requires 6 digit key to pair.",
+                "config": {
+                    "microbit-dal": {
+                        "bluetooth": {
+                            "open": 0,
+                            "pairing_mode": 1,
+                            "whitelist": 1,
+                            "security_level": "SECURITY_MODE_ENCRYPTION_WITH_MITM"
+                        }
+                    }
+                }
+            }
+        ]
     }
 }
\ No newline at end of file