kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
rodzic
f9d0a94e0f
commit
26311630ef
|
@ -1,4 +1,5 @@
|
|||
v1.0.157: Fix Bug#66 -Grbl settings invert display: , Fix Bug#68 - Machine Image for Custom, Fix Bug#69 - Keyboard: disable bindings in Macro Inputs, Improvement: Keyboard Binding for UNLOCK will also close Alarm Dialog now.
|
||||
v1.0.158: Improvements to the Mobile Jog UI
|
||||
v1.0.157: Fix Bug#66 -Grbl settings invert display: , Fix Bug#68 - Machine Image for Custom, Fix Bug#69 - Keyboard: disable bindings in Macro Inputs, Improvement: Keyboard Binding for UNLOCK will also close Alarm Dialog now.
|
||||
v1.0.156: Added Job Time Remaining functionality
|
||||
v1.0.155: Added Continuous Jog Functionality (Enable from the Keyboard Shortcuts icon on the top toolbar) (BETA)
|
||||
v1.0.154: added Keyboard Shortcuts Frontend
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#svgview {
|
||||
/* #svgview {
|
||||
/* Note only uses height attribs from here, before we connect to websocket. After that, it gets set by websocket.js */
|
||||
height: 200px;
|
||||
width: calc(100vw - 30px);
|
||||
|
@ -50,4 +50,4 @@
|
|||
#qrcode canvas {
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
}
|
||||
} */
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
<link rel="stylesheet" href="../lib/metro4/css/metro-all.css" />
|
||||
<link rel="stylesheet" href="../css/buttons.css" />
|
||||
<link rel="stylesheet" href="../css/main.css" />
|
||||
<link rel="stylesheet" href="../css/mobilejog.css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
@ -44,32 +43,31 @@
|
|||
|
||||
<div class="window" style="height: 100vh;">
|
||||
<div class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
|
||||
<!-- <span class="icon mif-cog"></span> -->
|
||||
<span class="icon"><img src="../icon-transparent.png"/></span>
|
||||
<span class="title" id="windowtitle">OpenBuilds CONTROL</span>
|
||||
<div class="buttons" style="-webkit-app-region: no-drag">
|
||||
<!-- <span class="btn-min" onclick="socket.emit('minimize')"></span>
|
||||
<span data-cls-hint="bg-light fg-dark drop-shadow" class="btn-close" onclick="socket.emit('minimisetotray')"></span> -->
|
||||
<!-- <span data-cls-hint="bg-light fg-dark drop-shadow" class="btn-close" onclick="confirmQuit()"></span> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="window-content" style="height: 100%; overflow: hidden !important;">
|
||||
|
||||
<!-- <nav data-role="ribbonmenu" class="mt-1">
|
||||
<ul class="tabs-holder">
|
||||
<li><a id="controlTab" href="#section-two" onclick="manualcontrolPanel();"><i class="fas fa-fw fa-play"></i> Control</a></li>
|
||||
<nav data-role="ribbonmenu" class="mt-1">
|
||||
<ul class="tabs-holder" style="display:none;">
|
||||
<li><a href="#section-two"><i class="fas fa-fw fa-play"></i> Jog</a></li>
|
||||
</ul>
|
||||
<div class="content-holder">
|
||||
<div class="section" id="section-two">
|
||||
<div class="group">
|
||||
<div class="form-group">
|
||||
|
||||
|
||||
<div class="form-group inline-form">
|
||||
<select class="success" data-role="select" data-filter="false" id="portUSB" disabled>
|
||||
<option value="">Waiting for USB</option>
|
||||
</select>
|
||||
<button class="button success mb-2 " onclick="selectPort()" id="connectBtn" type="button" disabled><i class="fas fa-plug"></i></button>
|
||||
<button class="button alert mb-2" style="display:none;" onclick="closePort()" id="disconnectBtn" type="button"><i class="fas fa-plug"></i> Disconnect</button>
|
||||
</div>
|
||||
<span class="title">Machine Interface</span>
|
||||
</div>
|
||||
<div class="group estop">
|
||||
<button class="ribbon-icon-button" onclick="socket.emit('clearAlarm', 2)">
|
||||
<button class="button mb-2" onclick="socket.emit('clearAlarm', 2)">
|
||||
<span class="icon">
|
||||
<span class="fa-layers" data-toggle="tooltip" data-placement="bottom" title="Flashes red when machine has entered ALARM state, click Clear Alarm button">
|
||||
<i id="navbellBtn3" class="fas fa-bell fg-red" style="display: none;"></i>
|
||||
|
@ -78,159 +76,127 @@
|
|||
</span>
|
||||
<span class="caption">Unlock</span>
|
||||
</button>
|
||||
<button class="ribbon-icon-button" onclick="socket.emit('stop', true)">
|
||||
<button class="button mb-2" onclick="socket.emit('stop', true)">
|
||||
<span class="icon">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-circle fg-red" data-fa-transform="grow-8"></i>
|
||||
<i class="fa-inverse far fa-hand-paper" data-fa-transform="grow-1 left-0.5"></i>
|
||||
</span>
|
||||
</span>
|
||||
<span class="caption">Stop</span>
|
||||
<span class="caption">Abort</span>
|
||||
</button>
|
||||
<span class="title">E-Stop</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav> -->
|
||||
</nav>
|
||||
|
||||
<div style="overflow-y: auto; height: calc(100vh - 180px);">
|
||||
|
||||
|
||||
<form class="inline-form bg-openbuilds p-1">
|
||||
<select class="success" data-role="select" data-filter="false" id="portUSB" disabled>
|
||||
<option value="">Waiting for USB</option>
|
||||
</select>
|
||||
<button class="button success" onclick="selectPort()" id="connectBtn" type="button" disabled><i class="fas fa-plug"></i></button>
|
||||
<button class="button" style="display:none;" onclick="closePort()" id="disconnectBtn" type="button"><i class="fas fa-plug"></i> Disconnect</button>
|
||||
|
||||
<div class="estop">
|
||||
|
||||
<button class="button light ml-1" onclick="socket.emit('clearAlarm', 2)">
|
||||
<span class="icon">
|
||||
<span class="fa-layers" data-toggle="tooltip" data-placement="bottom" title="Flashes red when machine has entered ALARM state, click Clear Alarm button">
|
||||
<i id="navbellBtn3" class="fas fa-bell fg-red" style="display: none;"></i>
|
||||
<i class="far fa-bell"></i>
|
||||
</span>
|
||||
</span>
|
||||
<span class="caption">Unlock</span>
|
||||
</button>
|
||||
|
||||
<button class="button alert" onclick="socket.emit('stop', true)">
|
||||
<span class="icon">
|
||||
<span class="fa-layers fa-fw">
|
||||
<!-- <i class="fas fa-circle fg-white" data-fa-transform="grow-8"></i> -->
|
||||
<i class="far fa-hand-paper fg-white" data-fa-transform="grow-8 left-0.5"></i>
|
||||
</span>
|
||||
</span>
|
||||
<span class="caption">Stop</span>
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
<center>
|
||||
<table class="drotable">
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0')" style="width: 60px;" data-role="ripple" data-ripple-color="#e21b1b">
|
||||
<center>
|
||||
<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>
|
||||
</td>
|
||||
<td>
|
||||
<div class="dro">
|
||||
<div class="float-left fg-red" data-fa-transform="right-15">
|
||||
<span class="fa-layers fa-fw">
|
||||
</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="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>
|
||||
<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>
|
||||
</div>
|
||||
<div class="float-right fg-red" id="xPos" data-editable>0.000</div>
|
||||
<input id="xPosInput" class="m-0 p-0 droInput float-right fg-red" />
|
||||
</div>
|
||||
<div class="float-right fg-red" id="xPos" data-editable>0.000</div>
|
||||
<input id="xPosInput" class="m-0 p-0 droInput float-right fg-red" />
|
||||
</div>
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Y0')" style="width: 60px;" data-role="ripple" data-ripple-color="#5de21b">
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
</td>
|
||||
<td>
|
||||
<div class="dro">
|
||||
<div class="float-left fg-green">
|
||||
<span class="fa-layers fa-fw">
|
||||
</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="left-18 rotate-270" style="font-family: Arial; font-size: 8px;">WORK</span>
|
||||
</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>
|
||||
<div class="float-right fg-green" id="yPos" data-editable>0.000</div>
|
||||
<input id="yPosInput" class="m-0 p-0 droInput float-right fg-green" />
|
||||
</div>
|
||||
<div class="float-right fg-green" id="yPos" data-editable>0.000</div>
|
||||
<input id="yPosInput" class="m-0 p-0 droInput float-right fg-green" />
|
||||
</div>
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Z0')" style="width: 60px;" data-role="ripple" data-ripple-color="#1ba1e2">
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
</td>
|
||||
<td>
|
||||
<div class="dro">
|
||||
<div class="float-left fg-blue">
|
||||
<span class="fa-layers fa-fw">
|
||||
</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="left-18 rotate-270" style="font-family: Arial; font-size: 8px;">WORK</span>
|
||||
</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>
|
||||
<div class="float-right fg-blue" id="zPos" data-editable>0.000</div>
|
||||
<input id="zPosInput" class="m-0 p-0 droInput float-right fg-blue" />
|
||||
</div>
|
||||
<div class="float-right fg-blue" id="zPos" data-editable>0.000</div>
|
||||
<input id="zPosInput" class="m-0 p-0 droInput float-right fg-blue" />
|
||||
</div>
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
<!-- <li><a href="#" onclick="z0probe()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z0 Wizard</a></li> -->
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0 Y0 Z0')" style="width: 60px;" data-role="ripple">
|
||||
</td>
|
||||
<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">
|
||||
<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>
|
||||
<li><a href="#" onclick="z0probe()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z0 Wizard</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
|
@ -239,10 +205,10 @@
|
|||
<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">
|
||||
</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>
|
||||
|
@ -253,170 +219,149 @@
|
|||
</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>
|
||||
</ul>
|
||||
<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>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="pos-relative">
|
||||
<button class="button light jogbtn" style="width: 42px;"></i>
|
||||
</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-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">gotozero</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 drop-left" 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-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>
|
||||
</tr>
|
||||
</table>
|
||||
</center>
|
||||
<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>
|
||||
<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>
|
||||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</center>
|
||||
|
||||
<nav data-role="ribbonmenu">
|
||||
<ul class="tabs-holder">
|
||||
<li><a href="#tab-buttons">Jog Buttons</a></li>
|
||||
<li><a href="#tab-pad">Touchpad</a></li>
|
||||
</ul>
|
||||
<hr class="border-bottom bd-lightGray ml-4 mr-4" />
|
||||
|
||||
<div class="content-holder">
|
||||
<div class="section" id="tab-buttons">
|
||||
<div id="buttonview">
|
||||
<center>
|
||||
<table class="jogtable">
|
||||
<tr>
|
||||
<td>
|
||||
</td>
|
||||
<div id="buttonview">
|
||||
<center>
|
||||
<table class="jogtable">
|
||||
<tr>
|
||||
<td>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="yP">
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="yP">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-up fg-green" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-green" data-fa-transform="shrink-5 up-8" style="font-weight:600">Y+</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="zP">
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="zP">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-up fg-blue" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-blue" data-fa-transform="shrink-5 up-8" style="font-weight:600">Z+</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="xM">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="xM">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-left fg-red" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-red" data-fa-transform="shrink-5 up-8" style="font-weight:600">X-</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="yM">
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="yM">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-down fg-green" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-green" data-fa-transform="shrink-5 up-8" style="font-weight:600">Y-</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="xP">
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="xP">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-right fg-red" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-red" data-fa-transform="shrink-5 up-8" style="font-weight:600">X+</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="zM">
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light square large jogbtn" id="zM">
|
||||
<span class="fa-layers fa-fw">
|
||||
<i class="fas fa-arrow-down fg-blue" data-fa-transform="shrink-2 down-8.5"></i>
|
||||
<span class="fa-layers-text fg-blue" data-fa-transform="shrink-5 up-8" style="font-weight:600">Z-</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist01" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist01" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
<span class=" fa-layers fa-fw">
|
||||
<span id="dist01label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">0.1mm</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist1" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist1" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
<span class=" fa-layers fa-fw">
|
||||
<span id="dist1label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">1mm</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist10" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist10" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
<span class=" fa-layers fa-fw">
|
||||
<span id="dist10label" class="fa-layers-text fg-grayBlue jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">10mm</span>
|
||||
<span id="dist10label" class="fa-layers-text fg-openbuilds jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">10mm</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist100" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
</td>
|
||||
<td>
|
||||
<button class="button light jogbtn" id="dist100" style="width: 100%; height: 30px; line-height: 28px;">
|
||||
<span class=" fa-layers fa-fw">
|
||||
<span id="dist100label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">100mm</span>
|
||||
</span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="section" id="tab-pad">
|
||||
<div class="title_box" id="bill_to">
|
||||
<div id="title"><small>Jog Touchpad</small></div>
|
||||
<div id="svgview">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<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>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</center>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="fixed-bottom">
|
||||
<div class="row">
|
||||
<div class="cell-3 p-1">
|
||||
<div>
|
||||
<span class="badge inline bg-grayBlue fg-white" style="width: 100%;">
|
||||
<span class="badge inline bg-openbuilds fg-white" style="width: 100%; font-size: 0.5em;">
|
||||
<span class="fa-layers" data-toggle="tooltip" data-placement="bottom" title="Flashes red when machine has entered ALARM state, click Clear Alarm button">
|
||||
<i id="navbell" class="fas fa-bell fg-red" style="display: none;"></i>
|
||||
<i class="far fa-bell"></i>
|
||||
|
@ -426,17 +371,17 @@
|
|||
</div>
|
||||
<div class="cell-3 p-1">
|
||||
<div>
|
||||
<span class="badge inline bg-grayBlue fg-white" id="connectStatus" style="width: 100%;">Not Connected</span>
|
||||
<span class="badge inline bg-openbuilds fg-white" id="connectStatus" style="width: 100%; font-size: 0.5em;">Not Connected</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cell-3 p-1">
|
||||
<div>
|
||||
<span class="badge inline bg-grayBlue fg-white" id="runStatus" style="width: 100%;">Not Connected</span>
|
||||
<span class="badge inline bg-openbuilds fg-white" id="runStatus" style="width: 100%; font-size: 0.5em;">Not Connected</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cell-3 p-1">
|
||||
<div>
|
||||
<span class="badge inline bg-grayBlue fg-white" id="gcodesent" style="width: 100%;">Job Queue: 0</span>
|
||||
<span class="badge inline bg-openbuilds fg-white" id="gcodesent" style="width: 100%; font-size: 0.5em;">Job Queue: 0</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,33 +1 @@
|
|||
var draw;
|
||||
var line;
|
||||
var isJogWidget = true;
|
||||
|
||||
SVG.on(document, 'DOMContentLoaded', function() {
|
||||
draw = SVG('svgview')
|
||||
})
|
||||
|
||||
$(document).ready(function() {
|
||||
$("#svgview").swipe(function(direction, offset, eventstate) {
|
||||
if (laststatus.comms.connectionStatus == 1 || laststatus.comms.connectionStatus == 2) {
|
||||
event.preventDefault();
|
||||
draw.clear()
|
||||
console.log("Moving", direction.x, "and", direction.y);
|
||||
console.log("Touch moved by", offset.x, "horizontally and", offset.y, "vertically");
|
||||
console.log("Event state ", eventstate)
|
||||
var height = draw.node.clientHeight;
|
||||
var width = draw.node.clientWidth;
|
||||
line = draw.line(width / 2, height / 2, (width / 2) + offset.x, (height / 2) + offset.y * -1).stroke({
|
||||
width: 5
|
||||
})
|
||||
if (eventstate == 'up') {
|
||||
var feedrate = $('#jograte').val();
|
||||
jogXY((offset.x / 10).toFixed(2), (offset.y / 10).toFixed(2), feedrate)
|
||||
Metro.toast.create("Delta move: X: " + (offset.x / 10).toFixed(2) + " / Y: " + (offset.y / 10).toFixed(2), null, 1000);
|
||||
setTimeout(function() {
|
||||
draw.clear()
|
||||
}, 1000)
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
var isJogWidget = true;
|
|
@ -12,13 +12,18 @@ function z0probe() {
|
|||
}
|
||||
|
||||
var z0probetemplate = `
|
||||
<div class="p-0 m-0" style="overflow-y: auto; height: calc(100vh - 280px);">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td>
|
||||
<img src="https://image.ibb.co/mPunnf/probe-info.png" alt="probe-info" height="300" style="border: 1px solid #f1f2f3;">
|
||||
</td>
|
||||
<tr>`
|
||||
|
||||
<td style="max-width: 300px;">
|
||||
if (!window.matchMedia("only screen and (max-width: 760px)").matches) {
|
||||
z0probetemplate += `<td>
|
||||
<img src="https://image.ibb.co/mPunnf/probe-info.png" alt="probe-info" height="300" style="border: 1px solid #f1f2f3;">
|
||||
</td>
|
||||
`
|
||||
}
|
||||
|
||||
z0probetemplate += `<td style="max-width: 300px;">
|
||||
<label>Travel Distance</label>
|
||||
<input id="z0traveldist" type="number" value="` + data.dist + `" data-role="input" data-append="mm" data-prepend="<i class='fas fa-arrows-alt-v'></i>" data-clear-button="false">
|
||||
<small class="text-muted">This is how far (maximum) the Z-Probe will move downward</small>
|
||||
|
@ -40,6 +45,7 @@ function z0probe() {
|
|||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
`
|
||||
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ function initSocket() {
|
|||
|
||||
|
||||
socket.on("machinename", function(data) {
|
||||
if (setMachineButton) {
|
||||
if (typeof setMachineButton !== 'undefined') {
|
||||
setMachineButton(data)
|
||||
}
|
||||
});
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIHGjCCBgKgAwIBAgISBMQKlFZDOTaad2vlXsUGmhfCMA0GCSqGSIb3DQEBCwUA
|
||||
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
|
||||
ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA5MTcxNDI4MjZaFw0x
|
||||
ODEyMTYxNDI4MjZaMCMxITAfBgNVBAMTGG15bWFjaGluZS5vcGVuYnVpbGRzLmNv
|
||||
bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPUouBqHb8L0+FaFl903
|
||||
9BmkzBoeaLMCHV6fk1HLme9ric/gq/hbxlVscf+dWyxOzEEyFVTe2dbUjtniqEFm
|
||||
GlyP4wMzAU11sMdtCHGugbxOCQJ1C94OkdGLPom5rfWFcgu5rTADd/D8+pBmdXLi
|
||||
UcUNaVQEd5b+JiHICf+HETQuJWG/wvf5q+6BwkEEJezYeb9JSTvXvJHvqA3VNAxE
|
||||
SLGm0SRi05i/JVuCJ3tBtyd+fk6uuCTeWfPYRMaIxnTfeevxCM8pCyrhgM3iAEyI
|
||||
wbM33ghHnBdIj2QLJ8lPK3DrC8wIKDI6lEy+Ku62kdm5wDxFVAJIkxQk9PdENa8j
|
||||
Edb3aUsPHVpQGy9ULHo3avR8CdLxyeQUHO+OQbXNSgFsAy1PPnI4sa+QgZL4b+rH
|
||||
lkErDr2xDlLT46VYEi7mjUyxT1Y2EhSsZnFgjkbCQa4JXDxVcugG8dvAxKn9os7A
|
||||
fUAo+Bzpn6ihjx4RMWpkvYJeLTUjcQWn6fVIU+cJejIs09vDWWUL6CDtC5lpM1iy
|
||||
5vp6VB8WPnT3U91lVbaYQXCXYBUVR2qkyEw5eeIUzadIenQ6yvtIkIzbrpvBBuA7
|
||||
pR8MbG1yPeZdMWPsTl0DsYTvK1174hxNcibaA7mXil3NwR0pjfnDsXPyna3ddwJr
|
||||
oh+aztnJCGbfrwyajqiMshS1AgMBAAGjggMfMIIDGzAOBgNVHQ8BAf8EBAMCBaAw
|
||||
HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD
|
||||
VR0OBBYEFFlMbbgitNSUgYq3xh1/5BUVKRusMB8GA1UdIwQYMBaAFKhKamMEfd26
|
||||
5tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAuBggrBgEFBQcwAYYiaHR0cDov
|
||||
L29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAvBggrBgEFBQcwAoYjaHR0cDov
|
||||
L2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8wIwYDVR0RBBwwGoIYbXltYWNo
|
||||
aW5lLm9wZW5idWlsZHMuY29tMIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsr
|
||||
BgEEAYLfEwEBATCB1jAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlw
|
||||
dC5vcmcwgasGCCsGAQUFBwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25s
|
||||
eSBiZSByZWxpZWQgdXBvbiBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4g
|
||||
YWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQg
|
||||
aHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcvcmVwb3NpdG9yeS8wggEDBgorBgEEAdZ5
|
||||
AgQCBIH0BIHxAO8AdQBVgdTCFpA2AUrqC5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAA
|
||||
AWXoJaYnAAAEAwBGMEQCIGbL3klQxUQQYwNk6/RuFshAFhPpLxFmIpoiy4WrFCzd
|
||||
AiBkcPC5/jk7Qw1J026ldfsR+bI4GM6D0K6P/guoEhCglwB2AKRQEmkFWhVUXmIR
|
||||
qze8ED9irlV2pF5LFxRFPhsiEGolAAABZeglqAUAAAQDAEcwRQIgBQR8aNdSVRg7
|
||||
LShUV6sWcMNBnc1jSW/UMsE/oTfqsm8CIQCEenKzCth3h4d6x7QV7XqicGqG2HLX
|
||||
DDD5yguGAFOO/zANBgkqhkiG9w0BAQsFAAOCAQEAEsksPkd2qItzu02SAVnnh+Vn
|
||||
108930nk0FXQ04M7sXIXHifpNR9eVvSleFaQKxldcNG5vUmx1ti5An3sHW/H+CHq
|
||||
zo+vVa+AS7O2zZNs5ZAPTcItpZjw3SaESOFV6KVgd04auQSHEWW6gA5WWSHoIY6F
|
||||
LuvMdu6OHGVQAA4DsxhcTy1pJ7R+Df8eAzOQLxNEkMACOhDpTDXwNR5A7FGoTixr
|
||||
HW2SxKmDAe4vCDpFAGdmZUiT3OwC0trwxaTEBzALA4hxI5hk9QsMDPeLSU2WOLwS
|
||||
fn3OW2N8cIHHygEL5aHdF4AVzAO3bINLmyXeAOS5B9iKk7lEVcwXkIeaF+cCfg==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
|
||||
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
||||
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
|
||||
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
|
||||
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
|
||||
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
|
||||
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
|
||||
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
|
||||
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
|
||||
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
|
||||
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
|
||||
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
|
||||
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
|
||||
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
|
||||
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
|
||||
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
|
||||
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
|
||||
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
|
||||
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
|
||||
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
|
||||
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
|
||||
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
|
||||
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
|
||||
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
|
||||
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
|
||||
-----END CERTIFICATE-----
|
|
@ -1,65 +0,0 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
uv3qKQgKCJGV/+A=
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
|
||||
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
||||
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
|
||||
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
|
||||
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
|
||||
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
|
||||
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
|
||||
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
|
||||
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
|
||||
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
|
||||
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
|
||||
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
|
||||
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
|
||||
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
|
||||
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
|
||||
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
|
||||
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
|
||||
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
|
||||
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
|
||||
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
|
||||
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
|
||||
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
|
||||
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
|
||||
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
|
||||
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
|
||||
-----END CERTIFICATE-----
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.157",
|
||||
"version": "1.0.158",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
|
|
Ładowanie…
Reference in New Issue