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

get sending working

Browse source
This commit is contained in:
Stewart Allen 2017-10-11 11:40:51 -04:00
commit 85cf0bf60e
2 changed files with 68 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

73
js/util-gx.js
View file

@ -128,7 +128,9 @@ class FFControl {
})
.on("line", line => {
line = line.toString();
if (line == "ok") {
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 {
@ -162,6 +164,11 @@ class FFControl {
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();
@ -181,29 +188,70 @@ class FFControl {
}
}
function uint32b(val) {
return new Buffer([
(val >> 24) & 0xff,
(val >> 16) & 0xff,
(val >> 8) & 0xff,
(val >> 0) & 0xff
]);
}
class GXSender {
constructor(file, host, port) {
constructor(file, host, port, filename) {
const buffer = fs.readFileSync(file);
const ctrl = new FFControl(host, port);
ctrl.sendCommand("M601 S1", lines => { console.log(lines) });
ctrl.sendCommand("M115", lines => { console.log(lines) });
// ctrl.sendCommand("M115", lines => { console.log(lines) });
// ctrl.sendCommand("M119", lines => { console.log(lines) });
// ctrl.sendCommand("M114", lines => { console.log(lines) });
// ctrl.sendCommand("M105", lines => { console.log(lines) });
// ctrl.sendCommand("M650", lines => { console.log(lines) });
// ctrl.sendCommand("M27", lines => { console.log(lines) });
filename = " 0:/user/" + (filename || "kirimoto.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);
if (chunk.length < 4096) {
chunk = Buffer.concat([chunk, new Buffer(4096-chunk.length).fill(0)]);
}
let crc = crc32.unsigned(chunk);
let block = Buffer.concat([
preamble,
uint32b(slice),
length,
uint32b(crc),
chunk
]);
// console.log(block);
// console.log(block.slice(4080));
// console.log(block.length);
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.monitor();
}
monitor() {
const ctrl = this.ctrl;
ctrl.sendCommand("M119", lines => { console.log(lines) });
ctrl.sendCommand("M114", lines => { console.log(lines) });
ctrl.sendCommand("M105", lines => { console.log(lines) });
ctrl.sendCommand("M650", lines => { console.log(lines) });
ctrl.sendCommand("M27", lines => { console.log(lines) });
// ctrl.sendCommand("M20", lines => { console.log(lines) });
// ctrl.sendCommand("M21", lines => { console.log(lines) });
// ctrl.sendCommand("M22", lines => { console.log(lines) });
// ctrl.sendCommand("M28", lines => { console.log(lines) });
setTimeout(() => { this.monitor() }, 1000);
}
}
const crc32 = require('buffer-crc32');
const net = require('net');
const fs = require('fs');
const arg = process.argv.slice(2);
const cmd = arg.shift();
const net = require('net');
const fs = require('fs');
switch (cmd) {
case 'read':
@ -222,7 +270,8 @@ switch (cmd) {
"usage:",
" read [file]",
" make [outfile] [gcode] [bmp] <time> <length>",
" print [host] [file]"
" send [file] [host] [port] <filename>",
" print [file]"
].join("\n"));
break;
}

13
package.json
View file

@ -28,16 +28,17 @@
"update": "git pull && git submodule update --recursive --remote && npm update"
},
"dependencies": {
"compression": "^1.7.0",
"connect": "^3.6.3",
"buffer-crc32": "^0.2.13",
"compression": "^1.7.1",
"connect": "^3.6.5",
"express-useragent": "^1.0.7",
"leveldown": "^1.7.2",
"leveldown": "^1.9.0",
"levelup": "^1.3.9",
"moment": "^2.18.1",
"moment": "^2.19.0",
"n3d-threejs": "^72.0.0",
"pixi.js": "^4.5.5",
"request": "^2.81.0",
"serve-static": "^1.12.4",
"request": "^2.83.0",
"serve-static": "^1.13.1",
"tween.js": "^0.14.0",
"uglify-js": "^2.8.29",
"validator": "^8.2.0"