diff --git a/src/js/macros.js b/src/js/macros.js index 873cde7..7ce713e 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -38,9 +38,9 @@ module.exports = { }, load: function() { const file_time = this.state.selected_time; - console.log('file_time',this.state.selected_time); + console.log('file_time',file_time); const file = this.state.selected; - console.log("file: ",this.state.selected); + console.log("file: ",file); // if (this.last_file == file && this.last_file_time == file_time) { // return; // } @@ -88,12 +88,9 @@ module.exports = { console.log("macros is undefined"); this.config.macros=[]; }else{ - this.config.macros.push({ - id:Math.round(Math.random()*100000), - name:macrosName, - color:macrosColor, - gcode:this.state.selected, - }) + this.config.macros[0].name=macrosName; + this.config.macros[0].color=macrosColor; + this.config.macros[0].gcode=this.state.selected; } console.log(this.config.macros); try { diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 2fd5e78..a04e396 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -588,14 +588,37 @@ "type":"list", "index":"123", "default":[ - { "name" : "Macros 1"}, - { "name" : "Macros 2"}, - { "name" : "Macros 3"} + { + "id" : "1", + "name" : null, + "color":null, + "gcode":null + }, + { + "id" : "1", + "name" : null, + "color":null, + "gcode":null + }, + { + "id" : "1", + "name" : null, + "color":null, + "gcode":null + } ], "template": { "name": { "type": "text", - "default": "New Macro" + "default": null + }, + "color": { + "type": "text", + "default":null + }, + "gcode": { + "type": "text", + "default":null } } },