pull/153/head
openbuilds-engineer 2020-03-19 16:21:06 +02:00
rodzic 070f31e652
commit ff303d9c05
12 zmienionych plików z 1224 dodań i 254 usunięć

Wyświetl plik

@ -1,4 +1,4 @@
v1.0.211: TODO: Jog add space between jog rose and step size, Todo update mobile to new Probe wizards,
v1.0.211: Mobile Jog: added space between jog rose and step size, Update mobile to new Probe wizards, Updates to Mobile Jog Page, Updated SSL Certificates, fixed bug #114 (Tooltip incorrect)
v1.0.210: Focussed on close button of alarm/error dialogs to ease closing, added Driver Install button for beginners, beta probing wizards (internal testing only)
v1.0.209: Added Node-Debugger to help check not-responding issue, disabled console.log debugging in server process
v1.0.208: Removed accidental S-Word from coolant menu commands

Wyświetl plik

@ -289,7 +289,7 @@
<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="disabled grblProbeMenu" onclick="openProbeDialog();" class="needsXYZProbe"><a href="#"><span class="fas fa-podcast fa-rotate-180 icon"></span> Probing Wizards</a></li>
<li class="disabled grblProbeMenu" onclick="openProbeDialog();"><a href="#"><span class="fas fa-podcast fa-rotate-180 icon"></span> Probing Wizards</a></li>
<li class="divider fg-lightGray"></li>
<li class="disabled grblCalibrationMenu" onclick="xstepscalibrate();"><a href="#"><i class="fas fa-wrench fa-fw"></i> Calibrate X-Axes Steps/mm</a></li>
<li class="disabled grblCalibrationMenu" onclick="ystepscalibrate();"><a href="#"><i class="fas fa-wrench fa-fw"></i> Calibrate Y-Axes Steps/mm</a></li>
@ -441,8 +441,8 @@
<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>
<li class="divider"></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeXDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe X-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe XYZ-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeXDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe X-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
</td>
@ -476,8 +476,8 @@
<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>
<li class="divider"></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeYDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Y-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe XYZ-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeYDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe Y-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
</td>
@ -512,7 +512,7 @@
<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 Z-Zero Wizard</a></li> -->
<li class="needsXYZProbe"><a href="#" onclick="openProbeZDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z-Zero Wizard with XYZ Plate</a></li>
<li><a href="#" onclick="openProbeZDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z-Zero Wizard with XYZ Plate</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
@ -787,7 +787,7 @@
</button>
<button id="runSimBtn" title="Run simulation" class="button dark" onclick="sim(0)"><i class="fas fa-fighter-jet"></i> Simulate</button>&nbsp;
<button id="stopSimBtn" style="display: none;" title="Stop Sim" class="button dark" onclick="simstop()"><i class="fas fa-stop"></i> Stop Sim</button>&nbsp;
<button id="resetViewBtn" title="Stop Sim" class="button dark" onclick="resetView(object)"><i class="fas fa-stop"></i> Reset View</button>&nbsp;
<button id="resetViewBtn" title="Resets camera angle and zoom" class="button dark" onclick="resetView(object)"><i class="fas fa-stop"></i> Reset View</button>&nbsp;
</div>
</div>
<div class="section" id="tab-four">
@ -1247,13 +1247,13 @@
<div class="dialog-content" style="max-height: calc(100vh - 100px);overflow-y: auto; overflow-x: hidden;">
<nav data-role="ribbonmenu">
<ul class="tabs-holder">
<li onclick="probexyztab();" class="probetabxyz" id="probexyztab"><a href="#">XYZ-Zero</a></li>
<li onclick="probextab();" class="probetabxyz" id="probextab"><a href="#">X-Zero</a></li>
<li onclick="probeytab();" class="probetabxyz" id="probeytab"><a href="#">Y-Zero</a></li>
<li onclick="probeztab();" class="probetabxyz" id="probeztab"><a href="#">Z-Zero</a></li>
<li onclick="probezplatetab();" class="probetabz" id="probezplatetab" style="display: none;"><a href="#">Z Touch Plate</a></li>
<li onclick="probeautotab();" class="probetabxyz disabled" id="probeautotab"><a href="#">Automatic</a></li>
<li onclick="probeendmilltab();" class="probetabxyz disabled" id="probeendmilltab"><a href="#">Endmill Diameter</a></li>
<li onclick="probexyztab();" class="probetabxyz" id="probexyztab"><a href="#">XYZ&nbsp;Zero</a></li>
<li onclick="probextab();" class="probetabxyz" id="probextab"><a href="#">X&nbsp;Zero</a></li>
<li onclick="probeytab();" class="probetabxyz" id="probeytab"><a href="#">Y&nbsp;Zero</a></li>
<li onclick="probeztab();" class="probetabxyz" id="probeztab"><a href="#">Z&nbsp;Zero</a></li>
<li onclick="probezplatetab();" class="probetabz" id="probezplatetab" style="display: none;"><a href="#">Z&nbsp;Touch&nbsp;Plate</a></li>
<!-- <li onclick="probeautotab();" class="probetabxyz disabled" id="probeautotab"><a href="#">Automatic</a></li>
<li onclick="probeendmilltab();" class="probetabxyz disabled" id="probeendmilltab"><a href="#">Endmill Diameter</a></li> -->
</ul>
</nav>
@ -1261,7 +1261,7 @@
<tr>
<td>
<div>
<div id="xyzprobeimages">
<img src="./img/xyzprobe/auto.png" alt="probe-auto" height="350" id="img-probe-auto" class="img-probe">
<img src="./img/xyzprobe/xyz.png" alt="probe-xyz" height="350" id="img-probe-xyz" class="img-probe" style="display: none;">
<img src="./img/xyzprobe/x.png" alt="probe-x" height="350" id="img-probe-x" class="img-probe" style="display: none;">
@ -1416,7 +1416,7 @@
<label>Probe Type: </label>
<a class="button" id="context_toggle"><span id="probetypebtn"><span class="icon"><img src="./img/xyzprobe/xyztouch.png" /></span> OpenBuilds XYZ Probe</span></a>
<a class="button" id="context_toggle"><span id="probetypebtn"><span class="icon"><img src="./img/xyzprobe/ztouch.png" /></span>OpenBuilds Z Touch Plate</a>
<ul class="d-menu context" data-role="dropdown" data-toggle-element="#context_toggle">
<li onclick="probetype('xyz');"><a href="#"><span class="icon"><img src="./img/xyzprobe/xyztouch.png" /></span> OpenBuilds XYZ Probe</a></li>
<li onclick="probetype('z');"><a href="#"><span class="icon"><img src="./img/xyzprobe/ztouch.png" /></span>OpenBuilds Z Touch Plate</a></li>

