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

removed asyn await and moved print buttons

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-08 19:37:43 +05:30
parent 7f5daeed6a
commit 89e1cfaf95
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/control-view.js
View File

@@ -506,10 +506,10 @@ module.exports = {
this.config.non_macros_list = [...this.state.non_macros_list]; this.config.non_macros_list = [...this.state.non_macros_list];
this.config.gcode_list = [...this.state.gcode_list]; this.config.gcode_list = [...this.state.gcode_list];
for (let file of files) { for (let file of files) {
const reader = new FileReader(); const reader = new FileReader();
reader.onload = async () => { reader.onload = () => {
const gcode = reader.result; const gcode = reader.result;
const extension = file.name.split(".").pop(); const extension = file.name.split(".").pop();
@@ -525,7 +525,7 @@ module.exports = {
return; return;
} }
await this.upload_gcode(file.name, gcode); this.upload_gcode(file.name, gcode);
const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name); const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name);
if (!isAlreadyPresent) { if (!isAlreadyPresent) {
@@ -782,6 +782,12 @@ module.exports = {
} }
} }
}, },
print_config: function () {
console.log(this.config);
},
print_state: function () {
console.log(this.state);
},
}, },
mixins: [require("./axis-vars")], mixins: [require("./axis-vars")],

3
src/pug/templates/control-view.pug
View File

@@ -359,6 +359,9 @@ script#control-view-template(type="text/x-template")
//- :disabled="!is_ready") //- :disabled="!is_ready")
//- | Upload File //- | Upload File
button.submit-macros(title="Cancel Macros",@click="print_config",style="margin-left:5px;background-color:#fafafa;") CONFIG
button.submit-macros(title="Cancel Macros",@click="print_state",style="margin-left:5px;background-color:#fafafa;") STATE
.progress(v-if="toolpath_progress && toolpath_progress < 1", .progress(v-if="toolpath_progress && toolpath_progress < 1",
title="Simulating GCode to check for errors, calculate ETA and " + title="Simulating GCode to check for errors, calculate ETA and " +
"generate 3D view. You can run GCode before the simulation " + "generate 3D view. You can run GCode before the simulation " +

3
src/pug/templates/macros.pug
View File

@@ -136,6 +136,3 @@ script#macros-template(type="text/x-template")
button.pure-button.pure-button-primary(@click="save_macro") Confirm button.pure-button.pure-button-primary(@click="save_macro") Confirm
button.submit-macros(title="Cancel Macro",@click="clear_macro",style="margin-left:5px;background-color:#fafafa;",:disabled="initial_tab") Cancel button.submit-macros(title="Cancel Macro",@click="clear_macro",style="margin-left:5px;background-color:#fafafa;",:disabled="initial_tab") Cancel
button.submit-macros(title="Cancel Macros",@click="print_config",style="margin-left:5px;background-color:#fafafa;") CONFIG
button.submit-macros(title="Cancel Macros",@click="print_state",style="margin-left:5px;background-color:#fafafa;") STATE