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

Merge branch 'master' of https://github.com/OpenBuilds/OpenBuilds-CONTROL

pull/371/head
unknown 2024-09-06 21:25:17 +02:00
rodzic 7e15c66021 deff1fad02
commit 4a8f79dbef
2 zmienionych plików z 34 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
app/index.html
Wyświetl plik

@ -1591,37 +1591,37 @@
determine endmill diameter. </small>
<hr>
<small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
</div>
<div id="probe-xyz" class="probe-tab-content">
<small>XYZ Probe Routine: This routine is used to find the XYZ origins</small>
<hr>
<small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
</div>
<div id="probe-x" class="probe-tab-content" style="display: none;">
<small>X Probe Routine: This routine is used to find the X origin</small>
<hr>
<small>Position the endmill to the left of the probe plate as shown, clip the magnet to the collet,
then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
</div>
<div id="probe-y" class="probe-tab-content" style="display: none;">
<small>Y Probe Routine: This routine is used to find the Y origin</small>
<hr>
<small>Position the endmill in front of the probe plate as shown, clip the magnet to the collet, then
click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
</div>
<div id="probe-z" class="probe-tab-content" style="display: none;">
<small>Z Probe Routine: This routine is used to find the Z origin</small>
<hr>
<small>Position the endmill above the probe plate as shown, clip the magnet to the collet or the alligator clip to the bit, then click
the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
</div>
<div id="probe-endmill" class="probe-tab-content" style="display: none;">
<small>Endmill Probe Routine: This routine is used to find the Endmill Diameter</small>
<hr>
<small>Position the endmill above the hole in the probe plate as shown, just above the plate, clip
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button to continue...</small>
the magnet to the collet, then click the <span class="fg-grayBlue">Confirm Probe Position</span> button or touch the probe to enable the <span class="fg-grayBlue">Probe</span> button.</small>
<hr>
<small>
This operation will perform an XYZ probe to establish the plate position, then using the hole in the plate,

31
app/wizards/probe/probev2.js
Wyświetl plik

@ -31,6 +31,7 @@ var probemode = {
position: "fl" // fl, fr, rl, rr, c
},
probe: xyzprobeplate,
interval: undefined,
}
$(document).ready(function() {
@ -81,8 +82,23 @@ $("#probeunitxyz").change(function() {
// $(".needsXYZProbe").hide();
// }
function openProbeDialog() {
function initProbeDialog() {
Metro.dialog.open("#xyzProbeWindow");
$('#confirmNewProbeBtn')[0].innerHTML = "Confirm Probe Position";
probemode.interval = setInterval(() => {
if (laststatus.machine.inputs.contains("P")) {
$('#confirmNewProbeBtn').addClass("disabled");
$('#confirmNewProbeBtn')[0].innerHTML = "Touched";
$('#runNewProbeBtn').removeClass("disabled").focus();
clearInterval(probemode.interval);
probemode.interval = undefined;
}
}, 100);
}
function openProbeDialog() {
initProbeDialog();
if (localStorage.getItem('probeType')) {
probetype(localStorage.getItem('probeType'))
if (localStorage.getItem('probeType') == "z") { // Z Touchplate
@ -114,7 +130,7 @@ function openProbeDialog() {
}
function openProbeXDialog() {
Metro.dialog.open("#xyzProbeWindow");
initProbeDialog();
if (localStorage.getItem('probeType')) {
probetype(localStorage.getItem('probeType'))
if (localStorage.getItem('probeType') == "z") {
@ -140,7 +156,7 @@ function openProbeXDialog() {
}
function openProbeYDialog() {
Metro.dialog.open("#xyzProbeWindow");
initProbeDialog();
if (localStorage.getItem('probeType')) {
probetype(localStorage.getItem('probeType'))
if (localStorage.getItem('probeType') == "z") {
@ -166,7 +182,7 @@ function openProbeYDialog() {
}
function openProbeZDialog() {
Metro.dialog.open("#xyzProbeWindow");
initProbeDialog();
if (localStorage.getItem('probeType')) {
probetype(localStorage.getItem('probeType'))
if (localStorage.getItem('probeType') == "z") {
@ -408,8 +424,10 @@ function probetype(type) {
}
function confirmProbeInPlace(operation) {
$('#confirmNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').addClass("disabled");
$('#runNewProbeBtn').removeClass("disabled").focus();
clearInterval(probemode.interval);
probemode.interval = undefined;
}
function resetJogModeAfterProbe() {
@ -425,10 +443,13 @@ function resetJogModeAfterProbe() {
}
}
$('#confirmNewProbeBtn').removeClass("disabled")
clearInterval(probemode.interval)
probemode.interval = undefined;
}
function runProbeNew() {
$('#confirmNewProbeBtn')[0].innerHTML = "Confirm Probe Position";
resetJogModeAfterProbe()
$("#consoletab").click()
probemode.stock.x = $("#stockwidth").val();