diff --git a/src/js/control-view.js b/src/js/control-view.js index 45599bf..aad62ef 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -203,7 +203,7 @@ module.exports = { return Math.min(1, p); }, isMacrosPresent: function(val){ - return this.config.macros[val].name=null; + return this.config.macros[val].name!="" || this.config.macros[val].gcode!=""; }, }, diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 75b1091..4fb6480 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -590,39 +590,39 @@ "default":[ { "id" : 1, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" }, { "id" : 2, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" }, { "id" : 3, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" }, { "id" : 4, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" }, { "id" : 5, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" }, { "id" : 6, - "name" : null, - "color":null, - "gcode":null + "name" : "", + "color":"#d9d9d9", + "gcode":"" } ], "template": { @@ -631,15 +631,15 @@ }, "name": { "type": "text", - "default": null + "default": "" }, "color": { "type": "text", - "default":null + "default":"" }, "gcode": { "type": "text", - "default":null + "default":"" } } },