pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

Browse source
This commit is contained in:
make-ing 2015-09-24 14:05:32 +02:00
commit b5a80db874
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/static/js/app/viewmodels/terminal.js
View file

@ -162,7 +162,8 @@ $(function() {
}
// var re = /^([gmt][0-9]+)(\s.*)?/;
var re = /^([gmtfs][0-9]+|\$[cinhgx#$]|[?~!])(.*)?/; // grbl style
// gcode words | $ commands | RT | /debug
var re = /^([gmtfs][0-9]+|\$[cinhgx#$]|[?~!]|\/)(.*)?/; // grbl style
var commandMatch = command.match(re);
if (commandMatch != null) {
command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : "");