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

Update

pull/212/head v1.0.276
openbuilds-engineer 2021-01-27 20:02:07 +02:00
rodzic 284e0f1e51
commit a313fceb13
6 zmienionych plików z 43 dodań i 13 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.276: Focus on OK button on JobComplete dialog, Updated Door handling for UI, Updated DOOR messages in footer
v1.0.275: Fixed /upload page for large files
v1.0.274: Interface Firmware v1.43
v1.0.273: Cleanup of old resources

14
app/index.html
Wyświetl plik

@ -1270,7 +1270,7 @@
<div class="row mb-2">
<label class="cell-sm-6">Router Bit Diameter</label>
<div class="cell-sm-6">
<input id="surfaceDiameter" type="number" data-role="input" data-append="mm" data-clear-button="false" placeholder="22" value="22" data-editable="true">
<input id="surfaceDiameter" type="number" data-role="input" data-append="mm" data-clear-button="false" value="22" data-editable="true">
<small class="text-muted">Diameter of your bit / endmill</small>
</div>
</div>
@ -1278,7 +1278,7 @@
<div class="row mb-2">
<label class="cell-sm-6">Stepover</label>
<div class="cell-sm-6">
<input id="surfaceStepover" type="number" data-role="input" data-append="%" data-clear-button="false" placeholder="40" value="40" data-editable="true">
<input id="surfaceStepover" type="number" data-role="input" data-append="%" data-clear-button="false" value="40" data-editable="true">
<small class="text-muted">Stepover between passes </small>
</div>
</div>
@ -1286,7 +1286,7 @@
<div class="row mb-2 border-bottom bd-lightGray">
<label class="cell-sm-6">Feedrate</label>
<div class="cell-sm-6">
<input id="surfaceFeedrate" type="number" maxlength="5" data-role="input" data-append="mm/min" data-clear-button="false" placeholder="800" value="800" data-editable="true"
<input id="surfaceFeedrate" type="number" maxlength="5" data-role="input" data-append="mm/min" data-clear-button="false" value="800" data-editable="true"
oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);">
<small class="text-muted">Cutting speed</small>
</div>
@ -1295,14 +1295,14 @@
<div class="row mb-2">
<label class="cell-sm-6">Width<br> <small class="text-muted">X-Axis</small></label>
<div class="cell-sm-6">
<input id="surfaceX" type="number" data-role="input" data-append="mm" data-clear-button="false" placeholder="200" value="200" data-editable="true">
<input id="surfaceX" type="number" data-role="input" data-append="mm" data-clear-button="false" value="200" data-editable="true">
</div>
</div>
<div class="row mb-2 border-bottom bd-lightGray">
<label class="cell-sm-6">Length<br> <small class="text-muted">Y-Axis</small></label>
<div class="cell-sm-6">
<input id="surfaceY" type="number" data-role="input" data-append="mm" data-clear-button="false" placeholder="300" value="300" data-editable="true">
<input id="surfaceY" type="number" data-role="input" data-append="mm" data-clear-button="false" value="300" data-editable="true">
<small class="text-muted">Width and Length of the area to machine flat</small>
</div>
</div>
@ -1310,7 +1310,7 @@
<div class="row mb-2 border-bottom bd-lightGray">
<label class="cell-sm-6">Skim Depth</label>
<div class="cell-sm-6">
<input id="surfaceDepth" type="number" data-role="input" data-append="mm" data-clear-button="false" placeholder="2" value="2" data-editable="true">
<input id="surfaceDepth" type="number" data-role="input" data-append="mm" data-clear-button="false" value="2" data-editable="true">
<small class="text-muted">How much material to remove</small>
</div>
</div>
@ -1318,7 +1318,7 @@
<div class="row mb-2 border-bottom bd-lightGray">
<label class="cell-sm-6">Spindle RPM</label>
<div class="cell-sm-6">
<input id="surfaceRPM" type="number" data-role="input" data-append="mm" data-clear-button="false" placeholder="1000" value="1000" data-editable="true">
<input id="surfaceRPM" type="number" data-role="input" data-append="mm" data-clear-button="false" value="1000" data-editable="true">
<small class="text-muted">Spindle RPM for variable spindles</small>
</div>
</div>

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

@ -235,12 +235,13 @@ function setControlBar(val, status) {
}
$('#chkSize').show().attr('disabled', true);
if (status.machine.inputs.includes('D')) {
$('#resumeBtn').show().attr('disabled', true);
$('#resumeBtn').hide().attr('disabled', true);
$('#pauseBtn').show().attr('disabled', true);
} else {
$('#resumeBtn').show().attr('disabled', false);
$('#pauseBtn').hide().attr('disabled', true);
}
$('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);

32
app/js/websocket.js
Wyświetl plik

@ -252,6 +252,7 @@ function initSocket() {
$("#completeMsgDiv").html(data.jobCompletedMsg);
}
Metro.dialog.open("#completeMsgModal");
var icon = ''
var source = "JOB COMPLETE"
var string = "Job completed in " + msToTime(runTime) + " / " + data.jobCompletedMsg
@ -267,7 +268,10 @@ function initSocket() {
var printLogCls = "fg-green"
printLogModern(icon, source, string, printLogCls)
}
$('#jobCompleteBtnOk').focus();
setTimeout(function() {
$('#jobCompleteBtnOk').focus();
}, 200)
});
@ -479,7 +483,31 @@ function initSocket() {
}
$('#runStatus').html("Controller: " + status.comms.runStatus);
if (status.comms.runStatus.indexOf("Door") == 0) {
var doorType = status.comms.runStatus.split(":")[1]
var doorMsg = "";
if (doorType == 0) {
doorMsg += "Closed: Ready to Resume"
}
if (doorType == 1) {
doorMsg += "Open: Paused"
}
if (doorType == 2) {
doorMsg += "De-energising"
}
if (doorType == 3) {
doorMsg += "Re-energising"
}
$('#runStatus').html("Door : " + doorMsg);
var icon = ''
var source = "door"
var printLogCls = "fg-darkGray"
printLogModern(icon, source, "Door : " + doorMsg, printLogCls)
} else {
$('#runStatus').html("Controller: " + status.comms.runStatus);
}
if (!disableDROupdates) {
if (unit == "mm") {

2
index.js
Wyświetl plik

@ -2085,7 +2085,7 @@ function parseFeedback(data) {
var pins = pinsdata[0].split('')
status.machine.inputs = pins;
if (!_.isEqual(pins, oldpinslist)) {
if (pins.includes('H')) {
if (pins.includes('H') || pins.includes('D')) {
// pause
pause();
var output = {

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.275",
"version": "1.0.276",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",