From 86e39597721d14f9c8612b64e52a69bf5a9d3ac1 Mon Sep 17 00:00:00 2001
From: Asger Gitz-Johansen <asger.gitz@hotmail.com>
Date: Sat, 7 Jun 2025 10:15:17 +0200
Subject: [PATCH 1/2] fix: gitignore autogenerated files and the external libs

CMakeUserPresets.json contains user (i.e. per developer) presets and
should therefore be ignored.

node_modules and so on is just for the lv_font_conv dependency.
---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index d6f917cfc4..13b939a3f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,10 @@ src/arm-none-eabi
 node_modules
 package.json
 package-lock.json
+
+# Toolchain and External dependencies
+sdk-toolchain/
+
+# Developer files
+CMakeUserPresets.json
+compile_commands.json

From a7d43cf08608276e2739c2775f5f201d5bbe9d57 Mon Sep 17 00:00:00 2001
From: Asger Gitz-Johansen <asger.gitz@hotmail.com>
Date: Sat, 7 Jun 2025 10:26:44 +0200
Subject: [PATCH 2/2] feat: add cmakepresets.json

This file helps editors to generate compile_commands.json database files
as well as streamlining some of the cmake commands.
---
 CMakePresets.json      | 23 +++++++++++++++++++++++
 doc/buildAndProgram.md | 40 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 CMakePresets.json

diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 0000000000..8f30cc6f1a
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,23 @@
+{
+    "version": 6,
+    "configurePresets": [
+        {
+            "binaryDir": "build/${presetName}",
+            "name": "Release",
+            "displayName": "Release build",
+            "cacheVariables": {
+                "ARM_NONE_EABI_TOOLCHAIN_PATH": "${fileDir}/sdk-toolchain/gcc-arm-none-eabi-10.3-2021.10",
+                "NRF5_SDK_PATH": "${fileDir}/sdk-toolchain/nRF5_SDK_15.3.0_59ac345",
+                "CMAKE_BUILD_TYPE": "Release",
+                "BUILD_DFU": "1",
+                "BUILD_RESOURCES": "1"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "Release",
+            "configurePreset": "Release"
+        }
+    ]
+}
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index 5d3af46ef0..2430561034 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -12,9 +12,9 @@ To build this project, you'll need:
     python -m venv .venv
     source .venv/bin/activate
     python -m pip install wheel
-    python -m pip install -r tools/mcuboot/requirements.txt
+    python -m pip install -r tools/mcuboot/requirements.txt adafruit-nrfutil
     ```
-- A reasonably recent version of CMake (I use 3.16.5)
+- A reasonably recent version of CMake (minimum 3.10)
 - lv_font_conv, to generate the font .c files
   - see [lv_font_conv](https://github.com/lvgl/lv_font_conv#install-the-script)
   - install npm (commonly done via the package manager, ensure node's version is at least 12)
@@ -24,7 +24,7 @@ To build this project, you'll need:
 
 ### Clone the repo
 
-```
+```sh
 git clone https://github.com/InfiniTimeOrg/InfiniTime.git
 cd InfiniTime
 git submodule update --init
@@ -34,6 +34,40 @@ cd build
 
 ### Project generation using CMake
 
+#### CMakePresets
+
+Note that this requires CMake 3.19 or later to be installed.
+This project provides a `CMakePresets.json` file, enabling easy and fast development with modern editors such as VSCode, neovim or CLion.
+The `CMakePresets.json` file looks for the arm-gcc toolchain and NRF52 SDK in the `sdk-toolchain` directory.
+So to download and extract these in the correct directory, do the following:
+
+```sh
+mkdir -p sdk-toolchain
+
+# Get the nRF5 SDK
+wget https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/sdks/nrf5/binaries/nrf5sdk153059ac345.zip
+mv nrf5sdk153059ac345.zip sdk-toolchain/
+cd sdk-toolchain
+unzip nrf5sdk153059ac345.zip
+cd -
+
+# Get the arm cross compiler (There's probably a more linux-y way of doing this though...)
+wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
+mv gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 sdk-toolchain/
+cd sdk-toolchain
+tar xjf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
+cd -
+```
+
+To use the presets, simply call `cmake` like so (make sure you have activated the python virtual environment as described [above](##dependencies)):
+
+```sh
+cmake --preset Release
+cmake --build build/Release
+```
+
+#### CMake Variables
+
 CMake configures the project according to variables you specify the command line. The variables are:
 
  Variable | Description | Example|