kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
Porównaj commity
13 Commity
e9f476bce3
...
99c4985c50
Autor | SHA1 | Data |
---|---|---|
unknown | 99c4985c50 | |
unknown | 5640067399 | |
unknown | 3c3dc0d0f6 | |
unknown | ec7605267e | |
unknown | 62f38f53b2 | |
unknown | b3f18175f3 | |
unknown | 3341c0a012 | |
unknown | 2f3004e81f | |
unknown | 15bb1d7a31 | |
unknown | 7e7553e684 | |
unknown | 2f22dc99a9 | |
unknown | 07fb882be8 | |
unknown | 5bc9f12399 |
|
@ -83,6 +83,8 @@ jobs:
|
|||
debugElectron: true
|
||||
env:
|
||||
# new MacOS notarize secrets (2024)
|
||||
npm_config_verbose: true
|
||||
npm_config_loglevel: verbose
|
||||
DEBUG: electron-builder # To debug electron-builder
|
||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
v1.0.371: (Unreleased):
|
||||
- Updated Build environment to Node 20
|
||||
v1.0.371:
|
||||
- Fixed Issue #257 Changed Arc drawing behavior for G2 full circles in 3D viewer
|
||||
- Fixed Issue #285 Updated ACRO with Pen servo default Grbl profile PWM parameters
|
||||
- Fixed Issue #299 Change of settings numbering for grblHAL Station parameters
|
||||
|
@ -20,6 +19,7 @@ v1.0.371: (Unreleased):
|
|||
- Fixed Issue #345 Merged fix for Update Grbl Settings for if settings are changed from macro/terminal/etc
|
||||
- Fixed Issue #346 Updated included grblHAL firmware binaries to v20240402 from 20230501
|
||||
- Fixed Issue #348 Merged fix for Dark Mode CSS Improvement
|
||||
- Fixed Issue #350 Updated local SSL certificates
|
||||
- Removed BlackBox X32 advertisement from Splash Screen
|
||||
- Changed DROs to use 3 decimal places per grblHAL standards
|
||||
- Updated Grbl Settings Descriptions for newer firmware builds
|
||||
|
@ -27,6 +27,10 @@ v1.0.371: (Unreleased):
|
|||
- Updated Readme screenshot on Github
|
||||
- Updated Firmware Found log strings to show platform and date
|
||||
- Added LEAD 1010 Plasma Add-On Machine Profile
|
||||
- Fixed bug related to "$$=" commands in Serial Terminal causing issues with Grbl Settings tab
|
||||
- Updated Build environment to Node 20
|
||||
- Removed IA32 target support for Windows. Building as X64 only
|
||||
- Removed broken avrgirl dependency - temporarily removed ability to flash atmega based controllers. Will rewrite with more modern alternative soon
|
||||
v1.0.370: Fixed typo in an error message, Updated SSL Certificates
|
||||
v1.0.369: Fixed bug in firmware flashing tool
|
||||
v1.0.368: Updated grblHAL firmware images to 20230501, updated grblHAL Settings templates, added 3-Axes with Door firmware, Fixed bug in Firmware flashing tool for Interface > Firmware Version when offline, Updated included Interface firmware version
|
||||
|
|
|
@ -202,12 +202,6 @@ select {
|
|||
height: 60px;
|
||||
}
|
||||
|
||||
#splash {
|
||||
z-index: 2000;
|
||||
padding: 1000px;
|
||||
/* background-color: #fff */
|
||||
}
|
||||
|
||||
.macrotype {
|
||||
position: absolute !important;
|
||||
top: 2px !important;
|
||||
|
@ -263,6 +257,9 @@ select {
|
|||
}
|
||||
|
||||
#splash {
|
||||
z-index: 2000;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-image: linear-gradient(to top, #888888, #ffffff, #888888);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
#loading-icon svg {
|
||||
width: 500px;
|
||||
position: fixed;
|
||||
left: 50%;
|
||||
margin-left: -250px;
|
||||
top: 32%;
|
||||
margin-top: -50px;
|
||||
}
|
||||
|
||||
#load-ring, #load-ring-second {
|
||||
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);
|
||||
}
|
||||
}
|
|
@ -408,10 +408,6 @@ body.theme_dark, .theme_dark div.window, .theme_dark .card {
|
|||
border: 1px solid #ce352c;
|
||||
}
|
||||
|
||||
.theme_dark #openbuildslogosplashImg {
|
||||
filter: invert(1) hue-rotate(180deg);
|
||||
}
|
||||
|
||||
.theme_dark .droInput {
|
||||
background: #222 !important;
|
||||
border: 1px solid #555;
|
||||
|
|
File diff suppressed because one or more lines are too long
Po Szerokość: | Wysokość: | Rozmiar: 7.8 KiB |
|
@ -13,6 +13,7 @@
|
|||
<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>
|
||||
|
||||
|
@ -21,9 +22,29 @@
|
|||
<div class="pos-fixed pos-center" id="splash">
|
||||
<center>
|
||||
<div id="openbuildslogosplash" style="display: none;">
|
||||
<!-- <img id="openbuildslogosplashImg" src="/img/openbuilds.png" onload="$('#openbuildslogosplash').fadeIn(800); setTimeout(function() { $('#splash').fadeOut(400); }, 2000)" width="200" /> -->
|
||||
<h1>OpenBuilds<sup>®</sup> CONTROL</h1>
|
||||
<img id="openbuildslogosplashImgX32" src="/img/splash.png" onload="setTimeout(function() {$('#openbuildslogosplash').fadeIn(100); setTimeout(function() { $('#splash').fadeOut(100); }, 1000)}, 100);" style="cursor:pointer" />
|
||||
<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>
|
||||
|
||||
|
||||
</div>
|
||||
</center>
|
||||
</div>
|
||||
|
|
|
@ -802,8 +802,8 @@ function selectMachine(type) {
|
|||
$100: "199.100", //"X-axis steps per millimeter"
|
||||
$101: "199.100", //"Y-axis steps per millimeter"
|
||||
$102: "199.100", //"Z-axis steps per millimeter"
|
||||
$110: "2500.000", //"X-axis maximum rate, mm/min"
|
||||
$111: "2500.000", //"Y-axis maximum rate, mm/min"
|
||||
$110: "4000.000", //"X-axis maximum rate, mm/min"
|
||||
$111: "4000.000", //"Y-axis maximum rate, mm/min"
|
||||
$112: "2500.000", //"Z-axis maximum rate, mm/min"
|
||||
$120: "150.000", //"X-axis acceleration, mm/sec^2"
|
||||
$121: "150.000", //"Y-axis acceleration, mm/sec^2"
|
||||
|
|
|
@ -96,6 +96,11 @@ function getChangelog() {
|
|||
|
||||
$(document).ready(function() {
|
||||
|
||||
$('#openbuildslogosplash').fadeIn(100);
|
||||
setTimeout(function() {
|
||||
$('#splash').fadeOut(500);
|
||||
}, 1400)
|
||||
|
||||
initDiagnostics(); // run second time to ensure checkboxes are ticked
|
||||
|
||||
if (!isJogWidget) {
|
||||
|
|
|
@ -39,7 +39,7 @@ function openFlashingTool() {
|
|||
<p class="small mb-4">You can use this wizard to flash Firmware onto compatible controllers. Only use with care, or when instructed by Support</p>
|
||||
<ul data-role="tabs" data-expand="true">
|
||||
<li><a href="#" onclick="flashToolBoard('blackboxx32');"><img src="/wizards/flashingtool2/img/bbx32-icon.png"> BlackBox X32</a></li>
|
||||
<li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png"> BlackBox 4X</a></li>
|
||||
<!-- li><a href="#" onclick="flashToolBoard('blackbox4x');"><img src="/wizards/flashingtool2/img/bb4x-icon.png"> BlackBox 4X</a></li -->
|
||||
<li><a href="#" onclick="flashToolBoard('interfacev1');"><img src="/wizards/flashingtool2/img/interfacev1-icon.png"> Interface</a></li>
|
||||
</ul>
|
||||
|
||||
|
|
|
@ -1,32 +1,31 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIFNjCCBB6gAwIBAgISA/JIGSX+74ATShqXdDXVgvD4MA0GCSqGSIb3DQEBCwUA
|
||||
MIIE/jCCA+agAwIBAgISBAghPN9JjLmhQvin5xNoZ5gUMA0GCSqGSIb3DQEBCwUA
|
||||
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
|
||||
EwJSMzAeFw0yMzA2MDcxNzU4NDdaFw0yMzA5MDUxNzU4NDZaMCMxITAfBgNVBAMT
|
||||
EwJSMzAeFw0yNDA0MTUxMTU3MzRaFw0yNDA3MTQxMTU3MzNaMCMxITAfBgNVBAMT
|
||||
GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
|
||||
ADCCAQoCggEBAJfA2X2Y1M8PbiAC9OwV2MdQf/ctPaa75ZahE0DmBECcwfD4ulYz
|
||||
75zLpOlX3assBSQGTh4Y/iolhVQlsa1CiAuce74tUvhnw0ssWqkUWr/GGmpovh1F
|
||||
i/dxRZv0wUbD1g0EtXqHQ01icFOzQc4zps7aT4ZRC/NCNicqTyk2eHbJMDFYaF3C
|
||||
Eg8yJjG9DrfVcBVyTsBBZiVnTHM4LfTtgR/06oYww6d76wYAfhgfl0Ag80X1rNc8
|
||||
r+4TKGe6iIYoY8HPI1BzeznwxmEBG8yTO011tc9CZ9mXb6DAfvIo0jYh3Itla2zR
|
||||
+LXUAipNFzEoKQhKHYtdbMhAHk+wmRMASnMCAwEAAaOCAlMwggJPMA4GA1UdDwEB
|
||||
ADCCAQoCggEBALLciFtV/lUfDm4qY0VACjVZDhinSoELgAh/ufHRutFZO1LFj9NZ
|
||||
sLarQ+4ZIMxX8UM4YKoX38G21EfVoHQm9RVgPZE9ER4ZJW/vyk0MQeuy7BFaFHEj
|
||||
cwk6nNQcZRuz6DDQkMFIEtZJ/Ny6FOn32fTu0XSpxCD62WDxQWReZaiJ5AoIEIyl
|
||||
Run/ppS/E+V3F4uHKRMyyfWKvQ2EiDqmRQ78TbnZ3jDu7K8PwlaGQJH4Yromu/fS
|
||||
5bn82Ekjb35KVyslQWVDOyHAheoG+oSdZvQwY2sAjLUsRovBg8xUZXJqLR6xpf4i
|
||||
SCA5swn72F5Y6mqG+3SlzTcM5RfbfjHBkRkCAwEAAaOCAhswggIXMA4GA1UdDwEB
|
||||
/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
|
||||
BAIwADAdBgNVHQ4EFgQU0lw7uno6SiaxIEerDzXh/96r10owHwYDVR0jBBgwFoAU
|
||||
BAIwADAdBgNVHQ4EFgQUWHngRcKoRW77Yu4KdvhY8ZXUNZAwHwYDVR0jBBgwFoAU
|
||||
FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
|
||||
hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
|
||||
LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
|
||||
MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUH
|
||||
AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB
|
||||
9QSB8gDwAHYAejKMVNi3LbYg6jjgUh7phBZwMhOFTTvSK8E6V6NS61IAAAGIlznM
|
||||
oQAABAMARzBFAiADpbGVUqFcnIUqMg8Wwi4vvz+1HyjUKNrtfDhd3PSAzQIhANRM
|
||||
cJhTWE7wq+NfP2nUVxviHJ7acmYONg4fsl9brp5tAHYArfe++nz/EMiLnT2cHj4Y
|
||||
arRnKV3PsQwkyoWGNOvcgooAAAGIlznM3AAABAMARzBFAiEAs+86tUPv/eYIF6US
|
||||
Qr22yNHJhibCs6SGqMRMsycHK9cCIEKtnedSMIHMefuRTxXRlKG4pVU65gdAH8bo
|
||||
K91TtosqMA0GCSqGSIb3DQEBCwUAA4IBAQChnMUPaMPdp9255XOnsfzxEovZm0oY
|
||||
P0O6IkBTb/CKzJtaG+xSyzEeJeNV+FsazoHc/Fktfu0pXRMMmFxKulaZLEKlz999
|
||||
O5wLwVk2mUvhaqIZwLyuy9+M/EMfk/7oUnRn+jBJ39dAvaiodIVMB5PBS3hx83mH
|
||||
dbP+JVzSEl5NUFKW0+9cZV0ZxN5pI1Fv+KBF/PSCk8kFYrzONSIgTy9SzufAR6GD
|
||||
Wh4IjqxhQPlkm1bc1Y9dgJ2rR6hYirRPJfU0RIvZOdFga18FCZzZ3dxZ5MRb6LhU
|
||||
5GRv7lzcYwrKTelhSuekhop+5USLzyfgRP1VLW1zR1PxADgEDIlCO4Mp
|
||||
MBMGA1UdIAQMMAowCAYGZ4EMAQIBMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYA
|
||||
GZgQcQnw1lIuMIDSnj9ku4NuKMz5D1KO7t/OSj8WtMoAAAGO4dWUTwAABAMARzBF
|
||||
AiAZqd9imKpthOJzr7hhDnDddajo8ZxwhsnOWqLHfDtLjgIhAMwrKheNuiteUEsr
|
||||
43WR0mKUm7c41jI6V/tJtASep7GxAHcA7s3QZNXbGs7FXLedtM0TojKHRny87N7D
|
||||
UUhZRnEftZsAAAGO4dWUQwAABAMASDBGAiEAj8rcQQrwANYa8GPQQLYcgVfdns+H
|
||||
7SXfJzT6RaGzVvcCIQCwycC3flTF/JNemSXl2c1bNn3rqg1SHiEgLjdTVqyJPDAN
|
||||
BgkqhkiG9w0BAQsFAAOCAQEAGEDBQlnZjAA3muRTPcCAv8IfFFuN7+PAno1rUXew
|
||||
39CfjPDskNOUxhri6sowwddd53GQpvmNDPJsrH4cvNQpMlmCssIE1uiP+oSV0/mi
|
||||
dlCX4kcu5CQvwAXC4qdLe/3UdB+PQhF2ILKLGsLMWqTmD2eIFRR7lnwtJ6j+qxRQ
|
||||
8U6BGauiqeibdbAIycfhFuat3z/quIYjGzM52De7TGZ6hd521y7VNblgFllXYSJq
|
||||
m1t4C71I1ehQdoi3No8S7qqv2Mu0VbBTb4otCKDtHcNtxalVNR3WxGSSoPB8eiU+
|
||||
XwIXIDnHgADGRaxqY6KRwJ+dhDq/h3bAdAY79yluMK//tw==
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
|
||||
|
@ -58,35 +57,3 @@ HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
|
|||
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
|
||||
nLRbwHOoq7hHwg==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
|
||||
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
||||
DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
|
||||
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
|
||||
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
|
||||
AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
|
||||
ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
|
||||
wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
|
||||
LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
|
||||
4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
|
||||
bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
|
||||
sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
|
||||
Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
|
||||
FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
|
||||
SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
|
||||
PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
|
||||
TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
|
||||
SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
|
||||
c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
|
||||
+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
|
||||
ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
|
||||
b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
|
||||
U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
|
||||
MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
|
||||
5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
|
||||
9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
|
||||
WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
|
||||
he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
|
||||
Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
|
||||
-----END CERTIFICATE-----
|
||||
|
|
5
index.js
5
index.js
|
@ -929,8 +929,6 @@ io.on("connection", function(socket) {
|
|||
console.log(firmwarePath)
|
||||
console.log("-------------------------------------------")
|
||||
|
||||
//const Avrgirl = require('avrgirl-arduino');
|
||||
|
||||
if (status.comms.connectionStatus > 0) {
|
||||
debug_log('WARN: Closing Port ' + port);
|
||||
stopPort();
|
||||
|
@ -2781,6 +2779,7 @@ function send1Q() {
|
|||
}
|
||||
|
||||
var modalCommands = ['G54', 'G55', 'G56', 'G57', 'G58', 'G59', 'G17', 'G18', 'G19', 'G90', 'G91', 'G91.1', 'G93', 'G94', 'G20', 'G21', 'G40', 'G43.1', 'G49', 'M0', 'M1', 'M2', 'M30', 'M3', 'M4', 'M5', 'M7', 'M8', 'M9']
|
||||
var modalCommandsRegExp = new RegExp(modalCommands.join("|"));
|
||||
|
||||
function addQToEnd(gcode) {
|
||||
// debug_log('added ' + gcode)
|
||||
|
@ -2795,7 +2794,7 @@ function addQToEnd(gcode) {
|
|||
if (testGcode == "$CD") {
|
||||
fluidncConfig = ""; // empty string
|
||||
}
|
||||
if (new RegExp(modalCommands.join("|")).test(testGcode)) {
|
||||
if (!gcode.startsWith("$J=") && modalCommandsRegExp.test(testGcode)) {
|
||||
gcodeQueue.push("$G");
|
||||
}
|
||||
if (gcode.match(/T([\d.]+)/i)) {
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
"ncp": "^2.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"avrgirl-arduino": "^5.0.1",
|
||||
"detect-rpi": "^1.4.0",
|
||||
"electron-updater": "^5.2.1",
|
||||
"evilscan": "^1.9.1",
|
||||
|
@ -132,8 +131,7 @@
|
|||
{
|
||||
"target": "nsis",
|
||||
"arch": [
|
||||
"x64",
|
||||
"ia32"
|
||||
"x64"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
52
privkey1.pem
52
privkey1.pem
|
@ -1,28 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCXwNl9mNTPD24g
|
||||
AvTsFdjHUH/3LT2mu+WWoRNA5gRAnMHw+LpWM++cy6TpV92rLAUkBk4eGP4qJYVU
|
||||
JbGtQogLnHu+LVL4Z8NLLFqpFFq/xhpqaL4dRYv3cUWb9MFGw9YNBLV6h0NNYnBT
|
||||
s0HOM6bO2k+GUQvzQjYnKk8pNnh2yTAxWGhdwhIPMiYxvQ631XAVck7AQWYlZ0xz
|
||||
OC307YEf9OqGMMOne+sGAH4YH5dAIPNF9azXPK/uEyhnuoiGKGPBzyNQc3s58MZh
|
||||
ARvMkztNdbXPQmfZl2+gwH7yKNI2IdyLZWts0fi11AIqTRcxKCkISh2LXWzIQB5P
|
||||
sJkTAEpzAgMBAAECggEBAJXpl3Fx11kt3xaUlSvccSiFJ8Ug1jSujiH9wa1tDWpe
|
||||
8WCB9mJOMDlvG9zARmVguTtbVzR4cC1mn43/JsUIYqlFzyCSWdK3fr/2cyFw0C1/
|
||||
IH1aN+Vm3Nx289MbOQwVTpHRww3mLeB2jIzDGxD/CZxzIfiIfAu1rxWFwGnwO5Tr
|
||||
qdW7haqVr3ZVqqQ3iHRc16rgEAKrwqoytEJ06M+JgKI2bnrfBkpxgVg8LM2gA8xN
|
||||
yP50ef7mYWN4gN7hzISgOEPDP4GjexwWah6+BkBCpBw7TFwX42/5r4QT5Z3EJcjc
|
||||
b+QUMaoUPdpmRzUp18YgxHZtFc2pb9D8EV5pSZU/FRECgYEAxrkkTNNMVxhi1UPO
|
||||
v5Fv3ZpYDhKtJmcgsldqdsMudYoZaLx9nKw7zIFN/xwKBE/U8Vq6nzr+RUg9UXnX
|
||||
ppNsNta9iUKuEclutR+GwsvJktx8DvjxAbKXj0DWrMpuuFm5Aps08MfvbADSA7LB
|
||||
amXTRgJ6+n3ZOVjItk3AuYQnaoUCgYEAw34EyV+BJlXO1HHzmud1EIA+eB7NpnDX
|
||||
D7NcnSJ5XUuSCThzJUyQhhxBCg2dH+9JSjEmcTvbFkhR52GG4TH5lHpIRltK3JgZ
|
||||
Vjg3epy+eWImQpoKMcawCUDwVq0V9TW5pcfncmMATQzukJlXcdyT1asyjSng7Y5P
|
||||
LuZVmxf3fpcCgYEAtFeClOHQzt2Hm8j8kKdY4L/YF3Vlg4tlhdOE/6BjwjGAm6cr
|
||||
S4qWfiH+eXylroIQWrQe1rA/3voPA6jSRw5Uz3OT8EP+GpA2EtM4hgFQviGvyBqt
|
||||
BQBhQJTz/T18u3pZRv85TSX0powcC1Um5/regBNyLW8WOk/TXnYzZ2iCKM0CgYAn
|
||||
PxRs7Qx7iryEMABM9+yrjGN+MAjvQjYaw9JzBWnCDhraWQfc1BsroV55SzRhJePb
|
||||
zjQ+hVq9hXVT82NlsGe/pDEAVvGXib2EbrLMnc0rh0XRFyW2yoGqyeu2Kvd+i/Oi
|
||||
UZiogTGdRlxakT5Z8IOJYN48Ms0iQ/CnpLxI763TLwKBgDluqgmXF1sDYnzZIDtE
|
||||
rskliyFgFGYG/bBUBwwpXkEboOhojmNN73v+ko+6pAl6DvN17GMhR3YP71d3K2PL
|
||||
wjj7lQSMELPLHOQvNbYOrtNdqb+YxExV28sEgCVqNqTNe+09IWgACWUDqObdMTTL
|
||||
wbY49d7N2Ih6Tg0vQFeIKgCo
|
||||
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==
|
||||
-----END PRIVATE KEY-----
|
||||
|
|
Ładowanie…
Reference in New Issue