muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edited config file to null

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-02 14:13:35 +05:30
parent f277cd9690
commit 6aaf167d4e
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/macros.js
View File

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

31
src/resources/config-template.json
View File

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