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

added run macros func, macros button styles changed, configured time

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-02 18:13:36 +05:30
parent 4dbba37d65
commit 34c3e60a17
5 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,6 +502,19 @@ module.exports = {
showProbeDialog: function(probeType) {
SvelteComponents.showDialog("Probe", { probeType });
},
runMacros : function(id){
if( this.config.macros[id].gcode_file_name != this.state.selected || this.config.macros[id].gcode_file_time != this.state.selected_time ){
this.state.selected=this.config.macros[id].gcode_file_name;
this.state.selected_time=this.config.macros[id].gcode_file_time
}
try{
this.load();
console.log("Loaded file");
// this.start_pause();
}catch(error){
console.warn("Error running program: ",error);
}
}
},

6
src/js/macros.js
View File

@@ -87,10 +87,8 @@ module.exports = {
this.config.macros[id].name=macrosName;
this.config.macros[id].color=macrosColor;
this.config.macros[id].gcode=this.state.selected;
console.log(this.state.selected_time);
console.log(typeof(this.state.selected_time));
this.config.macros[id].gcode_file_name=this.state.selected;
this.config.macros[id].gcode_file_time=this.state.selected_time;
console.log(this.config.macros);
try {

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

@@ -209,17 +209,17 @@ script#control-view-template(type="text/x-template")
.macros-div(class="present")
button.macros-buttons(title="Click to run Macros 1", @click="runMacros(0)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0;background-color:{{config.macros[0].color}}") {{config.macros[0].name}}
:disabled="!true",v-bind:style="background-color:{{config.macros[0].color}};color:#fff") {{config.macros[0].name}}
button.macros-buttons(title="Click to run Macros 2", @click="runMacros(1)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 2
:disabled="!true",v-bind:style="background-color:{{config.macros[1].color}};color:#fff") {{config.macros[1].name}}
button.macros-buttons(title="Click to run Macros 3", @click="runMacros(2)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 3
:disabled="!true",v-bind:style="background-color:{{config.macros[2].color}};color:#fff") {{config.macros[2].name}}
button.macros-buttons(title="Click to run Macros 4", @click="runMacros(3)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 4
:disabled="!true",v-bind:style="background-color:{{config.macros[3].color}};color:#fff") {{config.macros[3].name}}
button.macros-buttons(title="Click to run Macros 5", @click="runMacros(4)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 5
:disabled="!true",v-bind:style="background-color:{{config.macros[4].color}};color:#fff") {{config.macros[4].name}}
button.macros-buttons(title="Click to run Macros 6", @click="runMacros(5)",
:disabled="!true",style="height:60px;width:100px;font-weight:normal;border-radius:15px;border:0") Macros 6
:disabled="!true",v-bind:style="background-color:{{config.macros[5].color}};color:#fff") {{config.macros[5].name}}
.tabs

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

@@ -591,32 +591,38 @@
{
"name":"Macros 1",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
},
{
"name":"Macros 2",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
},
{
"name":"Macros 3",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
},
{
"name":"Macros 4",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
},
{
"name":"Macros 5",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
},
{
"name":"Macros 6",
"color": "",
"gcode": ""
"gcode_file_name": "",
"gcode_file_time": 0
}
],
"template": {
@@ -626,11 +632,15 @@
},
"color": {
"type": "text",
"default": "Default Color"
"default": "#efefef"
},
"gcode": {
"gcode_file_name": {
"type": "text",
"default": "Default G-Code"
},
"gcode_file_time": {
"type": "int",
"default": 0
}
}
},

7
src/stylus/style.styl
View File

@@ -621,6 +621,13 @@ span.unit
margin 10px
margin-left 400px
.macros-buttons
height 60px
width 100px
font-weight normal
border radius 10px
border 0
.macros
width 90%