kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
openbuilds-engineer
rodzic
fd9cb1182a
commit
15160a7f6b
|
|
@ -1,3 +1,4 @@
|
|||
v1.0.174: Added Inch/MM mode to Mobile Jog
|
||||
v1.0.173: Added support (beta) for G2/3 to the Simulator
|
||||
v1.0.172: Fix spelling error (US vs UK English)
|
||||
v1.0.171: Fix Keyboard-Jog Default Assignment bug
|
||||
|
|
|
|||
|
|
@ -1208,4 +1208,5 @@
|
|||
|
||||
<script type="text/javascript" src="js/grbl-flashing.js"></script>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
<!-- -->
|
||||
|
|
@ -94,22 +94,28 @@
|
|||
<div style="overflow-y: auto; height: calc(100vh - 180px);">
|
||||
|
||||
<center>
|
||||
<nav data-role="ribbonmenu" class="mt-2">
|
||||
<ul class="tabs-holder ml-17">
|
||||
<li onclick="mmMode();"><a id="mmMode" href="#tab-mm">mm-mode</a></li>
|
||||
<li onclick="inMode();"><a id="inMode" href="#tab-inch">inch-mode</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
<table class="drotable mt-2">
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0')" style="width: 60px;" data-role="ripple" data-ripple-color="#e21b1b">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" 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-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" 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-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<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" data-fa-transform="right-3">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>
|
||||
|
|
@ -121,7 +127,7 @@
|
|||
<td>
|
||||
<div class="pos-relative">
|
||||
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
|
||||
<ul class="d-menu context drop-shadow drop-left" data-role="dropdown">
|
||||
<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>
|
||||
|
|
@ -131,18 +137,18 @@
|
|||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Y0')" style="width: 60px;" data-role="ripple" data-ripple-color="#5de21b">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
|
||||
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
|
||||
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<div class="dro">
|
||||
<div class="float-left fg-green">
|
||||
<span class="fa-layers fa-fw">
|
||||
<span class="fa-layers-text fg-green" data-fa-transform="right-3">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>
|
||||
|
|
@ -153,7 +159,7 @@
|
|||
<td>
|
||||
<div class="pos-relative">
|
||||
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
|
||||
<ul class="d-menu context drop-shadow drop-left" data-role="dropdown">
|
||||
<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-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>
|
||||
|
|
@ -163,18 +169,18 @@
|
|||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Z0')" style="width: 60px;" data-role="ripple" data-ripple-color="#1ba1e2">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-8"></i>
|
||||
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
|
||||
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<div class="dro">
|
||||
<div class="float-left fg-blue">
|
||||
<span class="fa-layers fa-fw">
|
||||
<span class="fa-layers-text fg-blue" data-fa-transform="right-3">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>
|
||||
|
|
@ -185,7 +191,7 @@
|
|||
<td>
|
||||
<div class="pos-relative">
|
||||
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
|
||||
<ul class="d-menu context drop-shadow drop-left" data-role="dropdown">
|
||||
<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-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>
|
||||
|
|
@ -197,50 +203,48 @@
|
|||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0 Y0 Z0')" style="width: 60px;" data-role="ripple">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-18"></i>
|
||||
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-2" 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-12" 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-22" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-18"></i>
|
||||
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-2" 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-12" 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-22" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
|
||||
<span class="fa-layers-text fg-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<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-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
|
||||
<i class="fas fa-caret-down fg-openbuilds" 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-openbuilds" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">gotozero</span>
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-chart-line fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
|
||||
<i class="fas fa-caret-down fg-openbuilds" 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-openbuilds" 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-openbuilds 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-openbuilds icon"></span>GOTO X0Y0Z0 (Work Coord) (G53 G0 Z0, G0 X0 Y0, G0 Z0) (Retract Z to Machine Coord Z0)</a></li>
|
||||
<li id="gotozeroMPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTO X0Y0Z0 (Machine 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 jogbtn" style="width: 42px;"></i>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-layer-group fg-openbuilds" data-fa-transform="shrink-2 up-3"></i>
|
||||
<i class="fas fa-caret-down fg-openbuilds" data-fa-transform="down-8"></i>
|
||||
<!-- <span class="fa-layers-text fg-openbuilds" 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 drop-left" data-role="dropdown">
|
||||
<li><a href="#" onclick="sendGcode('G28')"><span class="fas fa-layer-group fg-openbuilds icon"></span>Go to Pre-Defined Position (G28)</a></li>
|
||||
<li><a href="#" onclick="sendGcode('G28.1')"><span class="fas fa-tasks fg-openbuilds icon"></span>Set Pre-Defined Position (G28.1)</a></li>
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-layer-group fg-openbuilds" data-fa-transform="shrink-2 up-3"></i>
|
||||
<i class="fas fa-caret-down fg-openbuilds" data-fa-transform="down-8"></i>
|
||||
<!-- <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 drop-right" data-role="dropdown">
|
||||
<li><a href="#" onclick="sendGcode('G28')"><span class="fas fa-layer-group fg-grayBlue icon"></span>Go to Pre-Defined Position (G28)</a></li>
|
||||
<li><a href="#" onclick="sendGcode('G28.1')"><span class="fas fa-tasks fg-grayBlue icon"></span>Set Pre-Defined Position (G28.1)</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#" onclick="sendGcode('G30')"><span class="fas fa-layer-group fg-openbuilds icon"></span>Go to Pre-Defined Position (G30)</a></li>
|
||||
<li><a href="#" onclick="sendGcode('G30.1')"><span class="fas fa-tasks fg-openbuilds icon"></span>Set Pre-Defined Position (G30.1)</a></li>
|
||||
<li><a href="#" onclick="sendGcode('G30')"><span class="fas fa-layer-group fg-grayBlue icon"></span>Go to Pre-Defined Position (G30)</a></li>
|
||||
<li><a href="#" onclick="sendGcode('G30.1')"><span class="fas fa-tasks fg-grayBlue icon"></span>Set Pre-Defined Position (G30.1)</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -348,7 +352,12 @@
|
|||
<tr>
|
||||
<td colspan="4">
|
||||
<div style="margin: 2px;">
|
||||
<input id="jograte" type="number" min="100" max="10000" step="500" placeholder="5000" data-role="input" data-prepend="Jog Feedrate:" data-clear-button="false" value="5000" style="text-align: right;" />
|
||||
<div id="jogratemmdiv">
|
||||
<input id="jograte" type="number" min="100" max="10000" step="500" placeholder="5000" data-role="input" data-prepend="Jog:" data-append="mm/min" data-clear-button="false" value="5000" style="text-align: right;" />
|
||||
</div>
|
||||
<div id="jograteinchdiv">
|
||||
<input id="jograteinch" type="number" min="1" max="5000" step="10" placeholder="196" data-role="input" data-prepend="Jog:" data-append="in/min" data-clear-button="false" value="196" style="text-align: right;" />
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.173",
|
||||
"version": "1.0.174",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue