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 parse comments. add false color speed in preview

Browse source
This commit is contained in:
Stewart Allen 2017-12-12 14:16:20 -05:00
commit 66f36674bd
3 changed files with 20 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -291,9 +291,9 @@ var gs_kiri_fdm = exports;
bottom: offset ? 0 : -device.bedDepth/2, bottom: offset ? 0 : -device.bedDepth/2,
z_max: device.maxHeight z_max: device.maxHeight
}, },
glideBridgeDist = device.nozzleSize * 2,
shortDist = process.outputShortDistance, shortDist = process.outputShortDistance,
shortFact = process.outputShortFactor, shortFact = process.outputShortFactor,
glideBridgeDist = device.nozzleSize * 2,
maxPrintMMM = process.outputFeedrate * 60, maxPrintMMM = process.outputFeedrate * 60,
seekMMM = process.outputSeekrate * 60, seekMMM = process.outputSeekrate * 60,
retOver = process.outputRetractOver, retOver = process.outputRetractOver,
@ -468,9 +468,10 @@ var gs_kiri_fdm = exports;
retracted = retDist; retracted = retDist;
moveTo({e:-retracted}, retSpeed, "retract (ooze control)"); moveTo({e:-retracted}, retSpeed, "retract (ooze control)");
moveTo({x:x, y:y}, moveMMM); moveTo({x:x, y:y}, moveMMM);
// } else if (lastp && dist <= glideBridgeDist) { } else if (lastp && dist <= glideBridgeDist) {
// var e = (layer === 0 ? emitPerMMLayer1 : emitPerMM) * dist; // connect ends of infill
// moveTo({x:x, y:y, e:e}, outMMM); var e = (layer === 0 ? emitPerMMLayer1 : emitPerMM) * dist;
moveTo({x:x, y:y, e:e}, outMMM);
} else { } else {
moveTo({x:x, y:y}, moveMMM); moveTo({x:x, y:y}, moveMMM);
} }

23
js/kiri-print.js
View file

@ -97,7 +97,7 @@ var gs_kiri_print = exports;
}; };
lines.forEach(function(line) { lines.forEach(function(line) {
line = line.split(" "); line = line.split(";")[0].split(" ");
if (line.length < 2) return; if (line.length < 2) return;
switch (line.shift()) { switch (line.shift()) {
case 'G0': case 'G0':
@ -222,7 +222,7 @@ var gs_kiri_print = exports;
// data to speed up worker -> browser transfer // data to speed up worker -> browser transfer
newlayer.push({ newlayer.push({
emit: out.emit, emit: out.emit,
// speed: out.speed, speed: out.speed,
// retract: out.retract, // retract: out.retract,
point: {x: out.point.x, y: out.point.y, z: out.point.z} point: {x: out.point.x, y: out.point.y, z: out.point.z}
}); });
@ -252,15 +252,18 @@ var gs_kiri_print = exports;
// render layered output // render layered output
scope.lines = 0; scope.lines = 0;
scope.output.forEach(function(layerout) { scope.output.forEach(function(layerout) {
var move = [], print = [], z; var move = [], print = {}, z;
layerout.forEach(function(out) { layerout.forEach(function(out, index) {
if (last) { if (last) {
if (UTIL.distSq(last, out.point) < 0.001 && out.point.z === last.z) { if (UTIL.distSq(last, out.point) < 0.001 && out.point.z === last.z) {
return; return;
} }
if (out.emit > 0) { if (out.emit > 0) {
print.push(last); var spd = out.speed || 3000;
print.push(out.point); var arr = print[spd] || [];
print[spd] = arr;
arr.push(last);
arr.push(out.point);
} else { } else {
move.push(last); move.push(last);
move.push(out.point); move.push(out.point);
@ -273,9 +276,13 @@ var gs_kiri_print = exports;
}); });
view = KIRI.newLayer(scope.group); view = KIRI.newLayer(scope.group);
scope.layerView.push(view); scope.layerView.push(view);
// console.log({move:move, print:print});
if (showMoves) view.lines(move, moveColor); if (showMoves) view.lines(move, moveColor);
view.lines(print, 0x5566aa); for (var speed in print) {
var sint = Math.min(6000, parseInt(speed));
var red = Math.round((sint/6000) * 0xff);
var blue = 0xff - red;
view.lines(print[speed], (red<<16) | (blue));
}
view.render(); view.render();
scope.lines += print.length; scope.lines += print.length;
}); });

354
js/util-gx.js
View file

@ -1,354 +0,0 @@
/** Copyright 2014-2017 Stewart Allen -- All Rights Reserved */
"use strict";
class GXReader {
constructor(file) {
this.buf = fs.readFileSync(file);
this.pos = 16;
this.magic = this.buf.slice(0,16).toString().trim();
console.log({
magic: this.magic,
bmpoff: this.u32(),
gc1off: this.u32(),
gc2off: this.u32(),
prsecs: this.u32(),
prfila: this.u32(),
unk01: this.u32(),
unk02: this.u16(),
unk03: this.u16(),
unk04: this.u16(),
unk05: this.u16(),
unk06: this.u16(),
unk07: this.u16(),
unk08: this.u16(),
unk09: this.u16(),
unk10: this.u8(),
unk11: this.u8(),
index: this.pos
});
}
inc(inc) {
const ret = this.pos;
this.pos += inc;
return ret;
}
u8() {
return this.buf.readUInt8(this.inc(1));
}
u16() {
return this.buf.readUInt16LE(this.inc(2));
}
u32() {
return this.buf.readUInt32LE(this.inc(4));
}
string() {
}
}
class GXWriter {
constructor(gcode, bmp, time, length) {
gcode = fs.readFileSync(gcode); // raw gcode
bmp = fs.readFileSync(bmp); // any 80x60 pixel bmp
const header = new Buffer(58);
header.write("xgcode 1.0\n\u0000\u0000\u0000\u0000\u0000", 0);
header.writeUInt32LE(58, 16); // bmp offset
header.writeUInt32LE(58 + bmp.length, 20); // gcode offset
header.writeUInt32LE(58 + bmp.length, 24); // gcode offset
header.writeUInt32LE(time || 100, 28); // print seconds
header.writeUInt32LE(length || 100, 32); // print filament len mm
header.writeUInt32LE( 0, 36); // ?
header.writeUInt16LE( 1, 40); // ?
header.writeUInt16LE(200, 42); // ?
header.writeUInt16LE( 20, 44); // ?
header.writeUInt16LE( 3, 46); // ?
header.writeUInt16LE( 60, 48); // ?
header.writeUInt16LE(110, 50); // ?
header.writeUInt16LE(220, 52); // ?
header.writeUInt16LE(220, 54); // ?
header.writeUInt8 ( 1, 56); // ?
header.writeUInt8 ( 1, 57); // ?
this.output = Buffer.concat([header, bmp, gcode]);
}
write(file) {
fs.writeFileSync(file, this.output);
return this;
}
}
class LineBuffer {
constructor(stream) {
this.buffer = null;
this.stream = stream;
this.stream.on("data", data => {
if (this.buffer) {
this.buffer = Buffer.concat([this.buffer, data]);
} else {
this.buffer = data;
}
this.nextLine()
});
}
nextLine() {
let left = 0;
const data = this.buffer;
const cr = data.indexOf("\r");
const lf = data.indexOf("\n");
if (lf && cr + 1 == lf) { left = 1 }
if (lf >= 0) {
this.stream.emit("line", data.slice(0, lf - left));
this.buffer = data.slice(lf + 1);
this.nextLine();
}
}
}
class FFControl {
constructor(host, port) {
const socket = new net.Socket().connect({
host: host,
port: port
})
.on("connect", () => {
console.log({connected: [host, port]});
this.connected = true;
this.doSendTimer();
})
.on("line", line => {
line = line.toString();
let okidx = line.indexOf("ok");
if (okidx >= 0) {
if (okidx > 0) this.output.push(line);
if (this.next) {
if (this.next.cb) this.next.cb(this.output);
} else {
console.log({reply_no_cmd: this.output});
}
this.output = [];
this.timer = null;
this.doSendTimer();
} else {
this.output.push(line);
}
})
.on("error", (error) => {
console.log({error: error});
})
.on("end", () => {
console.log({end: [host,port]});
})
.on("close", () => {
console.log({close: [host,port]});
})
;
socket.lineBuffer = new LineBuffer(socket);
this.connected = false;
this.socket = socket;
this.queue = [];
this.timer = null;
this.next = null;
this.output = [];
}
sendBuffer(buf, callback) {
this.queue.push({cmd: buf, cb: callback});
this.doSendTimer();
}
sendCommand(cmd, callback) {
this.queue.push({cmd: "~" + cmd + "\r\n", cb: callback});
this.doSendTimer();
}
doSendTimer() {
if (!this.connected || this.timer) return;
if (this.queue.length > 0) this.timer = setTimeout(() => {
this.doSend()
}, 0);
}
doSend() {
const next = this.queue.shift();
this.next = next;
this.socket.write(next.cmd);
}
}
function uint32b(val) {
return new Buffer([
(val >> 24) & 0xff,
(val >> 16) & 0xff,
(val >> 8) & 0xff,
(val >> 0) & 0xff
]);
}
class GXSender {
constructor(file, host, port, filename) {
const buffer = fs.readFileSync(file);
const ctrl = new FFControl(host, port);
ctrl.sendCommand("M601 S1", lines => { console.log(lines) }); // take control
ctrl.sendCommand("M115", lines => { console.log(lines) });
ctrl.sendCommand("M650", lines => { console.log(lines) });
ctrl.sendCommand("M115", lines => { console.log(lines) });
ctrl.sendCommand("M114", lines => { console.log(lines) });
ctrl.sendCommand("M27", lines => { console.log(lines) });
ctrl.sendCommand("M119", lines => { console.log(lines) });
ctrl.sendCommand("M105", lines => { console.log(lines) });
// ctrl.sendCommand("M119", lines => { console.log(lines) });
// ctrl.sendCommand("M105", lines => { console.log(lines) });
// ctrl.sendCommand("M27", lines => { console.log(lines) });
filename = " 0:/user/" + (filename || "noname.gx");
ctrl.sendCommand("M28 " + buffer.length + filename, lines => { console.log(lines) });
const slices = Math.ceil(buffer.length / 4096);
const preamble = new Buffer([0x5a, 0x5a, 0xa5, 0xa5]);
const length = uint32b(4096);
for (let slice = 0; slice < slices; slice++) {
let chunk = buffer.slice(slice * 4096, slice * 4096 + 4096);
let crc = crc32.unsigned(chunk);
let len = chunk.length;
if (len < 4096) {
chunk = Buffer.concat([chunk, new Buffer(4096-len).fill(0)]);
}
let block = Buffer.concat([
preamble,
uint32b(slice),
uint32b(len),
uint32b(crc),
chunk
]);
ctrl.sendBuffer(block, lines => { console.log(lines) });
}
ctrl.sendCommand("M29", lines => { console.log(lines) }); // end of send
ctrl.sendCommand("M23" + filename, lines => { console.log(lines) }); // start print
this.ctrl = ctrl;
this.count = 5;
this.monitor();
}
monitor() {
if (this.count-- == 0) {
this.end();
return;
}
const ctrl = this.ctrl;
ctrl.sendCommand("M119", lines => { console.log(lines) });
ctrl.sendCommand("M105", lines => { console.log(lines) });
ctrl.sendCommand("M27", lines => { console.log(lines) });
setTimeout(() => { this.monitor() }, 1000);
}
end() {
this.ctrl.sendCommand("M602", lines => { console.log(lines) }); // control release
}
}
class TCPipe {
constructor(lport, dhost, dport) {
this.server = net.createServer(client => {
let last = null;
let buf = null;
const emit = (socket, buffer) => {
console.log("--- " + socket.name + " ---");
if (buffer.length > 256) {
console.log(buffer.toString("hex"));
} else {
console.log(buffer.toString().trim());
}
};
const onData = (socket, buffer) => {
if (last != socket) { emit(socket, buffer); buf = buffer }
else { buf = Buffer.concat([buf, buffer]) }
last = socket;
};
client
.on("data", data => {
onData(client, data);
socket.write(data);
})
.on("error", (error) => {
client.end();
})
.on("end", () => {
client.end();
})
.on("close", () => {
// ok
})
;
const socket = new net.Socket().connect({
host: dhost,
port: dport
})
.on("data", data => {
onData(socket, data);
client.write(data);
})
.on("error", (error) => {
socket.end();
})
.on("end", () => {
socket.end();
emit(last, buf);
})
.on("close", () => {
// ok
})
;
client.name = "client";
socket.name = "server";
})
.on("error", error => { console.log(error)} )
.listen(lport, () => { })
;
}
}
const crc32 = require('buffer-crc32');
const net = require('net');
const fs = require('fs');
if (!module.parent) {
const arg = process.argv.slice(2);
const cmd = arg.shift();
switch (cmd) {
case 'pipe':
new TCPipe(parseInt(arg.shift()), arg.shift(), parseInt(arg.shift()));
break;
case 'read':
new GXReader(arg.shift());
break;
case 'make':
let output = arg.shift();
new GXWriter(arg.shift(), arg.shift(), parseInt(arg.shift() || 100), parseInt(arg.shift() || 100)).write(output);
break;
case 'send':
new GXSender(arg.shift(), arg.shift(), parseInt(arg.shift()), arg.shift());
break;
default:
console.log([
"invalid command: " + cmd,
"usage:",
" read [file]",
" make [outfile] [gcode] [bmp] <time> <length>",
" send [file] [host] [port] <filename>",
" print [file]"
].join("\n"));
break;
}
}