Skip to content

Commit

Permalink
v1.0.329
Browse files Browse the repository at this point in the history
  • Loading branch information
petervanderwalt committed Jul 14, 2022
1 parent 1df3f0d commit 81528e1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 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.329: Testing version for random start bug
v1.0.327/8: Updated GHA compile environment dependencies
v1.0.326: Reverted to classic Grbl Settings layout, added more Grbl settings parameters, fixed bug in Firmware upload tool,
v1.0.325: Updated Electron-builder backend
Expand Down
28 changes: 24 additions & 4 deletions app/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,33 @@ function runJobFile() {
// Add any event handlers here...
xhr.open('POST', '/runjob', true);
xhr.send(formData);
printLog(`<span class="fg-red">[ GCODE Parser ]</span><span class='fg-darkGray'> GCODE File (from memory) sent to backend </span>`);

} else {
socket.emit('runJob', {
data: editor.getValue(),
isJob: true,
fileName: loadedFileName
// v1.0.329 Removed as a test for random issue with Websocket Disconnects on some files, using http post for both
// socket.emit('runJob', {
// data: editor.getValue(),
// isJob: true,
// fileName: loadedFileName
// });
var formData = new FormData();
var blob = new Blob([editor.getValue()], {
type: 'text/plain'
});

var fileOfBlob = new File([blob], 'upload.gcode');
formData.append("file", fileOfBlob);
var xhr = new XMLHttpRequest();
xhr.onload = function() {
if (xhr.status == 200) {
console.log(xhr.response)
}
};
// Add any event handlers here...
xhr.open('POST', '/runjob', true);
xhr.send(formData);
printLog(`<span class="fg-red">[ GCODE Parser ]</span><span class='fg-darkGray'> GCODE File (from gcode editor) sent to backend </span>`);

}

lastJobStartTime = new Date().getTime()
Expand Down
Binary file modified build/installerSidebar.bmp
Binary file not shown.
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.328",
"version": "1.0.329",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Host Software",
"author": "github.com/openbuilds <support@openbuilds.com>",
Expand Down

0 comments on commit 81528e1

Please sign in to comment.