diff --git a/src/js/app.js b/src/js/app.js index a458dd5..70cc90a 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -109,12 +109,13 @@ module.exports = new Vue({ template: require("../resources/config-template.json"), config: { settings: { units: "METRIC" }, - motors: [{}, {}, {}, {},{}, {}, {}, {}], + motors: [{}, {}, {}, {}], version: "", full_version: "", ip: "<>", wifiName: "not connected", - macros:[{},{},{}] + macros:[{},{},{},{},{},{},{},{}], + macrosList:[] }, state: { messages: [], diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 04554d2..6c834c8 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -645,7 +645,9 @@ } }, - "macrosList": [ + "macrosList": { + "type":"list", + "default":[ "FireLaser.ngc", "GoHomeXYZ.ngc", "ParkRearRightWW.ngc", @@ -654,7 +656,8 @@ "TurnOffSpindleAndLaser.ngc", "VacOn.ngc", "TurnOffVac.ngc" - ], + ] + }, "admin": { "auto-check-upgrade": { diff --git a/src/resources/macros_config.json b/src/resources/macros_config.json deleted file mode 100644 index 8e52202..0000000 --- a/src/resources/macros_config.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - - }, - { - - }, - { - - } -] \ No newline at end of file