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

fixes #35

Browse source
This commit is contained in:
Stewart Allen 2018-04-21 18:06:39 -04:00
commit ee38faa835
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/kiri-driver-cam.js
View file

@ -1381,8 +1381,9 @@ var gs_kiri_cam = exports;
device = settings.device, device = settings.device,
gcodes = settings.device || {}, gcodes = settings.device || {},
space = gcodes.gcodeSpace, space = gcodes.gcodeSpace,
stripComments = gcodes.gcodeStrip, stripComments = gcodes.gcodeStrip || false,
cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ], cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ],
cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ],
cmdDwell = gcodes.gcodeDwell || [ "G4 P{time}" ], cmdDwell = gcodes.gcodeDwell || [ "G4 P{time}" ],
widget = print.widgets[0], widget = print.widgets[0],
bounds = widget.getCamBounds(settings), bounds = widget.getCamBounds(settings),
@ -1566,7 +1567,12 @@ var gs_kiri_cam = exports;
} }
if (layerout.spindle && layerout.spindle !== spindle) { if (layerout.spindle && layerout.spindle !== spindle) {
spindle = layerout.spindle; spindle = layerout.spindle;
append((spindle > 0 ? "M3" : "M4") + " S" + Math.abs(spindle)); if (spindle > 0) {
filterEmit(cmdSpindle, {speed: Math.abs(spindle)});
} else {
append("M4");
}
// append((spindle > 0 ? "M3" : "M4") + " S" + Math.abs(spindle));
} }
layerout.forEach(function(out) { layerout.forEach(function(out) {
moveTo(out); moveTo(out);

12
js/kiri.js
View file

@ -121,6 +121,7 @@ self.kiri.license = exports.LICENSE;
gcodePost: 1, gcodePost: 1,
gcodeDwell: 1, gcodeDwell: 1,
gcodeChange: 1, gcodeChange: 1,
gcodeSpindle: 1,
gcodeFExt: 1, gcodeFExt: 1,
gcodeSpace: 1, gcodeSpace: 1,
gcodeStrip: 1 gcodeStrip: 1
@ -249,8 +250,9 @@ self.kiri.license = exports.LICENSE;
gcodeFan: "", // FDM fan command gcodeFan: "", // FDM fan command
gcodeTrack: "", // FDM progress command gcodeTrack: "", // FDM progress command
gcodeLayer: "", // FDM layer output gcodeLayer: "", // FDM layer output
gcodeDwell: [], // CAM dwell script gcodeDwell: ["G4 P{time}"], // CAM dwell script
gcodeChange: [], // CAM tool change script gcodeChange: ["M6 T{tool}"], // CAM tool change script
gcodeSpindle: ["M3 S{speed}"], // CAM spindle speed
gcodeFExt: "", // CAM file extension gcodeFExt: "", // CAM file extension
gcodeSpace: "", // CAM token spacing gcodeSpace: "", // CAM token spacing
gcodeStrip: true // CAM strip comments gcodeStrip: true // CAM strip comments
@ -2264,6 +2266,7 @@ self.kiri.license = exports.LICENSE;
setDeviceFExt: UC.newInput("file ext", {title:"file name exension", modes:CAM, size:5}), setDeviceFExt: UC.newInput("file ext", {title:"file name exension", modes:CAM, size:5}),
setDeviceDwell: UC.newText("dwell", {title:"gcode dwell script", modes:CAM, size:14, height:2}), setDeviceDwell: UC.newText("dwell", {title:"gcode dwell script", modes:CAM, size:14, height:2}),
setDeviceChange: UC.newText("tool change", {title:"tool change script", modes:CAM, size:14, height:2}), setDeviceChange: UC.newText("tool change", {title:"tool change script", modes:CAM, size:14, height:2}),
setDeviceSpindle: UC.newText("spindle speed", {title:"set spindle speed", modes:CAM, size:14, height:2}),
setDevicePause: UC.newText("pause", {title:"gcode pause script", modes:FDM, size:14, height:3}), setDevicePause: UC.newText("pause", {title:"gcode pause script", modes:FDM, size:14, height:3}),
setDevicePre: UC.newText("header", {title:"gcode header script", modes:FDM_CAM, size:14, height:3}), setDevicePre: UC.newText("header", {title:"gcode header script", modes:FDM_CAM, size:14, height:3}),
setDevicePost: UC.newText("footer", {title:"gcode footer script", modes:FDM_CAM, size:14, height:3}), setDevicePost: UC.newText("footer", {title:"gcode footer script", modes:FDM_CAM, size:14, height:3}),
@ -2956,6 +2959,7 @@ self.kiri.license = exports.LICENSE;
cmd: { cmd: {
fan_power: UI.setDeviceFan.value, fan_power: UI.setDeviceFan.value,
progress: UI.setDeviceTrack.value, progress: UI.setDeviceTrack.value,
spindle: UI.setDeviceSpindle.value.split('\n'),
layer: UI.setDeviceLayer.value.split('\n') layer: UI.setDeviceLayer.value.split('\n')
}, },
pre: UI.setDevicePre.value.split('\n'), pre: UI.setDevicePre.value.split('\n'),
@ -3002,6 +3006,7 @@ self.kiri.license = exports.LICENSE;
gcodeProc: valueOf(code.proc, ''), gcodeProc: valueOf(code.proc, ''),
gcodePause: valueOf(code.pause, []), gcodePause: valueOf(code.pause, []),
gcodeDwell: valueOf(code.dwell, []), gcodeDwell: valueOf(code.dwell, []),
gcodeSpindle: valueOf(cmd.spindle, []),
gcodeChange: valueOf(code['tool-change'], []), gcodeChange: valueOf(code['tool-change'], []),
gcodeFExt: valueOf(code['file-ext'], 'gcode'), gcodeFExt: valueOf(code['file-ext'], 'gcode'),
gcodeSpace: valueOf(code['token-space'], ''), gcodeSpace: valueOf(code['token-space'], ''),
@ -3032,6 +3037,7 @@ self.kiri.license = exports.LICENSE;
UI.setDeviceNozzle.value = dev.nozzleSize; UI.setDeviceNozzle.value = dev.nozzleSize;
// CAM // CAM
UI.setDeviceMaxSpindle.value = dev.spindleMax; UI.setDeviceMaxSpindle.value = dev.spindleMax;
UI.setDeviceSpindle.value = dev.gcodeSpindle.join('\n');
UI.setDeviceDwell.value = dev.gcodeDwell.join('\n'); UI.setDeviceDwell.value = dev.gcodeDwell.join('\n');
UI.setDeviceChange.value = dev.gcodeChange.join('\n'); UI.setDeviceChange.value = dev.gcodeChange.join('\n');
UI.setDeviceFExt.value = dev.gcodeFExt; UI.setDeviceFExt.value = dev.gcodeFExt;
@ -3055,6 +3061,8 @@ self.kiri.license = exports.LICENSE;
UI.setDeviceLayer, UI.setDeviceLayer,
UI.setDeviceFilament, UI.setDeviceFilament,
UI.setDeviceNozzle, UI.setDeviceNozzle,
UI.setDeviceMaxSpindle,
UI.setDeviceSpindle,
UI.setDeviceDwell, UI.setDeviceDwell,
UI.setDeviceChange, UI.setDeviceChange,
UI.setDeviceFExt, UI.setDeviceFExt,

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
VERSION:"1.2.1" VERSION:"1.2.2"
}; };
if (!module) var module = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;