Wyświetl plik

@ -127,9 +127,12 @@
<td class="p-2">
<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-right" data-role="dropdown">
<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>
<li class="divider"></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeXDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe X-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
</td>
@ -159,9 +162,12 @@
<td class="p-2">
<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-right" data-role="dropdown">
<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>
<li class="divider"></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeYDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe Y-Zero Wizard</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
</td>
@ -191,11 +197,12 @@
<td class="p-2">
<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-right" data-role="dropdown">
<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>
<li><a href="#" onclick="openProbeZDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z-Zero Wizard with XYZ-Touchplate</a></li>
<li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe XYZ-Zero Wizard</a></li>
</ul>
</div>
</td>
@ -239,7 +246,7 @@
<!-- <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">
<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>
@ -408,6 +415,197 @@
</div>
<div style="display: none;">
<!-- XYZ Probe -->
<div class="dialog dark m-0" id="xyzProbeWindow" data-role="dialog" data-overlay-click-close="true" data-to-top="true">
<div class="dialog-title">Probing Wizard</div>
<div class="dialog-content" style="max-height: calc(100vh - 100px);overflow-y: auto; overflow-x: hidden;">
<nav data-role="ribbonmenu">
<ul class="tabs-holder">
<li onclick="probexyztab();" class="probetabxyz" id="probexyztab"><a href="#">XYZ&nbsp;Zero</a></li>
<li onclick="probextab();" class="probetabxyz" id="probextab"><a href="#">X&nbsp;Zero</a></li>
<li onclick="probeytab();" class="probetabxyz" id="probeytab"><a href="#">Y&nbsp;Zero</a></li>
<li onclick="probeztab();" class="probetabxyz" id="probeztab"><a href="#">Z&nbsp;Zero</a></li>
<li onclick="probezplatetab();" class="probetabz" id="probezplatetab" style="display: none;"><a href="#">Z&nbsp;Touch&nbsp;Plate</a></li>
<!-- <li onclick="probeautotab();" class="probetabxyz disabled" id="probeautotab"><a href="#">Automatic</a></li>
<li onclick="probeendmilltab();" class="probetabxyz disabled" id="probeendmilltab"><a href="#">Endmill Diameter</a></li> -->
</ul>
</nav>
<table>
<tr>
<td>
<div id="xyzprobeimages">
<img src="../img/xyzprobe/auto.png" alt="probe-auto" height="150" id="img-probe-auto" class="img-probe">
<img src="../img/xyzprobe/xyz.png" alt="probe-xyz" height="150" id="img-probe-xyz" class="img-probe" style="display: none;">
<img src="../img/xyzprobe/x.png" alt="probe-x" height="150" id="img-probe-x" class="img-probe" style="display: none;">
<img src="../img/xyzprobe/y.png" alt="probe-y" height="150" id="img-probe-y" class="img-probe" style="display: none;">
<img src="../img/xyzprobe/z.png" alt="probe-z" height="150" id="img-probe-z" class="img-probe" style="display: none;">
<img src="../img/xyzprobe/zplate.png" alt="probe-zplate" height="150" id="img-probe-zplate" class="img-probe" style="display: none;">
<img src="../img/xyzprobe/endmill.png" alt="probe-endmill" height="150" id="img-probe-endmill" class="img-probe" style="display: none;">
</div>
</td>
<td style="padding: 4px; padding-left: 15px; vertical-align: top;">
<div id="probe-auto" class="probe-tab-content" style="display: none;">
<small>Automatic Probe Routine: This routine is used to find the XYZ origins, as well as automatically
determine endmill diameter. </small>
<hr>
<small>Position the endmill above the hole in the probe plate as shown to the left just above the plate, clip
on the magnetic connecting clip, then click Probe</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 to the left just above the plate, clip
on the magnetic connecting clip, then click Probe</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 on the magnetic connecting clip,
then click Probe</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 on the magnetic connecting clip, then
click Probe</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 on the magnetic connecting clip, then click
Probe</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 to the left just above the plate, clip
on the magnetic connecting clip, then click Probe</small>
<hr>
<small>
This operation will perform an XYZ probe to establish the plate position, then using the hole in the plate,
it will measure and calculate the Endmill Diameter and display it onscreen. <br>This operation will NOT set
any work-coordinates!
</small>
</div>
<hr>
<div id="endmilldiameterform">
<label>Endmill Diameter</label>
<input id="probediameterxyz" type="number" value="6.35" data-role="input" data-append="mm" data-prepend="<img class='fa-fw' src='https://cam.openbuilds.com/images/endmilldia.svg' width='16px' height='16px'>"
data-clear-button="false">
</div>
<hr>
<!-- Not working on Mobile -->
<!-- <button class="button" id="toggle-probe-advanced"><i class="fas fa-fw fa-cogs"></i> Advanced</button> -->
<div class="pos-relative">
<div data-role="collapse" data-toggle-element="#toggle-probe-advanced" data-collapsed="true" id="toggle-probe-advanced-content">
<div id="xyzdatum" class="probe-tab-content">
<small>Where is the XY Zero Datum / Origin in your CAM setup, relevant to the front-left corner we are
probing? </small>
<br>
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="180" viewBox="0 0 79.375 47.625">
<style>
</style>
<defs>
<marker id="A" orient="auto" class="J">
<path transform="matrix(.4 0 0 .4 2.96 .4)" d="m-2.5-1c0 2.76-2.24 5-5 5s-5-2.24-5-5 2.24-5 5-5 5 2.24 5 5z" class="D K L" />
</marker>
<marker id="B" orient="auto" class="J">
<path transform="matrix(.4 0 0 .4 2.96 .4)" d="m-2.5-1c0 2.76-2.24 5-5 5s-5-2.24-5-5 2.24-5 5-5 5 2.24 5 5z" class="D K L" />
</marker>
<marker id="C" orient="auto" class="J">
<path transform="matrix(.8 0 0 .8 10 0)" d="M0 0l5-5-17.5 5L5 5z" class="D K L" />
</marker>
<marker id="D" orient="auto" class="J">
<path transform="matrix(.8 0 0 .8 10 0)" d="M0 0l5-5-17.5 5L5 5z" class="D K L" />
</marker>
</defs>
<g fill="#fff" class="D">
<g stroke-width=".132" class="B">
<path d="M7.195 7.363l15.94 28.46L70.758 31.1 47.99 5.015z" fill="#999" />
<path d="M23.133 35.823l-1.257 8.313 47.7-5.284 1.172-7.752z" fill="#ececec" />
<path d="M7.195 7.363l15.94 28.46-1.257 8.313-15.722-29.89z" fill="#ccc" />
</g>
<g stroke-width=".049" class="C N">
<path d="M7.198 7.363l63.74 25.952" />
<path d="M23.322 38.1L47.993 5.093" />
</g>
<g fill="none" stroke-width=".197" class="N">
<path d="M3.942 15.993L19.16 45.07" marker-start="url(#C)" marker-end="url(#A)" />
<path d="M70.118 41.003l-47.624 5.73" marker-start="url(#D)" marker-end="url(#B)" />
</g>
<g transform="matrix(.24595 -.020313 .020313 .24595 108.29 -158.287)">
<rect class="probe-label" id="probe-c" rx="5.925" height="16.422" width="59.717" y="682.21" x="-368.93" stroke-width=".987" class="B" />
<text id="probe-c-text" xml:space="preserve" letter-spacing="0" font-size="2.229" y="694.532" x="-339.852" class="C E F G H">
<tspan y="694.532" x="-330.852" class="I">CENTER</tspan>
</text>
<rect class="probe-label areaactive" id="probe-fl" rx="6.543" height="30.532" width="43.617" y="742.64" x="-423.17" class="B M" />
<text id="probe-fl-text" xml:space="preserve" letter-spacing="0" y="755.631" x="-401.459" class="C E F G H I">
<tspan y="755.631" x="-350">FRONT</tspan>
<tspan y="768.172" x="-350">LEFT</tspan>
</text>
<rect class="probe-label" id="probe-fr" rx="6.543" height="30.532" width="43.617" y="733.68" x="-239.82" class="B M" />
<text id="probe-fr-text" xml:space="preserve" letter-spacing="0" y="746.284" x="-217.439" class="C E F G H I">
<tspan y="746.284" x="-166">FRONT</tspan>
<tspan y="758.824" x="-169">RIGHT</tspan>
</text>
<rect class="probe-label" id="probe-rr" rx="6.543" height="30.532" width="43.617" y="621.52" x="-312.72" class="B M" />
<text id="probe-rr-text" xml:space="preserve" letter-spacing="0" y="633.759" x="-290.442" class="C E F G H I">
<tspan y="633.759" x="-239.442">REAR</tspan>
<tspan y="646.3" x="-242.442">RIGHT</tspan>
</text>
<rect class="probe-label" id="probe-rl" rx="6.543" height="30.532" width="43.617" y="616.07" x="-476.33" class="B M" />
<text id="probe-rl-text" xml:space="preserve" letter-spacing="0" y="628.815" x="-455.49" class="C E F G H I">
<tspan y="628.815" x="-404">REAR</tspan>
<tspan y="641.356" x="-404">LEFT</tspan>
</text></g>
</g>
</svg>
<br>
<small>If the origin is not Front, Left (Default): Then provide stock dimensions to calculate correct
offset of X0, Y0:</small>
<br>
<label>Width</label>
<input id="stockwidth" type="number" value="200" data-role="input" data-append="mm" data-prepend="<i class='fas fa-arrows-alt-h'></i>" data-clear-button="false">
<label>Length</label>
<input id="stocklength" type="number" value="200" data-role="input" data-append="mm" data-prepend="<i class='fas fa-arrows-alt-v'></i>" data-clear-button="false">
</div>
<!-- end xyzdatum-->
</div>
</div>
</td>
</tr>
</table>
</div>
<div class="dialog-actions">
<label>Probe Type: </label>
<a class="button" id="context_toggle"><span id="probetypebtn"><span class="icon"><img src="../img/xyzprobe/xyztouch.png" /></span> OpenBuilds XYZ Probe</span></a>
<ul class="d-menu context" data-role="dropdown" data-toggle-element="#context_toggle">
<li onclick="probetype('xyz');"><a href="#"><span class="icon"><img src="../img/xyzprobe/xyztouch.png" /></span> OpenBuilds XYZ Probe</a></li>
<li onclick="probetype('z');"><a href="#"><span class="icon"><img src="../img/xyzprobe/ztouch.png" /></span>OpenBuilds Z Touch Plate</a></li>
<li class="divider"></li>
<!-- li onclick="probetype('custom');"><a href="#">Custom</a></li -->
</ul>
<hr>
<button class="button js-dialog-close" onclick="Metro.dialog.close('#xyzProbeWindow');">Cancel</button>
<button class="button success js-dialog-close" onclick="confirmProbeInPlace();">Probe</button>
</div>
</div>
<!-- End XYZ Probe -->
</div>
</body>
@ -436,6 +634,7 @@
<script type="text/javascript" src="../js/metroactions.js"></script>
<script type="text/javascript" src="../js/jog.js"></script>
<script type="text/javascript" src="../js/probe.js"></script>
<script type="text/javascript" src="../js/probev2.js"></script>
<!-- <script type="text/javascript" src="js/calibrate.js"></script> -->
<script type="text/javascript" src="../js/mobilejog.js"></script>

