kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
v1.0.163
openbuilds-engineer
rodzic
9d04c762ef
commit
7b5d4f1bad
|
|
@ -1,3 +1,4 @@
|
|||
v1.0.163: Surfacing Wizard, Move Switch for Incr/Conti Jog, Improvements to GCODE Editor and 3D view
|
||||
v1.0.162: Improved .OBC (OpenBuilds CAM) Handling
|
||||
v1.0.161: Associate .OBC (OpenBuilds CAM files)
|
||||
v1.0.160: Update MiniMill Grbl-defaults Profile to match New Video
|
||||
|
|
|
|||
|
|
@ -88,3 +88,74 @@
|
|||
background: rgba(164,206,249, 0.2);
|
||||
border: 1px solid rgb(164,206,249);
|
||||
}
|
||||
|
||||
|
||||
/* CSS Mini SwitchCheckbox */
|
||||
/* <label class="toggle">
|
||||
<input type="checkbox"/>
|
||||
<div>app-notifition</div>
|
||||
</label> */
|
||||
.disappear-from-screen, .toggle input {
|
||||
border: 0;
|
||||
clip: rect(0 0 0 0);
|
||||
height: 1px;
|
||||
margin: -1px;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
}
|
||||
.toggle-component {
|
||||
margin-bottom: 3rem;
|
||||
}
|
||||
.toggle-component p {
|
||||
margin: 0.7rem 0;
|
||||
}
|
||||
.toggle {
|
||||
display: table;
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.toggle input:focus + div {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.toggle > div {
|
||||
cursor: pointer;
|
||||
border-radius: 14px;
|
||||
width: 36px;
|
||||
height: 17px;
|
||||
background: white;
|
||||
border: 1px solid lightgray;
|
||||
user-select: none;
|
||||
position: relative;
|
||||
transition: 150ms ease-out;
|
||||
font-size: 0;
|
||||
}
|
||||
.toggle > div:hover {
|
||||
box-shadow: 0 0 4px #4a4e51;
|
||||
}
|
||||
.toggle > div:before {
|
||||
will-change: translate;
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
left: 2px;
|
||||
content: '';
|
||||
width: 0.7rem;
|
||||
height: 0.7rem;
|
||||
background: #4a4e51;
|
||||
border-radius: 50%;
|
||||
transition: 150ms;
|
||||
}
|
||||
.toggle input:checked + div {
|
||||
background: #fff;
|
||||
border-color: #lightgray;
|
||||
}
|
||||
.toggle input:checked + div:before {
|
||||
color: #4a4e51;
|
||||
transform: translateX(19px);
|
||||
background: #4a4e51;
|
||||
}
|
||||
|
||||
|
||||
/* End CSS mini Switch */
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ body {
|
|||
|
||||
#jogcontrols {
|
||||
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
|
||||
height: 190px;
|
||||
height: 230px;
|
||||
}
|
||||
|
||||
#macros {
|
||||
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
|
||||
height: calc(100vh - 445px);
|
||||
height: calc(100vh - 485px);
|
||||
width: 100%;
|
||||
border-top: 1px solid #ccc;
|
||||
/* margin-top: 5px; */
|
||||
|
|
@ -27,7 +27,7 @@ body {
|
|||
|
||||
#renderArea {
|
||||
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
|
||||
height: calc(100vh - 445px);
|
||||
height: calc(100vh - 485px);
|
||||
width: 100%;
|
||||
border-top: 1px solid #ccc;
|
||||
/* margin-top: 5px; */
|
||||
|
|
@ -38,7 +38,7 @@ body {
|
|||
|
||||
#editor {
|
||||
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
|
||||
height: calc(100vh - 485px);
|
||||
height: calc(100vh - 525px);
|
||||
width: 100%;
|
||||
border-top: 1px solid #ccc;
|
||||
/* margin-top: 5px; */
|
||||
|
|
@ -48,7 +48,7 @@ body {
|
|||
#console {
|
||||
/*font-family: "Courier New", Courier, monospace;*/
|
||||
font-family: "Lucida Console", Monaco, monospace;
|
||||
height: calc(100vh - 485px);
|
||||
height: calc(100vh - 525px);
|
||||
width: 100%;
|
||||
overflow-y: auto;
|
||||
overflow-x: none;
|
||||
|
|
|
|||
169
app/index.html
169
app/index.html
|
|
@ -11,8 +11,8 @@
|
|||
<script type="text/javascript" src="lib/jquery/jquery.min.js"></script>
|
||||
<link rel="stylesheet" href="lib/metro4/css/metro-all.min.css" />
|
||||
<link rel="stylesheet" href="lib/iconpicker/css/fontawesome-iconpicker.min.css" />
|
||||
<link rel="stylesheet" href="css/buttons.css" />
|
||||
<link rel="stylesheet" href="css/main.css" />
|
||||
<link rel="stylesheet" href="css/buttons.css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -258,27 +258,26 @@
|
|||
<span class="caption grblmode">Home<br>All</span>
|
||||
</button>
|
||||
|
||||
<button id="mobileBtn" class="ribbon-button" onclick="jogWidget();">
|
||||
<span class="icon">
|
||||
<i class="fas fa-mobile-alt"></i>
|
||||
</span>
|
||||
<span class="caption grblmode">Jog<br>Widget</span>
|
||||
</button>
|
||||
|
||||
|
||||
<div>
|
||||
<button class="ribbon-button dropdown-toggle">
|
||||
<span class="icon">
|
||||
<i class="far fa-keyboard"></i>
|
||||
<button id="" class="ribbon-button dropdown-toggle">
|
||||
<span class="icon">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-hat-wizard"></i>
|
||||
</span>
|
||||
<span class="caption grblmode">Keyboard<br>Shortcuts</span>
|
||||
</button>
|
||||
<ul class="ribbon-dropdown" data-role="dropdown" data-duration="100">
|
||||
<li id="continuousJogMenu"><a href="#"><i class="fas fa-running fa-fw"></i> Continuous Jogging Mode</a></li>
|
||||
<li class="divider"></li>
|
||||
<li onclick="keyboardShortcutsEditor();"><a href="#"><i class="far fa-edit fa-fw"></i> Customise Key Assignments</a></li>
|
||||
</span>
|
||||
<span class="caption">Wizards<br>& Tools</span>
|
||||
<span class="badge bg-red fg-white">New!</span>
|
||||
</button>
|
||||
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
|
||||
<li><a href="#" onclick="populateSurfaceToolForm();"><i class="fas fa-exchange-alt"></i> Surfacing / Flattening Wizard</a></li>
|
||||
<li><a href="#" onclick="jogWidget();"><i class="fas fa-mobile-alt"></i> Mobile Jog Widget</a></li>
|
||||
<li class="divider fg-lightGray"></li>
|
||||
<li onclick="keyboardShortcutsEditor();"><a href="#"><i class="far fa-edit fa-fw"></i> Customise Shortcut Key Assignments</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<span class="title">Control</span>
|
||||
</div>
|
||||
<div class="group estop" style="width: 100px;">
|
||||
|
|
@ -354,10 +353,17 @@
|
|||
|
||||
<div id="manualControlPanel">
|
||||
<center>
|
||||
<div id="jogcontrols" class="mt-1">
|
||||
<div class="row flex-justify-center flex-align-center" style="width: 100%; height: 100%;">
|
||||
<div id="jogcontrols" class="mt-2">
|
||||
<div class="row flex-justify-center flex-align-start" style="width: 100%; height: 100%;">
|
||||
<div class="cell">
|
||||
<table class="drotable">
|
||||
<!-- <nav data-role="ribbonmenu" class="mt-2">
|
||||
<ul class="tabs-holder ml-17">
|
||||
<li><a href="#tab-mm">mm-mode</a></li>
|
||||
<li><a href="#tab-inch">inch-mode</a></li>
|
||||
|
||||
</ul>
|
||||
</nav> -->
|
||||
<table class="drotable mt-0">
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0')" style="width: 60px;" data-role="ripple" data-ripple-color="#e21b1b">
|
||||
|
|
@ -427,7 +433,7 @@
|
|||
<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>
|
||||
<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>
|
||||
|
|
@ -483,7 +489,7 @@
|
|||
</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>
|
||||
|
|
@ -508,11 +514,12 @@
|
|||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cell border-left bd-lightGray">
|
||||
<div class="cell border-left bd-lightGray ">
|
||||
|
||||
<table class="jogtable">
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
|
||||
<td>
|
||||
|
|
@ -573,6 +580,24 @@
|
|||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan='4'>
|
||||
<table style="width: 100%;">
|
||||
<tr>
|
||||
<td><span class="text-small">Incremental Jog</span>
|
||||
</td>
|
||||
<td class="pb-1">
|
||||
<label class="toggle">
|
||||
<input type="checkbox" id="jogTypeContinuous"/>
|
||||
<div>app-notifition</div>
|
||||
</label>
|
||||
</td>
|
||||
<td><span class="text-small">Continuous Jog</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn distbtn" id="dist01" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
|
|
@ -608,23 +633,18 @@
|
|||
<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;" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="cell border-left bd-lightGray" id="frocell">
|
||||
<button class="button light mini mb-1" onclick="feedOverride(100);">reset</button>
|
||||
<input id="fro" data-on-stop="feedOverride(arguments[0])" data-role="slider" data-accuracy="5" data-vertical="true" data-size="150" data-accuracy="1" data-min="10" data-max="200" data-value="100" data-hint="true" data-hint-always="true" data-hint-position="bottom"
|
||||
<input id="fro" data-on-stop="feedOverride(arguments[0])" data-role="slider" data-accuracy="5" data-vertical="true" data-size="190" data-accuracy="1" data-min="10" data-max="200" data-value="100" data-hint="true" data-hint-always="true" data-hint-position="bottom"
|
||||
data-hint-mask="Feed: $1%" data-cls-hint="bg-light
|
||||
fg-dark shadow-1" data-cls-complete="bg-openbuilds">
|
||||
</div>
|
||||
<div class="cell border-left bd-lightGray" id="trocell">
|
||||
<button class="button light mini mb-1" onclick="spindleOverride(100);">reset</button>
|
||||
<input id="tro" data-on-stop="spindleOverride(arguments[0])" data-role="slider" data-accuracy="5" data-vertical="true" data-size="150" data-accuracy="1" data-min="10" data-max="200" data-value="100" data-hint="true" data-hint-always="true" data-hint-position="bottom"
|
||||
<input id="tro" data-on-stop="spindleOverride(arguments[0])" data-role="slider" data-accuracy="5" data-vertical="true" data-size="190" data-accuracy="1" data-min="10" data-max="200" data-value="100" data-hint="true" data-hint-always="true" data-hint-position="bottom"
|
||||
data-hint-mask="Tool: $1%" data-cls-hint="bg-light
|
||||
fg-dark shadow-1" data-cls-complete="bg-openbuilds">
|
||||
</div>
|
||||
|
|
@ -632,7 +652,7 @@
|
|||
</div>
|
||||
|
||||
|
||||
<div id="controlLogs" class="mt-1">
|
||||
<div id="controlLogs" class="mt-0">
|
||||
|
||||
<nav data-role="ribbonmenu">
|
||||
<ul class="tabs-holder">
|
||||
|
|
@ -662,13 +682,15 @@
|
|||
|
||||
<div class="fixed-bottom m-3 mb-9">
|
||||
<!-- <form class="inline-form"> -->
|
||||
<button title="Update the 3D View with the edited GCODE" class="button success" onclick="parseGcodeInWebWorker(editor.getValue())"><i class="mif-3d-rotation fa-fw"></i> Update 3D View</button>
|
||||
<button title="Save GCODE to file" class="button primary" onclick="saveGcode();"><i class="fa fa-save icon"></i></button>
|
||||
<button title="Find and Replace" class="button dark" onclick="editor.execCommand('replace')"><i class="fas fa-search"></i> Find/Replace</button>
|
||||
<button title="Select All" class="button dark" onclick="editor.execCommand('selectall')"><i class="far fa-check-square"></i> Select All</button>
|
||||
<button title="Undo" class="button dark" onclick="editor.execCommand('undo')"><i class="fas fa-undo"></i> Undo</button>
|
||||
<button title="Redo" class="button dark" onclick="editor.execCommand('redo')"><i class="fas fa-redo"></i> Redo</button>
|
||||
<button title="Go to End" class="button dark" onclick="editor.execCommand('gotoend')"><i class="fas fa-chevron-down"></i></button>
|
||||
<button title="Go to Start" class="button dark" onclick="editor.execCommand('gotostart')"><i class="fas fa-chevron-up"></i></button>
|
||||
<button title="Clear Editor" class="button dark" onclick="editor.execCommand('selectall'); editor.execCommand('del');"><i class="fas fa-eraser"></i> Clear</button>
|
||||
<button title="Clear Editor" class="button dark" onclick="editor.execCommand('selectall'); editor.execCommand('del'); parseGcodeInWebWorker(editor.getValue());"><i class="fas fa-eraser"></i> Clear</button>
|
||||
<!-- </form> -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -917,6 +939,86 @@
|
|||
<!-- -->
|
||||
|
||||
<div id="hiddendivs" style="display:none;">
|
||||
|
||||
<div class="dialog" data-role="dialog" id="surfacingDialog" data-width="90%" data-actions-align="right" data-overlay-click-close="true">
|
||||
<div class="dialog-title">Flattening / Surfacing Tool</div>
|
||||
<div class="dialog-content" style="height: calc(100% - 100px);">
|
||||
<form>
|
||||
<div class="row mb-2">
|
||||
|
||||
<div class="cell-sm-6">
|
||||
<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">
|
||||
<small class="text-muted">Diameter of your bit / endmill</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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">
|
||||
<small class="text-muted">Stepover between passes </small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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" data-role="input" data-append="mm/min" data-clear-button="false" placeholder="800" value="800">
|
||||
<small class="text-muted">Cutting speed</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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">
|
||||
</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">
|
||||
<small class="text-muted">Width and Length of the area to machine flat</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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">
|
||||
<small class="text-muted">How much material to remove</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="cell-sm-6">
|
||||
<small class="text-muted">NB: make sure your spindle is 100% perpendicular (trammed) to your bed, before running a Surfacing operation. Incorrectly trammed spindles will cause uneven machining of the surface, leading to pitting and uneven surface finish
|
||||
</small>
|
||||
<hr>
|
||||
|
||||
<small class="text-muted">You can use the Surfacing Tool to
|
||||
<ul class="text-muted">
|
||||
<li>Prepare / flatten your spoilboard</li>
|
||||
<li>Level off stock</li>
|
||||
</ul></small>
|
||||
<hr>
|
||||
<center>
|
||||
<img src="https://i.ibb.co/Wfks2ry/diameter.png" alt="diameter" border="0" style="max-width: calc(100% - 10px); ">
|
||||
</center>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="dialog-actions">
|
||||
<button class="button success js-dialog-close" onclick="createSurfaceGcode()">Proceed</button>
|
||||
<button class="button js-dialog-close">Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="dialog" id="downloadUpdate" data-role="dialog" data-overlay-click-close="true" data-to-top="true">
|
||||
<div class="dialog-title">Update Ready</div>
|
||||
<div class="dialog-content">
|
||||
|
|
@ -1032,7 +1134,8 @@
|
|||
<script type="text/javascript" src="js/calibrate-y.js"></script>
|
||||
<script type="text/javascript" src="js/calibrate-z.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript" src="js/probe.js"></script>
|
||||
|
||||
<script type="text/javascript" src="wizards/surfacing.js"></script>
|
||||
|
||||
</html>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
var allowContinuousJog;
|
||||
var allowContinuousJog = false;
|
||||
var jogdist = 10;
|
||||
var safeToUpdateSliders = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,31 @@
|
|||
var keyboardShortcuts = false;
|
||||
|
||||
//
|
||||
$(document).ready(function() {
|
||||
if (localStorage.getItem('continuousJog')) {
|
||||
if (JSON.parse(localStorage.getItem('continuousJog')) == true) {
|
||||
$('#continuousJogMenu').addClass('checked')
|
||||
$('#jogTypeContinuous').prop('checked', true)
|
||||
allowContinuousJog = true;
|
||||
$('.distbtn').hide()
|
||||
} else {
|
||||
$('#continuousJogMenu').removeClass('checked')
|
||||
$('#jogTypeContinuous').prop('checked', false)
|
||||
allowContinuousJog = false;
|
||||
$('.distbtn').show();
|
||||
}
|
||||
}
|
||||
|
||||
$('#jogTypeContinuous').on('click', function() {
|
||||
if ($(this).is(':checked')) {
|
||||
localStorage.setItem('continuousJog', true);
|
||||
allowContinuousJog = true;
|
||||
$('.distbtn').hide();
|
||||
} else {
|
||||
localStorage.setItem('continuousJog', false);
|
||||
allowContinuousJog = false;
|
||||
$('.distbtn').show();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if (localStorage.getItem('keyboardShortcuts')) {
|
||||
keyboardShortcuts = JSON.parse(localStorage.getItem('keyboardShortcuts'));
|
||||
} else {
|
||||
|
|
@ -34,21 +47,6 @@ $(document).ready(function() {
|
|||
}
|
||||
bindKeys()
|
||||
|
||||
|
||||
$('#continuousJogMenu').bind('click', function() {
|
||||
if ($('#continuousJogMenu').hasClass('checked')) {
|
||||
$('#continuousJogMenu').removeClass('checked')
|
||||
localStorage.setItem('continuousJog', false);
|
||||
allowContinuousJog = false;
|
||||
$('.distbtn').show();
|
||||
} else {
|
||||
$('#continuousJogMenu').addClass('checked')
|
||||
localStorage.setItem('continuousJog', true);
|
||||
allowContinuousJog = true;
|
||||
$('.distbtn').hide();
|
||||
}
|
||||
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -317,13 +315,13 @@ function keyboardShortcutsEditor() {
|
|||
</div>
|
||||
</div>
|
||||
<div class="row mb-1 ml-1 mr-1">
|
||||
<label class="cell-sm-6"><i class="fas fa-minus fg-openbuilds fa-fw"></i> Decrease Step Size<br><span class="text-small">For non-continious Jogging</span></label>
|
||||
<label class="cell-sm-6"><i class="fas fa-minus fg-openbuilds fa-fw"></i> Decrease Step Size<br><span class="text-small">For Incremental Jogging</span></label>
|
||||
<div class="cell-sm-6">
|
||||
<input type="text" class="keyboardshortcutinput" readonly id="stepMnewKey" value="` + keyboardShortcuts.stepM + `" onclick="$('.keyboardshortcutinput').removeClass('alert').removeClass('newKeyAssignment'); $('#stepMnewKey').addClass('alert').addClass('newKeyAssignment')">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1 ml-1 mr-1">
|
||||
<label class="cell-sm-6"><i class="fas fa-plus fg-openbuilds fa-fw"></i> Increase Step Size<br><span class="text-small">For non-continious Jogging</span></label>
|
||||
<label class="cell-sm-6"><i class="fas fa-plus fg-openbuilds fa-fw"></i> Increase Step Size<br><span class="text-small">For Incremental Jogging</span></label>
|
||||
<div class="cell-sm-6">
|
||||
<input type="text" class="keyboardshortcutinput" readonly id="stepPnewKey" value="` + keyboardShortcuts.stepP + `" onclick="$('.keyboardshortcutinput').removeClass('alert').removeClass('newKeyAssignment'); $('#stepPnewKey').addClass('alert').addClass('newKeyAssignment')">
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ var editor;
|
|||
var isJogWidget = false;
|
||||
|
||||
function getChangelog() {
|
||||
|
||||
$("#changelog").empty()
|
||||
var template2 = `<ul>`
|
||||
$.get("https://raw.githubusercontent.com/OpenBuilds/SW-Machine-Drivers/master/CHANGELOG.txt?date=" + new Date().getTime(), function(data) {
|
||||
|
|
@ -19,7 +18,6 @@ function getChangelog() {
|
|||
template2 += `</ul>`
|
||||
$("#changelog").html(template2);
|
||||
});
|
||||
|
||||
// if (!Metro.dialog.isOpen('#settingsmodal')) {
|
||||
// Metro.dialog.open('#splashModal')
|
||||
// }
|
||||
|
|
@ -187,4 +185,61 @@ var webgl = (function() {
|
|||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
})();
|
||||
})();
|
||||
|
||||
function saveGcode() {
|
||||
var blob = new Blob([editor.getValue()], {
|
||||
type: "plain/text"
|
||||
});
|
||||
invokeSaveAsDialog(blob, 'edited-gcode.gcode');
|
||||
}
|
||||
|
||||
function invokeSaveAsDialog(file, fileName) {
|
||||
if (!file) {
|
||||
throw 'Blob object is required.';
|
||||
}
|
||||
|
||||
if (!file.type) {
|
||||
file.type = 'text/plain';
|
||||
}
|
||||
|
||||
var fileExtension = file.type.split('/')[1];
|
||||
|
||||
if (fileName && fileName.indexOf('.') !== -1) {
|
||||
var splitted = fileName.split('.');
|
||||
fileName = splitted[0];
|
||||
fileExtension = splitted[1];
|
||||
}
|
||||
|
||||
var fileFullName = (fileName || (Math.round(Math.random() * 9999999999) + 888888888)) + '.' + fileExtension;
|
||||
|
||||
if (typeof navigator.msSaveOrOpenBlob !== 'undefined') {
|
||||
return navigator.msSaveOrOpenBlob(file, fileFullName);
|
||||
} else if (typeof navigator.msSaveBlob !== 'undefined') {
|
||||
return navigator.msSaveBlob(file, fileFullName);
|
||||
}
|
||||
|
||||
var hyperlink = document.createElement('a');
|
||||
hyperlink.href = URL.createObjectURL(file);
|
||||
// hyperlink.target = '_blank';
|
||||
hyperlink.download = fileFullName;
|
||||
|
||||
if (!!navigator.mozGetUserMedia) {
|
||||
hyperlink.onclick = function() {
|
||||
(document.body || document.documentElement).removeChild(hyperlink);
|
||||
};
|
||||
(document.body || document.documentElement).appendChild(hyperlink);
|
||||
}
|
||||
|
||||
var evt = new MouseEvent('click', {
|
||||
view: window,
|
||||
bubbles: true,
|
||||
cancelable: true
|
||||
});
|
||||
|
||||
hyperlink.dispatchEvent(evt);
|
||||
|
||||
if (!navigator.mozGetUserMedia) {
|
||||
URL.revokeObjectURL(hyperlink.href);
|
||||
}
|
||||
}
|
||||
|
|
@ -614,6 +614,8 @@ function resetView(object) {
|
|||
viewExtents(helper);
|
||||
}
|
||||
} else {
|
||||
viewExtents(object);
|
||||
if (object.userData.lines.length > 1) {
|
||||
viewExtents(object);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@ worker.addEventListener('message', function(e) {
|
|||
object = false;
|
||||
}
|
||||
object = loader.parse(JSON.parse(e.data));
|
||||
if (object) {
|
||||
if (object && object.userData.lines.length > 1) {
|
||||
scene.add(object);
|
||||
redrawGrid(parseInt(object.userData.bbbox2.min.x), parseInt(object.userData.bbbox2.max.x), parseInt(object.userData.bbbox2.min.y), parseInt(object.userData.bbbox2.max.y), object.userData.inch)
|
||||
// animate();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,144 @@
|
|||
function populateSurfaceToolForm() {
|
||||
$("#gcode").empty();
|
||||
|
||||
if (localStorage.getItem("lastSurfacingTool")) {
|
||||
var data = JSON.parse(localStorage.getItem("lastSurfacingTool"));
|
||||
} else {
|
||||
var data = {
|
||||
surfaceDiameter: 22,
|
||||
surfaceStepover: 40,
|
||||
surfaceFeedrate: 800,
|
||||
surfaceX: 200,
|
||||
surfaceY: 300,
|
||||
surfaceDepth: 3,
|
||||
};
|
||||
}
|
||||
$("#surfaceDiameter").val(data.surfaceDiameter);
|
||||
$("#surfaceStepover").val(data.surfaceStepover);
|
||||
$("#surfaceFeedrate").val(data.surfaceFeedrate);
|
||||
$("#surfaceX").val(data.surfaceX);
|
||||
$("#surfaceY").val(data.surfaceY);
|
||||
$("#surfaceDepth").val(data.surfaceDepth);
|
||||
var $radios = $("input:radio[name=surfaceType]");
|
||||
$radios.filter("[value=" + data.surfaceType + "]").prop("checked", true);
|
||||
Metro.dialog.open("#surfacingDialog");
|
||||
}
|
||||
|
||||
function createSurfaceGcode() {
|
||||
var data = {
|
||||
surfaceDiameter: $("#surfaceDiameter").val(),
|
||||
surfaceStepover: $("#surfaceStepover").val(),
|
||||
surfaceFeedrate: $("#surfaceFeedrate").val(),
|
||||
surfaceX: $("#surfaceX").val(),
|
||||
surfaceY: $("#surfaceY").val(),
|
||||
surfaceDepth: $("#surfaceDepth").val(),
|
||||
surfaceType: $("input[name='surfaceType']:checked").val()
|
||||
};
|
||||
console.log(data);
|
||||
localStorage.setItem("lastSurfacingTool", JSON.stringify(data));
|
||||
|
||||
var startpointX = 0 + data.surfaceDiameter / 2;
|
||||
var endpointX = data.surfaceX - data.surfaceDiameter / 2;
|
||||
|
||||
var startpointY = 0 + data.surfaceDiameter / 2;
|
||||
var endpointY = data.surfaceY - data.surfaceDiameter / 2;
|
||||
|
||||
var lineOver = data.surfaceDiameter * (data.surfaceStepover / 100);
|
||||
|
||||
var gcode =
|
||||
`; Surfacing / Flattening Operation: ` +
|
||||
data.surfaceType +
|
||||
`
|
||||
; Endmill Diameter: ` +
|
||||
data.surfaceDiameter +
|
||||
`mm
|
||||
; Stepover: ` +
|
||||
data.surfaceStepover +
|
||||
`%, Feedrate: ` +
|
||||
data.surfaceFeedrate +
|
||||
`mm/min
|
||||
; X: ` +
|
||||
data.surfaceX +
|
||||
`, Y: ` +
|
||||
data.surfaceX +
|
||||
`, Z: ` +
|
||||
data.surfaceDepth +
|
||||
`
|
||||
G54; Work Coordinates
|
||||
G21; mm-mode
|
||||
G90; Absolute Positioning
|
||||
M3 S1000; Spindle On
|
||||
G0 X0 Y0 Z10
|
||||
G1 F` +
|
||||
data.surfaceFeedrate + `\n`;
|
||||
|
||||
var reverse = false;
|
||||
|
||||
if (!reverse) {
|
||||
gcode +=
|
||||
`G0 X` +
|
||||
startpointX +
|
||||
` Y` +
|
||||
startpointY +
|
||||
` Z10\n
|
||||
G1 X` +
|
||||
startpointX +
|
||||
` Y` +
|
||||
startpointY +
|
||||
` Z-` +
|
||||
data.surfaceDepth +
|
||||
`\n`;
|
||||
} else {
|
||||
gcode +=
|
||||
`G0 X` +
|
||||
endpointX +
|
||||
` Y` +
|
||||
startpointY +
|
||||
` Z10\n
|
||||
G1 X` +
|
||||
endpointX +
|
||||
` Y` +
|
||||
startpointY +
|
||||
` Z-` +
|
||||
data.surfaceDepth +
|
||||
`\n`;
|
||||
}
|
||||
|
||||
for (i = startpointY; i.toFixed(4) < endpointY; i += lineOver) {
|
||||
if (!reverse) {
|
||||
gcode += `G1 Y` + i.toFixed(4) + `\n`;
|
||||
gcode += `G1 X` + startpointX + ` Y` + i.toFixed(4) + ` Z-` + data.surfaceDepth + `\n`;
|
||||
gcode += `G1 X` + endpointX + ` Y` + i.toFixed(4) + ` Z-` + data.surfaceDepth + `\n`;
|
||||
reverse = true;
|
||||
} else {
|
||||
gcode += `G1 Y` + i.toFixed(4) + `\n`;
|
||||
gcode += `G1 X` + endpointX + ` Y` + i.toFixed(4) + ` Z-` + data.surfaceDepth + `\n`;
|
||||
gcode += `G1 X` + startpointX + ` Y` + i.toFixed(4) + ` Z-` + data.surfaceDepth + `\n`;
|
||||
reverse = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!reverse) {
|
||||
gcode += `G1 Y` + endpointY + `\n`;
|
||||
gcode += `G1 X` + startpointX + ` Y` + endpointY + ` Z-` + data.surfaceDepth + `\n`;
|
||||
gcode += `G1 X` + endpointX + ` Y` + endpointY + ` Z-` + data.surfaceDepth + `\n`;
|
||||
reverse = true;
|
||||
} else {
|
||||
gcode += `G1 Y` + endpointY + `\n`;
|
||||
gcode += `G1 X` + endpointX + ` Y` + endpointY + ` Z-` + data.surfaceDepth + `\n`;
|
||||
gcode += `G1 X` + startpointX + ` Y` + endpointY + ` Z-` + data.surfaceDepth + `\n`;
|
||||
reverse = false;
|
||||
}
|
||||
|
||||
gcode += `G0 Z10\n`;
|
||||
gcode += `G0 X0 Y0\n`;
|
||||
gcode += `M5 S0\n`;
|
||||
|
||||
editor.session.setValue(gcode);
|
||||
parseGcodeInWebWorker(gcode)
|
||||
printLog('Surfacing / Flattening GCODE Loaded ');
|
||||
|
||||
// console.log(gcode);
|
||||
//
|
||||
// $("#gcode").html(gcode.replace(/(?:\r\n|\r|\n)/g, "<br>"));
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.162",
|
||||
"version": "1.0.163",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue