Replaced JSON template configuration file with YAML equivalent (bloom.template.json -> bloom.template.yaml)

This commit is contained in:
Nav
2022-07-23 15:42:16 +01:00
parent ae5747e79b
commit cbd2b1ea1c
4 changed files with 21 additions and 29 deletions

View File

@@ -72,7 +72,7 @@ qt_add_resources(
PREFIX
"/compiled"
FILES
"./resources/bloom.template.json"
"./resources/bloom.template.yaml"
"./resources/help.txt"
"./resources/gdbHelpMonitorInfo.txt"
)

View File

@@ -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
}
}

View File

@@ -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

View File

@@ -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)) {