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

test

Browse Source
This commit is contained in:
sanjayk03-dev
2023-12-30 11:57:18 +05:30
parent 0bf3d936d4
commit 3664c2e19b
3 changed files with 15 additions and 9 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;
// if(this.config.macros!=undefined){ // if(this.config.macros!=undefined){
// console.log("isMacrosPresent",this.config.macros!=undefined); // console.log("isMacrosPresent",this.config.macros!=undefined);
// console.log(this.config.macros.length!=0); // console.log(this.config.macros.length!=0);

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

@@ -3,8 +3,9 @@ script#macros-template(type="text/x-template")
h1 Macros Configuration h1 Macros Configuration
.macros-form .macros-form
p.title Enter Macros Name p.title Enter Macros Name
input.input-color(type="color",id="macros-color",value="#ffffff") .input-container
input.input-name(type="text",id="macros-name") input.input-color(type="color",id="macros-color",value="#ffffff")
input.input-name(type="text",id="macros-name")
p.title Select/Upload G-Code p.title Select/Upload G-Code
select(title="Select previously uploaded GCode programs.", select(title="Select previously uploaded GCode programs.",
v-model="state.selected", @change="load", :disabled="!is_ready", v-model="state.selected", @change="load", :disabled="!is_ready",
@@ -16,6 +17,6 @@ script#macros-template(type="text/x-template")
button.submit-macros(title="Save Macros",@click="saveMacros", button.submit-macros(title="Save Macros",@click="saveMacros",
style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad") Save Macros style="height:50px;width:140px;font-weight:normal;background-color:#add1ad;color:#fff;border-color:#add1ad") Save Macros
button.pure-button(title="Print config.", @click="printConfig", button.pure-button(title="Print config.", @click="printConfig",
style="height:50px;width:100px;font-weight:normal") print Config style="height:50px;width:120px;font-weight:normal") print Config
gcode-viewer gcode-viewer

15
src/stylus/style.styl
View File

@@ -612,9 +612,9 @@ span.unit
vertical-align middle vertical-align middle
.macros-div .macros-div
height 500px height 50px
width 500px width 100px
margin 100px margin 10px
.submit-macros .submit-macros
height 50px height 50px
@@ -1067,6 +1067,11 @@ tt.save
border-color #434242 border-color #434242
padding-left 10px padding-left 10px
.input-container
height 40px
align-items center
p.title p.title
font-size 20px font-size 20px
padding-top 20px padding-top 20px
@@ -1077,12 +1082,12 @@ tt.save
height 40px height 40px
width 40px width 40px
border 1px solid #fdfdfd border 1px solid #fdfdfd
border-radius 2px border-radius 1px
button button
border-radius 8px border-radius 8px
border-width 1px border-width 1px
border-color #434242 border 0
.input-field .input-field
margin-top 10px margin-top 10px