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

fix gcode space setting. bump settings version (some legacy corner cases)

Browse source
This commit is contained in:
Stewart Allen 2020-04-11 22:34:04 -04:00
commit a5e6c9760e
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/kiri-conf.js
View file

@ -10,7 +10,7 @@ let gs_kiri_conf = exports;
if (self.kiri.conf) return; if (self.kiri.conf) return;
let KIRI = self.kiri, let KIRI = self.kiri,
CVER = 2; CVER = 185;
function genID() { function genID() {
while (true) { while (true) {
@ -96,7 +96,7 @@ let gs_kiri_conf = exports;
gcodeSpindle: valueOf(cmd.spindle, []), 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'], true),
gcodeStrip: valueOf(code['strip-comments'], false), gcodeStrip: valueOf(code['strip-comments'], false),
gcodeLaserOn: valueOf(code['laser-on'], []), gcodeLaserOn: valueOf(code['laser-on'], []),
gcodeLaserOff: valueOf(code['laser-off'], []), gcodeLaserOff: valueOf(code['laser-off'], []),
@ -156,7 +156,7 @@ let gs_kiri_conf = exports;
} }
// v1 to v2 changed FDM extruder / nozzle / filament structure // v1 to v2 changed FDM extruder / nozzle / filament structure
if (settings.ver === 1) { if (settings.ver != CVER) {
// backup settings before upgrade // backup settings before upgrade
API.sdb.setItem(`ws-settings-${Date.now()}`, JSON.stringify(settings)); API.sdb.setItem(`ws-settings-${Date.now()}`, JSON.stringify(settings));
device_v1_to_v2(settings.device); device_v1_to_v2(settings.device);
@ -164,7 +164,7 @@ let gs_kiri_conf = exports;
objectMap(settings.devices, dev => { objectMap(settings.devices, dev => {
return device_from_code(dev); return device_from_code(dev);
}); });
settings.ver = 2; settings.ver = CVER;
} }
fill_cull(settings, defaults, defaults); fill_cull(settings, defaults, defaults);
@ -463,7 +463,7 @@ let gs_kiri_conf = exports;
gcodeTrack: "", // FDM progress command gcodeTrack: "", // FDM progress command
gcodeLayer: [], // FDM layer output gcodeLayer: [], // FDM layer output
gcodeFExt: "", // CAM file extension gcodeFExt: "", // CAM file extension
gcodeSpace: "", // CAM token spacing gcodeSpace: true, // CAM token spacing
gcodeStrip: true, // CAM strip comments gcodeStrip: true, // CAM strip comments
gcodeDwell: ["G4 P{time}"], // CAM dwell script gcodeDwell: ["G4 P{time}"], // CAM dwell script
gcodeChange: ["M6 T{tool}"], // CAM tool change script gcodeChange: ["M6 T{tool}"], // CAM tool change script

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

@ -1556,7 +1556,7 @@ var gs_kiri_cam = exports;
settings = print.settings, settings = print.settings,
device = settings.device, device = settings.device,
gcodes = settings.device || {}, gcodes = settings.device || {},
space = gcodes.gcodeSpace, space = gcodes.gcodeSpace ? ' ' : '',
stripComments = gcodes.gcodeStrip || false, stripComments = gcodes.gcodeStrip || false,
cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ], cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ],
cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ], cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ],

4
js/kiri-driver-fdm.js
View file

@ -584,6 +584,7 @@ let gs_kiri_fdm = exports;
return start; return start;
} else { } else {
console.log({already_purged: nozzle, from: track, layer}); console.log({already_purged: nozzle, from: track, layer});
return start;
} }
} }
@ -616,6 +617,9 @@ let gs_kiri_fdm = exports;
found = 0; found = 0;
closest = null; closest = null;
mindist = Infinity; mindist = Infinity;
// TODO must select slices of the same extruder type first
// instead of just finding closest, create sorted list and
// next is draw from list
for (meshIndex = 0; meshIndex < slices.length; meshIndex++) { for (meshIndex = 0; meshIndex < slices.length; meshIndex++) {
sliceEntry = slices[meshIndex]; sliceEntry = slices[meshIndex];
if (!sliceEntry) continue; if (!sliceEntry) continue;