Skip to content

Add GRBL 0.8 support #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kvdveer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add GRBL 0.8 support #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25375,11 +25375,8 @@ let Com = class Com extends _react2.default.Component {
fDate = data.date;
dispatch((0, _com.setComAttrs)({ firmware: firmware, firmwareVersion: fVersion && fVersion.toString() }));
_commandHistory2.default.write('Firmware ' + firmware + ' ' + fVersion + ' detected', _commandHistory2.default.SUCCESS);
if (firmware === 'grbl' && parseFloat(fVersion) < 1.1) {
_commandHistory2.default.error('Grbl version too old -> YOU MUST INSTALL AT LEAST GRBL 1.1e');
socket.emit('closePort', 1);
machineConnected = false;
//console.log('GRBL < 1.1 not supported!');
if (firmware === 'grbl' && parseFloat(fVersion) < 1.1) {
_commandHistory2.default.write('Grbl ' + fVersion + ' has limited support (upgrade to 1.1+ for full features)', _commandHistory2.default.WARN);
}
});

Expand Down
11 changes: 10 additions & 1 deletion firmwareFeatures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,18 @@ var featuresNone = {
aAxes: false
};

exports.get = function (firmware) {
exports.get = function (firmware, version) {
switch (firmware) {
case 'grbl':
if (version && version.indexOf('0.') === 0) {
var f = {};
for (var key in featuresGrbl) {
f[key] = featuresGrbl[key];
}
f.feedOverride = false;
f.spindleOverride = false;
return f;
}
return featuresGrbl;
case 'smoothie':
return featuresSmoothie;
Expand Down
81 changes: 62 additions & 19 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ writeLog(chalk.green(' '), 0);


// Init webserver
var webServer = new nstatic.Server(config.uipath || path.join(__dirname, '/app'));
var webServer = new nstatic.Server(config.uipath || path.join(__dirname, '/app'), { cache: false });
var app = http.createServer(function (req, res) {
var queryData = url.parse(req.url, true).query;
if (queryData.url) {
Expand Down Expand Up @@ -355,7 +355,7 @@ io.sockets.on('connection', function (appSocket) {
});

appSocket.on('getFeatureList', function (data) { // Deliver supported Firmware Features to Web-Client
appSocket.emit('featureList', firmwareFeatures.get(firmware));
appSocket.emit('featureList', firmwareFeatures.get(firmware, fVersion));
});

appSocket.on('getRunningJob', function (data) { // Deliver running Job to Web-Client
Expand Down Expand Up @@ -472,6 +472,10 @@ io.sockets.on('connection', function (appSocket) {
parser.on('data', function (data) {
//data = data.toString().trimStart();
writeLog('Recv: ' + data, 3);
var framingMatch = data.match(/^\{\d+\/\d+\}(.*)/);
if (framingMatch) {
data = framingMatch[1];
}
if (data.indexOf('ok') === 0) { // Got an OK so we are clear to send
if (firmware === 'grbl') {
grblBufferSize.shift();
Expand Down Expand Up @@ -692,7 +696,8 @@ io.sockets.on('connection', function (appSocket) {

} else if (data.indexOf('Grbl') === 0) { // Check if it's Grbl
firmware = 'grbl';
fVersion = data.substr(5, 4); // get version
var versionMatch = data.match(/[\d.]+[a-z]?/i);
fVersion = versionMatch ? versionMatch[0] : '';
fDate = '';
writeLog('GRBL detected (' + fVersion + ')', 1);
io.sockets.emit('firmware', {firmware: firmware, version: fVersion, date: fDate});
Expand Down Expand Up @@ -937,6 +942,7 @@ io.sockets.on('connection', function (appSocket) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = true;
var alarmCode = parseInt(data.split(':')[1]);
writeLog('ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
io.sockets.emit('data', 'ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
Expand Down Expand Up @@ -964,9 +970,11 @@ io.sockets.on('connection', function (appSocket) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = false;
var errorCode = parseInt(data.split(':')[1]);
writeLog('error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
io.sockets.emit('data', 'error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
send1Q();
break;
case 'smoothie':
case 'tinyg':
Expand Down Expand Up @@ -1089,6 +1097,8 @@ io.sockets.on('connection', function (appSocket) {
while (responseArray.length > 0) {
data = responseArray.shift();
writeLog('Telnet: ' + data, 3);
var framingMatch = data.match(/^\{\d+\/\d+\}(.*)/);
if (framingMatch) { data = framingMatch[1]; }
if (data.indexOf('ok') === 0) { // Got an OK so we are clear to send
if (firmware === 'grbl') {
grblBufferSize.shift();
Expand Down Expand Up @@ -1277,7 +1287,8 @@ io.sockets.on('connection', function (appSocket) {
}
} else if (data.indexOf('Grbl') === 0) { // Check if it's Grbl
firmware = 'grbl';
fVersion = data.substr(5, 4); // get version
var versionMatch = data.match(/[\d.]+[a-z]?/i);
fVersion = versionMatch ? versionMatch[0] : '';
fDate = '';
writeLog('GRBL detected (' + fVersion + ')', 1);
io.sockets.emit('firmware', {firmware: firmware, version: fVersion, date: fDate});
Expand Down Expand Up @@ -1386,6 +1397,8 @@ io.sockets.on('connection', function (appSocket) {
} else if (data.indexOf('ALARM') === 0) { //} || data.indexOf('HALTED') === 0) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = true;
var alarmCode = parseInt(data.split(':')[1]);
writeLog('ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
io.sockets.emit('data', 'ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
Expand Down Expand Up @@ -1413,9 +1426,11 @@ io.sockets.on('connection', function (appSocket) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = false;
var errorCode = parseInt(data.split(':')[1]);
writeLog('error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
io.sockets.emit('data', 'error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
send1Q();
break;
case 'smoothie':
case 'tinyg':
Expand Down Expand Up @@ -1528,6 +1543,8 @@ io.sockets.on('connection', function (appSocket) {
for (var i = 0; i < split.length; i++) {
var data = split[i];
if (data.length > 0) {
var framingMatch = data.match(/^\{\d+\/\d+\}(.*)/);
if (framingMatch) { data = framingMatch[1]; }
writeLog('Recv: ' + data, 3);
if (data.indexOf('ok') === 0) { // Got an OK so we are clear to send
if (firmware === 'grbl') {
Expand Down Expand Up @@ -1679,7 +1696,8 @@ io.sockets.on('connection', function (appSocket) {
reprapWaitForPos = false;
} else if (data.indexOf('Grbl') === 0) { // Check if it's Grbl
firmware = 'grbl';
fVersion = data.substr(5, 4); // get version
var versionMatch = data.match(/[\d.]+[a-z]?/i);
fVersion = versionMatch ? versionMatch[0] : '';
fDate = '';
writeLog('GRBL detected (' + fVersion + ')', 1);
io.sockets.emit('firmware', {firmware: firmware, version: fVersion, date: fDate});
Expand Down Expand Up @@ -1881,6 +1899,8 @@ io.sockets.on('connection', function (appSocket) {
} else if (data.indexOf('ALARM') === 0) { //} || data.indexOf('HALTED') === 0) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = true;
var alarmCode = parseInt(data.split(':')[1]);
writeLog('ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
io.sockets.emit('data', 'ALARM: ' + alarmCode + ' - ' + grblStrings.alarms(alarmCode));
Expand Down Expand Up @@ -1908,9 +1928,11 @@ io.sockets.on('connection', function (appSocket) {
switch (firmware) {
case 'grbl':
grblBufferSize.shift();
blocked = false;
var errorCode = parseInt(data.split(':')[1]);
writeLog('error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
io.sockets.emit('data', 'error: ' + errorCode + ' - ' + grblStrings.errors(errorCode));
send1Q();
break;
case 'smoothie':
case 'tinyg':
Expand Down Expand Up @@ -2436,7 +2458,13 @@ function jog(data) {
writeLog('Adding jog commands to queue. blocked=' + blocked + ', paused=' + paused + ', Q=' + gcodeQueue.length, 1);
switch (firmware) {
case 'grbl':
addQ('$J=G91' + dir + dist + feed);
if (fVersion && fVersion.indexOf('0.') === 0) {
addQ('G91');
addQ('G0' + feed + dir + dist);
addQ('G90');
} else {
addQ('$J=G91' + dir + dist + feed);
}
send1Q();
break;
case 'smoothie':
Expand Down Expand Up @@ -2497,7 +2525,13 @@ function jogTo(data) { // data = {x:xVal, y:yVal, z:zVal, mode:0(absulute)|1
writeLog('Adding jog commands to queue. blocked=' + blocked + ', paused=' + paused + ', Q=' + gcodeQueue.length);
switch (firmware) {
case 'grbl':
addQ('$J=G9' + mode + xVal + yVal + zVal + feed);
if (fVersion && fVersion.indexOf('0.') === 0) {
addQ('G9' + mode);
addQ('G0' + feed + xVal + yVal + zVal);
addQ('G90');
} else {
addQ('$J=G9' + mode + xVal + yVal + zVal + feed);
}
send1Q();
break;
case 'smoothie':
Expand Down Expand Up @@ -2839,34 +2873,37 @@ function feedOv(data) {
if (isConnected) {
switch (firmware) {
case 'grbl':
if (fVersion && fVersion.indexOf('0.') === 0) {
writeLog(chalk.yellow('Feed override not supported on GRBL ' + fVersion), 1);
break;
}
var code;
switch (data) {
case 0:
code = 144; // set to 100%
code = 144;
data = '100';
feedOverride = data;
break;
case 10:
code = 145; // +10%
code = 145;
data = '+' + data;
feedOverride += 10;
break;
case -10:
code = 146; // -10%
code = 146;
feedOverride -= 10;
break;
case 1:
code = 147; // +1%
code = 147;
data = '+' + data;
feedOverride += 1;
break;
case -1:
code = 148; // -1%
code = 148;
feedOverride -= 1;
break;
}
if (code) {
//jumpQ(String.fromCharCode(parseInt(code)));
machineSend(String.fromCharCode(parseInt(code)));
writeLog('Sent: Code(' + code + ')', 2);
writeLog(chalk.red('Feed Override ' + data + '% (=' + feedOverride + ')'), 1);
Expand Down Expand Up @@ -2919,33 +2956,36 @@ function spindleOv(data) {
if (isConnected) {
switch (firmware) {
case 'grbl':
if (fVersion && fVersion.indexOf('0.') === 0) {
writeLog(chalk.yellow('Spindle override not supported on GRBL ' + fVersion), 1);
break;
}
var code;
switch (data) {
case 0:
code = 153; // set to 100%
code = 153;
data = '100';
break;
case 10:
code = 154; // +10%
code = 154;
data = '+' + data;
spindleOverride += 10;
break;
case -10:
code = 155; // -10%
code = 155;
spindleOverride -= 10;
break;
case 1:
code = 156; // +1%
code = 156;
data = '+' + data;
spindleOverride += 1;
break;
case -1:
code = 157; // -1%
code = 157;
spindleOverride -= 1;
break;
}
if (code) {
//jumpQ(String.fromCharCode(parseInt(code)));
machineSend(String.fromCharCode(parseInt(code)));
writeLog('Sent: Code(' + code + ')', 2);
writeLog(chalk.red('Spindle (Laser) Override ' + data + '% (=' + spindleOverride + ')'), 1);
Expand Down Expand Up @@ -3330,7 +3370,10 @@ function clearAlarm(data) { // Clear Alarm
writeLog('Sent: M112', 2);
break;
}
blocked = false;
paused = false;
writeLog('Resuming Queue Lockout', 1);
send1Q();
break;
case 2:
writeLog('Emptying Queue', 1);
Expand Down