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

v1.0.141

pull/110/head
openbuilds-engineer 2019-01-30 10:39:36 +02:00
rodzic bc6f0dbf6c
commit 5ab161aaae
6 zmienionych plików z 50 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -1,3 +1,4 @@
v1.0.141: Fix Bug that prevented Jog, fixed bug that disabled homing for Smoothie
v1.0.140: 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

2
app/index.html
Wyświetl plik

@ -251,7 +251,7 @@
</ul>
</div>
<button id="homeBtn" class="ribbon-button" onclick="sendGcode('$H')">
<button id="homeBtn" class="ribbon-button">
<span class="icon">
<i class="fas fa-home"></i>
</span>

2
app/js/grblsettings.js
Wyświetl plik

@ -50,7 +50,7 @@ function grblSettings(data) {
// $('#grblFirmwareBtn').removeAttr('disabled');
$('#grblSettings').show()
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
if (grblParams['$22'] == 1) {
$('#gotozeroMPos').removeClass('disabled')
$('#homeBtn').attr('disabled', false)
$('#gotoXzeroMpos').removeClass('disabled')

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

@ -175,12 +175,20 @@ $(document).ready(function() {
jog('Z', jogdist, feedrate);
})
$('#homeBtn').on('click', function(ev) {
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
sendGcode('$H')
} else if (laststatus != undefined && laststatus.machine.firmware.type == 'smoothie') {
sendGcode('G28')
}
})
$('#chkSize').on('click', function() {
var bbox2 = new THREE.Box3().setFromObject(object);
console.log('bbox for Draw Bounding Box: ' + object + ' Min X: ', (bbox2.min.x), ' Max X:', (bbox2.max.x), 'Min Y: ', (bbox2.min.y), ' Max Y:', (bbox2.max.y));
var feedrate = $('#jograte').val();
if (laststatus.machine.firmware.type === 'grbl') {
if object.userData.inch {
if (object.userData.inch) {
var moves = `
$J=G90G20X` + (bbox2.min.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n
$J=G90G20X` + (bbox2.max.x) + ` Y` + (bbox2.min.y) + ` F` + feedrate + `\n

61
app/js/ui.js
Wyświetl plik

@ -116,11 +116,14 @@ function setControlBar(val, status) {
$('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true);
$('#toolBtn2').hide().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').hide().attr('disabled', true);
} else {
$('#homeBtn').hide().attr('disabled', true);
if (laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').hide().attr('disabled', true);
} else {
$('#homeBtn').hide().attr('disabled', true);
}
}
$('.estop').hide()
} else if (val == 1 || val == 2) { // Connected, but not Playing yet
if (typeof ace !== 'undefined') {
@ -134,10 +137,12 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', true);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', false);
} else {
$('#homeBtn').show().attr('disabled', true);
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', false);
} else {
$('#homeBtn').show().attr('disabled', true);
}
}
$('.estop').show()
} else if (val == 3) { // Busy Streaming GCODE
@ -148,10 +153,12 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
}
$('.estop').show()
} else if (val == 4) { // Paused
@ -162,10 +169,12 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
}
$('.estop').show()
} else if (val == 5) { // Alarm State
@ -176,10 +185,12 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', true);
$('#toolBtn2').show().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
}
$('.estop').show()
} else if (val == 6) { // Firmware Upgrade State
@ -190,10 +201,12 @@ function setControlBar(val, status) {
$('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true);
$('#toolBtn2').hide().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').hide().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
if (laststatus != undefined && laststatus.machine.firmware.type == 'grbl') {
if (grblParams['$22'] == 1) {
$('#homeBtn').hide().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
}
$('.estop').hide()
}

2
package.json
Wyświetl plik

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