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.3' into rel-4.4

Browse source
This commit is contained in:
Stewart Allen 2025-10-25 09:00:35 -04:00
commit 5888c37e7a
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/kiri/mode/fdm/export.js
View file

@ -607,7 +607,9 @@ export function fdm_export(print, online, ondone, ondebug) {
for (pidx=0; pidx<path.length; pidx++) { for (pidx=0; pidx<path.length; pidx++) {
out = path[pidx]; out = path[pidx];
speedMMM = (out.speed || process.outputFeedrate) * 60; // range speedMMM = (out.speed || process.outputFeedrate) * 60; // range
fanSpeed = out.fan ?? fanSpeed; if (!isBelt) {
fanSpeed = out.fan ?? fanSpeed;
}
// hint to controller that we're working on a specific object // hint to controller that we're working on a specific object
// so that gcode between start/stop comments can be cancelled // so that gcode between start/stop comments can be cancelled
@ -680,13 +682,13 @@ export function fdm_export(print, online, ondone, ondebug) {
} }
// in belt mode, fan can change per segment (for base) // in belt mode, fan can change per segment (for base)
// if (isBelt) { if (isBelt) {
setTempFanSpeed(out.fan); setTempFanSpeed(out.fan);
if (fanSpeed !== lastFanSpeed) { }
appendAllSub(gcodeFan); if (fanSpeed !== lastFanSpeed) {
lastFanSpeed = fanSpeed; appendAllSub(gcodeFan);
} lastFanSpeed = fanSpeed;
// } }
if (lastp && out.emit) { if (lastp && out.emit) {
if (arcDist) { if (arcDist) {

7
web/kiri/index.css
View file

@ -1530,6 +1530,10 @@ details[open] summary::after {
border-radius: 3px; border-radius: 3px;
text-align: center; text-align: center;
} }
.dark #op-add-list > div:hover {
color: black;
background-color: var(--blue-2) !important;
}
#op-add-list > div:hover { #op-add-list > div:hover {
background-color: var(--blue-4); background-color: var(--blue-4);
} }
@ -1538,9 +1542,6 @@ details[open] summary::after {
right: 0; right: 0;
top: 0; top: 0;
} }
#cam-lathe:hover {
background-color: rgba(0,0,0,0) !important;
}
#progress { #progress {
left: 0; left: 0;