mirror
/
OpenBuilds-CONTROL
kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix #49

pull/110/head
openbuilds-engineer 2019-01-29 23:29:13 +02:00
rodzic aff358f221
commit 77926c659b
5 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
CHANGELOG.txt
Wyświetl plik

@ -1,6 +1,7 @@
v.1.0138: Changed size of MiniMill overlay, made 3D viewer the default tab
v.1.0137: Added Confirmation Dialogs to the Grbl Settings reset buttons
v.1.0136: Added Door and Buttons to Troubleshooting, Added G28/G30 handling, Added Custom machine profile, added Machine Overlay in 3D viewer, added Goto OpenBuilds Button
v1.0.139: Fix Jog/Checksize to still move in mm after G20
v1.0.138: Changed size of MiniMill overlay, made 3D viewer the default tab
v1.0.137: Added Confirmation Dialogs to the Grbl Settings reset buttons
v1.0.136: Added Door and Buttons to Troubleshooting, Added G28/G30 handling, Added Custom machine profile, added Machine Overlay in 3D viewer, added Goto OpenBuilds Button
v1.0.135: Handle XPROv4 DriverMinder/Grbl-feedhold-resume-abort buttons, add G20/G91 to GOTOZERO moves
v1.0.134: Added mPOS gotozero, and wPOS GotoZero via mPos Z0
v1.0.133: Fixed MacOS errors, Improved Icons

10
app/js/grbl-defaults.js
Wyświetl plik

@ -418,7 +418,7 @@ function selectMachine(type) {
$24: "25.000", //"Homing locate feed rate, mm/min"
$25: "500.000", //"Homing search seek rate, mm/min"
$26: "250", //"Homing switch debounce delay, milliseconds"
$27: "1.000", //"Homing switch pull-off distance, millimeters"
$27: "5.000", //"Homing switch pull-off distance, millimeters"
$30: "1000", //"Maximum spindle speed, RPM"
$31: "0", //"Minimum spindle speed, RPM"
$32: "0", //"Maximum spindle speed, RPM"
@ -446,7 +446,7 @@ function selectMachine(type) {
$4: "1", //"Invert step enable pin, boolean"
$5: "0", //"Invert limit pins, boolean"
$6: "0", //"Invert probe pin, boolean"
$10: "3", //"Status report options, mask"
$10: "2", //"Status report options, mask"
$11: "0.020", //"Junction deviation, millimeters"
$12: "0.002", //"Arc tolerance, millimeters"
$13: "0", //"Report in inches, boolean"
@ -457,7 +457,7 @@ function selectMachine(type) {
$24: "2000.000", //"Homing locate feed rate, mm/min"
$25: "1000.000", //"Homing search seek rate, mm/min"
$26: "250", //"Homing switch debounce delay, milliseconds"
$27: "1.000", //"Homing switch pull-off distance, millimeters"
$27: "5.000", //"Homing switch pull-off distance, millimeters"
$30: "1000", //"Maximum spindle speed, RPM"
$31: "0", //"Minimum spindle speed, RPM"
$32: "0", //"Maximum spindle speed, RPM"
@ -485,7 +485,7 @@ function selectMachine(type) {
$4: "1", //"Invert step enable pin, boolean"
$5: "0", //"Invert limit pins, boolean"
$6: "0", //"Invert probe pin, boolean"
$10: "3", //"Status report options, mask"
$10: "2", //"Status report options, mask"
$11: "0.020", //"Junction deviation, millimeters"
$12: "0.002", //"Arc tolerance, millimeters"
$13: "0", //"Report in inches, boolean"
@ -496,7 +496,7 @@ function selectMachine(type) {
$24: "2000.000", //"Homing locate feed rate, mm/min"
$25: "1000.000", //"Homing search seek rate, mm/min"
$26: "250", //"Homing switch debounce delay, milliseconds"
$27: "1.000", //"Homing switch pull-off distance, millimeters"
$27: "5.000", //"Homing switch pull-off distance, millimeters"
$30: "1000", //"Maximum spindle speed, RPM"
$31: "0", //"Minimum spindle speed, RPM"
$32: "0", //"Maximum spindle speed, RPM"

10
app/js/jog.js
Wyświetl plik

@ -181,11 +181,11 @@ $(document).ready(function() {
var feedrate = $('#jograte').val();
if (laststatus.machine.firmware.type === 'grbl') {
var moves = `
$J=G90 X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90 X` + (bbox2.max.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90 X` + (bbox2.max.x) + ` Y` + (bbox2.max.y) + ` F` + feedrate + `\n
$J=G90 X` + (bbox2.min.x) + ` Y` + (bbox2.max.y) + ` F` + feedrate + `\n
$J=G90 X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90G21X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90G21X` + (bbox2.max.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90G21X` + (bbox2.max.x) + ` Y` + (bbox2.max.y) + ` F` + feedrate + `\n
$J=G90G21X` + (bbox2.min.x) + ` Y` + (bbox2.max.y) + ` F` + feedrate + `\n
$J=G90G21X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
`;
} else {
var moves = `

8
index.js
Wyświetl plik

@ -854,6 +854,8 @@ io.on("connection", function(socket) {
port.on("data", function(data) {
var command = sentBuffer[0];
// console.log('data:', data)
// Grbl $I parser
if (data.indexOf("[VER:") === 0) {
status.machine.name = data.split(':')[2].split(']')[0].toLowerCase()
@ -1194,7 +1196,7 @@ io.on("connection", function(socket) {
console.log('Adding jog commands to queue. Firmw=' + status.machine.firmware.type + ', blocked=' + status.comms.blocked + ', paused=' + status.comms.paused + ', Q=' + gcodeQueue.length);
switch (status.machine.firmware.type) {
case 'grbl':
addQToEnd('$J=G91' + dir + dist + feed);
addQToEnd('$J=G91G21' + dir + dist + feed);
send1Q();
break;
case 'smoothie':
@ -1235,7 +1237,7 @@ io.on("connection", function(socket) {
console.log('Adding jog commands to queue. blocked=' + status.comms.blocked + ', paused=' + status.comms.paused + ', Q=' + gcodeQueue.length);
switch (status.machine.firmware.type) {
case 'grbl':
addQToEnd('$J=G91 X' + xincrement + " Y" + yincrement + " " + feed);
addQToEnd('$J=G91G21X' + xincrement + " Y" + yincrement + " " + feed);
send1Q();
break;
case 'smoothie':
@ -1268,7 +1270,7 @@ io.on("connection", function(socket) {
console.log('Adding jog commands to queue. blocked=' + status.comms.blocked + ', paused=' + status.comms.paused + ', Q=' + gcodeQueue.length);
switch (status.machine.firmware.type) {
case 'grbl':
addQToEnd('$J=G91' + mode + xVal + yVal + zVal + feed);
addQToEnd('$J=G91G21' + mode + xVal + yVal + zVal + feed);
break;
case 'smoothie':
addQToEnd('G91' + mode);

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.138",
"version": "1.0.139",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",