Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
petervanderwalt committed Jun 7, 2023
1 parent f724560 commit f3c9b79
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 49 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
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
v1.0.367: Fixed 'indexOf' startup Bug - removed Port Conflict Detection
Expand Down
1 change: 1 addition & 0 deletions app/jog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
<script type="text/javascript" src="../js/ui.js"></script>
<script type="text/javascript" src="../js/websocket.js"></script>
<script type="text/javascript" src="../js/grbl-settings.js"></script>
<script type="text/javascript" src="../js/grbl-settings-templates.js"></script>
<script type="text/javascript" src="../js/metroactions.js"></script>
<script type="text/javascript" src="../js/jog.js"></script>
<script type="text/javascript" src="../js/mobilejog.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion app/js/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ function initSocket() {
}

if (string.indexOf("A fatal error occurred: Failed to connect to ESP32: Timed out waiting for packet header") != -1) {
string = "<span class='fg-darkRed'>" + string + ": Make sure the device is in BOOTLOADER MODE. Your computer failed to put it into Bootloader mode automatically. You can enter bootloader mode by: Press and hold down MODE, the Press RESET while still holding MODE. Let go of RESET, then wait a second or two and let go of MODE. Best performed right after starting the Firmware Flashing operation."
string = "<span class='fg-darkRed'>" + string + ": Make sure the device is in BOOTLOADER MODE. Your computer failed to put it into Bootloader mode automatically. You can enter bootloader mode by: Press and hold down MODE, then Press RESET while still holding MODE. Let go of RESET, then wait a second or two and let go of MODE. Best performed right after starting the Firmware Flashing operation."
}


