AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add laser on/off gcode. cleanup help, export dialogs

Browse source
This commit is contained in:
Stewart Allen 2020-03-13 12:31:10 -04:00
commit eb381f3417
13 changed files with 149 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web/kiri/filter/LASER/Any.Generic.Laser
View file

@ -1,13 +1,18 @@
{
"file-ext": "gcode",
"token-space": " ",
"strip-comments": false,
"pre":[
"G21 ; set units to MM (required)",
"G90 ; absolute position mode (required)"
],
"post":[
"M30 ; program end"
],
"laser-on":[
"M106 S{power}"
],
"laser-off":[
"M107"
],
"settings": {
"bed_width": 300,

12
web/kiri/filter/LASER/Glowforge
View file

@ -1,14 +1,10 @@
{
"file-ext": "gcode",
"token-space": " ",
"strip-comments": false,
"pre":[
"G21 ; set units to MM (required)",
"G90 ; absolute position mode (required)"
],
"post":[
"M30 ; program end"
],
"pre":[],
"post":[],
"laser-on":[],
"laser-off":[],
"settings": {
"bed_width": 500,
"bed_depth": 300

21
web/kiri/help.html
View file

@ -23,19 +23,22 @@
<b>File Load & Import</b>
<li>Drag and drop an <a href="https://en.wikipedia.org/wiki/STL_(file_format)" target="_stl">STL</a> onto the grid
<li>Or load with Function [Import]
<li>Or load with Function <button onclick="kiri.api.event.import()">Import</button>
<p>
<b>Start Working</b>
<li>Select device mode: FDM, CAM, Laser
<li>Select device profile under Devices
<li>Set slicing parameters in right menu
<li>Test slicing settings with Function [Slice]
<li>Preview slicing output with Function [Preview]
<li>Export gcode with Function [Export]
<li>Set mode
<button onclick="kiri.api.mode.set('FDM')">FDM</button>
<button onclick="kiri.api.mode.set('CAM')">CAM</button>
<button onclick="kiri.api.mode.set('LASER')">LASER</button>
<li>Select <button onclick="kiri.api.show.devices()">Device</button>
<li>Set slicing parameters in right panel
<li><button onclick = "kiri.api.function.slice()">Slice</button>
using settings from the right panel
<li><button onclick = "kiri.api.function.print()">Preview</button> GCode output
<li><button onclick = "kiri.api.function.export()">Export</button> GCode
<p>
<b>Other ways to use Kiri</b>
<b>Other ways to use Kiri:Moto</b>
<li><label><a target="_onshape" href="https://appstore.onshape.com/apps/CAM/EAAEWYIOMQKBENEMYW2N7MF253CT4WYL6SUJGEY=/description">Onshape</a></label> -- Inside Onshape
<li><label><a target="_thingiverse" href="http://www.thingiverse.com/apps/kirimoto/">Thingiverse</a></label> -- Inside Thingiverse

12
web/kiri/output-gcode.html
View file

@ -5,17 +5,17 @@
<div>
<table id="print-info">
<tr><th>file name</th><td><input id="print-filename" size="30" spellcheck="false" /></td></tr>
<tr><th>file size (bytes)</th><td><input id="print-filesize" size="10" disabled="true" /></td></tr>
<tr id="mill-info"><th>estimate (h:m:s)</th><td><input id="mill-time" size="10" disabled="true" /></td></tr>
<tr><th>file size (bytes)</th><td><input id="print-filesize" size="12" disabled="true" /></td></tr>
<tr id="mill-info"><th>time estimate (h:m:s)</th><td><input id="mill-time" size="12" disabled="true" /></td></tr>
</table>
</div>
<div id="print-filament-row">
<table>
<tr><th>filament used (mm)</th><td><input id="print-filament" size="10" disabled="true" /></td></tr>
<tr><th>filament density (g/cm^3)</th><td><input id="print-density" size="10" value="1.25" /></td></tr>
<tr><th>printed weight (g)</th><td><input id="print-weight" size="10" disabled="true" /></td></tr>
<tr><th>estimate (h:m:s)</th><td><input id="print-time" size="10" disabled="true" /></td></tr>
<tr><th>filament used (mm)</th><td><input id="print-filament" size="12" disabled="true" /></td></tr>
<tr><th>filament density (g/cm^3)</th><td><input id="print-density" size="12" value="1.25" /></td></tr>
<tr><th>printed weight (g)</th><td><input id="print-weight" size="12" disabled="true" /></td></tr>
<tr><th>time estimate (h:m:s)</th><td><input id="print-time" size="12" disabled="true" /></td></tr>
</table>
</div>

2
web/kiri/output-laser.html
View file

@ -5,7 +5,7 @@
<div>
<table id="print-info">
<tr><th>file name</th><td><input id="print-filename" size="30" spellcheck="false" /></td></tr>
<tr><th>segments</th><td><input id="print-lines" size="10" disabled="true" /></td></tr>
<tr><th>segments</th><td><input id="print-lines" size="12" disabled="true" /></td></tr>
</table>
</div>

4
web/kiri/style.css
View file

@ -532,6 +532,8 @@ button.selected {
}
#device label {
white-space: nowrap;
}
#device > div > label {
padding: 2px;
}
#device input {
@ -664,7 +666,6 @@ button[import="1"] {
z-Index: 10000;
}
.poptext label {
width: 100% !important;
text-align: center !important;
border-top: 1px solid #888;
border-left: 1px solid #888;
@ -676,6 +677,7 @@ button[import="1"] {
}
.poptext textarea {
flex-grow: 1;
margin: 0;
opacity: 0.95;
outline: none;
overflow-y: scroll !important;