logging
This commit is contained in:
@@ -286,7 +286,10 @@ module.exports = {
|
|||||||
this.macroFound = false;
|
this.macroFound = false;
|
||||||
this.macroFoundName = "";
|
this.macroFoundName = "";
|
||||||
this.macroFoundGcode = "";
|
this.macroFoundGcode = "";
|
||||||
macro_with_filename.forEach(item => (item.file_name = "default"));
|
macro_with_filename.forEach(item => {
|
||||||
|
console.log(item.name);
|
||||||
|
item.file_name = "default";
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (filename == "default") {
|
if (filename == "default") {
|
||||||
this.newGcode = "";
|
this.newGcode = "";
|
||||||
@@ -378,7 +381,6 @@ module.exports = {
|
|||||||
const macros_list = this.state.macros_list.map(item => item.file_name).toString();
|
const macros_list = this.state.macros_list.map(item => item.file_name).toString();
|
||||||
api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${macros_list}`);
|
api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${macros_list}`);
|
||||||
this.config.macros_list = [];
|
this.config.macros_list = [];
|
||||||
this.clear_macro();
|
|
||||||
this.edited = false;
|
this.edited = false;
|
||||||
this.confirmReset = false;
|
this.confirmReset = false;
|
||||||
try {
|
try {
|
||||||
@@ -388,6 +390,7 @@ module.exports = {
|
|||||||
console.error("Restore Failed: ", error);
|
console.error("Restore Failed: ", error);
|
||||||
alert("Restore failed");
|
alert("Restore failed");
|
||||||
}
|
}
|
||||||
|
this.clear_macro();
|
||||||
},
|
},
|
||||||
add_new_macro: async function () {
|
add_new_macro: async function () {
|
||||||
let length = this.state.macros.length;
|
let length = this.state.macros.length;
|
||||||
|
|||||||
@@ -221,7 +221,6 @@ class Config(object):
|
|||||||
tmpl['template'], with_defaults)
|
tmpl['template'], with_defaults)
|
||||||
else:
|
else:
|
||||||
self.values[name]=value
|
self.values[name]=value
|
||||||
self.log.info('>> config to state'+name)
|
|
||||||
self.ctrl.state.config(name,value)
|
self.ctrl.state.config(name,value)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user