Expand Down
42 changes: 21 additions & 21 deletions fullchain1.pem
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
-----BEGIN CERTIFICATE-----
MIIFNTCCBB2gAwIBAgISA/m8o7dHZAblcRjsgQtOsmD6MA0GCSqGSIb3DQEBCwUA
MIIFNjCCBB6gAwIBAgISA/JIGSX+74ATShqXdDXVgvD4MA0GCSqGSIb3DQEBCwUA
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
EwJSMzAeFw0yMzAzMjAxOTAxNDdaFw0yMzA2MTgxOTAxNDZaMCMxITAfBgNVBAMT
EwJSMzAeFw0yMzA2MDcxNzU4NDdaFw0yMzA5MDUxNzU4NDZaMCMxITAfBgNVBAMT
GG15bWFjaGluZS5vcGVuYnVpbGRzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
ADCCAQoCggEBALXkEHVQ4tpegMIku8+9Rn/u/MfE7DoSVZ2MMlY4XEqMvccx7Sj+
CnNOc/rnMJ6V/nkj+8b5s9rxqQSCw6UOlmFJqPhjafU4SOipDWf1sQCKEkBn34FQ
cR+cTyc4gym8PAqZcWuCfCHgHubuza6A+9AtU/v491PwWPsJY5AOrHVPOsjXq8JO
t2x5g40TxfO6PJxMv9MDiDRmRALmpHjhoh9KgoEzQN48nv1uPPZRSJ1dm/p62t7b
QuVbxWmTgNd3NdcWKCxfykBnJMDlLgPT5ftoyqb4MrzEbbuFZ34+TeHfbdWoOtLq
Vk59pPCnXQoLnPVtPqxRVrBVlESAZK1rJoECAwEAAaOCAlIwggJOMA4GA1UdDwEB
ADCCAQoCggEBAJfA2X2Y1M8PbiAC9OwV2MdQf/ctPaa75ZahE0DmBECcwfD4ulYz
75zLpOlX3assBSQGTh4Y/iolhVQlsa1CiAuce74tUvhnw0ssWqkUWr/GGmpovh1F
i/dxRZv0wUbD1g0EtXqHQ01icFOzQc4zps7aT4ZRC/NCNicqTyk2eHbJMDFYaF3C
Eg8yJjG9DrfVcBVyTsBBZiVnTHM4LfTtgR/06oYww6d76wYAfhgfl0Ag80X1rNc8
r+4TKGe6iIYoY8HPI1BzeznwxmEBG8yTO011tc9CZ9mXb6DAfvIo0jYh3Itla2zR
+LXUAipNFzEoKQhKHYtdbMhAHk+wmRMASnMCAwEAAaOCAlMwggJPMA4GA1UdDwEB
/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
BAIwADAdBgNVHQ4EFgQUszKYYxlc3L5R4faRVIHXGMbFamUwHwYDVR0jBBgwFoAU
BAIwADAdBgNVHQ4EFgQU0lw7uno6SiaxIEerDzXh/96r10owHwYDVR0jBBgwFoAU
FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
LmxlbmNyLm9yZy8wIwYDVR0RBBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUH
AgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB
9ASB8QDvAHUAejKMVNi3LbYg6jjgUh7phBZwMhOFTTvSK8E6V6NS61IAAAGHAJ0W
LAAABAMARjBEAiBPH7EHmVS9ObDRPQ441BpQd3/JkSmto9OG6EFi5ch37QIgEvbz
9mD5dFjVjF+StRbaic/1fuJ8zd4I/sQ2wH/ftcgAdgCt9776fP8QyIudPZwePhhq
tGcpXc+xDCTKhYY069yCigAAAYcAnRZDAAAEAwBHMEUCIQDvFH1xSHBozav32r9r
/jWL1ddZiENUJGWwdizGE7OEIwIgMK1RKLyWVTVnlPuz2iwPndIt+hLOygvLkELD
1KN8R1QwDQYJKoZIhvcNAQELBQADggEBABi1X50iMWs6wY5VU9M+CvCkpSDARgN8
LZgh9UqbwZheoRiGYOMOPPL3XSu055rTMxcQZlJj38yf8rALPMQHiQVxQI2bDQny
I6MUSziyiyQ/JtMjHza3B8+SZUgnhuwajFWsRJQsjGKCv0UEb8hAc2//JW7NrNFf
rsh2jsaKxkzkJkdPWYNdLJ9JGK/QdUqVD/2B+MggHg8Cj85Oi2VXvEOXdfxACW+P
zmiULGOBKkUFKhvjIVTtHCR8IzOcxxLxvw5j6qGOit5EryIjIZZsTNR67gZtXdc7
baoKufatZjX/HFXkTuGz0YOdQIg12NFnpgAtivPf91K2lZpgGn8V9YA=
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
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.369",
"version": "1.0.370",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Host Software",
"author": "github.com/openbuilds <support@openbuilds.com>",
Expand Down
52 changes: 26 additions & 26 deletions privkey1.pem
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC15BB1UOLaXoDC
JLvPvUZ/7vzHxOw6ElWdjDJWOFxKjL3HMe0o/gpzTnP65zCelf55I/vG+bPa8akE
gsOlDpZhSaj4Y2n1OEjoqQ1n9bEAihJAZ9+BUHEfnE8nOIMpvDwKmXFrgnwh4B7m
7s2ugPvQLVP7+PdT8Fj7CWOQDqx1TzrI16vCTrdseYONE8XzujycTL/TA4g0ZkQC
5qR44aIfSoKBM0DePJ79bjz2UUidXZv6etre20LlW8Vpk4DXdzXXFigsX8pAZyTA
5S4D0+X7aMqm+DK8xG27hWd+Pk3h323VqDrS6lZOfaTwp10KC5z1bT6sUVawVZRE
gGStayaBAgMBAAECggEACxlKg84WuZpwougY6bkz9xR/KjVy8KwzuzRV0fsIbqgd
4GzEeu7ddmHAI/w9dD/U0lGGyIJuHhsG5DaSd5znQjJ7dASk74iqsj+2iLRuQ4kp
SfLMqZhd/r7L+amyHzbUNxVb3WKN7oc9e3vw4wgN1Yseh86OUPnmhBLzl1O95D6C
ExFfkcE15OfJF0E+WftOr6WLiFhhhnkpmYb6IPPTdbsjDAaLA5T7XegmZ6KIMDGN
xAkodzJmwFmc/n0m18WrAzmdMg3QAyQFCUO/U0TuMGdnjYSC4X6z5aYX8rLUbevf
gp7hHHP2ad+cmBF9ggMyOnT5W5vJeGp4iDkK6O/ArQKBgQDYjcsoks7CiSxsoo+j
XUXQvpzehk+KCGFNKNndoO/WL9cu0reMo/PvDNXkgOKWwfQmyuOBfXTDbw/L81jx
r/UdBtFkNh3HajfgtoFAEe/kIZgCHeD2ge9c33SZIlh2uIycLfNi8tqZOxSSQhap
rd4q27zBfQ/ZZW0O6Aei9ljU+wKBgQDXBeMNpNryILaGLF4Bu6t/Et6ZrDhzRDzI
E29yifnWFAeJw8NFeNPs4+MIQqv4KgpEwIc/wFg5w7uYqcCWZJxbdgeq0y0znq5D
IEw0rncmkxqYuHVglyuGwS31jNH8wTbQ+7wHvOl3Lkuo4kjm3FtEB/GrTYaviD1I
DbH6f6fBswKBgQCY9m9OVYSefO5YPetf5X5vGHUN6ak9QvYX3ocluYwvqtNAS69D
NHwVmudq5G8pNg8TZ7STvt4/Pa/WzClDbpqgyjQVqPQX67tUixV5ADKG3gPVWu2Q
se81ltFxaYU7Nth7aSnF9uzZ15WMSgpgCGQpudT2hzQuxynloZfjUEcnCQKBgQCU
BQZvrwvV4HUl2kcAlGuTd67rROY7Wz8oUFDJHXhySamCydOT8ICbM6lnV1ZA6NfW
yl6QoV1aroZmqnzcSvhj8dWHYAZe4Z5+sS4kmfGGCYAmn9yVmJsrEbMMtVsczvlo
VdLz1LU3CRSmdtfOrOTa6UkRLrZIAdaF0n+xvM0EBwKBgFIMtOBTDVrtXDd2oa6d
lL5VUrAE1br3K9iCod8g+442M1WdAD9YE04Av7MNs3cJb1OyMHCyP+g5W/w6jnz4
gPYK/CsSjex8UFzpCw9Me1HNDrPFNIOnTE3Kvd/+IfV9nbFVC+22xGA/JbUvcXGG
BPYzro++nm2mG3JovIEU3a/9
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
-----END PRIVATE KEY-----

0 comments on commit f3c9b79

Please sign in to comment.