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.134 mPos Work

pull/110/head v1.0.134
openbuilds-engineer 2019-01-18 21:01:53 +02:00
rodzic ea489250b1
commit 382960effa
7 zmienionych plików z 100 dodań i 30 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.134: Added mPOS gotozero, and wPOS GotoZero via mPos Z0
v1.0.133: Fixed MacOS errors, Improved Icons
v1.0.131: Added Changelog section to Troubleshooting
v1.0.130: Fixed MacOS Quit Behaviour

56
app/index.html
Wyświetl plik

@ -337,7 +337,8 @@
<div class="dro">
<div class="float-left fg-red" data-fa-transform="right-15">
<span class="fa-layers fa-fw">
<span class="fa-layers-text fg-red">X</span>
<span class="fa-layers-text fg-red" data-fa-transform="right-3">X</span>
<span class="fa-layers-text fg-red" data-fa-transform="left-18 rotate-270" style="font-family: Arial; font-size: 8px;">WORK</span>
<!-- <span class="fa-layers-text fg-red" data-fa-transform="left-20 rotate--90" style="font-family: Arial; font-size: 11px;">work</span> -->
</span>
</div>
@ -349,7 +350,8 @@
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 X0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto X Zero (G0 X0)</a></li>
<li><a href="#" onclick="sendGcode( 'G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Work Coord) (G0 X0)</a></li>
<li id="gotoXzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Machine Coord) (G53 G0 X0)</a></li>
</ul>
</div>
</td>
@ -368,7 +370,8 @@
<div class="dro">
<div class="float-left fg-green">
<span class="fa-layers fa-fw">
<span class="fa-layers-text fg-green">Y</span>
<span class="fa-layers-text fg-green" data-fa-transform="right-3">Y</span>
<span class="fa-layers-text fg-green" data-fa-transform="left-18 rotate-270" style="font-family: Arial; font-size: 8px;">WORK</span>
</span>
</div>
<div class="float-right fg-green" id="yPos" data-editable>0.000</div>
@ -379,7 +382,8 @@
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 Y0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto Y Zero (G0 Y0)</a></li>
<li><a href="#" onclick="sendGcode( 'G0 Y0')"><span class="fas fa-chart-line fg-green icon"></span>Goto Y0 (Work Coord) (G0 Y0)</a></li>
<li id="gotoYzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 Y0')"><span class="fas fa-chart-line fg-green icon"></span>Goto Y0 (Machine Coord) (G53 G0 Y0)</a></li>
</ul>
</div>
</td>
@ -398,7 +402,8 @@
<div class="dro">
<div class="float-left fg-blue">
<span class="fa-layers fa-fw">
<span class="fa-layers-text fg-blue">Z</span>
<span class="fa-layers-text fg-blue" data-fa-transform="right-3">Z</span>
<span class="fa-layers-text fg-blue" data-fa-transform="left-18 rotate-270" style="font-family: Arial; font-size: 8px;">WORK</span>
</span>
</div>
<div class="float-right fg-blue" id="zPos" data-editable>0.000</div>
@ -409,9 +414,10 @@
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 Z0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto Z Zero (G0 Z0)</a></li>
<li><a href="#" onclick="sendGcode( 'G0 Z0')"><span class="fas fa-chart-line fg-blue icon"></span>Goto Z0 (Work Coord) (G0 Z0)</a></li>
<li id="gotoZzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 Z0')"><span class="fas fa-chart-line fg-blue icon"></span>Goto Z0 (Machine Coord) (G53 G0 Z0)</a></li>
<li class="divider"></li>
<li><a href="#" onclick="z0probe()"><span class="fas fa-podcast fa-rotate-180 fg-grayBlue icon"></span>Probe Z0 Wizard</a></li>
<li><a href="#" onclick="z0probe()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z0 Wizard</a></li>
</ul>
</div>
</td>
@ -429,19 +435,31 @@
</button>
</td>
<td>
<button class="button light jogbtn" style="width: 161px;" id="gotozero" data-role="ripple">
<span class="fa-layers fa-fw">
<i class="fas fa-chart-line fg-grayBlue" data-fa-transform="shrink-2 down-8 left-12"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">X</span>
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-19" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-29" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
<span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">gotozero</span>
</span>
</button>
<div class="pos-relative">
<button class="button light jogbtn" style="width: 161px;" data-role="ripple">
<span class="fa-layers fa-fw">
<i class="fas fa-chart-line fg-grayBlue" data-fa-transform="shrink-2 down-8 left-12"></i>
<i class="fas fa-caret-down fg-grayBlue" data-fa-transform="shrink-2 right-70"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">X</span>
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-19" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-29" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
<span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">gotozero</span>
</span>
</button>
<ul class="d-menu context drop-shadow" data-role="dropdown">
<li id="gotozeroWPos"><a href="#"><span class="fas fa-chart-line fg-grayBlue icon"></span>GOTO X0Y0Z0 (Work Coord) (G0 Z5, G0 X0 Y0, G0 Z0) (Retract Z to Work Coord Z5)</a></li>
<li id="gotozeroMPos"><a href="#"><span class="fas fa-chart-line fg-grayBlue icon"></span>GOTO X0Y0Z0 (Work Coord) (G53 G0 Z0, G0 X0 Y0, G0 Z0) (Retract Z to Machine Coord Z0)</a></li>
</ul>
</div>
</td>
<td>
<!-- <div class="pos-relative">
<button class="button light disabled"><i class="fas fa-caret-down fg-grayBlue" disabled></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Work Coord) (G0 X0)</a></li>
<li id="gotoXzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Machine Coord) (G53 G0 X0)</a></li>
</ul>
</div> -->
</td>
</tr>
@ -745,7 +763,7 @@
<img src="img/grbl.png" /> Flashing tool
</div>
<div class="card-content">
<p class="text-small ml-2">You can use this section to flash Grbl onto a compatible controller</p>
<p class="text-small ml-2">You can use this section to flash Grbl onto a compatible controller<br>Careful, use with care, or when instructed by Support</p>
<table class="table striped compact">
<tbody>
<tr>

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

