From 9f3ddb35116273e5f58564caa63cc655711b9b01 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 8 Jul 2020 12:18:15 -0400 Subject: [PATCH] inject tool use data into .gcode header comments --- src/mode/cam/driver.js | 54 ++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/src/mode/cam/driver.js b/src/mode/cam/driver.js index 143d9370..8e101d33 100644 --- a/src/mode/cam/driver.js +++ b/src/mode/cam/driver.js @@ -1746,6 +1746,7 @@ settings = print.settings, device = settings.device, gcodes = settings.device || {}, + tools = settings.tools, space = gcodes.gcodeSpace ? ' ' : '', stripComments = gcodes.gcodeStrip || false, cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ], @@ -1771,19 +1772,19 @@ min: { x:Infinity, y:Infinity, z:Infinity} }, offset = { - x: -settings.origin.x, - y: settings.origin.y + x: -settings.origin.x, + y: settings.origin.y }, consts = { - tool: 0, - tool_name: "unknown", - top: (offset ? dev.bedDepth : dev.bedDepth/2), - left: (offset ? 0 : -dev.bedWidth/2), - right: (offset ? dev.bedWidth : dev.bedWidth/2), - bottom: (offset ? 0 : -dev.bedDepth/2), - time_sec: 0, - time_ms: 0, - time: 0 + tool: 0, + tool_name: "unknown", + top: (offset ? dev.bedDepth : dev.bedDepth/2), + left: (offset ? 0 : -dev.bedWidth/2), + right: (offset ? dev.bedWidth : dev.bedWidth/2), + bottom: (offset ? 0 : -dev.bedDepth/2), + time_sec: 0, + time_ms: 0, + time: 0 }, append; @@ -1830,7 +1831,14 @@ } } - function toolNameByNumber(number, tools) { + function toolByNumber(number) { + for (let i=0; i { + let tool = toolz[tn]; + append(`; tool=${tn} flute=${tool.flute_diam} len=${tool.flute_len} metric=${tool.metric}`); + }); + } + + // emit gcode preamble + filterEmit(gcodes.gcodePre, consts); + // emit all points in layer/point order print.output.forEach(function (layerout) { if (mode !== layerout.mode) {