kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
In Progress
openbuilds-engineer
rodzic
ba1b9eb28f
commit
bb47d23007
|
|
@ -1,3 +1,4 @@
|
||||||
|
v1.0.239: Add support for VFD/PWM spindles to Tool On menu, Fixed bug in Surfacing Wizard Issue #139, Updated Certificates
|
||||||
v1.0.238: Added Automatic Probing (Find Endmill diameter automatically), Fix cosmetic bug in editing JS Macros. Fixed issues/enhancements #92, #108, #127, #128, #129, #130, #131, #132, #134, #135
|
v1.0.238: Added Automatic Probing (Find Endmill diameter automatically), Fix cosmetic bug in editing JS Macros. Fixed issues/enhancements #92, #108, #127, #128, #129, #130, #131, #132, #134, #135
|
||||||
v1.0.236/7: Fixed Pause bug
|
v1.0.236/7: Fixed Pause bug
|
||||||
v1.0.235: Improved Serial Buffer check
|
v1.0.235: Improved Serial Buffer check
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
REISSUED
|
|
||||||
|
|
@ -243,21 +243,31 @@
|
||||||
<span class="caption">Tool<br>On</span>
|
<span class="caption">Tool<br>On</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
|
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
|
||||||
<li><a class="grblmode" href="#" onclick="sendGcode('M3 S1000')">Spindle On (M3 S1000)</a></li>
|
<li><a class="grblmode" href="#" onclick="sendGcode('M3 S'+parseInt(grblParams.$30).toFixed(0))">Router On (M3 S<span class="ToolOnS100">1000</span>)</a></li>
|
||||||
<!-- <li class="divider"></li> -->
|
<li>
|
||||||
|
<a href="#" class="dropdown-toggle">Variable Speed Spindle On (M3 Sxxx)</a>
|
||||||
|
<ul class="ribbon-dropdown" data-role="dropdown">
|
||||||
|
<li onclick="sendGcode('M3 S'+(parseInt(grblParams.$30) * 0.05).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 5% RPM (M3 S<span class="ToolOnS5">50</span>)</a></li>
|
||||||
|
<li onclick="sendGcode('M3 S'+(parseInt(grblParams.$30) * 0.1).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 10% RPM (M3 S<span class="ToolOnS10">100</span>)</a></li>
|
||||||
|
<li onclick="sendGcode('M3 S'+(parseInt(grblParams.$30) * 0.25).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 25% RPM (M3 S<span class="ToolOnS25">250</span>)</a></li>
|
||||||
|
<li onclick="sendGcode('M3 S'+(parseInt(grblParams.$30) * 0.5).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 50% RPM (M3 S<span class="ToolOnS50">500</span>)</a></li>
|
||||||
|
<li onclick="sendGcode('M3 S'+(parseInt(grblParams.$30) * 0.75).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 75% RPM (M3 S<span class="ToolOnS75">750</span>)</a></li>
|
||||||
|
<li onclick="sendGcode('M3 S'+parseInt(grblParams.$30).toFixed(0)+'\n G1F1000')"><a href="#">Spindle On 100% RPM (M3 S<span class="ToolOnS100">1000</span>)</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="#" class="dropdown-toggle">Laser On (M3 Sxxx)</a>
|
<a href="#" class="dropdown-toggle">Laser On (M3 Sxxx)</a>
|
||||||
<ul class="ribbon-dropdown" data-role="dropdown">
|
<ul class="ribbon-dropdown" data-role="dropdown">
|
||||||
<li onclick="sendGcode('M3 S50\n G1F1000')"><a href="#">Laser On 5% Power (M3 S50)</a></li>
|
<li onclick="sendGcode('M3 S50\n G1F1000')"><a href="#">Laser On 5% Power (M3 S<span class="ToolOnS5">50</span>)</a></li>
|
||||||
<li onclick="sendGcode('M3 S100\n G1F1000')"><a href="#">Laser On 10% Power (M3 S100)</a></li>
|
<li onclick="sendGcode('M3 S100\n G1F1000')"><a href="#">Laser On 10% Power (M3 S<span class="ToolOnS10">100</span>)</a></li>
|
||||||
<li onclick="sendGcode('M3 S250\n G1F1000')"><a href="#">Laser On 25% Power (M3 S250)</a></li>
|
<li onclick="sendGcode('M3 S250\n G1F1000')"><a href="#">Laser On 25% Power (M3 S<span class="ToolOnS25">250</span>)</a></li>
|
||||||
<li onclick="sendGcode('M3 S500\n G1F1000')"><a href="#">Laser On 50% Power (M3 S500)</a></li>
|
<li onclick="sendGcode('M3 S500\n G1F1000')"><a href="#">Laser On 50% Power (M3 S<span class="ToolOnS50">500</span>)</a></li>
|
||||||
<li onclick="sendGcode('M3 S750\n G1F1000')"><a href="#">Laser On 75% Power (M3 S750)</a></li>
|
<li onclick="sendGcode('M3 S750\n G1F1000')"><a href="#">Laser On 75% Power (M3 S<span class="ToolOnS75">750</span>)</a></li>
|
||||||
<li onclick="sendGcode('M3 S1000\n G1F1000')"><a href="#">Laser On 100% Power (M3 S1000)</a></li>
|
<li onclick="sendGcode('M3 S1000\n G1F1000')"><a href="#">Laser On 100% Power (M3 S<span class="ToolOnS100">1000</span>)</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<!-- <li class="divider"></li> -->
|
<!-- <li class="divider"></li> -->
|
||||||
<li><a class="grblmode" href="#" onclick="sendGcode('M3 S1000')">Plasma On (M3 S1000)</a></li>
|
<li><a class="grblmode" href="#" onclick="sendGcode('M3 S'+parseInt(grblParams.$30).toFixed(0))">Plasma On (M3 S<span class="ToolOnS100">1000</span>)</a></li>
|
||||||
<li class="divider fg-lightGray"></li>
|
<li class="divider fg-lightGray"></li>
|
||||||
<li id="menuMisting" style="display: none;"><a class="grblmode" href="#" onclick="sendGcode('M7')">Misting On (M7)</a></li>
|
<li id="menuMisting" style="display: none;"><a class="grblmode" href="#" onclick="sendGcode('M7')">Misting On (M7)</a></li>
|
||||||
<li><a class="grblmode" href="#" onclick="sendGcode('M8')">Coolant On (M8)</a></li>
|
<li><a class="grblmode" href="#" onclick="sendGcode('M8')">Coolant On (M8)</a></li>
|
||||||
|
|
@ -278,7 +288,7 @@
|
||||||
<span class="caption">Tool<br>Off</span>
|
<span class="caption">Tool<br>Off</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
|
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
|
||||||
<li><a class="grblmode" href="#" onclick="sendGcode('M5')">Spindle / Laser / Plasma Off (M5)</a></li>
|
<li><a class="grblmode" href="#" onclick="sendGcode('M5')">Router / Spindle / Laser / Plasma Off (M5)</a></li>
|
||||||
<li class="divider fg-lightGray"></li>
|
<li class="divider fg-lightGray"></li>
|
||||||
<li><a class="grblmode" href="#" onclick="sendGcode('M9')">Coolant Off (M9)</a></li>
|
<li><a class="grblmode" href="#" onclick="sendGcode('M9')">Coolant Off (M9)</a></li>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,8 @@ function grblSettings(data) {
|
||||||
} else {
|
} else {
|
||||||
$('#enLaser').removeClass('success').addClass('alert').html('OFF')
|
$('#enLaser').removeClass('success').addClass('alert').html('OFF')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateToolOnSValues();
|
||||||
}
|
}
|
||||||
|
|
||||||
function grblPopulate() {
|
function grblPopulate() {
|
||||||
|
|
@ -616,6 +618,15 @@ function clearEEPROM() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateToolOnSValues() {
|
||||||
|
$(".ToolOnS5").html((parseInt(grblParams.$30) * 0.05).toFixed(0))
|
||||||
|
$(".ToolOnS10").html((parseInt(grblParams.$30) * 0.1).toFixed(0))
|
||||||
|
$(".ToolOnS25").html((parseInt(grblParams.$30) * 0.25).toFixed(0))
|
||||||
|
$(".ToolOnS50").html((parseInt(grblParams.$30) * 0.5).toFixed(0))
|
||||||
|
$(".ToolOnS75").html((parseInt(grblParams.$30) * 0.75).toFixed(0))
|
||||||
|
$(".ToolOnS100").html(parseInt(grblParams.$30).toFixed(0))
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Strings from https://github.com/gnea/grbl/wiki/Grbl-v1.1-Configuration
|
// Strings from https://github.com/gnea/grbl/wiki/Grbl-v1.1-Configuration
|
||||||
var grblConfigDesc = {
|
var grblConfigDesc = {
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ G1 X` +
|
||||||
gcode += `G0 Z10\n`;
|
gcode += `G0 Z10\n`;
|
||||||
gcode += `G0 X` + endpointX + ` Y` + endpointY + `\n`; // position at start point
|
gcode += `G0 X` + endpointX + ` Y` + endpointY + `\n`; // position at start point
|
||||||
gcode += `G1 Z-` + data.surfaceDepth + `\n`; // plunge
|
gcode += `G1 Z-` + data.surfaceDepth + `\n`; // plunge
|
||||||
gcode += `G0 X` + endpointX + ` Y` + startpointY + `Z-` + data.surfaceDepth + `\n`; // Cut side
|
gcode += `G1 X` + endpointX + ` Y` + startpointY + `Z-` + data.surfaceDepth + `\n`; // Cut side
|
||||||
gcode += `G0 Z10\n`;
|
gcode += `G0 Z10\n`;
|
||||||
gcode += `G0 X0 Y0\n`;
|
gcode += `G0 X0 Y0\n`;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
AP2VLgsqF6Zdsnlv
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
|
|
||||||
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
|
|
||||||
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
|
|
||||||
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
|
|
||||||
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
|
|
||||||
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
|
|
||||||
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
|
|
||||||
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
|
|
||||||
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
|
|
||||||
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
|
|
||||||
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
|
|
||||||
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
|
|
||||||
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
|
|
||||||
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
|
|
||||||
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
|
|
||||||
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
|
|
||||||
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
|
|
||||||
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
|
|
||||||
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
|
|
||||||
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
|
|
||||||
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
|
|
||||||
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
|
|
||||||
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
|
|
||||||
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
|
|
||||||
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
-----BEGIN RSA PRIVATE KEY-----
|
|
||||||
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
|
|
||||||
-----END RSA PRIVATE KEY-----
|
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
MIIFZzCCBE+gAwIBAgISA8BWuo1WCqLFT1+26LHt89REMA0GCSqGSIb3DQEBCwUA
|
MIIFaTCCBFGgAwIBAgISBGPpDLayyITajZYhoFtMcQQzMA0GCSqGSIb3DQEBCwUA
|
||||||
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
|
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
|
||||||
ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA2MDExNjA5MzFaFw0y
|
ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA4MTAxMzA4NThaFw0y
|
||||||
MDA4MzAxNjA5MzFaMCMxITAfBgNVBAMTGG15bWFjaGluZS5vcGVuYnVpbGRzLmNv
|
MDExMDgxMzA4NThaMCMxITAfBgNVBAMTGG15bWFjaGluZS5vcGVuYnVpbGRzLmNv
|
||||||
bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiYZEE4iHklQFsWC1KB
|
bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMWgzFUsO+nq1rjX3RsU
|
||||||
zY45IGCir0SD9aRriF/rof6+Bo8U2HEyTIBRSdfCqt5uv/ij2ZY4NJktcYk4iI5l
|
Of/zj34LLaU+u7ETUz+I9DdOyRQXwsqAXqugnZlKAdQDHGMSodR92SnewaMGQ7KE
|
||||||
lVA7X1guebXLrypVhQM+Mbp7HVFBtwnNZ47ZjvReeHKsDz8xM5Efc81UYyQp7g06
|
E9IxXjn9Rt8v0RPwim7hWddwHBJgAhHJY676IeDDLgqVJCMLbx3Xu1aTBYAdZ1A3
|
||||||
YOIFf1dDbE3k530zaW5Fd0NqhenJvyOhz3yxnepd/dy1zn3/A0F1vkk4nUhqC4sX
|
HRu9wD5bI/QSmmjH1Noz1m5A7ClMipPxnImMeFr7qBpvwiVHHSOLjFLLOMranO5p
|
||||||
tRuEe/x4kCrU7Mf4LkT23HMeA7brWDSzE1qmn38aMN0rM1fUoZUguSsSM97yGXd0
|
8ie5VZfuUn+ENID7/phF5sm+AmFmltJRQdyWd5f51dB9RZBLd7AS4eqUNL3noddv
|
||||||
a5dZkEZ8LruGcyE0FxxrOQ5PjQtx3LF5AOnLiIUODb5UnNITGg3Gvsr8w/XM0Zub
|
1UVYro4X5cqTeRZa5YHy6clCEKKP9iZ3kTghd8mO/Uf+oiL/48WSVAyII/2sa7vT
|
||||||
2+cCAwEAAaOCAmwwggJoMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
|
5bECAwEAAaOCAm4wggJqMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
|
||||||
BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUrjInjcvb6WU5
|
BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUOWGR4wPeGgDC
|
||||||
DRQJJf02y2KrwL0wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYI
|
K3m2F9YZLH7Def4wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYI
|
||||||
KwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0
|
KwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0
|
||||||
c2VuY3J5cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0
|
c2VuY3J5cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0
|
||||||
c2VuY3J5cHQub3JnLzAjBgNVHREEHDAaghhteW1hY2hpbmUub3BlbmJ1aWxkcy5j
|
c2VuY3J5cHQub3JnLzAjBgNVHREEHDAaghhteW1hY2hpbmUub3BlbmJ1aWxkcy5j
|
||||||
b20wTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEF
|
b20wTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEF
|
||||||
BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEDBgorBgEEAdZ5AgQC
|
BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQC
|
||||||
BIH0BIHxAO8AdQBep3P531bA57U2SH3QSeAyepGaDIShEhKEGHWWgXFFWAAAAXJw
|
BIH2BIHzAPEAdwBep3P531bA57U2SH3QSeAyepGaDIShEhKEGHWWgXFFWAAAAXPY
|
||||||
3BloAAAEAwBGMEQCIDcE3s6KW56n/v+21TDz+x60eRAkXSkXZ9uRTj5H2Ej/AiBC
|
s/RcAAAEAwBIMEYCIQDf5R75xNfGn9PZdy7uGRHj/hk1J4ySd7WWK6y046LQXAIh
|
||||||
tTudyS4Z7l6kNv40+bb3GnDojax9L3xyiHj+Z60tZAB2AAe3XBvlfWj/8bDGHSMV
|
AOBkysDf5PzZqGF9D0vY6tFvW4XiT0zMQ20enPJR0SaeAHYAB7dcG+V9aP/xsMYd
|
||||||
x7rmV3xXlLdq7rxhOhpp06IcAAABcnDcGYgAAAQDAEcwRQIgaq2+xZoftATBzABK
|
IxXHuuZXfFeUt2ruvGE6GmnTohwAAAFz2LP0gAAABAMARzBFAiEAna+uN4heJBKw
|
||||||
AOYurZqWn7bwdFnuvA3AFarIhAYCIQDw6MqpUMf9D5vci6lm2nZ8ucNeYiZYJpjm
|
Z09ygcJYFftI2lWJorhTeVAksFMMfeACIFo7zXAS9wKzyj22ENLiDs/nZvtdPp9D
|
||||||
T40YMPGF6DANBgkqhkiG9w0BAQsFAAOCAQEADD7bHLtv0ESr8edQYnhXUTtgO+K8
|
lA/XAr2bxMsIMA0GCSqGSIb3DQEBCwUAA4IBAQAWOE71yJSYAhOaG5vGmVsqCtwz
|
||||||
RgOw/t3Pw3AfYKIADias2d7Olge3JHBLufSyWadmGOSHg/BmmAimaRfZOjJ+5Svn
|
E22FBa9dXIvmXZoKxyzJtkIBGO4Q58JQ+r2/enpDEUDAHV3e5rexnPJA+v9ekdjI
|
||||||
G/pj2o61tdeTk1EqcGzGY1QYPGql98CcTXtUSduJ0JMBJLBsViKZdbSqpO2ZJSxF
|
+hdzRDuwJp89rL5F80kCHzrw0uqT87maMJttVpfufvTnEbQdwCtL49egn3Ejfi2A
|
||||||
B5Me9g9z+uClVBWospHjb4lHSaFCdV3J24/zLhNcJzvzxe5BKkMdHE1k5I/ryXge
|
sTNOEeWpU3M2mEDPTFPiI6+4zIzABW0eIZVjdK3oHUg+U3rgX7tnsxVEW6mryxOO
|
||||||
4T3Nt+wd6njS6uFfllkPqmD/hVSE4VL+UDIKu3sRqiJCYvDFDlPz1AuT7W8SIvKf
|
HPoONdGncH4vPYo1kjtqbu9GYuQYtNz/FGjIQPJsw3gN2oI7kY0Xzscv6mB0iI33
|
||||||
/u0LHtrne6LZyZV6E+HgSBPrZL8oZacdYGLGgp7r+6iNQReyiQhtz6jTRw==
|
ySZdMB5FCA77RsLmo3GBOYTmGDM1X1hyWh6Dmshbm8YwSdvH2mCuECd0LLWe
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
|
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "OpenBuildsCONTROL",
|
"name": "OpenBuildsCONTROL",
|
||||||
"version": "1.0.238",
|
"version": "1.0.240",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
|
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
|
||||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||||
|
|
|
||||||
52
privkey1.pem
52
privkey1.pem
|
|
@ -1,28 +1,28 @@
|
||||||
-----BEGIN PRIVATE KEY-----
|
-----BEGIN PRIVATE KEY-----
|
||||||
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
|
||||||
TUEmI2jpnUxLjpzYCsTNXQ==
|
Eb7XQGbTvIvFsA1O8VYTbaZ5
|
||||||
-----END PRIVATE KEY-----
|
-----END PRIVATE KEY-----
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue