kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
v1.0.382
rodzic
c3233c29ac
commit
d63207f5fd
|
@ -1,3 +1,6 @@
|
|||
v1.0.382:
|
||||
- Updated Theme
|
||||
- Updated SSL Certificates
|
||||
v1.0.381:
|
||||
- Added additional board support to Flashing tools
|
||||
- Fixed linebreak on realtime feedrate indicator
|
||||
|
@ -13,6 +16,8 @@ v1.0.381:
|
|||
- Improved port refresh (PR #367 Thanks Windfisch)
|
||||
- Fixed Select machine Dropdown for Servo/Pen ACROs (Issue #363)
|
||||
- Improved Grbl settings parsing for odd 3rd party Grbl forks that include comments in settings strings (PR #371)
|
||||
- Enabled Alpha Transparency on 3D viewer (minor cosmetic tweak)
|
||||
- Surfacing Wizard - remember last value of input for final depth (improvement)
|
||||
v1.0.380:
|
||||
- Test Fix for grblHAL startup alarm lock
|
||||
v1.0.379:
|
||||
|
|
|
@ -167,24 +167,24 @@ select {
|
|||
|
||||
/* OpenBuilds Navbar for MetroWindows */
|
||||
.fg-openbuilds {
|
||||
color: rgb(64, 68, 71) !important;
|
||||
color: rgb(0, 0, 0) !important;
|
||||
}
|
||||
|
||||
.bg-openbuilds {
|
||||
background-color: rgb(64, 68, 71) !important;
|
||||
background-color: rgb(0, 0, 0) !important;
|
||||
}
|
||||
|
||||
.bd-openbuilds {
|
||||
border-color: rgb(64, 68, 71) !important;
|
||||
border-color: rgb(0, 0, 0) !important;
|
||||
}
|
||||
|
||||
.openbuilds-switch .check::after {
|
||||
: rgb(64, 68, 71) !important;
|
||||
border-color: rgb(64, 68, 71) !important;
|
||||
: rgb(0, 0, 0) !important;
|
||||
border-color: rgb(0, 0, 0) !important;
|
||||
}
|
||||
|
||||
.openbuilds-switch input[type="checkbox"]:checked~.check {
|
||||
background: rgb(64, 68, 71) !important;
|
||||
background: rgb(0, 0, 0) !important;
|
||||
}
|
||||
|
||||
.openbuilds-switch input[type="checkbox"]:checked~.check::after {
|
||||
|
@ -260,7 +260,7 @@ select {
|
|||
z-index: 2000;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-image: linear-gradient(to top, #888888, #ffffff, #888888);
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
.machine-profile-menu {
|
||||
|
|
|
@ -1,67 +1,22 @@
|
|||
#loading-icon svg {
|
||||
width: 500px;
|
||||
#splash {
|
||||
z-index: 2000;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
position: fixed;
|
||||
left: 50%;
|
||||
margin-left: -250px;
|
||||
top: 32%;
|
||||
margin-top: -50px;
|
||||
/* Ensure it covers the viewport */
|
||||
top: 0;
|
||||
left: 0;
|
||||
display: flex;
|
||||
/* Use flexbox for centering */
|
||||
justify-content: center;
|
||||
/* Horizontal centering */
|
||||
align-items: center;
|
||||
/* Vertical centering */
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
#load-ring, #load-ring-second {
|
||||
#openbuildslogosplash img {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
position: fixed;
|
||||
left: 50%;
|
||||
margin-left: -250px;
|
||||
top: 32%;
|
||||
margin-top: -50px;
|
||||
border-radius: 50%;
|
||||
animation-name: halo-effect;
|
||||
animation-duration: 0.9s;
|
||||
animation-iteration-count: infinite;
|
||||
}
|
||||
|
||||
#load-ring {
|
||||
animation-name: halo-effect;
|
||||
animation-duration: 0.9s;
|
||||
animation-iteration-count: infinite;
|
||||
}
|
||||
|
||||
#load-ring-second {
|
||||
animation-name: halo-effect;
|
||||
animation-duration: 1.3s;
|
||||
animation-iteration-count: infinite;
|
||||
animation-delay: 0.4s;
|
||||
}
|
||||
|
||||
@keyframes halo-effect {
|
||||
0% {
|
||||
transform: scale(1);
|
||||
background-color: rgba(56, 56, 56, 0.1);
|
||||
}
|
||||
|
||||
20% {
|
||||
transform: scale(1.05);
|
||||
background-color: rgba(56, 56, 56, 0.2);
|
||||
}
|
||||
|
||||
40% {
|
||||
transform: scale(1.1);
|
||||
background-color: rgba(56, 56, 56, 0.3);
|
||||
}
|
||||
|
||||
60% {
|
||||
transform: scale(1.15);
|
||||
background-color: rgba(56, 56, 56, 0.4);
|
||||
}
|
||||
|
||||
80% {
|
||||
transform: scale(1.2);
|
||||
background-color: rgba(56, 56, 56, 0.3);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1.1);
|
||||
background-color: rgba(56, 56, 56, 0.2);
|
||||
}
|
||||
max-width: 100%;
|
||||
/* Ensure it scales on smaller screens */
|
||||
}
|
|
@ -1,8 +1,3 @@
|
|||
.theme_dark #splash {
|
||||
background-image: linear-gradient(to top, #111, #555, #111);
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
body.theme_dark, .theme_dark div.window, .theme_dark .card {
|
||||
background: #222 !important;
|
||||
color: #FFF;
|
||||
|
@ -408,7 +403,7 @@ body.theme_dark, .theme_dark div.window, .theme_dark .card {
|
|||
border: 1px solid #ce352c;
|
||||
}
|
||||
|
||||
.theme_dark select {
|
||||
.theme_dark select {
|
||||
border: 1px solid #555;
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,88 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="400"
|
||||
height="92"
|
||||
viewBox="0 0 105.83333 24.341667"
|
||||
version="1.1"
|
||||
id="svg127"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
|
||||
sodipodi:docname="OpenBuildsCONTROL.svg">
|
||||
<defs
|
||||
id="defs121" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.979899"
|
||||
inkscape:cx="307.51417"
|
||||
inkscape:cy="144.37704"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-rotation="0"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="760"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata124">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M 21.000298,7.5914652 C 18.491922,2.8839647 13.337722,1.3033479 9.2487244,2.5059923 4.4725002,3.9148046 1.8266774,8.0037999 1.9297614,12.367695 c 0.1030771,4.776228 3.1956036,8.349797 7.3876861,9.518091 4.7418625,1.305721 9.9647855,-0.996477 12.0264645,-5.841431 0.549781,0.309259 1.065202,0.618504 1.614983,0.962114 C 21.481356,20.820583 17.15183,24.359802 11.68838,24.187997 5.606424,23.981829 1.0707287,19.549212 0.17733367,14.257571 -0.92222926,7.6945557 3.2354924,2.2310974 8.6645814,0.68484392 14.299839,-0.93014935 19.866374,1.715684 22.409114,6.2513793 21.928054,6.6980658 21.481356,7.1447652 21.000298,7.5914652 Z"
|
||||
id="path34"
|
||||
style="fill:#ffffff;stroke-width:0.343613" />
|
||||
<text
|
||||
class="cls-2"
|
||||
id="text38"
|
||||
style="font-weight:700;font-size:13.2979px;font-family:SpaceBT-Bold, 'Space Bd BT';fill:#ffffff;stroke-width:0.343613;"
|
||||
x="20.313072"
|
||||
y="16.181801"><tspan
|
||||
x="20.313072"
|
||||
y="16.181801"
|
||||
id="tspan36"
|
||||
style="fill:#ffffff;stroke-width:0.343613;">OPENBUILDS</tspan></text>
|
||||
<text
|
||||
class="cls-3"
|
||||
transform="scale(1.0488088,0.95346263)"
|
||||
id="text42"
|
||||
style="font-size:4.91366px;font-family:SegoeUISymbol, 'Segoe UI Symbol';letter-spacing:0.3em;fill:#ffffff;stroke-width:0.360385;"
|
||||
x="68.67485"
|
||||
y="22.701735"><tspan
|
||||
x="68.67485"
|
||||
y="22.701735"
|
||||
id="tspan40"
|
||||
style="fill:#ffffff;stroke-width:0.360385;">CONTROL</tspan></text>
|
||||
<polygon
|
||||
class="cls-1"
|
||||
points="70.6,437.3 71.1,436.1 71.7,435.1 72.6,434.2 73.6,433.6 74.8,433.1 76,432.9 77.2,433 78.4,433.3 79.5,433.9 80.4,434.6 81.2,435.6 81.8,436.7 82.1,437.9 82.1,439.1 81.9,440.3 81.5,441.5 80.8,442.5 80,443.4 78.9,444 78.8,444.1 83.2,453.7 83.7,453.5 85,452.6 89.2,455.7 93.2,451.8 90,447.6 90.9,446.3 92.1,443.1 92.2,442.3 97.3,441.6 97.3,436 92.2,435.2 91.6,432.9 90.1,429.9 93.2,425.8 89.2,421.8 85.1,424.9 82.2,423.4 79.8,422.8 79.1,417.6 73.5,417.6 72.8,422.8 72,422.9 68.9,424.1 67.5,425 63.4,421.8 59.4,425.8 62.5,430 61.7,431.3 60.5,434.5 60.4,435.2 55.2,436 55.2,441.6 60.4,442.3 61,444.7 62.5,447.6 59.4,451.8 63.4,455.7 67.5,452.7 69.4,453.6 73.8,444.1 73.1,443.7 72.2,443 71.4,442 70.8,440.9 70.5,439.7 70.5,438.5 "
|
||||
id="polygon44"
|
||||
style="fill:#ffffff"
|
||||
transform="matrix(0.34361329,0,0,0.34361329,-14.254425,-138.34104)" />
|
||||
</g>
|
||||
</svg>
|
Po Szerokość: | Wysokość: | Rozmiar: 4.0 KiB |
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 392 KiB |
|
@ -0,0 +1,69 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
viewBox="0 0 512 512"
|
||||
id="svg11"
|
||||
sodipodi:docname="Gear icon - black.svg"
|
||||
width="512"
|
||||
height="512"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
||||
<metadata
|
||||
id="metadata17">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs15" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
id="namedview13"
|
||||
showgrid="false"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="194.2141"
|
||||
inkscape:cy="229.3789"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg11" />
|
||||
<!-- Generator: Adobe Illustrator 28.7.2, SVG Export Plug-In . SVG Version: 1.2.0 Build 154) -->
|
||||
<g
|
||||
id="g9"
|
||||
transform="matrix(5.452568,0,0,5.4467272,-11.448462,-10.885809)">
|
||||
<g
|
||||
id="Layer_1">
|
||||
<g
|
||||
id="g6">
|
||||
<path
|
||||
d="M 69.6,40.3 68.3,37.7 72.6,32 67.1,26.5 61.4,30.8 57.3,28.7 54,27.8 53,20.6 h -7.8 l -1,7.2 -1,0.2 -4.5,1.7 -1.8,1.2 -5.8,-4.4 -5.5,5.5 4.4,5.8 -1.2,1.8 -1.7,4.5 v 1 c -0.1,0 -7.3,1 -7.3,1 v 7.8 l 7.2,1 0.9,3.3 2.1,4.1 -4.3,5.7 5.5,5.5 5.7,-4.3 2.7,1.4 6.2,-13.3 -1,-0.5 -1.3,-1.1 -1.1,-1.3 -0.8,-1.5 -0.4,-1.6 v -1.7 c 0,0 0.2,-1.7 0.2,-1.7 l 0.6,-1.6 0.9,-1.4 1.2,-1.2 1.4,-0.9 1.6,-0.6 1.7,-0.3 h 1.7 c 0,0 1.6,0.5 1.6,0.5 l 1.5,0.8 1.3,1.1 1.1,1.3 0.8,1.5 0.4,1.6 v 1.7 c 0,0 -0.2,1.7 -0.2,1.7 l -0.6,1.6 -0.9,1.4 -1.2,1.2 -1.4,0.9 h -0.3 c 0,0 6.2,13.4 6.2,13.4 l 0.7,-0.3 1.8,-1.2 5.8,4.4 5.5,-5.5 -4.4,-5.8 0.3,-0.4 c 0.6,-0.9 1.1,-1.9 1.5,-2.9 l 0.8,-2 C 71,56.3 71.2,55.6 71.3,55 v 0 c 0,0 7.2,-1 7.2,-1 v -7.8 l -7.2,-1 -0.5,-1.7 c -0.3,-1.1 -0.7,-2.1 -1.2,-3.1 z"
|
||||
id="path2" />
|
||||
<path
|
||||
d="M 96,49.1 C 96,75 74.9,96 49,96 23.1,96 2,74.8 2.1,48.9 2.1,23 23.3,1.8 49.1,2 75,2.2 96.1,23.3 96,49.1 Z M 48.9,9.4 C 27.1,9.4 9.3,27.3 9.4,49.1 9.4,70.9 27.3,88.7 49,88.6 70.9,88.6 88.6,70.7 88.5,49 88.5,27.2 70.6,9.4 48.9,9.4 Z"
|
||||
id="path4"
|
||||
sodipodi:nodetypes="csccccscccs" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
Po Szerokość: | Wysokość: | Rozmiar: 2.9 KiB |
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 93.91 94">
|
||||
<defs>
|
||||
<style>
|
||||
.cls-1 {
|
||||
fill: #fff;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<path class="cls-1" d="M67.57,38.34l-1.34-2.64,4.29-5.73-5.51-5.53-5.75,4.3-4.11-2.1-3.27-.87-1.02-7.19h-7.81l-1.02,7.16-.99.16-4.47,1.7-1.84,1.2-5.81-4.37-5.53,5.53,4.37,5.83-1.2,1.82-1.72,4.47-.15.99-7.16,1.02v7.81l7.19,1.03.87,3.27,2.1,4.1-4.3,5.75,5.53,5.51,5.73-4.29,2.68,1.36,6.19-13.26-1.02-.52-1.32-1.08-1.08-1.33-.78-1.52-.45-1.65-.08-1.7.26-1.69.61-1.59.93-1.44,1.21-1.2,1.43-.94,1.61-.61,1.69-.26,1.7.08,1.65.45,1.52.78,1.33,1.08,1.08,1.32.78,1.52.44,1.65.1,1.7-.27,1.7-.61,1.59-.93,1.43-1.21,1.21-1.43.93-.27.1,6.19,13.3.75-.29,1.84-1.2,5.83,4.37,5.51-5.51-4.37-5.83.29-.44c.6-.93,1.11-1.91,1.5-2.95l.76-1.97c.24-.62.41-1.27.51-1.93h0s7.16-1.02,7.16-1.02v-7.81l-7.17-1.02-.45-1.68c-.29-1.06-.68-2.08-1.18-3.06Z"/>
|
||||
<path class="cls-1" d="M93.91,47.08c-.1,25.94-21.11,46.93-46.96,46.92C21.03,93.98-.06,72.84,0,46.94.06,21,21.3-.16,47.09,0c25.93.17,46.92,21.27,46.82,47.08ZM46.9,7.39c-21.81.07-39.58,17.92-39.52,39.68.06,21.84,17.88,39.61,39.63,39.53,21.87-.09,39.59-17.86,39.52-39.64-.07-21.84-17.9-39.63-39.63-39.56Z"/>
|
||||
</svg>
|
Po Szerokość: | Wysokość: | Rozmiar: 1.2 KiB |
|
@ -10,11 +10,12 @@
|
|||
<meta name="metro4:init" content="true">
|
||||
<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="css/splash.css" />
|
||||
<link rel="stylesheet" href="css/main.css" />
|
||||
<link rel="stylesheet" href="css/buttons.css" />
|
||||
<link rel="stylesheet" href="css/probev2.css" />
|
||||
<link rel="stylesheet" href="css/splash.css" />
|
||||
<link rel="stylesheet" href="/lib/furcanIconPicker/iconpicker-1.5.0.css" />
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
@ -22,39 +23,18 @@
|
|||
<div class="pos-fixed pos-center" id="splash">
|
||||
<center>
|
||||
<div id="openbuildslogosplash" style="display: none;">
|
||||
<h1 style="position: fixed; top: 100px; left: 50%; transform: translateX(-50%); ">OpenBuilds<sup>®</sup> CONTROL</h1>
|
||||
<div id="loading-icon">
|
||||
|
||||
<div id="load-ring">
|
||||
</div>
|
||||
|
||||
<div id="load-ring-second">
|
||||
</div>
|
||||
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 98 98">
|
||||
<g inkscape:groupmode="layer" id="layer2" inkscape:label="Layer 2">
|
||||
<circle style="opacity:1;mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.995984;stroke:none;stroke-width:0.319262;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;paint-order:markers fill stroke"
|
||||
id="path831" cx="48.947918" cy="48.947918" r="48.947918" />
|
||||
</g>
|
||||
<g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
|
||||
<path style="fill:#000001;fill-opacity:1;stroke:#000000;stroke-width:0.229295;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.911647"
|
||||
d="M 41.724417,97.153288 C 7.8893711,91.663168 -10.237781,54.730442 6.3414223,25.063074 26.776851,-11.504743 81.11003,-6.9263244 94.989281,32.533036 107.17501,67.177604 77.660443,102.9843 41.724417,97.153288 Z M 55.162218,96.560784 C 95.32486,90.947675 111.21754,42.386841 82.127307,14.167626 55.380558,-11.778279 10.298455,1.9142827 2.0101952,38.501195 -5.2419835,70.514495 22.74975,101.09073 55.162218,96.560784 Z M 42.182578,93.476472 C 9.1990746,88.070933 -6.9110156,50.983155 11.721752,23.351259 32.448727,-7.386274 80.17692,-0.74575393 91.738625,34.484165 102.2852,66.620893 75.182263,98.88467 42.182578,93.476472 Z M 54.570245,92.896884 C 93.037603,87.506128 107.01684,40.083184 77.571669,14.867181 52.771124,-6.3713026 13.410171,6.5282892 5.8636505,38.367737 -1.3026826,68.603134 24.198734,97.153079 54.570245,92.896884 Z M 22.50714,76.745813 c -2.582254,-2.591301 -3.580353,-3.737705 -3.447408,-3.959646 0.102919,-0.171814 1.253755,-1.734022 2.557416,-3.471574 2.959106,-3.943998 2.831963,-3.351577 1.353331,-6.30587 -0.692345,-1.383306 -1.487151,-3.38747 -1.766228,-4.453697 -0.507417,-1.9386 -0.507417,-1.9386 -5.112847,-2.617838 -4.605429,-0.679246 -4.605429,-0.679246 -4.667005,-5.905418 -0.07272,-6.173513 -0.691801,-5.377613 4.757698,-6.116861 4.539836,-0.615844 4.581587,-0.62648 4.581587,-1.167306 0,-0.724698 2.103504,-6.013126 2.891228,-7.26883 0.744033,-1.186071 0.744033,-1.186071 -1.875373,-4.687366 -1.440674,-1.925718 -2.619416,-3.717415 -2.619416,-3.981556 0,-0.59059 6.574282,-7.246076 7.157667,-7.246076 0.21686,0 1.991928,1.18683 3.9446,2.6374 3.550318,2.637401 3.550318,2.637401 4.623465,1.95545 1.187355,-0.754526 6.735496,-2.986039 7.424101,-2.986039 0.520725,0 0.523557,-0.01117 1.134836,-4.476117 0.259259,-1.893743 0.52804,-3.729112 0.597288,-4.078599 0.125906,-0.63543 0.125906,-0.63543 5.432877,-0.573861 5.898639,0.06842 5.237039,-0.673108 6.328134,7.092769 0.278368,1.981218 0.278368,1.981218 2.263012,2.502502 1.091554,0.286707 3.147561,1.109758 4.568893,1.829007 2.584255,1.307721 2.584255,1.307721 6.052337,-1.297396 1.907452,-1.432813 3.632184,-2.605116 3.832737,-2.605116 0.609089,0 7.437248,7.005672 7.265439,7.45432 -0.08044,0.210054 -1.284882,1.91745 -2.676528,3.794212 -2.530262,3.412282 -2.530262,3.412282 -1.182107,6.124452 0.741475,1.491682 1.541984,3.473845 1.778882,4.404799 0.519566,2.041688 0.291772,1.92349 4.909286,2.547246 1.952889,0.263802 3.834207,0.536384 4.180687,0.60572 0.629976,0.126076 0.629976,0.126076 0.629976,5.373814 0,2.886256 -0.08218,5.298613 -0.182559,5.360791 -0.100404,0.0622 -2.16211,0.395457 -4.58158,0.740611 -3.219365,0.459265 -4.399028,0.710261 -4.399028,0.935994 0,0.608912 -2.332174,6.408243 -2.991702,7.439316 -0.861763,1.347275 -1.064718,0.842053 1.960849,4.881042 1.448926,1.934239 2.634407,3.664094 2.634407,3.844116 0,0.406131 -6.881496,7.322863 -7.28556,7.322863 -0.161312,0 -1.909062,-1.202796 -3.883907,-2.67287 -3.590622,-2.672868 -3.590622,-2.672868 -4.285617,-2.258903 -1.837138,1.094257 -2.35653,1.329923 -2.667528,1.210342 -0.312455,-0.120143 -8.231627,-16.77286 -8.218372,-17.281897 0.0035,-0.126249 0.530958,-0.539429 1.172603,-0.918176 8.021633,-4.734996 5.224846,-17.444302 -4.057459,-18.43813 -10.613507,-1.13636 -15.509433,13.098568 -6.354186,18.474803 1.334743,0.783797 1.469237,0.328271 -2.804465,9.498405 -4.53297,9.726451 -3.958097,8.96937 -6.020406,7.928701 -0.895717,-0.451993 -1.665128,-0.821805 -1.709813,-0.821805 -0.04468,0 -1.662643,1.187898 -3.595462,2.639765 -1.932808,1.451867 -3.626716,2.639765 -3.764234,2.639765 -0.137506,0 -1.885554,-1.641275 -3.884546,-3.647258 z"
|
||||
id="path24" sodipodi:nodetypes="csscssssscsscsscsscssscsssssssssssssssssssscsssssscsssscsccssssssss" />
|
||||
</g>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
|
||||
<img src="/img/OpenBuildsCONTROL.svg">
|
||||
</div>
|
||||
</center>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="window" style="height: 100vh; overflow-y: hidden;">
|
||||
<div id="windowtitlebar" class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
|
||||
<div class="window bd-black" style="height: 100vh; overflow-y: hidden;">
|
||||
<div id="windowtitlebar" class="window-caption bg-black bd-black" style="-webkit-app-region: drag; height: 42px; padding-left: 3px;">
|
||||
<!-- <span class="icon mif-cog"></span> -->
|
||||
<span class="icon" style="top: -2px;"><img src="icon-transparent.png" /></span>
|
||||
<span class="title" id="windowtitle">OpenBuilds CONTROL</span>
|
||||
<span><img src="/img/OpenBuildsCONTROL.svg" height="40" /></span>
|
||||
<span class="title" id="windowtitle" style="padding-left: 10px;">OpenBuilds CONTROL</span>
|
||||
|
||||
<div class="buttons" style="-webkit-app-region: no-drag">
|
||||
<span title="Minimize" class="btn-custom" onclick="socket.emit('minimize')"><i class="fas fa-window-minimize"></i></span>
|
||||
<span title="Maximize" class="btn-custom" onclick="socket.emit('maximize')"><i class="fas fa-window-maximize"></i></span>
|
||||
|
@ -284,7 +264,7 @@
|
|||
<div class="group">
|
||||
<button class="ribbon-button" onclick="socket.emit('openbuilds', true);">
|
||||
<span class="icon">
|
||||
<img src="img/openbuilds.svg">
|
||||
<img src="img/openbuilds-logo.svg">
|
||||
</span>
|
||||
<span class="caption">OpenBuilds</span>
|
||||
</button>
|
||||
|
@ -1966,4 +1946,4 @@
|
|||
<script src="/lib/furcanIconPicker/iconpicker-1.5.0.js"></script>
|
||||
|
||||
</html>
|
||||
<!-- -->
|
||||
<!-- -->
|
|
@ -432,87 +432,9 @@ function selectMachine(type) {
|
|||
$131: "1300.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "acro55pen") {
|
||||
// Acro 55
|
||||
var customFirmware = 'acropen';
|
||||
var grblParams_def = {
|
||||
$0: "10", //"Step pulse time, microseconds"
|
||||
$1: "255", //Step idle delay, milliseconds
|
||||
$2: "0", //Step pulse invert, mask
|
||||
$3: "1", //Step direction invert, mask
|
||||
$4: "1", //Invert step enable pin, boolean
|
||||
$5: "0", //Invert limit pins, boolean
|
||||
$6: "0", //Invert probe pin, boolean
|
||||
$10: "1", //Status report options, mask
|
||||
$11: "0.010", //Junction deviation, millimeters
|
||||
$12: "0.002", //Arc tolerance, millimeters
|
||||
$13: "0", //Report in inches, boolean
|
||||
$20: "0", //Soft limits enable, boolean
|
||||
$21: "0", //Hard limits enable, boolean
|
||||
$22: "0", //Homing cycle enable, boolean
|
||||
$23: "7", //Homing direction invert, mask
|
||||
$24: "100.000", //Homing locate feed rate, mm/min
|
||||
$25: "1000.000", //Homing search seek rate, mm/min
|
||||
$26: "250", //Homing switch debounce delay, milliseconds
|
||||
$27: "5.000", //Homing switch pull-off distance, millimeters
|
||||
$30: "255", //Maximum spindle speed, RPM
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$100: "57.143", //X-axis steps per millimeter-1/16 step
|
||||
$101: "57.143", //Y-axis steps per millimeter-1/16 step
|
||||
$102: "57.143", //Z-axis steps per millimeter-1/16 step
|
||||
$110: "5000.000", //X-axis maximum rate, mm/min
|
||||
$111: "5000.000", //Y-axis maximum rate, mm/min
|
||||
$112: "5000.000", //Z-axis maximum rate, mm/min
|
||||
$120: "500.000", //X-axis acceleration, mm/sec^2
|
||||
$121: "500.000", //Y-axis acceleration, mm/sec^2
|
||||
$122: "500.000", //Z-axis acceleration, mm/sec^2
|
||||
$130: "300.000", //X-axis maximum travel, millimeters
|
||||
$131: "300.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "acro510pen") {
|
||||
// Acro 510
|
||||
var customFirmware = 'acropen';
|
||||
var grblParams_def = {
|
||||
$0: "10", //"Step pulse time, microseconds"
|
||||
$1: "255", //Step idle delay, milliseconds
|
||||
$2: "0", //Step pulse invert, mask
|
||||
$3: "1", //Step direction invert, mask
|
||||
$4: "1", //Invert step enable pin, boolean
|
||||
$5: "0", //Invert limit pins, boolean
|
||||
$6: "0", //Invert probe pin, boolean
|
||||
$10: "1", //Status report options, mask
|
||||
$11: "0.010", //Junction deviation, millimeters
|
||||
$12: "0.002", //Arc tolerance, millimeters
|
||||
$13: "0", //Report in inches, boolean
|
||||
$20: "0", //Soft limits enable, boolean
|
||||
$21: "0", //Hard limits enable, boolean
|
||||
$22: "0", //Homing cycle enable, boolean
|
||||
$23: "7", //Homing direction invert, mask
|
||||
$24: "100.000", //Homing locate feed rate, mm/min
|
||||
$25: "1000.000", //Homing search seek rate, mm/min
|
||||
$26: "250", //Homing switch debounce delay, milliseconds
|
||||
$27: "5.000", //Homing switch pull-off distance, millimeters
|
||||
$30: "255", //Maximum spindle speed, RPM
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$100: "57.143", //X-axis steps per millimeter-1/16 step
|
||||
$101: "57.143", //Y-axis steps per millimeter-1/16 step
|
||||
$102: "57.143", //Z-axis steps per millimeter-1/16 step
|
||||
$110: "5000.000", //X-axis maximum rate, mm/min
|
||||
$111: "5000.000", //Y-axis maximum rate, mm/min
|
||||
$112: "5000.000", //Z-axis maximum rate, mm/min
|
||||
$120: "500.000", //X-axis acceleration, mm/sec^2
|
||||
$121: "500.000", //Y-axis acceleration, mm/sec^2
|
||||
$122: "500.000", //Z-axis acceleration, mm/sec^2
|
||||
$130: "800.000", //X-axis maximum travel, millimeters
|
||||
$131: "300.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "acro1010pen") {
|
||||
} else if (type == "acroa1") {
|
||||
// Acro 1010
|
||||
var customFirmware = 'acropen';
|
||||
var customFirmware = false;
|
||||
var grblParams_def = {
|
||||
$0: "10", //"Step pulse time, microseconds"
|
||||
$1: "255", //Step idle delay, milliseconds
|
||||
|
@ -533,9 +455,17 @@ function selectMachine(type) {
|
|||
$25: "1000.000", //Homing search seek rate, mm/min
|
||||
$26: "250", //Homing switch debounce delay, milliseconds
|
||||
$27: "5.000", //Homing switch pull-off distance, millimeters
|
||||
$30: "255", //Maximum spindle speed, RPM
|
||||
$30: "1000", //Maximum spindle speed, RPM
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$33: "50", //PWM Freq for RC Servo
|
||||
$34: "5", //Spindle Off Value for RC Servo
|
||||
$35: "5", //Spinde Min Value for RC Servo
|
||||
$36: "10", //Spindle max Value for RC Servo
|
||||
$44: "1", // Home X first
|
||||
$45: "2", // Then Home Z
|
||||
$100: "57.143", //X-axis steps per millimeter-1/16 step
|
||||
$101: "57.143", //Y-axis steps per millimeter-1/16 step
|
||||
$102: "57.143", //Z-axis steps per millimeter-1/16 step
|
||||
|
@ -545,87 +475,9 @@ function selectMachine(type) {
|
|||
$120: "500.000", //X-axis acceleration, mm/sec^2
|
||||
$121: "500.000", //Y-axis acceleration, mm/sec^2
|
||||
$122: "500.000", //Z-axis acceleration, mm/sec^2
|
||||
$130: "800.000", //X-axis maximum travel, millimeters
|
||||
$131: "800.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "acro1510pen") {
|
||||
// Acro 1510
|
||||
var customFirmware = 'acropen';
|
||||
var grblParams_def = {
|
||||
$0: "10", //"Step pulse time, microseconds"
|
||||
$1: "255", //Step idle delay, milliseconds
|
||||
$2: "0", //Step pulse invert, mask
|
||||
$3: "1", //Step direction invert, mask
|
||||
$4: "1", //Invert step enable pin, boolean
|
||||
$5: "0", //Invert limit pins, boolean
|
||||
$6: "0", //Invert probe pin, boolean
|
||||
$10: "1", //Status report options, mask
|
||||
$11: "0.010", //Junction deviation, millimeters
|
||||
$12: "0.002", //Arc tolerance, millimeters
|
||||
$13: "0", //Report in inches, boolean
|
||||
$20: "0", //Soft limits enable, boolean
|
||||
$21: "0", //Hard limits enable, boolean
|
||||
$22: "0", //Homing cycle enable, boolean
|
||||
$23: "7", //Homing direction invert, mask
|
||||
$24: "100.000", //Homing locate feed rate, mm/min
|
||||
$25: "1000.000", //Homing search seek rate, mm/min
|
||||
$26: "250", //Homing switch debounce delay, milliseconds
|
||||
$27: "5.000", //Homing switch pull-off distance, millimeters
|
||||
$30: "255", //Maximum spindle speed, RPM
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$100: "57.143", //X-axis steps per millimeter-1/16 step
|
||||
$101: "57.143", //Y-axis steps per millimeter-1/16 step
|
||||
$102: "57.143", //Z-axis steps per millimeter-1/16 step
|
||||
$110: "5000.000", //X-axis maximum rate, mm/min
|
||||
$111: "5000.000", //Y-axis maximum rate, mm/min
|
||||
$112: "5000.000", //Z-axis maximum rate, mm/min
|
||||
$120: "500.000", //X-axis acceleration, mm/sec^2
|
||||
$121: "500.000", //Y-axis acceleration, mm/sec^2
|
||||
$122: "500.000", //Z-axis acceleration, mm/sec^2
|
||||
$130: "800.000", //X-axis maximum travel, millimeters
|
||||
$131: "1300.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "acro1515pen") {
|
||||
// Acro 1515
|
||||
var customFirmware = 'acropen';
|
||||
var grblParams_def = {
|
||||
$0: "10", //"Step pulse time, microseconds"
|
||||
$1: "255", //Step idle delay, milliseconds
|
||||
$2: "0", //Step pulse invert, mask
|
||||
$3: "1", //Step direction invert, mask
|
||||
$4: "1", //Invert step enable pin, boolean
|
||||
$5: "0", //Invert limit pins, boolean
|
||||
$6: "0", //Invert probe pin, boolean
|
||||
$10: "1", //Status report options, mask
|
||||
$11: "0.010", //Junction deviation, millimeters
|
||||
$12: "0.002", //Arc tolerance, millimeters
|
||||
$13: "0", //Report in inches, boolean
|
||||
$20: "0", //Soft limits enable, boolean
|
||||
$21: "0", //Hard limits enable, boolean
|
||||
$22: "0", //Homing cycle enable, boolean
|
||||
$23: "7", //Homing direction invert, mask
|
||||
$24: "100.000", //Homing locate feed rate, mm/min
|
||||
$25: "1000.000", //Homing search seek rate, mm/min
|
||||
$26: "250", //Homing switch debounce delay, milliseconds
|
||||
$27: "5.000", //Homing switch pull-off distance, millimeters
|
||||
$30: "255", //Maximum spindle speed, RPM
|
||||
$31: "0", //Minimum spindle speed, RPM
|
||||
$32: "0", //Laser-mode enable, boolean
|
||||
$100: "57.143", //X-axis steps per millimeter-1/16 step
|
||||
$101: "57.143", //Y-axis steps per millimeter-1/16 step
|
||||
$102: "57.143", //Z-axis steps per millimeter-1/16 step
|
||||
$110: "5000.000", //X-axis maximum rate, mm/min
|
||||
$111: "5000.000", //Y-axis maximum rate, mm/min
|
||||
$112: "5000.000", //Z-axis maximum rate, mm/min
|
||||
$120: "500.000", //X-axis acceleration, mm/sec^2
|
||||
$121: "500.000", //Y-axis acceleration, mm/sec^2
|
||||
$122: "500.000", //Z-axis acceleration, mm/sec^2
|
||||
$130: "1300.000", //X-axis maximum travel, millimeters
|
||||
$131: "1300.000", //Y-axis maximum travel, millimeters
|
||||
$132: "70.000", //Z-axis maximum travel, millimeters
|
||||
$130: "863.000", //X-axis maximum travel, millimeters
|
||||
$131: "609.000", //Y-axis maximum travel, millimeters
|
||||
$132: "50.000", //Z-axis maximum travel, millimeters
|
||||
}
|
||||
} else if (type == "minimill") {
|
||||
// minimill
|
||||
|
@ -1072,6 +924,9 @@ function setMachineButton(type) {
|
|||
} else if (type == "acro1515") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds Acro 1515`
|
||||
overlaytype = type;
|
||||
} else if (type == "acroa1") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds ACRO A1`
|
||||
overlaytype = type
|
||||
} else if (type == "minimill") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds MiniMill`
|
||||
overlaytype = type;
|
||||
|
@ -1093,21 +948,6 @@ function setMachineButton(type) {
|
|||
} else if (type == "leadmachine1515") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> OpenBuilds LEAD 1515`
|
||||
overlaytype = type;
|
||||
} else if (type == "acro55pen") {
|
||||
template = `<img src="img/mch/acro55.png"/> OpenBuilds Acro 55 with Servo Pen Attachment`;
|
||||
overlaytype = type;
|
||||
} else if (type == "acro510pen") {
|
||||
template = `<img src="img/mch/acro510.png"/> OpenBuilds Acro 510 with Servo Pen Attachment`;
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1010pen") {
|
||||
template = `<img src="img/mch/acro1010.png"/> OpenBuilds Acro 1010 with Servo Pen Attachment`;
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1510pen") {
|
||||
template = `<img src="img/mch/acro1510.png"/> OpenBuilds Acro 1510 with Servo Pen Attachment`;
|
||||
overlaytype = type;
|
||||
} else if (type == "acro1515pen") {
|
||||
template = `<img src="img/mch/acro1515.png"/> OpenBuilds Acro 1515 with Servo Pen Attachment`;
|
||||
overlaytype = type
|
||||
} else if (type == "custom") {
|
||||
template = `<img src="img/mch/` + type + `.png"/> Custom Machine`
|
||||
overlaytype = type;
|
||||
|
|
|
@ -145,23 +145,15 @@ function grblPopulate() {
|
|||
<ul class="ribbon-dropdown machine-profile-menu" data-role="dropdown" data-duration="100">
|
||||
<li><a href="#" onclick="selectMachine('custom');"><img src="img/mch/custom.png" width="16px"/> CUSTOM Machine (Profile sets sane defaults)</a></li>
|
||||
<li>
|
||||
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro</a>
|
||||
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds ACRO</a>
|
||||
<ul class="ribbon-dropdown" data-role="dropdown">
|
||||
<li onclick="selectMachine('acro55');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55</a></li>
|
||||
<li onclick="selectMachine('acro510');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510</a></li>
|
||||
<li onclick="selectMachine('acro1010');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010</a></li>
|
||||
<li onclick="selectMachine('acro1510');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510</a></li>
|
||||
<li onclick="selectMachine('acro1515');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro with Servo Pen Attachment</a>
|
||||
<ul class="ribbon-dropdown" data-role="dropdown">
|
||||
<li onclick="selectMachine('acro55pen');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55 with Servo Pen Attachment</a></li>
|
||||
<li onclick="selectMachine('acro510pen');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510 with Servo Pen Attachment</a></li>
|
||||
<li onclick="selectMachine('acro1010pen');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010 with Servo Pen Attachment</a></li>
|
||||
<li onclick="selectMachine('acro1510pen');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510 with Servo Pen Attachment</a></li>
|
||||
<li onclick="selectMachine('acro1515pen');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515 with Servo Pen Attachment</a></li>
|
||||
<li onclick="selectMachine('acro55');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds ACRO 55</a></li>
|
||||
<li onclick="selectMachine('acro510');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds ACRO 510</a></li>
|
||||
<li onclick="selectMachine('acro1010');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds ACRO 1010</a></li>
|
||||
<li onclick="selectMachine('acro1510');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds ACRO 1510</a></li>
|
||||
<li onclick="selectMachine('acro1515');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds ACRO 1515</a></li>
|
||||
<li class="divider"></li>
|
||||
<li onclick="selectMachine('acroa1');"><a href="#"><img src="img/mch/acroa1.png" width="16px"/> OpenBuilds ACRO A1</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>
|
||||
|
@ -620,4 +612,4 @@ function setup_settings_table() {
|
|||
displayProbeDirInvert()
|
||||
|
||||
console.log("Updated")
|
||||
}
|
||||
}
|
|
@ -11,7 +11,7 @@ document.addEventListener("contextmenu", function(e) {
|
|||
|
||||
function setWindowTitle(status) {
|
||||
|
||||
var string = "OpenBuilds CONTROL"
|
||||
var string = ""
|
||||
|
||||
if (status) {
|
||||
string += " v" + status.driver.version
|
||||
|
@ -29,7 +29,7 @@ function setWindowTitle(status) {
|
|||
}
|
||||
|
||||
$('#windowtitle').html(string)
|
||||
document.title = string
|
||||
document.title = "OpenBuilds CONTROL" + string
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ function drawWorkspace(xmin, xmax, ymin, ymax) {
|
|||
var coneGeo = new THREE.CylinderGeometry(0, 5, 40, 15, 1, false)
|
||||
coneGeo.applyMatrix(new THREE.Matrix4().makeTranslation(0, -20, 0));
|
||||
|
||||
cone = new THREE.Mesh(coneGeo, new THREE.MeshPhongMaterial({
|
||||
cone = new THREE.Mesh(coneGeo, new THREE.MeshLambertMaterial({
|
||||
color: 0x0000ff,
|
||||
specular: 0x0000ff,
|
||||
shininess: 00
|
||||
|
@ -317,7 +317,8 @@ function init3D() {
|
|||
renderer = new THREE.WebGLRenderer({
|
||||
autoClearColor: true,
|
||||
antialias: true,
|
||||
preserveDrawingBuffer: true
|
||||
preserveDrawingBuffer: true,
|
||||
alpha: true
|
||||
});
|
||||
// ThreeJS Render/Control/Camera
|
||||
scene = new THREE.Scene();
|
||||
|
|
|
@ -53,7 +53,7 @@ function openFlashingTool() {
|
|||
<li><a href="#" onclick="flashToolBoard('blackboxx32');"><img src="/wizards/flashingtool2/img/bbx32-icon.png" height="32"> <b>BlackBox X32</b></a></li>
|
||||
<!-- li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png" height="32"> <b>BlackBox 4X</b></a></li -->
|
||||
<li><a href="#" onclick="flashToolBoard('interfacev1');"><img src="/wizards/flashingtool2/img/interfacev1-icon.png" height="32"> <b>Interface</b></a></li>
|
||||
<li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li>
|
||||
<!-- li><a href="#" onclick="flashToolBoard('bloxv1');"><img src="/wizards/flashingtool2/img/blox-icon.png" height="32"> <b>BLOX</b></a></li -->
|
||||
</ul>`
|
||||
|
||||
template += `
|
||||
|
@ -81,7 +81,7 @@ function openFlashingTool() {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row" id="flash-tool-blox-row" style="display: none;">
|
||||
<!-- div class="row" id="flash-tool-blox-row" style="display: none;">
|
||||
<div class="cell-md-3 mb-1">Machine Style</div>
|
||||
<div class="cell-md-9 mb-1">
|
||||
<select data-prepend=" <i class='fas fa-cube'></i>" data-role="select" data-filter="false" id="bloxFirmwareType" data-editable="true">
|
||||
|
@ -91,7 +91,7 @@ function openFlashingTool() {
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div -->
|
||||
|
||||
<div class="row" id="flash-tool-interface-fw-row" style="display: none;">
|
||||
<div class="cell-md-3 mb-1">Firmware Version</div>
|
||||
|
|
|
@ -68,7 +68,7 @@ var surfacingWizardTemplate = `
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row mb-2 pb-2 border-bottom bd-gray">
|
||||
<label class="cell-sm-6">Enable Framing</label>
|
||||
<div class="cell-sm-6">
|
||||
|
@ -155,7 +155,7 @@ function populateSurfaceToolForm() {
|
|||
$("#surfaceY").val(data.surfaceY);
|
||||
$("#surfaceDepth").val(data.surfaceDepth);
|
||||
if (data.surfaceFinalDepth != undefined) {
|
||||
data.surfaceFinalDepth = data.surfaceDepth;
|
||||
data.surfaceFinalDepth = data.surfaceFinalDepth;
|
||||
$("#surfaceFinalDepth").val(data.surfaceFinalDepth);
|
||||
} else {
|
||||
$("#surfaceFinalDepth").val(data.surfaceDepth);
|
||||
|
|
109
fullchain1.pem
109
fullchain1.pem
|
@ -1,59 +1,58 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIE/jCCA+agAwIBAgISBAghPN9JjLmhQvin5xNoZ5gUMA0GCSqGSIb3DQEBCwUA
|
||||
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
|
||||
EwJSMzAeFw0yNDA0MTUxMTU3MzRaFw0yNDA3MTQxMTU3MzNaMCMxITAfBgNVBAMT
|
||||
GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
|
||||
ADCCAQoCggEBALLciFtV/lUfDm4qY0VACjVZDhinSoELgAh/ufHRutFZO1LFj9NZ
|
||||
sLarQ+4ZIMxX8UM4YKoX38G21EfVoHQm9RVgPZE9ER4ZJW/vyk0MQeuy7BFaFHEj
|
||||
cwk6nNQcZRuz6DDQkMFIEtZJ/Ny6FOn32fTu0XSpxCD62WDxQWReZaiJ5AoIEIyl
|
||||
Run/ppS/E+V3F4uHKRMyyfWKvQ2EiDqmRQ78TbnZ3jDu7K8PwlaGQJH4Yromu/fS
|
||||
5bn82Ekjb35KVyslQWVDOyHAheoG+oSdZvQwY2sAjLUsRovBg8xUZXJqLR6xpf4i
|
||||
SCA5swn72F5Y6mqG+3SlzTcM5RfbfjHBkRkCAwEAAaOCAhswggIXMA4GA1UdDwEB
|
||||
/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
|
||||
BAIwADAdBgNVHQ4EFgQUWHngRcKoRW77Yu4KdvhY8ZXUNZAwHwYDVR0jBBgwFoAU
|
||||
FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
|
||||
hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
|
||||
LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
|
||||
MBMGA1UdIAQMMAowCAYGZ4EMAQIBMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYA
|
||||
GZgQcQnw1lIuMIDSnj9ku4NuKMz5D1KO7t/OSj8WtMoAAAGO4dWUTwAABAMARzBF
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
|
||||
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
|
||||
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
|
||||
WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
|
||||
RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
|
||||
AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
|
||||
R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
|
||||
sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
|
||||
NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
|
||||
Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
|
||||
/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
|
||||
AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
|
||||
Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
|
||||
FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
|
||||
AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
|
||||
Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
|
||||
gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
|
||||
PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
|
||||
ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
|
||||
CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
|
||||
lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
|
||||
avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
|
||||
yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
|
||||
yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
|
||||
hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
|
||||
HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
|
||||
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
|
||||
nLRbwHOoq7hHwg==
|
||||
MIIFBTCCAu2gAwIBAgIQS6hSk/eaL6JzBkuoBI110DANBgkqhkiG9w0BAQsFADBP
|
||||
MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
|
||||
Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
|
||||
Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
|
||||
bmNyeXB0MQwwCgYDVQQDEwNSMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
|
||||
AoIBAQDPV+XmxFQS7bRH/sknWHZGUCiMHT6I3wWd1bUYKb3dtVq/+vbOo76vACFL
|
||||
YlpaPAEvxVgD9on/jhFD68G14BQHlo9vH9fnuoE5CXVlt8KvGFs3Jijno/QHK20a
|
||||
/6tYvJWuQP/py1fEtVt/eA0YYbwX51TGu0mRzW4Y0YCF7qZlNrx06rxQTOr8IfM4
|
||||
FpOUurDTazgGzRYSespSdcitdrLCnF2YRVxvYXvGLe48E1KGAdlX5jgc3421H5KR
|
||||
mudKHMxFqHJV8LDmowfs/acbZp4/SItxhHFYyTr6717yW0QrPHTnj7JHwQdqzZq3
|
||||
DZb3EoEmUVQK7GH29/Xi8orIlQ2NAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG
|
||||
MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
|
||||
AgEAMB0GA1UdDgQWBBS7vMNHpeS8qcbDpHIMEI2iNeHI6DAfBgNVHSMEGDAWgBR5
|
||||
tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG
|
||||
Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD
|
||||
VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B
|
||||
AQsFAAOCAgEAkrHnQTfreZ2B5s3iJeE6IOmQRJWjgVzPw139vaBw1bGWKCIL0vIo
|
||||
zwzn1OZDjCQiHcFCktEJr59L9MhwTyAWsVrdAfYf+B9haxQnsHKNY67u4s5Lzzfd
|
||||
u6PUzeetUK29v+PsPmI2cJkxp+iN3epi4hKu9ZzUPSwMqtCceb7qPVxEbpYxY1p9
|
||||
1n5PJKBLBX9eb9LU6l8zSxPWV7bK3lG4XaMJgnT9x3ies7msFtpKK5bDtotij/l0
|
||||
GaKeA97pb5uwD9KgWvaFXMIEt8jVTjLEvwRdvCn294GPDF08U8lAkIv7tghluaQh
|
||||
1QnlE4SEN4LOECj8dsIGJXpGUk3aU3KkJz9icKy+aUgA+2cP21uh6NcDIS3XyfaZ
|
||||
QjmDQ993ChII8SXWupQZVBiIpcWO4RqZk3lr7Bz5MUCwzDIA359e57SSq5CCkY0N
|
||||
4B6Vulk7LktfwrdGNVI5BsC9qqxSwSKgRJeZ9wygIaehbHFHFhcBaMDKpiZlBHyz
|
||||
rsnnlFXCb5s8HKn5LsUgGvB24L7sGNZP2CX7dhHov+YhD+jozLW2p9W4959Bz2Ei
|
||||
RmqDtmiXLnzqTpXbI+suyCsohKRg6Un0RC47+cpiVwHiXZAW+cn8eiNIjqbVgXLx
|
||||
KPpdzvvtTnOPlC7SQZSYmdunr3Bf9b77AiC/ZidstK36dRILKz7OA54=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.381",
|
||||
"version": "1.0.382",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "OpenBuildsCONTROL CNC Machine Host Software",
|
||||
"author": "github.com/openbuilds <support@openbuilds.com>",
|
||||
|
|
52
privkey1.pem
52
privkey1.pem
|
@ -1,28 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCy3IhbVf5VHw5u
|
||||
KmNFQAo1WQ4Yp0qBC4AIf7nx0brRWTtSxY/TWbC2q0PuGSDMV/FDOGCqF9/BttRH
|
||||
1aB0JvUVYD2RPREeGSVv78pNDEHrsuwRWhRxI3MJOpzUHGUbs+gw0JDBSBLWSfzc
|
||||
uhTp99n07tF0qcQg+tlg8UFkXmWoieQKCBCMpUbp/6aUvxPldxeLhykTMsn1ir0N
|
||||
hIg6pkUO/E252d4w7uyvD8JWhkCR+GK6Jrv30uW5/NhJI29+SlcrJUFlQzshwIXq
|
||||
BvqEnWb0MGNrAIy1LEaLwYPMVGVyai0esaX+IkggObMJ+9heWOpqhvt0pc03DOUX
|
||||
234xwZEZAgMBAAECggEAV39CxUugC4wRxxq9TVcypz5VgwHzlIVHsOCq2f07YsZA
|
||||
GxHCdiXeKL5HkOaCAPTUdYnS3+Kl92G1Hx8GS0vzgO1/sNkq0oqCoeuwD1j7to3k
|
||||
pehnL6Gj2NPvfGQXoiG0aIzfA256qJGxPVlaecphuUxK8sNJyshsJtxenPcAzB03
|
||||
KIbG76EH+EMQQUHP/4NkZEg99FX4bfChP7eLzKVlVctSp+mm1CmGVAFjfMyXqQXI
|
||||
lzy2vx5l6sTbb148SYeXFKNxKiwUKDEHO9lOkDBcMnjsbxpanqb4q22xKr4qsumC
|
||||
L9Le23CFgEFXpWYHAjsDnedtrlQTmZXbr6P6E3p+MQKBgQDZ3TVU5FPqtN0DK3dk
|
||||
aaSvID0lwTWvUIS13zSP34hY+LilBe18/ytS5pXgH0IzD6I/NN6zg8yXibjoMaDh
|
||||
ZUAH5SIlNTrLm3duPYVqkDaOeyiqGWe76+TTLKTQTnHNiXJkF5kbUmjy3H+MjgTN
|
||||
6I3BTXHwslbjfi082CwiTK+FVwKBgQDSK4/i/Q4hI9TcKpComyDKKI+oEBCdBl5Z
|
||||
U/7QbeNcNAb4HK85cke/v2hJ6G/e9aD2KFNCledpO4ShhHHB3+Z/+vb1XhSmbW04
|
||||
qTZCnaEJkvTjUdy03NBRyIcOlNr66m9874ws6HqgiowwdajQ90M9nKBulvvB6Vjc
|
||||
G4gPFUunDwKBgF/Ykb3nNYPsTc83MC9cyrbA2CXj+lpGchwRNm6VSMbbpV/0W6bC
|
||||
G609BHK1Tcpo9lgYSmFvenKwhEiijMScZq8SfxMfd95bZw94wVlAWMAWLq2mv5xN
|
||||
Cz5cRaXe3PIvpcOjHhiHCOTPXM3ZLQPpa3O/PoFF9DPhLsW11LTCR/XBAoGAWNcv
|
||||
OH1N1rZlyTd49Ly2bJ4es6Uu0KGbilkWMpbw783SUFkXvMnRCH3poKxPdckQ5F0B
|
||||
bPke2/3bv8bTq2dw8RJuCCRfyEYjUDs/A4PMSdbEC79T82QP7zI73O8RbdVhkUdV
|
||||
Urpm86v9PJLP7J1I4CdwLa9G9p4kAM7mgbG3zAMCgYBE4WoKb4zd5+RA4zIKGzPk
|
||||
hPb8fp2Hw5DAV/PTay/YLsLgjr6Ypl8YMw/26A+jNNgdnKuo8L/kuRyQf+8lnFUK
|
||||
k1k9mSNc/nnatkXT7n1G9cfEG0yvOJLtPy2melaKqk31YfBtTLYeWjGeYhcdBzeK
|
||||
9vyLHDbwXN4XG5eOX0Ecew==
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCpTm21GntJGri+
|
||||
5P2OtfV3D8U7ON8CDYlTdZ0jBIEnulzcGDfE5Dy73SdEJj4KGf7FwG7Mv5inPZmn
|
||||
hATULAduvEw47yHrHPVG4b56EqupnII+JxJ56o23isOM8FHbc75upPqevH2YrWny
|
||||
J2xFDe3X9j+Rh3BRLBPy7iCRgjAVvD1dUZ75URiDEY2glvtK0KhZc2oXVzPnnvNC
|
||||
xNpuqctuYPIsfT3XgcNAIRvpIaFlq/VHqDGA2nODc8Ds8T1tSZGeU8Tynaq1A/sA
|
||||
ccwN2q0PFgL4q3hvs/wGWdMxnWY73npVrtp6PkVuXzHimVe5bQCvJ8xzv1gXned7
|
||||
uLRJ/sh/AgMBAAECggEBAIwj3g1lMR1O4BMq6nKBTQBTbndZ2MYTPFN37Cy7Iskm
|
||||
qoyIA0mXfmomYcU4PmwQHmHDqjMSeKIeDByr229gTnqrpBAQaKv7WU9ltkvHPo5z
|
||||
fR9DKjj+HHYLh1gW6DrVMJDXQJe5/+Ar0qFdXnI+WFxFeVLVn/Ogn5aa4xxufazO
|
||||
vfkQ4CbVJSZkwgNVcoaF/HoCJITAb1pVuZTSg8e7Q8H7qyncHpKwKTrmAooF/LiV
|
||||
GPKzz8ddWem27yVehwe3DxmhVGv++znbiK+wpX5CPGqJo4GAE/oHedomgufEW91N
|
||||
2r1gnrJ5x6krhB0tUQQn6GGoNO8H0cYdG9gZoLkCq3ECgYEA0KzCXzF8GbEO1mYZ
|
||||
lYxuH7N60BPMjeIIpqfnGWAWzuhp5GBJumeFjWN8AXUSALnTQEHBRqM5QPnagHqh
|
||||
5nrsgmTt3fXdHNaf3sMdb91+GhcJ2arIzaWW53I6pxbqN/+gqIIkCIqzZHfkxTRY
|
||||
ouZlQMH8n5+Bpu1A5Wndlx/VMtcCgYEAz7QDw5jvteqTAbcWZw0QoM0NXj3T/j4n
|
||||
vnYfV8MRRf6hv/BEtT6LOsArHacddyPYli36bJXFPuf1eCs7RtDFq3tLV7eKBMEi
|
||||
KFVtvlty40afBXAhK4vien2Sae26127KKFxCW2nnOPh20o31IgTFQRizOIlCblZ8
|
||||
61FV9FFBCpkCgYB1lBJFTv2tAD3rAkaCJElcpWWa3r0QaP8U4GBvxNu1I/Gek76X
|
||||
QINY4mhZ7dwB+rKUbzh3E7tL6Dx8zhxxYGvpIPOCcGlxOWGFRA1PHc9S5g5PzlIs
|
||||
xZPcv1lbEqdQfEHLEOE6yuQ/xOprT45t40HEFknAq0CDjQVW/qqz32TiqwKBgQDO
|
||||
nOr1ougp1avhE+kEH/n/i5sVuXltuxS8ITLykYhYUYFDttYSWaIUkl8Rg1ELWCw2
|
||||
0IwBgkcRWZtUq+SugDVybRa4rkpsilbZOooNx1iU/4Zm2XEVqXRklw+Tsjmf3oTY
|
||||
+1XDK6kogflpYG+OJKK4K8L0pY3gxsZDK8jOXhnOWQKBgFOzmczxmQg2pvoVC/BV
|
||||
FNK9KNDOcX+4oceKAgq+A3JzFoCmb8n7E8W6sbIw3k0LxcBQsYBEbe6sFAYCjjeV
|
||||
uxy9Xv66bYpsm/deQbTge4syxwfWF7Ftgk5labi7vH/5p+RbKnK6uwVFVFKoX7pt
|
||||
yAPpYEmOVd6IkM1BPqvK9BD7
|
||||
-----END PRIVATE KEY-----
|
||||
|
|
Ładowanie…
Reference in New Issue