From 63571fb12fdeeb5a15ae781f7c89e76e5029f3dc Mon Sep 17 00:00:00 2001
From: Juri Wolf <Amerlander@users.noreply.github.com>
Date: Mon, 4 Apr 2022 18:51:58 +0200
Subject: [PATCH] cleanup settings (#172)

- closes https://github.com/microsoft/pxt-calliope/issues/170
- deprecates https://github.com/microsoft/pxt-calliope/issues/162
- no changes for https://github.com/microsoft/pxt-calliope/issues/161

Co-authored-by: JW <gitkraken@juriwolf.de>
Co-authored-by: Juri <info@juriwolf.de>
---
 libs/bluetooth/pxt.json |  4 ----
 libs/core/pxt.json      | 30 ++++++++++--------------------
 pxtarget.json           |  2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/libs/bluetooth/pxt.json b/libs/bluetooth/pxt.json
index 51cc58c2..188aa9b6 100644
--- a/libs/bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@@ -26,10 +26,6 @@
             }
         },
         "optionalConfig": {
-            "microbit-dal": {
-                "stack_size": 1280,
-                "gatt_table_size": "0x700"
-            }
         },
         "userConfigs": [
         ]
diff --git a/libs/core/pxt.json b/libs/core/pxt.json
index dfb6eb21..764f2be1 100644
--- a/libs/core/pxt.json
+++ b/libs/core/pxt.json
@@ -124,34 +124,24 @@
                     "event_service": 0,
                     "device_info_service": 0
                 },
-                "stack_size": 2048,
+                "stack_size": 1280,
                 "gatt_table_size": "0x600",
                 "panic_on_heap_full": 0,
                 "debug": 0,
                 "heap_debug": 0,
-                "sram_end": "0x20008000"
-            },
-            "RAM_SIZE": "\"32K\""
+                "sram_end": "0x20004000",
+                "RAM_SIZE": "\"16K\""
+            }
         },
         "userConfigs": [
-            {
-                "description": "Limit bluetooth access to BLE mode (A + B + Reset)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "enabled": 0
-                        }
-                    }
-                }
-            },
             {
                 "description": "32K RAM (mini v2 and some v1.3)",
                 "config": {
                     "microbit-dal": {
                         "stack_size": 2048,
-                        "sram_end": "0x20008000"
-                    },
-                    "RAM_SIZE": "\"32K\""
+                        "sram_end": "0x20008000",
+                        "RAM_SIZE": "\"16K\""
+                    }
                 }
             },
             {
@@ -159,9 +149,9 @@
                 "config": {
                     "microbit-dal": {
                         "stack_size": 1280,
-                        "sram_end": "0x20004000"
-                    },
-                    "RAM_SIZE": "\"16K\""
+                        "sram_end": "0x20004000",
+                        "RAM_SIZE": "\"16K\""
+                    }
                 }
             }
         ]
diff --git a/pxtarget.json b/pxtarget.json
index c42c11c4..02ef03d3 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -109,7 +109,7 @@
         "useNewFunctions": true
     },
     "compileService": {
-        "yottaTarget": "calliope-mini-classic-gcc@https://github.com/calliope-mini/target-calliope-mini-classic-gcc#v1.2.3",
+        "yottaTarget": "calliope-mini-classic-gcc@https://github.com/calliope-mini/target-calliope-mini-classic-gcc#v1.2.4",
         "yottaCorePackage": "microbit",
         "githubCorePackage": "calliope-mini/microbit",
         "gittag": "v2.2.0-rc6-calliope.rc3-iss0.3",