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

Fix handling of Tool Off Button

pull/110/head
openbuilds-engineer 2018-12-19 21:32:15 +02:00
rodzic 3e56de09d7
commit cd1e836214
3 zmienionych plików z 7 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/index.html
Wyświetl plik

@ -233,7 +233,7 @@
</div> </div>
<div> <div>
<button id="toolBtn" class="ribbon-button dropdown-toggle"> <button id="toolBtn2" class="ribbon-button dropdown-toggle">
<span class="icon"> <span class="icon">
<span class="fa-layers fa-fw"> <span class="fa-layers fa-fw">
<i class="fas fa-bookmark" data-fa-transform="rotate-180"></i> <i class="fas fa-bookmark" data-fa-transform="rotate-180"></i>

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

@ -94,6 +94,7 @@ function setControlBar(val, status) {
$('#pauseBtn').hide().attr('disabled', true); $('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').hide().attr('disabled', true); $('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true); $('#toolBtn').hide().attr('disabled', true);
$('#toolBtn2').hide().attr('disabled', true);
$('#homeBtn').hide().attr('disabled', true); $('#homeBtn').hide().attr('disabled', true);
$('.estop').hide() $('.estop').hide()
} else if (val == 1 || val == 2) { // Connected, but not Playing yet } else if (val == 1 || val == 2) { // Connected, but not Playing yet
@ -107,6 +108,7 @@ function setControlBar(val, status) {
$('#pauseBtn').hide().attr('disabled', true); $('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', true); $('#stopBtn').show().attr('disabled', true);
$('#toolBtn').show().attr('disabled', false); $('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', false); $('#homeBtn').show().attr('disabled', false);
$('.estop').show() $('.estop').show()
} else if (val == 3) { // Busy Streaming GCODE } else if (val == 3) { // Busy Streaming GCODE
@ -116,6 +118,7 @@ function setControlBar(val, status) {
$('#pauseBtn').show().attr('disabled', false); $('#pauseBtn').show().attr('disabled', false);
$('#stopBtn').show().attr('disabled', false); $('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false); $('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true); $('#homeBtn').show().attr('disabled', true);
$('.estop').show() $('.estop').show()
} else if (val == 4) { // Paused } else if (val == 4) { // Paused
@ -125,6 +128,7 @@ function setControlBar(val, status) {
$('#pauseBtn').hide().attr('disabled', true); $('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', false); $('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false); $('#toolBtn').show().attr('disabled', false);
$('#toolBtn2').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true); $('#homeBtn').show().attr('disabled', true);
$('.estop').show() $('.estop').show()
} else if (val == 5) { // Alarm State } else if (val == 5) { // Alarm State
@ -134,6 +138,7 @@ function setControlBar(val, status) {
$('#pauseBtn').hide().attr('disabled', true); $('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', false); $('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', true); $('#toolBtn').show().attr('disabled', true);
$('#toolBtn2').show().attr('disabled', true);
$('#homeBtn').show().attr('disabled', true); $('#homeBtn').show().attr('disabled', true);
$('.estop').show() $('.estop').show()
} }

2
package.json
Wyświetl plik

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