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 minx, maxx, miny, maxy to macro substitution

Browse source
This commit is contained in:
Stewart Allen 2021-11-08 13:29:04 -05:00
commit 62e2c69889
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/mode/fdm/export.js
View file

@ -73,7 +73,10 @@
arcDev = 0.5, arcDev = 0.5,
arcMax = 40, arcMax = 40,
originCenter = process.outputOriginCenter || device.bedRound, originCenter = process.outputOriginCenter || device.bedRound,
offset = originCenter ? null : { offset = originCenter ? {
x: 0,
y: 0
} : {
x: device.bedWidth/2, x: device.bedWidth/2,
y: isBelt ? 0 : device.bedDepth/2 y: isBelt ? 0 : device.bedDepth/2
}, },
@ -84,7 +87,12 @@
lastNozzleTemp = nozzleTemp, lastNozzleTemp = nozzleTemp,
lastBedTemp = bedTemp, lastBedTemp = bedTemp,
lastFanSpeed = fanSpeed, lastFanSpeed = fanSpeed,
bounds = settings.bounds,
subst = { subst = {
minx: bounds.min.x + offset.x,
maxx: bounds.max.x + offset.x,
miny: bounds.min.y + offset.y,
maxy: bounds.max.y + offset.y,
travel_speed: seekMMM, travel_speed: seekMMM,
retract_speed: retSpeed, retract_speed: retSpeed,
retract_distance: retDist, retract_distance: retDist,
@ -93,10 +101,10 @@
bed_temp: bedTemp, bed_temp: bedTemp,
fan_speed: fanSpeed, fan_speed: fanSpeed,
speed: fanSpeed, // legacy speed: fanSpeed, // legacy
top: offset ? device.bedDepth : device.bedDepth/2, top: offset.x ? device.bedDepth : device.bedDepth/2,
left: offset ? 0 : -device.bedWidth/2, left: offset.x ? 0 : -device.bedWidth/2,
right: offset ? device.bedWidth : device.bedWidth/2, right: offset.x ? device.bedWidth : device.bedWidth/2,
bottom: offset ? 0 : -device.bedDepth/2, bottom: offset.x ? 0 : -device.bedDepth/2,
z_max: device.maxHeight, z_max: device.maxHeight,
layers: layers.length, layers: layers.length,
progress: 0, progress: 0,