From 443fc1b110b1622b315fe178aa66b7918ed70eba Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Fri, 12 Jan 2024 03:05:48 +0530 Subject: [PATCH] completed the req until now :) = configureed initial --- src/js/macros.js | 53 +++++++++++++-------------- src/resources/config-template.json | 58 +++++++++++++----------------- 2 files changed, 50 insertions(+), 61 deletions(-) diff --git a/src/js/macros.js b/src/js/macros.js index 64bded5..16e4551 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -67,7 +67,7 @@ module.exports = { alert(`Unsupported file type: ${extension}`); return; } - console.log(file); + SvelteComponents.showDialog("Upload", { file, onComplete: () => { @@ -79,8 +79,6 @@ module.exports = { uploadGCode: function (filename,file) { const xhr = new XMLHttpRequest(); - console.log(xhr); - xhr.onload = function () { if (xhr.status >= 200 && xhr.status < 300) { console.log("File uploaded successfully"); @@ -132,7 +130,6 @@ module.exports = { console.error("Restore Failed: ", error); alert("Restore failed"); } - console.log(this.config); }, cancelMacros: function () { document.getElementById(`macros-name-${this.tab - 1}`).value = ""; @@ -144,51 +141,51 @@ module.exports = { this.config.macros = [ { name: "FireLaser", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "FireLaser.ngc", + gcode_file_time: 1705008250.2333415, }, { name: "Home", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "GoHomeXYZ.ngc", + gcode_file_time: 1705008321.710827, }, { name: "Perk", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "ParkRearRightWW.ngc", + gcode_file_time: 1705008360.977644, }, { name: "Spindle Warmup", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "SpindleWarmUp1Minute.ngc", + gcode_file_time: 1705008372.967075, }, { name: "Spindle ON", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "TurnOnSpindle.ngc", + gcode_file_time: 1705008405.5059154, }, { name: "Spindle OFF", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "TurnOffSpindleAndLaser.ngc", + gcode_file_time: 1705008384.6566093, }, { name: "Vacuum ON", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "VacOn.ngc", + gcode_file_time: 1705008413.7756715, }, { name: "Vacuum OFF", - color: "#e6e6e6", - gcode_file_name: " ", - gcode_file_time: 0, + color: "#dedede", + gcode_file_name: "TurnOffVac.ngc", + gcode_file_time: 1705008395.476232, }, ]; this.confirmReset = false; diff --git a/src/resources/config-template.json b/src/resources/config-template.json index 56f780a..c3e6f7e 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -590,65 +590,57 @@ "default": [ { "name": "FireLaser", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "FireLaser.ngc", + "gcode_file_time": 1705008250.2333415 }, { "name": "Home", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "GoHomeXYZ.ngc", + "gcode_file_time": 1705008321.710827 }, { "name": "Perk", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "ParkRearRightWW.ngc", + "gcode_file_time": 1705008360.977644 }, { "name": "Spindle Warmup", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "SpindleWarmUp1Minute.ngc", + "gcode_file_time": 1705008372.967075 }, { "name": "Spindle ON", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "TurnOnSpindle.ngc", + "gcode_file_time": 1705008405.5059154 }, { "name": "Spindle OFF", - "color": "#e6e6e6", - "gcode_file_name": "", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "TurnOffSpindleAndLaser.ngc", + "gcode_file_time": 1705008384.6566093 }, { "name": "Vacuum ON", - "color": "#e6e6e6", - "gcode_file_name": " ", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "VacOn.ngc", + "gcode_file_time": 1705008413.7756715 }, { "name": "Vacuum OFF", - "color": "#e6e6e6", - "gcode_file_name": " ", - "gcode_file_time": 0 + "color": "#dedede", + "gcode_file_name": "TurnOffVac.ngc", + "gcode_file_time": 1705008395.476232 } ], "template": { "color": { "type": "text", - "default": "#e6e6e6" - }, - "gcode_file_name": { - "type": "text", - "default": "" - }, - "gcode_file_time": { - "type": "int", - "default": 0 + "default": "#dedede" } } },