From cbd2b1ea1c61dacf050c83e0f55a3d1a29b1e5e6 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 23 Jul 2022 15:42:16 +0100
Subject: [PATCH] Replaced JSON template configuration file with YAML
 equivalent (bloom.template.json -> bloom.template.yaml)

---
 CMakeLists.txt                |  2 +-
 resources/bloom.template.json | 25 -------------------------
 resources/bloom.template.yaml | 17 +++++++++++++++++
 src/Application.cpp           |  6 +++---
 4 files changed, 21 insertions(+), 29 deletions(-)
 delete mode 100644 resources/bloom.template.json
 create mode 100644 resources/bloom.template.yaml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dda74163..34c66654 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ qt_add_resources(
     PREFIX
         "/compiled"
     FILES
-        "./resources/bloom.template.json"
+        "./resources/bloom.template.yaml"
         "./resources/help.txt"
         "./resources/gdbHelpMonitorInfo.txt"
 )
diff --git a/resources/bloom.template.json b/resources/bloom.template.json
deleted file mode 100644
index 53a6c9ed..00000000
--- a/resources/bloom.template.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "environments": {
-    "default": {
-      "debugTool": {
-        "name": "atmel-ice",
-        "releasePostDebugSession": true
-      },
-
-      "target": {
-        "name": "avr8",
-        "physicalInterface": "debug-wire"
-      },
-
-      "debugServer": {
-        "name": "avr-gdb-rsp",
-        "ipAddress": "127.0.0.1",
-        "port": "1442"
-      }
-    }
-  },
-
-  "insight": {
-    "enabled": true
-  }
-}
diff --git a/resources/bloom.template.yaml b/resources/bloom.template.yaml
new file mode 100644
index 00000000..af53b9f5
--- /dev/null
+++ b/resources/bloom.template.yaml
@@ -0,0 +1,17 @@
+environments:
+  default:
+    debugTool:
+      name: "atmel-ice"
+      releasePostDebugSession: true
+
+    target:
+      name: "avr8"
+      physicalInterface: "debug-wire"
+
+    debugServer:
+      name: "avr-gdb-rsp"
+      ipAddress: "127.0.0.1"
+      port: 1442
+
+insight:
+  enabled: true
diff --git a/src/Application.cpp b/src/Application.cpp
index c2f78e81..f86dbfe0 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -341,13 +341,13 @@ namespace Bloom
         }
 
         /*
-         * The file bloom.template.json is just a template Bloom config file that is included in the binary image as
-         * a resource. See src/resource.qrc
+         * The file bloom.template.yaml is just a template Bloom config file that is included in the binary image as
+         * a resource. See the root-level CMakeLists.txt for more.
          *
          * We simply copy the template file into the user's working directory.
          */
         auto templateConfigFile = QFile(
-            QString::fromStdString(Paths::compiledResourcesPath()+ "/resources/bloom.template.json")
+            QString::fromStdString(Paths::compiledResourcesPath()+ "/resources/bloom.template.yaml")
         );
 
         if (!templateConfigFile.open(QIODevice::ReadOnly)) {