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 typo in laser gcode output

Browse source
This commit is contained in:
Stewart Allen 2020-05-05 20:45:09 -04:00
commit d97365db77
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -294,7 +294,7 @@ let gs_kiri_laser = exports;
function exportGCode(print) { function exportGCode(print) {
let lines = [], dx = 0, dy = 0, feedrate; let lines = [], dx = 0, dy = 0, feedrate;
let dev = print.settings.device; let dev = print.settings.device;
let space = dev.gcodeSpace; let space = dev.gcodeSpace ? ' ' : '';
let power = 255; let power = 255;
let laser_on = dev.gcodeLaserOn || []; let laser_on = dev.gcodeLaserOn || [];
let laser_off = dev.gcodeLaserOff || []; let laser_off = dev.gcodeLaserOff || [];
@ -337,7 +337,7 @@ let gs_kiri_laser = exports;
}); });
}, },
function(point) { function(point) {
return `X${(point.x - dx, 3).toFixed(3)}${space}Y${(point.y - dy, 3).toFixed(3)}`; return `X${(point.x - dx).toFixed(3)}${space}Y${(point.y - dy).toFixed(3)}`;
} }
); );

7
web/kiri/gyroid-test.html
View file

@ -145,6 +145,7 @@
let zcache = {}; let zcache = {};
let timer = new Timer(); let timer = new Timer();
let maxdist = rez * 0.01; let maxdist = rez * 0.01;
let fast = false;
function $(id) { function $(id) {
return document.getElementById(id); return document.getElementById(id);
@ -152,10 +153,11 @@
function init() { function init() {
$('zval').max = rez; $('zval').max = rez;
let mark = Date.now();
for (let z=0; z<PI2; z += inc) { for (let z=0; z<PI2; z += inc) {
generate(z); generate(z);
} }
console.log(timer.toString()); console.log(Date.now() - mark, timer.toString());
render(0); render(0);
} }
@ -272,7 +274,6 @@
let chain; let chain;
let added; let added;
let cleared = 0; let cleared = 0;
let fast = true;
do { do {
for (let i=0; i<sparse.length; i++) { for (let i=0; i<sparse.length; i++) {
@ -333,7 +334,7 @@
} }
} while (added); } while (added);
} while (cleared < sparse.length); } while (cleared < sparse.length);
console.log('chains',chain.length); // console.log('chains',chain.length);
timer.mark('chain'); timer.mark('chain');
// simplify poly // simplify poly