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

completed the req until now :) = configureed initial

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-12 03:05:48 +05:30
parent 446f5283bf
commit 443fc1b110
2 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/js/macros.js
View File

@@ -67,7 +67,7 @@ module.exports = {
alert(`Unsupported file type: ${extension}`); alert(`Unsupported file type: ${extension}`);
return; return;
} }
console.log(file);
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
file, file,
onComplete: () => { onComplete: () => {
@@ -79,8 +79,6 @@ module.exports = {
uploadGCode: function (filename,file) { uploadGCode: function (filename,file) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
console.log(xhr);
xhr.onload = function () { xhr.onload = function () {
if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status >= 200 && xhr.status < 300) {
console.log("File uploaded successfully"); console.log("File uploaded successfully");
@@ -132,7 +130,6 @@ module.exports = {
console.error("Restore Failed: ", error); console.error("Restore Failed: ", error);
alert("Restore failed"); alert("Restore failed");
} }
console.log(this.config);
}, },
cancelMacros: function () { cancelMacros: function () {
document.getElementById(`macros-name-${this.tab - 1}`).value = ""; document.getElementById(`macros-name-${this.tab - 1}`).value = "";
@@ -144,51 +141,51 @@ module.exports = {
this.config.macros = [ this.config.macros = [
{ {
name: "FireLaser", name: "FireLaser",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "FireLaser.ngc",
gcode_file_time: 0, gcode_file_time: 1705008250.2333415,
}, },
{ {
name: "Home", name: "Home",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "GoHomeXYZ.ngc",
gcode_file_time: 0, gcode_file_time: 1705008321.710827,
}, },
{ {
name: "Perk", name: "Perk",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "ParkRearRightWW.ngc",
gcode_file_time: 0, gcode_file_time: 1705008360.977644,
}, },
{ {
name: "Spindle Warmup", name: "Spindle Warmup",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "SpindleWarmUp1Minute.ngc",
gcode_file_time: 0, gcode_file_time: 1705008372.967075,
}, },
{ {
name: "Spindle ON", name: "Spindle ON",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "TurnOnSpindle.ngc",
gcode_file_time: 0, gcode_file_time: 1705008405.5059154,
}, },
{ {
name: "Spindle OFF", name: "Spindle OFF",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "TurnOffSpindleAndLaser.ngc",
gcode_file_time: 0, gcode_file_time: 1705008384.6566093,
}, },
{ {
name: "Vacuum ON", name: "Vacuum ON",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "VacOn.ngc",
gcode_file_time: 0, gcode_file_time: 1705008413.7756715,
}, },
{ {
name: "Vacuum OFF", name: "Vacuum OFF",
color: "#e6e6e6", color: "#dedede",
gcode_file_name: " ", gcode_file_name: "TurnOffVac.ngc",
gcode_file_time: 0, gcode_file_time: 1705008395.476232,
}, },
]; ];
this.confirmReset = false; this.confirmReset = false;

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

@@ -590,65 +590,57 @@
"default": [ "default": [
{ {
"name": "FireLaser", "name": "FireLaser",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "FireLaser.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008250.2333415
}, },
{ {
"name": "Home", "name": "Home",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "GoHomeXYZ.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008321.710827
}, },
{ {
"name": "Perk", "name": "Perk",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "ParkRearRightWW.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008360.977644
}, },
{ {
"name": "Spindle Warmup", "name": "Spindle Warmup",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "SpindleWarmUp1Minute.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008372.967075
}, },
{ {
"name": "Spindle ON", "name": "Spindle ON",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "TurnOnSpindle.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008405.5059154
}, },
{ {
"name": "Spindle OFF", "name": "Spindle OFF",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": "", "gcode_file_name": "TurnOffSpindleAndLaser.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008384.6566093
}, },
{ {
"name": "Vacuum ON", "name": "Vacuum ON",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": " ", "gcode_file_name": "VacOn.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008413.7756715
}, },
{ {
"name": "Vacuum OFF", "name": "Vacuum OFF",
"color": "#e6e6e6", "color": "#dedede",
"gcode_file_name": " ", "gcode_file_name": "TurnOffVac.ngc",
"gcode_file_time": 0 "gcode_file_time": 1705008395.476232
} }
], ],
"template": { "template": {
"color": { "color": {
"type": "text", "type": "text",
"default": "#e6e6e6" "default": "#dedede"
},
"gcode_file_name": {
"type": "text",
"default": ""
},
"gcode_file_time": {
"type": "int",
"default": 0
} }
} }
}, },