From b791f92e044c09ed4da7bae6989413d3ecaa1377 Mon Sep 17 00:00:00 2001
From: openbuilds-engineer
Date: Thu, 9 Mar 2023 22:04:52 +0200
Subject: [PATCH] v1.0.360
---
CHANGELOG.txt | 1 +
app/wizards/resume/resume.js | 21 +++++++++++++--------
package.json | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 347ac313..d172d21d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,4 @@
+v1.0.360: Improved Job Recovery wizard to handle Spindle commands / Warn if no spindle commands found (Thanks to @sharmstr)
v1.0.357-359: Debugged and fixed the Linux/Mac Modules bug, removed Hazardous from dependencies, Changed internal methods for launching esptool
v1.0.356: Added right-click Context Menu to Macro Buttons. Moved Delete/Edit to Macros Context Menu. Added Macro Button Sorting to Context Menu. Added Macro Export/Import functionality
v1.0.355: Updated installer license agreement / terms and conditions, Added Email Registration, Fixed Surfacing Wizard menu bug
diff --git a/app/wizards/resume/resume.js b/app/wizards/resume/resume.js
index 37d0b387..73cb6955 100644
--- a/app/wizards/resume/resume.js
+++ b/app/wizards/resume/resume.js
@@ -139,7 +139,7 @@ function startFromHere(lineNumber) {
- Keep the first lines of the file as header
- Raise Z with the GCODE:
- - Spindle ON command not found!
+ - Spindle ON command not found! Please start spindle before running job
- Move to entry position with GCODE:
- Move to cutting height with GCODE:
- Run GCODE starting at line and continue with the job
@@ -157,16 +157,16 @@ function startFromHere(lineNumber) {
if (currentLine.length > 0) {
currentLine = currentLine.split(/[;(]/); // Remove everything after ; or ( = comment
line = currentLine[0]
- line = line.toUpperCase();
+ line = line.toUpperCase();
- if ( line.indexOf('M3') != -1 || line.indexOf('M4') != -1 ) {
- foundSpindle = true;
+ if (line.indexOf('M3') != -1 || line.indexOf('M4') != -1) {
+ foundSpindle = true;
spindle = line;
// Search forward one line for pause cmd
if (editor.session.getLine(i + 1).toUpperCase().indexOf('G4') != -1) {
console.log('pause line? ' + editor.session.getLine(i + 1))
spindle += '\n' + editor.session.getLine(i + 1).toUpperCase();
- }
+ }
break;
}
}
@@ -200,9 +200,9 @@ function startFromHere(lineNumber) {
$('#resumeZm').html(GcodeLineZDown);
if (spindle) {
- $('#spindleMsg').html("Turn spindle ON: ");
+ $('#spindleMsg').html("Turn spindle ON: " + spindle + " ");
$('#resumeSpindle').html(spindle);
- }
+ }
//Metro.dialog.open("#ResumeFileDialog");
}
@@ -216,7 +216,12 @@ function redoJob() {
var ZGcode = $('#resumeZm').html();
var resumeLineNumber = $('#resumeLastLine').html();
var resumeLastNumber = editor.session.getLength();
- var spindleGcode = $('#resumeSpindle').html();
+ if ($('#resumeSpindle').html() != undefined) {
+ var spindleGcode = $('#resumeSpindle').html();
+ } else {
+ var spindleGcode = '';
+ }
+
for (var i = 0; i < startLineNumber; i++) {
diff --git a/package.json b/package.json
index 72d09507..4295a1e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
- "version": "1.0.359",
+ "version": "1.0.360",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Host Software",
"author": "github.com/openbuilds ",