From f1198d936942ab3e021f1b41ff1a70dc443cd0dc Mon Sep 17 00:00:00 2001
From: Adam Fowler <adam@adamfowler.org>
Date: Thu, 14 Apr 2022 10:11:24 +0100
Subject: [PATCH] Part of #113. Relay compiling with Herald on nRF52840DK.

Project now builds small enough for nRF52840DK
- Uses 160KB SRAM, 591KB Flash (With debug flags)
- Herald Beacon code running
- Herald scanning code running, but without provider configured yet
- Beacon advertising causing Mesh adverts to not show - investigate
Signed off by: Adam Fowler <adam@adamfowler.org>
---
 herald-mesh-relay/.vscode/settings.json |  8 +++++---
 herald-mesh-relay/prj.conf              | 15 +++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/herald-mesh-relay/.vscode/settings.json b/herald-mesh-relay/.vscode/settings.json
index a11c7cd..0bd4fea 100644
--- a/herald-mesh-relay/.vscode/settings.json
+++ b/herald-mesh-relay/.vscode/settings.json
@@ -67,8 +67,8 @@
   },
   "cmake.configureEnvironment": {
     // "BOARD": "nrf52dk_nrf52832"
-    "BOARD": "nrf52833dk_nrf52833"
-    // "BOARD": "nrf52840dk_nrf52840"
+    // "BOARD": "nrf52833dk_nrf52833"
+    "BOARD": "nrf52840dk_nrf52840"
     // "BOARD": "nrf5340dk_nrf5340_cpuapp"
     // ,"HERALD_ANALYSIS_ENABLED":"y"
   },
@@ -80,5 +80,7 @@
     "board": "nrf52840dk_nrf52840",
     "arch": "arm",
     "dir": "${ZEPHYR_BASE}/boards/arm/nrf52840dk_nrf52840"
-  }
+  },
+  "nrf-connect.topdir": "${nrf-connect.sdk:1.9.1}",
+  "nrf-connect.toolchain.path": "${nrf-connect.toolchain:1.9.1}"
 }
\ No newline at end of file
diff --git a/herald-mesh-relay/prj.conf b/herald-mesh-relay/prj.conf
index 791c6de..7865ae9 100644
--- a/herald-mesh-relay/prj.conf
+++ b/herald-mesh-relay/prj.conf
@@ -21,16 +21,6 @@ CONFIG_BT_DEVICE_NAME="Herald MESH Proxy"
 # DO NOT ENABLE THIS EVER - Breaks the stack
 # CONFIG_NO_OPTIMIZATIONS=y
 
-# REQUIRED for bluetooth serial debug
-# CONFIG_BT_NUS=y
-# CONFIG_BT_MAX_PAIRED=2
-# Enable bonding
-# CONFIG_BT_SETTINGS=y
-# CONFIG_FLASH=y
-# CONFIG_FLASH_PAGE_LAYOUT=y
-# CONFIG_FLASH_MAP=y
-# CONFIG_NVS=y
-# CONFIG_SETTINGS=y
 # For debugging connection issues when using NUS service (disconnect MPU Fault) - DOESNT DO ANYTHING!
 #CONFIG_MPSL_LOG_LEVEL_DBG=y
 
@@ -70,7 +60,7 @@ CONFIG_BT_DEVICE_NAME="Herald MESH Proxy"
 # CONFIG_WATCHDOG=n
 # CONFIG_PINMUX=n
 # CONFIG_SPI=n
-# CONFIG_GPIO=y
+CONFIG_GPIO=y
 
 # # Power management
 # CONFIG_SYS_POWER_MANAGEMENT=n
@@ -103,7 +93,8 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
-CONFIG_SETTINGS=n
+# Below required for BT_SETTINGS
+CONFIG_SETTINGS=y
 CONFIG_HWINFO=y
 CONFIG_DK_LIBRARY=y