@ -49,6 +49,20 @@ function grblSettings(data) {
// $('#grblSaveBtn').removeAttr('disabled');
// $('#grblFirmwareBtn').removeAttr('disabled');
$('#grblSettings').show()
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#gotozeroMPos').removeClass('disabled')
$('#homeBtn').attr('disabled', false)
$('#gotoXzeroMpos').removeClass('disabled')
$('#gotoYzeroMpos').removeClass('disabled')
$('#gotoZzeroMpos').removeClass('disabled')
} else {
$('#gotozeroMPos').addClass('disabled')
$('#homeBtn').attr('disabled', true)
$('#gotoXzeroMpos').addClass('disabled')
$('#gotoYzeroMpos').addClass('disabled')
$('#gotoZzeroMpos').addClass('disabled')
}
}
function grblPopulate() {
@ -307,8 +321,12 @@ function grblPopulate() {
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#limitsinstalled:checkbox').prop('checked', true);
$('#gotozeroMPos').removeClass('disabled')
$('#homeBtn').attr('disabled', false)
} else {
$('#limitsinstalled:checkbox').prop('checked', false);
$('#gotozeroMPos').addClass('disabled')
$('#homeBtn').attr('disabled', true)
}
setTimeout(function() {

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

@ -126,12 +126,18 @@ $(document).ready(function() {
$('#dist500label').addClass('fg-grayBlue')
})
$('#gotozero').on('click', function(ev) {
$('#gotozeroWPos').on('click', function(ev) {
sendGcode('G0 Z5');
sendGcode('G0 X0 Y0');
sendGcode('G0 Z0');
});
$('#gotozeroMPos').on('click', function(ev) {
sendGcode('G53 G0 Z0');
sendGcode('G0 X0 Y0');
sendGcode('G0 Z0');
});
$('#xM').on('click', function(ev) {
var dir = 'X-';
var feedrate = $('#jograte').val();

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

@ -116,7 +116,11 @@ function setControlBar(val, status) {
$('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true);
$('#toolBtn2').hide().attr('disabled', true);
$('#homeBtn').hide().attr('disabled', true);
if (grblParams['$21'] == 1 && 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') {
@ -130,7 +134,11 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', true);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', false);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', false);
} else {
$('#homeBtn').show().attr('disabled', true);
}
$('.estop').show()
} else if (val == 3) { // Busy Streaming GCODE
$('#runBtn').hide().attr('disabled', true);
@ -140,7 +148,11 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
$('.estop').show()
} else if (val == 4) { // Paused
$('#runBtn').hide().attr('disabled', true);
@ -150,7 +162,11 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
$('.estop').show()
} else if (val == 5) { // Alarm State
$('#runBtn').show().attr('disabled', true);
@ -160,7 +176,11 @@ function setControlBar(val, status) {
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', true);
$('#toolBtn2').show().attr('disabled', true);
$('#homeBtn').show().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').show().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
$('.estop').show()
} else if (val == 6) { // Firmware Upgrade State
$('#runBtn').hide().attr('disabled', true);
@ -170,7 +190,11 @@ function setControlBar(val, status) {
$('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true);
$('#toolBtn2').hide().attr('disabled', true);
$('#homeBtn').hide().attr('disabled', true);
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#homeBtn').hide().attr('disabled', true);
} else {
$('#homeBtn').show().attr('disabled', true);
}
$('.estop').hide()
}
}

9
index.js
Wyświetl plik

@ -535,9 +535,12 @@ app.get('/upload', (req, res) => {
})
app.get('/gcode', (req, res) => {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.send(uploadedgcode);
if (uploadedgcode.indexOf('$') != 0) { // Ignore grblSettings jobs
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.send(uploadedgcode);
}
})
// File Post

2
package.json
Wyświetl plik

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