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

added pycharm module, chagned package version to 1.4.0 alph1, added 8 macros button

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-09 22:38:35 +05:30
parent 825f930293
commit dacfd16184
17 changed files with 212 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pug/index.pug
View File

@@ -35,6 +35,9 @@ html(lang="en")
li.pure-menu-heading
a.pure-menu-link(href="#control") Control
li.pure-menu-heading
a.pure-menu-link(href="#macros") Macros
li.pure-menu-heading
a.pure-menu-link(href="#settings") Settings
@@ -62,9 +65,6 @@ html(lang="en")
li.pure-menu-heading
a.pure-menu-link(href="#cheat-sheet") Cheat Sheet
li.pure-menu-heading
a.pure-menu-link(href="#macros") Macros
li.pure-menu-heading
a.pure-menu-link(href="#help") Help

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

@@ -220,6 +220,10 @@ script#control-view-template(type="text/x-template")
:disabled="!true",v-bind:style="{ backgroundColor: config.macros[4].color }") {{config.macros[4].name}}
button.macros-buttons(title="Click to run Macros 6", @click="runMacros(5)",
:disabled="!true",v-bind:style="{ backgroundColor: config.macros[5].color }") {{config.macros[5].name}}
button.macros-buttons(title="Click to run Macros 7", @click="runMacros(6)",
:disabled="!true",v-bind:style="{ backgroundColor: config.macros[6].color }") {{config.macros[6].name}}
button.macros-buttons(title="Click to run Macros 8", @click="runMacros(7)",
:disabled="!true",v-bind:style="{ backgroundColor: config.macros[7].color }") {{config.macros[7].name}}
.tabs

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

@@ -36,6 +36,12 @@ script#macros-template(type="text/x-template")
input#tab6(type="radio", name="tabs", @click="tab = '6'")
label(for="tab6",style="height:50px;width:100px") Macros 6
input#tab7(type="radio", name="tabs", @click="tab = '7'")
label(for="tab7",style="height:50px;width:100px") Macros 7
input#tab8(type="radio", name="tabs", @click="tab = '8'")
label(for="tab8",style="height:50px;width:100px") Macros 8
section#content1.tab-content
.macros-form
p.title Name
@@ -203,3 +209,59 @@ script#macros-template(type="text/x-template")
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros(5)",
style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Cancel
section#content7.tab-content
.macros-form
p.title Name
.input-container
input.input-color(type="color",id="macros-color-6",value="#ffffff")
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-6")
p.title G-Code
.select-upload-gcode
select#gcodeSelect-6(title="Select previously uploaded GCode programs.",selected
v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option
option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open",
:disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px;margin-left:4px;background-color:#5a9ad7;color:#fff;display:flex;align-items:center;justify-content:space-around") Upload
.fa.fa-upload
form.gcode-file-input.file-upload
input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc")
br
gcode-viewer
button.submit-macros(title="Save Macros",@click="saveMacros(6)",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros(6)",
style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Cancel
section#content8.tab-content
.macros-form
p.title Name
.input-container
input.input-color(type="color",id="macros-color-7",value="#ffffff")
input.input-name(type="text",minlength='1',maxlength='15',id="macros-name-7")
p.title G-Code
.select-upload-gcode
select#gcodeSelect-7(title="Select previously uploaded GCode programs.",selected
v-model="state.selected",@change="load", :disabled="!is_ready",
style="max-width:100%;height:40px;border-radius:5px")
option(disabled='' selected='' value='default') Select an option
option(v-for="file in state.files", :value="file") {{file}}
button.pure-button(title="Upload a new GCode program.", @click="open",
:disabled="!is_ready",style="height:40px;width:130px;font-weight:normal;border-radius:5px;margin-left:4px;background-color:#5a9ad7;color:#fff;display:flex;align-items:center;justify-content:space-around") Upload
.fa.fa-upload
form.gcode-file-input.file-upload
input(type="file", @change="upload", :disabled="!is_ready",
accept=".nc,.ngc,.gcode,.gc")
br
gcode-viewer
button.submit-macros(title="Save Macros",@click="saveMacros(7)",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border:0;margin-top:30px") Save
button.submit-macros(title="Cancel Macros",@click="cancelMacros(7)",
style="height:50px;width:140px;font-weight:normal;margin-left:5px;background-color:#f6f6f6;color:#000;border:0;margin-top:30px") Cancel