q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started work on adding extrusion control

master
Gina Häußge 2013-02-09 23:20:41 +01:00
parent 7fb354a256
commit f09d57bef9
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octoprint/static/css/ui.css
View File

@ -176,3 +176,7 @@ table th.timelapse_files_action, table td.timelapse_files_action {
margin-right: 20px;
margin-bottom: 20px;
}
.text-right {
text-align: right;
}

32
octoprint/templates/index.html
View File

@ -171,7 +171,7 @@
<div class="tab-pane" id="controls">
<!-- XY jogging control panel -->
<div class="jog-panel">
<h4>XY</h4>
<h1>X/Y</h1>
<div>
<button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('y', 10) }"><i class="icon-arrow-up"></i></button>
</div>
@ -186,7 +186,7 @@
</div>
<!-- Z jogging control panel -->
<div class="jog-panel">
<h4>Z</h4>
<h1>Z</h1>
<div>
<button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z', 10) }"><i class="icon-arrow-up"></i></button>
</div>
@ -197,16 +197,38 @@
<button class="btn box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendJogCommand('z', -10) }"><i class="icon-arrow-down"></i></button>
</div>
</div>
<!-- General control -->
<!-- Extrusion control panel -->
<div class="jog-panel">
<h4>Control</h4>
<h1>E</h1>
<div>
<div class="input-append">
<input type="text" id="controls_extrusionAmount" class="input-mini text-right" data-bind="enable: isOperational(), attr: {placeholder: innerWall}">
<span class="add-on">mm</span>
</div>
<div class="btn-group">
<button class="btn">Extrude</button>
<button class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<a href="#">Retract</a>
</li>
</ul>
</div>
</div>
</div>
<!-- General control -->
<!--div class="jog-panel">
<h1>Control</h1>
<div>
<button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }"><i class="icon-off"></i>&nbsp;Motors off</button>
<button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M106'}) }">Fans on</button>
<button class="btn control-box" data-bind="enable: isOperational() && !isPrinting(), click: function() { $root.sendCustomCommand({type:'command',command:'M106 S0'}) }">Fans off</button>
</div>
</div>
</div-->
<!-- Container for custom controls -->
<div data-bind="template: { name: $root.displayMode, foreach: controls }"></div>
<!-- Templates for custom controls -->