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

fixing gcode selection

Browse Source
This commit is contained in:
sanjayk03-dev
2023-12-30 19:38:23 +05:30
parent e3ca0ba3a3
commit ca152ed38a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ module.exports = {
return Math.min(1, p); return Math.min(1, p);
}, },
isMacrosPresent: function(){ isMacrosPresent: function(){
return this.config.macros==undefined; return this.config.macros!=undefined;
}, },
}, },

19
src/js/macros.js
View File

@@ -34,24 +34,23 @@ module.exports = {
methods:{ methods:{
open: function() { open: function() {
utils.clickFileInput("gcode-file-input"); utils.clickFileInput("gcode-file-input");
console.log("utils done");
}, },
load: function() { load: function() {
const file_time = this.state.selected_time; const file_time = this.state.selected_time;
console.log('file_time',this.state.selected_time); console.log('file_time',this.state.selected_time);
const file = this.state.selected; const file = this.state.selected;
console.log("file: ",this.state.selected); console.log("file: ",this.state.selected);
if (this.last_file == file && this.last_file_time == file_time) { // if (this.last_file == file && this.last_file_time == file_time) {
return; // return;
} // }
this.last_file = file; // this.last_file = file;
this.last_file_time = file_time; // this.last_file_time = file_time;
this.$broadcast("gcode-load", file); // this.$broadcast("gcode-load", file);
this.$broadcast("gcode-line", this.state.line); // this.$broadcast("gcode-line", this.state.line);
this.toolpath_progress = 0; // this.toolpath_progress = 0;
this.load_toolpath(file, file_time); // this.load_toolpath(file, file_time);
}, },
upload: function(e) { upload: function(e) {
const files = e.target.files || e.dataTransfer.files; const files = e.target.files || e.dataTransfer.files;