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

Merge branch 'rel-4.6'

Browse source
This commit is contained in:
Stewart Allen 2026-01-11 15:29:15 -05:00
commit c6c9846b96
184 changed files with 15553 additions and 9433 deletions
Download patch file Download diff file Expand all files Collapse all files

57
web/kiri/index.html
View file

@ -22,8 +22,8 @@
<link rel="stylesheet" type="text/css" href="index.css">
<link href="manifest.json" rel="manifest">
<link href="../font/css/all.min.css" rel="stylesheet">
<!-- <script type="module" src="/lib/kiri/run/worker.js"></script>
<script type="module" src="/lib/kiri/run/minion.js"></script> -->
<!-- <script type="module" src="/lib/kiri/run/worker.js"></script> -->
<!-- <script type="module" src="/lib/kiri/run/minion.js"></script> -->
<script src="../lib/ext/tween.js"></script>
<script src="../font/js/all.min.js" crossorigin="anonymous" defer></script>
<script src="../lib/main/kiri.js" type="module"></script>
@ -110,8 +110,8 @@
<div id="file-import">
<label lk="import">import</label>
<span><i class="fas fa-file-upload"></i></span>
<!-- required file input loader -->
<input id="load-file" type="file" name="loadme" style="display:none"></input>
<!-- required file input loaders -->
<input id="load-file" type="file" name="loadme" style="display:none" accept=".km,.kmz,.stl,.obj,.svg,.png,.jpg,.jpeg,.gcode,.nc"></input>
</div>
<hr>
<div id="app-export">
@ -447,21 +447,22 @@
<div id="fdm-ranges" class="f-col"></div>
</div>
<div class="set2-group f-col mode-cam">
<div class="set-header mode-cam"><a>operation list</a></div>
<details open>
<summary class="set-header mode-cam"><a>operation list</a></summary>
<div id="camops" class="f-col a-stretch grow">
<div id="oplist" class="f-col"></div>
<div id="op-add" class="opdiv">
<i class="fas fa-plus"></i>
<div id="op-add-pop" class="f-col">
<div id="op-add-list" class="opdiv op-grid">
<div id="cam-index" title="rotate index axis">index</div>
<div id="cam-lathe" title="lathe operation">lathe</div>
<div id="laser-on" title="turn on laser mode">laser on</div>
<div id="laser-off" title="turn off laser mode">laser off</div>
<div id="cam-index" title="rotate index axis">index</div>
<div id="cam-lathe" title="lathe operation">lathe</div>
<div id="cam-flip" title="flip part and load&#13;profile for other side&#13;for double-sided work">flip</div>
<div id="cam-reg" title="drill registration holes&#13;along the X or Y axis&#13;for double-sided work">register</div>
<div title="drill selected holes">drill</div>
<div title="clear stock face">level</div>
<div title="drill selected holes">drill</div>
<div title="follow a downward helix&#13;using conical selections">helical</div>
<div title="insert custom gcode">gcode</div>
<div title="2.5D tracing along X or Y axis&#13;used for complex part features">contour</div>
@ -470,10 +471,12 @@
<div title="remove an area of material&#13;inside a defined boundary&#13;sometimes called pocketing">rough</div>
<div title="cutout parts using their shadow outline">outline</div>
<div title="perform operations on using outlines or surfaces&#13;many operations are simple wrappers around this">area</div>
<div id="cam-loop" title="loop next N operations M times">loop</div>
</div>
</div>
</div>
</div>
</details>
</div>
<div class="grow"></div>
<div class="line-sep2"></div>
@ -675,22 +678,42 @@
<label class="grow0 pad3">spool</label>
<select id="print-bambu-spool"></select>
<button id="print-bambu-1" class="grow" disabled>send</button>
<button id="print-bambu-2" class="grow" disabled>send + print</button>
<button id="print-bambu-2" class="grow" disabled>print</button>
</div>
</div>
<div id="send-to-octohead" class="header"><label>octoprint</label></div>
<div id="send-to-octoprint" class="f-col box">
<div id="send-remote-head" class="header"><label>send to print</label></div>
<div id="send-remote-print" class="f-col box">
<div class="grow f-row">
<div class="f-col grow">
<div id="ophost"><label lk="ex_host">host</label><input id="octo-host" size="20" placeholder="http(s)://host:port" /></div>
<div id="opapik"><label lk="ex_akey">key</label><input id="octo-apik" size="20" /></div>
<div id="ophost">
<label lk="ex_host">host</label>
<input id="octo-host" size="20" placeholder="http(s)://host:port" />
</div>
<div id="opapik">
<label lk="ex_akey">key</label>
<input id="octo-apik" size="20" />
</div>
<div id="optype">
<label lk="ex_type">type</label>
<select id="octo-type">
<option selected>moonraker</option>
<option>octoprint</option>
</select>
</div>
</div>
<button id="print-octoprint">send</button>
<button id="send-remote">send</button>
<button id="print-remote">print</button>
</div>
<div id="oph1nt">
<label class="hint">
check printer
<a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS</a>
settings
</label>
</div>
<div id="oph1nt"><label class="hint"><a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS support</a> must be enabled in API settings</label></div>
</div>
<div id="export-support" class="f-col">
<a id="export-support-a" target="support">this project neeeds your support!</a>
<a id="export-support-a" target="support">this project needs your support!</a>
</div>
</div>
<div id="mod-x-sla" class="mod-print mdialog f-col">
@ -716,7 +739,7 @@
<div class="f-row box">
<button id="print-svg" class="grow">svg</button>
<button id="print-dxf" class="grow">dxf</button>
<button id="print-stl" class="grow">stl</button>
<button id="print-obj" class="grow">obj</button>
<button id="print-lg" class="grow">gcode</button>
</div>
</div>