Wyświetl plik

@ -31,6 +31,7 @@ function getChangelog() {
$(document).ready(function() {
initDiagnostics(); // run second time to ensure checkboxes are ticked
if (!isJogWidget) {

Wyświetl plik

@ -10,8 +10,8 @@ var zprobeplate = {
xoffset: 0,
yoffset: 0,
zoffset: 20,
xyzmode: false,
name: "OpenBuilds Z Touchplate",
xyzmode: false
}
var probemode = {
@ -30,6 +30,15 @@ var probemode = {
probe: xyzprobeplate,
}
$(document).ready(function() {
if (localStorage.getItem('probeType')) {
console.log("Enabling XYZ Probing")
$(".needsXYZProbe").show()
} else {
console.log("Disabling XYZ Probing")
$(".needsXYZProbe").hide()
}
});
// still beta, lets hide it from users
// if (!enableBetaFeatures) {
// $(".needsXYZProbe").hide();
@ -52,6 +61,13 @@ function openProbeDialog() {
$("#probexyztab").addClass("active")
}, 100)
}
} else {
probetype("z")
setTimeout(function() {
probezplatetab()
$(".probetabxyz").removeClass("active")
$("#probezplatetab").addClass("active")
}, 100)
}
}
@ -72,6 +88,9 @@ function openProbeXDialog() {
$("#probextab").addClass("active")
}, 100)
}
} else {
probetype("z");
// error - needs XYZ probe
}
}
@ -92,6 +111,9 @@ function openProbeYDialog() {
$("#probeytab").addClass("active")
}, 100)
}
} else {
probetype("z");
// error - needs XYZ probe
}
}
@ -112,6 +134,9 @@ function openProbeZDialog() {
$("#probeztab").addClass("active")
}, 100)
}
} else {
probetype("z");
// error - needs XYZ probe
}
}
@ -251,6 +276,7 @@ $("#probe-c, #probe-c-text").on("click", function() {
function probetype(type) {
localStorage.setItem('probeType', type);
if (type == "xyz") {
$(".needsXYZProbe").show()
probemode.probe = xyzprobeplate // protoxyzprobeplate, xyzprobeplate, zprobeplate
var template = `<span class="icon"><img src="https://i.ibb.co/QkxzYN8/xyztouch.png"/></span> OpenBuilds XYZ Probe`;
$("#probetypebtn").html(template)
@ -258,6 +284,7 @@ function probetype(type) {
$(".probetabxyz").show();
probexyztab()
} else if (type == "protoxyz") {
$(".needsXYZProbe").show()
probemode.probe = protoxyzprobeplate // protoxyzprobeplate, xyzprobeplate, zprobeplate
var template = `<span class="icon"><img src="https://i.ibb.co/QkxzYN8/xyztouch.png"/></span> Prototype OpenBuilds XYZ Probe`;
$("#probetypebtn").html(template)
@ -265,6 +292,7 @@ function probetype(type) {
$(".probetabxyz").show();
probexyztab()
} else if (type == "z") {
$(".needsXYZProbe").hide()
probemode.probe = zprobeplate // protoxyzprobeplate, xyzprobeplate, zprobeplate
var template = `<span class="icon"><img src="https://i.ibb.co/CQ7rSW6/ztouch.png"/></span>OpenBuilds Z Touch Plate`;
$("#probetypebtn").html(template)

Wyświetl plik

@ -1,39 +1,39 @@
-----BEGIN CERTIFICATE-----
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
vCJOuoXNiSE3D3Qcw94=
MIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAXqdz+d9WwOe1Nkh90EngMnqRmgyE
oRIShBh1loFxRVgAAAFw8wYBxgAABAMARzBFAiEAunfHVzDv5O5ih7j6ROBUdhss
kMSCdNr0Bqraax12JykCIBwNXkMI7/eHWNWhIwCsssCkVAD7b5CRVMd+ovVZgq5V
AHYAB7dcG+V9aP/xsMYdIxXHuuZXfFeUt2ruvGE6GmnTohwAAAFw8wYCJQAABAMA
RzBFAiBeEm/DRh+yoHS9kyxdObRgjfMRQpKeOD2Gzv69I0rGMwIhAPUeGi0em2CJ
qSjhtiuGRfu9OyaU+zsViKC4IWLGdqmKMA0GCSqGSIb3DQEBCwUAA4IBAQAdG1PZ
5u6sE/bcWGXOlw5aW6t+TsF3ObnC+s0/NvBmMdwU8URJEveBzBrGdb7O++hcvSOE
qzhqmiixeVnYUZsjSJ5PUqCunZR5lrc9gdmYFjJJxhrr3QvX8jrRsbo/qkn0HB1T
MmN2FBdOWa5hVcTVi31WWAqYHDGOiYyzGr9bY3jjFCoDfL4GwdRDGyiT1S+LyAEA
egQ2oMdzS1dFq6a/+jjiTKzuNKnJ0Bl5aL4TPuHBsWmVyHUaN9s3gcaf5cFvh/AO
03PtoiSwPspVBQn+kwUb62m4x6iJZJdBib4cUVP5dmsOpEEtdIPE7hKQwWynDhUx
AP2VLgsqF6Zdsnlv
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----

Wyświetl plik

@ -1,65 +0,0 @@
-----BEGIN CERTIFICATE-----
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
gt1X4Aunq+54lkEsvg==
-----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-----

Wyświetl plik

@ -1,51 +1,51 @@
-----BEGIN RSA PRIVATE KEY-----
MIIJKgIBAAKCAgEAj0XCCVVlTKSo/b3/runw24Rc9JFyUrIoAFrx0AVWYK93aTMp
2dqggvatPi96+sHD5NFd9rd9/cfyWHFrPv9/q35mv0j4mRs4agYBeHwgPCHrFeG+
jQVkpKcP0UiVWdCGyUvoYWFJVOBt44ufpDpa+qds6r8U1RjHsBqmjUWGiGRISaIX
55tk6jg5UfS8mJmWyl/fYafM87N/pzIzLluK/D9zbRvJ8QUtChwPs1KsEZNrWUaK
zqtlFS3ECAyMdGZliVkyoGC6piiPz/SJGAHi5DBYsWckPX63rXJNSCw/rP/ZxgQq
6FLnyhwNO/aEx/nTV6uRQxDu6GDHQ9Z/+Gs/HopJj6tEmU1jypVj2R8dz3rVnvDC
cX5VthIMUaCyQ3oJyRNHQ83egYI1KbTd295Z+fCpEeQnPIu46f0gEUOUw+tjV08h
xIzWgAqhFY6IgRJfghkenOPEoczCdBUpM/oB1S8WGuNyQrZcB7Cw6G0JcqBHK/48
0LTTbq7PjGJ1tlPAZ5cFx3tzhl/79/H/3Au9T8CUF8r/e01s7mYt98Tr7Af7oR5x
w8HgF5UVjldaa8g1ytvEPinrPoY1yx1XKO1e0GF9We7htGnJTpVjcCLOl+v+Pu+l
mlGo3LqBAXeVZGE8U4xrqSz93oo+fChxDow8rzgPxGJD6gdSApGYs/w+GS0CAwEA
AQKCAgEAhUOuk33yBpNWeQbkr678kUMSL46mVxNNr97n88UzLiWoHZswf2ojSQ3n
4OLLMjlPXCP+kcDlmUwFOIzu459GAp9FNQHL8qXmGIBTl91lImmuQCFFW+i7T4fx
Z4prGSqkZNKNaR7T1fYXYML7kAeTnnhjEAsCdqBhBYYUi20zEOSudIcoUw8wk8gO
URQi5JJgNwdsQWqScc/xmfRQtPsDUVQ3qjJh6SUWWsP1OqhYUtTb0iOSc1/rWwLB
x3bcolyob1QfihvPIUSzWAwuBL2kbPonVYQJqoWWleeuyMYXyHQG/W/c9VJANbdX
/AF2SogvM+nq6QX0IwP59TisucYP45HrX6iIngxECk2H8/q3i55jLDESrMsQJ0t6
/y4mLpTIeURXTQIXBYBfnSZzmp+dffF+R5qGip5JcgHpLRxszEy9f8vMV0YeDebc
LgVoaW6vJfr0lwx223D29smsgj3DvK7xyiw8SU91jomk9BF5lL6/NFRDEZQj9vF8
lgicjmuJUHWeawd8TgVrtdq+7Z/aI4itaNzv+vcLa20InAVh7t/sv+HeM079qgzG
0DPtlteVXpxnE5JM/HG+aPZs0pr/LHWhuQLahBR982racwOMEmXtzylTEr+1Gntc
Q6laZcN5D1t2QY6hH9nWVPE3hVe81jGBoeR9EGul73iYnngJesUCggEBANrZRbyo
8667nlW2FI1v6WKV+9w2kKhArF87Vfys92MLATd722aFg7gIVjdWis9P/CHmwfo/
vrl88PvkQh+TG9vGft88le4vssDs6WvkS2W2yU4AYdKhFKR4fazEnkz6tzNSeGxV
j9ILykQ464j7rvsBlFH3FOsRcn2MPrK4QTuzfL1LB5ss0lXXYu29tifC8MzLMdAc
B7aFvWXsP1DjDHibb/BFBnRqWHizY4mjNYRlk9MRioz5MIb8xxCIJ7aCM7ARlt/I
X0tvI+7e/jU239Q/SPg7vMMWoX6gnJ/Xr4f2Hs/8TkBwU7ZCyOVh04JxVN2TE94F
34Kg8SkvJRkZKVcCggEBAKeYGAZrEpTkgm7/h+Qn+ED7GAYgL4uS99XOQ1n8Q+Ar
goQ4FhuYm5cUKgnZVm3VuLiUjscI61RKKFHQTyLSlKxzHuiMLTpOaOo7JF0bDaCP
25YSPbMoXU3oH2JemLLLOtCNmCr7GJBaPkZ+jqFIUUt6N3WdGOqUQHIbGEexorNa
21M39u/L2hWd/4cawCLybHrTVg5WVJjDCi2zKIsXITDt+UYArEOkOyneaBavAcyc
0wf8RgY+F7p7Inn2zKudPTI8q3WWLDCVEd2WJ7Jsx2zfwB6NY5t25VA/5UmS2X+q
RO1lF2Zpk0x3pG5ZxBbbvnpAznnBmtMC/O28IRqwCxsCggEBAIZ21vVK7aafmnJZ
VJlueHxdYQl18T2ftwkwQO3mLH4LRe0cSbrdMAhD/w0zPEiSgX0m9mpW/k2jqcFr
BwG1dnl7pXpuFETrw63sIqNq+rR9MYSekXxEApXnfnhHumfb5/I9qsYNcDeDjPyL
6JQa5/FLkCEoag7ggnMHV4Kh2VrgNjVsQzkhuf6KPzuJw8D8cs2xz2Jpxodr9uoH
1QNS7dew0X9UOdoPeVp4BiGMSRaW/tPBxFpHxXw7Fehfb98gcrespwHKcFq959sd
4h06IR6c3629roZDgmh2MKW5dR1ZqKbsA/xtx9GFiT/+8mEEVzto4d0ZyLHPRz2h
vO6F2jMCggEAWp7+FrJc6M+qy7Q2WaNXNGPReLZ8nv8ILb8LYiPq29MLDs14/tEF
CKsplAvGFTvkV0JU9cCX5wr2RE7cC5tMMvdItjvd1NJDHqx+HC4drz06YipY3IAt
+4tRNRKrhLopgk2eA1ekz6FMXTffjcwZ0TMzu9AHgghJ1Klb9qBRtqOhRp1TVBSp
RtkZK4fGbt8g00VlGfmKYtPLtCxU9ui51MhI6pZAj47FQv100RcuZOJDpeS+RG/c
ysP8P3C4+O7cAUcW+00JdfeVInkn2+2/49oU+zA+tPiURFFYfPD/1G1QOgFYptLd
iBKFgfnd8vI9S8OxIdsTCZhrBW2dhN2+EwKCAQEAy6evDCwKBQYYRxA//z/zi28y
RbHCn6elQ0q8/syMc0wydKEBcDgcIzeBIheG0SVVFCWJijp1Egzu3hUenYUnOJYG
g+fjYR7DF2wOZe+7egXuf94v6gSYVep27OTzXVsNSddseSgJhIrJldv1s6IX+2rS
T/ItkQQC6WPwiB+aGzeNcLLmzqkV5o0lDWELHnXBpRr3otBq8JtEe1tyA60/rynA
dJhdul9X0Qmhx0sJY8BvMRv2e+cT8Kr5J9viYsf7FpFyhcoWOdz+gy9zAMh1zhIM
R1y0HFqPbHbNgJv/vKMQmmmQdn+jdMNpI1GCBwhPDtCyBN9YZNJJan7AoJ2Nfw==
MIIJKAIBAAKCAgEAitBfpfqZ2QDmcEdc9X8xuEiaqFcqFjZwMbXjaGYUr4lc2YOc
UeZoZB7SbXObslPK11fvxb7fG61MtBqwYLUf2rJm6VgH6Er8Jfz7wo8Qd5k1WLze
70RXPZ69gy3aCbVsUA5AZXztHjbp/C0hlrdVxa9owNqwIS/kMfHRXQZBnJ0CIS4e
nr7JLJNcM2RycDP0iIGq+vRu6eIYpKne8vTEZtMxBdMfOkRPmyptZq+JMoioNquH
yeJxyWwXA5I6cdurZ2zymo3Fh58oxxDvHTxpiqQivcJuafnlZEiKMt5briFTfwlQ
95r8CjyqogDbUQiFZGaQGLRI9a2YOLL9vPzstQHsbBbSKFobunweRzDSs6WXbEPP
gDvI5VjZIPRy1tr8F4fTZsAT6X//QkC3YlqJ9rt8VgKkuazePj36zho/go7VXoFf
KtJEvYvqzSQFCGvOJ/dG4s9bjBEsK2TT0Ha6SkoWAEQ/QF/E5+RsMSlytGx/kw6K
pH3Mr/GRzDkTSTjKrmr5cWu0OjLkAdDr2AZKVkVQ5IGHQcdX82dxA/20QA3qONaG
kX6AyEoRji3EXLvVRceUcFgxEsUQ/SwIZ2mhPm01iGlpTJyOQkPUI4bHgXaOhpoX
uKfHUA7vw2f3EVHUD/30+zXEE5NRE9mRYgC70OMYLUg0I5r0YiWIACKmKUcCAwEA
AQKCAgAMfQKd5BXDOBmDMGhkjbTjZ2TCkFTw+qTNVBfJZKWnxSvdRcHifGAX4c38
mtH/ERrGlNq1Z56a1tR3v47upFzhR/uKMqlDdLuKj1/2+Pf6SoZKHXPRAsz2djmG
e7GJ/hBog1+3wa1zcm1KiqTi8kt9JXK/Ju2BjtVwyNiVDeMJO/bdFVEb5v4iTH+X
AAprncD6JvBC84qm7/hXmBC+utaQiZ93bq74hvzCcOa2vkQRj8nSYUwuFXk3LcpE
P/uSErkw7NRGo0qKEP+SKSvZ7X1xQ6L8f2l/j0Pb6crFGMwWtljUrPnjzMWwBhUz
ze/tMl8N0UxVbKLDt4JiV3gMcJS68PdjMR2jPnMwLKNU6sK3XnESlZtePmutjsWJ
ARbwRkQXrKq2oENwp+cVSo+0rOuWA2u31tqaeStJG4HV+laYz3WZUQMgF9oQYLnv
4G1R0w4mgJTRLovDJD2Pq5gigovx8PMuPqA5yJj1iKwKtY1hGk4siVNCmB65mjYu
UKZ2JqDSCsbZ1r/DPLBoHmA+e5Emk1aU4Yt25f5Olbhp8aiaRQv4Db0ZWRy7Xpmr
ECJeUQV3iFpxeRKkjwbDuoprMxqFydHJS8LcRZ2q9YaRbASwhkw19QgU02IUpK19
HW/zoS5NCTrkL6rszXWe4OC84OvJUohNLNfYOstzJGw4Y/jQAQKCAQEA9iIECJYM
y3iku79HpJWNVDdUrTdUMoOWasJMPKdn8VZsHb8QQ4W8uYZv21uiGuUnqVtNIcoo
biOLC6YR/criBTWfYyvW2IvMDe5YaKH6vE+kP3cjNyaUnQccwj9QtdyRVuBVmm6u
yjGdLBgZE9VXRLwinPVcAtumtg+DkQDo75S0zGVXSSAUdkufepc5XRCWu88GvFGX
tEdlplBaRJaZjACxmb066IQ0GRMLiSwsmyA9vQSB6qdkvkM51b56eJzmYlWLt/LG
jA9NDI5fwNEtAFgvRY94JcXhgPbQjbLbu1B0E+Se67xm70WOiMowLf5LRdbyhQOM
xyk0hwlPaZwfAQKCAQEAkGD6RRSq1kKUixLcM1UGT56SQviRu7oxpVud5Uzv5war
uo/aWhPdx99pxVvIu0pekjo//vev/unXX7TjLlHBRfWCZCxVPFId1RJQKDsCjc1L
2VxZrHxyw6iI2oM2sU1gKYWX0+k2irA0EjmMYPyY6fc+yzWXLtBPW3mTvFu4Sv4F
nuMZMnzJ14fZiFVzbHRbps74Ke1lPCx9meuISYErpWs3noRBIKoPtGwztx2jpkYz
jh+oHBQHkku7o3tZE4EBXN52X6d/ypfxQaB4SP8p9HGNz5StFEoHGNJQgtxN2oL9
43ejCc7cjxk6AUAr2J3QtzxhGGvEN1MVT1Noz+mQRwKCAQEAq3tvi/ve1jQrsZLG
+2gmmzIhkL0nsDn1plPQgcGwrXgkw2TGlAStRCTh8daZzlsxktDFoHEUUgf5bBg8
GLItXqvJbHKysRRVCq+wcNXJt0FVkdITeu0qRW0bIEq0lMAjkn+hpILQzJZchsgT
ULomnwDkrK5VeLhIIjgU1gXoRGM6w90nPw9WskRlzCdoE+rm2dqXOsUuCLBlpcX9
3iN+vwgMtKweSrkxAvc95kgcm8eOvA5T5YTSr6xusviOo1HNQV2QhoxiwFo4uDLJ
i7EwxTirVq9qaga/4fYTv2WJqauX8/QotN0CalnvwGX9w02UbAgh14JtpqSSsDJQ
XagkAQKCAQBFRhKvFKSHm3iUZh87jf8yMp5w/b1G+qaZdaUEAW9WRRAeuqkE8WVH
Yn3okQp2Os+3j7VnC8bpI6AQLsWWUunOPGcs00yuXaQsuNW3B+FI0okjKLlqFmgm
UvYfCjgyyDJsmcnohoyB7Nt/Jxeg7XIdSGFbtUHt10tMU8A77zI04T8nJkXPwKpD
/M22KXHxRr83ATV3QI2DWsGFGcrRoeWkQBZ2u3RYTOCuLACASvtba3GPLsdFeaLM
YgQNA8EQp6RUv/TCHqclONQsLeeo9q1VuSpWwDpvcrmHAlpY/4VnY9SX0K5spVGU
Y4E+WmDvVYFwecsIoaSK+xVNc3Ll12Y/AoIBAAmzbqUmjLUXzDSk/SUJyKX8NVZE
YQ4zPLc3/LC+x2hfIqWj6GEfJrwEAG84UYYenFVqk15e4K0wmUGCBJtpIa06jTJh
E9XakJehmwMDNRohxyohFINcltdQzlm2xZMD0yr+x0KavvAnedwLHspBz0iZbPy5
akwU9X4TfR7yG1G5PhEfPELBQMED6NBWGzB11rsVbSn7SGlU/FN5TGuWoSBAdq5s
5b+SvAr/igNDCOfs5d+vUtMYa9cqqU2FSGNpUz/F7FLyqdahkLoxz/nNf413GFyr
h8SQmPMQz4GPSN+/Eqk9qXSyhO0l59P6Lp3tKnpiYGd+5NO2eNHq8F7sQBY=
-----END RSA PRIVATE KEY-----

Wyświetl plik

@ -1,51 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIJJwIBAAKCAgEAjLPmhFtfUZfqRVuvJ4JdRFpACGmkRiyFh/+UC281vnKpbJn3
qGvNrwZK+h2PU4zHAEXBz1o1iJhoMV4g+VflnAF0OOOZNcWs/uN2ovl5nDj7gJZF
ot/j5EkQtlIkeJIGjQFlzGuAXwbjnBHmQIh3rP6ARgYW60n7Pk8CrAyHIXqnqRXN
SSjfbhnQ2gz5lC8HdJqkhNbCERrjChmnR6AhQxFnj6S19yjIA2D7fSyLDBtzY2ga
62zdFQX/mXwB13qgawqDKmxj5XoMxw2EoShR+d4iVTs0NK3h9tEPJXuZ9RxmJdVA
qsYA7I5GTMLQddNi/EKxm4PeJ1qVssq6Wob5DevgKQ+vrUOsjPmbhRHJA5ysrEQe
gD7bXlkSSZeUndIq8Kiy5yOgi0uTfqo4vtQ6c0fCR2z6DoQSEH2140ybFBZKdnRz
6fjqZNdkv99kDiscwGlxVkiJR2GmEFCEDJ9Zuj16T366pHYXPtaXWwn0PlY/rgc4
yEgCb90Bp88e8wRe26bE5D+krVzBHbCa73nqoTe5ljjzku+LYAxHbgGdv2Vy2USh
STinQiSRhKVdGVwl8ZYpWXu+vMNC0q3urnA0uTw42yOZi11e37RPAUh2zQp8mjFD
ZEVOX9uPq+JDQDYxwPsOJhRHlzQ0jrqqE3+M5vv4HCrOZ5/JJcLoqF1lu8kCAwEA
AQKCAgB0aQtZineMfFHZXIfH+nXL7Zd43l6JqKA56tzDsRkYHqnKLoDWmYqtOlmi
If7JM3oZ4Zz+PzZ3cxERdz10zqIrtpA/2R6TfJ8qq2smX52cAREkTDAFF5Pm9gSb
s8506uv8kaF1xaOJ+5spLy3/Smkpec8LIFKqDKWP4bLmQd8zddVtcZpM40IoR7ei
EIYVceuLL77aIQyjNkmNu7fI7NVYNfgmwjHC8by5/u1TnRzVwYhwQFu1WHZ5xGK6
y/yCGPTMWwA2g0MLQzV7ItYOt9tLDdv+BGOnCg4gNMuBSYgRYZOpzYwZPoTZMsU7
ERuDwIbvCwcDEdElYi7kpBIWgAFhphzy4n9FojWgFWmOJxhSM3Aq0GWLACJCCGh8
vbLizuV3nMi7F/etYmB+/5Dks1hqNfl8LXY48qEv77zwNCY69Cpqm027Yu6rup2P
W2fZm0mLr7Pu6rZB6UuqxRZWRqyEZikapKlOJJl5Yo/GRZosLTgWFO0ZgRIwKKTd
p3HzzLS/0zIC4WV09OtDlGuo2l2CDxMdQf/NlD0BI5vpTJe3WTdl+4cYkkK/eqDM
4y/MIWYpSDW1rm1SajxuqpMjJE0bcL2pgZIEd+UuB7gQH1j2IaDlXp/5+bRB+4cR
Jmj6yyVOGkORrB7p1KcgMMFhhvJVZbt7z8yWqiT+RxjuarV2GQKCAQEAziJ3vT4C
BEAqanIR8cUV2E3MoCWrfZPg/vCg8e9Bn7QSmeXBfgkj2u9DWmwPIzfrcvgOV2Fo
KLqIR4EUgtpS5PP5V2C5FRPYw5dgJq/Zqmt144vCtuqXXWv3nPMD6Jv7uz5Ssds2
nL8KrGZ8SLryUbEvC114wtWhMfOBgU89+LaS0S0JTb3uY64it9jxDhoz711rj3DZ
6igu7utmtcGJlqqVFawpjQZ31tyXENUGTLw31YzeC76cDZ2Oh7Cv8ysaCevN3QE2
yywmQOAwkbUFZoD++M1SzIFBbVraRRJTFaiPlFTKgLq4rZ/SHuoCRybHeYr1tMbw
qN+9EkcoqLZjzwKCAQEArr1bgn86XPkUSyXrkpS3aCRzXkiRWGmdWaDpf5WWqF01
lKZDQ+JyrTA9sOO3N1OUPK3124p5dl2+H/416AFT652/tF0a2QHPcdXrbjlVF+lM
5Y2AdplPzq35/YaTF108L/Z3gj9miAkcsxqg9JvSncp4PKpgcM8EWIWFuHfT8sEk
/+znqr/SWPacvEWNa7L7j9q0yL3wjZrDzbSnLVYzQPpyzCdi89II8viMmqgWmuE1
tsIEa+qh3k06XxjsbWFm7aqgodKl5rFXZ0xx2w8SC8Mk2X/bgjISZGGJOqMvrapb
8Ucce2I8YNzMlgBvwjmDqt/j4lzovr+YR9IwAIKU5wKCAQAQoEsUIno7KYnCSC0W
WRUn+y50BFXOrSzKo1H38ZpTbUzKyPNQXSBdOksuceTOrGX7QfK2LY8fKdxwGAM1
grKI8Py9hXmoL4+eRwlkVW6zBjPeBJnR8x3+VQUFzbwU+O/W7HHzEoFXJzmPKj0A
CMQevrHSstlYra5wvvlFGsUe2GsDICTN9nHR7Gu0dHUM9CQYPGq+iRWqg081yhrg
shmM43le5CH90/W6iNROcUAu1EeUm+YVAGzJ1Fl4rFGkxWc2QaS7HKv0uzziorKI
Lhefauwl2TnCcPJ8BYXxaEb3Sj86cZRbybO3nVpvT+SbJI+WSBUFXb5vgIxZew/W
e8+VAoIBAEHShJkYsfR5wyI3q5BwwtHRAUBf15hVWHd9vNdZkwHi8p8HLklxEL+a
b3KlpMuLiUh+QyGq/OwQjeDhUo8NiP41UxRvCgD6xJjd+yxvHlW+hT/nWJ/USpLR
SF0vB1OCxHxQvF3s4gOWYyA4hK7/z4uuzDIV//Qel0V9Loz5XnaQOQ7Kv827KlJm
u03UaVxLdKWQvg7sNaQxy1Y+mcbjNLViYkHzCDxOPx6/b7+GV9WJxkEMvrukC8uA
jd9qtQzS5wHaB15Nyj6nSQRZcH4TJDoYDVZ86kQV9oWnlBjphblGdhHiNqFntNTL
96j9ixu/rJB+fAo181p/M67CR2C5z7sCggEAfNGPRiFgy4anjrxGv2wvTQmCUWZb
TWUJ668LVtUwdw0Eu3k0GCfICDnbd68vVicDJsZsADOW+oapqT1O1oS6LYJPsOO7
7dp6uXxbT3nvdLOheiGFN88Pk5Ytb6qWbwVU+DM3JGa3MhD0+CK2jP110eKt3J9W
e2Y8kWztOTPpkWpjvIgG6v4fJqRyzq/WcP4MusAhbv1+RRQIE9BV9gq79XIpuTAo
0yjK+dkmiiVHal6/g0oKcrhMvUfkXShxhl297kUIxB/iIBhBH48j5hm7cJzwuWhg
6eu5SPMHwQ0yBpbmY+qoDWhywc+DgPrMyIYdADuCtz8M+RDo+/ByYZxUHw==
-----END RSA PRIVATE KEY-----

Wyświetl plik

@ -42,6 +42,11 @@ var mkdirp = require('mkdirp');
app.use(express.static(path.join(__dirname, "app")));
//Note when renewing Convert zerossl cert first `openssl.exe rsa -in domain-key.key -out domain-key.key`
// fix error: App threw an error during load
// Error: error:06000066:public key routines:OPENSSL_internal:DECODE_ERROR
var httpsOptions = {
key: fs.readFileSync(path.join(__dirname, 'domain-key.key')),
cert: fs.readFileSync(path.join(__dirname, 'domain-crt.cer'))

925
package-lock.json wygenerowano

Plik diff jest za duży Load Diff

Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.211",
"version": "1.0.211",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
@ -17,7 +17,9 @@
"electron-updater": "^4.0.6",
"express": "^4.16.4",
"formidable": "^1.2.1",
"https": "^1.0.0",
"ip": "^1.1.5",
"jscs": "^3.0.7",
"lodash": "^4.17.13",
"md5": "^2.2.1",
"mkdirp": "^0.5.1",