Merge remote-tracking branch 'origin/dev' into dev

Sienci-Labs · Jan 8, 2024 · 6ddc0fe · 6ddc0fe
2 parents 45a263b + 3de3ee4
commit 6ddc0fe
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/src/app/containers/Calibration/Diagnostics/components/AtAGlance.jsx b/src/app/containers/Calibration/Diagnostics/components/AtAGlance.jsx
@@ -35,6 +35,10 @@ import styles from '../index.styl';
 
 const AtAGlance = ({ homing, softLimits, homingLocation, reportInches, stepperMotors }) => {
     const handleStepperMotorToggle = (value) => {
+        if (!controller.settings?.settings) {
+            return;
+        }
+
         if (value) {
             store.replace('workspace.diagnostics.stepperMotor.storedValue', controller.settings.settings.$1);
             controller.command('gcode', ['$1=255', '$$']);

diff --git a/src/app/lib/GCodeVirtualizer.js b/src/app/lib/GCodeVirtualizer.js
@@ -865,16 +865,19 @@ class GCodeVirtualizer extends EventEmitter {
         this.fn = { addLine, addArcCurve, addCurve, callback };
         this.collate = collate;
 
-        const { xAccel, yAccel, zAccel } = accelerations;
-        this.xAccel = xAccel;
-        this.yAccel = yAccel;
-        this.zAccel = zAccel;
-
-        const { xMaxFeed, yMaxFeed, zMaxFeed } = maxFeedrates;
-        this.xMaxFeed = xMaxFeed;
-        this.yMaxFeed = yMaxFeed;
-        this.zMaxFeed = zMaxFeed;
+        if (accelerations) {
+            const { xAccel, yAccel, zAccel } = accelerations;
+            this.xAccel = xAccel;
+            this.yAccel = yAccel;
+            this.zAccel = zAccel;
+        }
 
+        if (maxFeedrates) {
+            const { xMaxFeed, yMaxFeed, zMaxFeed } = maxFeedrates;
+            this.xMaxFeed = xMaxFeed;
+            this.yMaxFeed = yMaxFeed;
+            this.zMaxFeed = zMaxFeed;
+        }
 
         if (this.collate) {
             this.vmState.feedrates = new Set();

diff --git a/src/app/lib/diagnostics.js b/src/app/lib/diagnostics.js
@@ -249,8 +249,6 @@ function generateSupportFile() {
     api.alarmList.fetch().then(data => {
         const grblAlarmsAndErrors = get(data, 'body.list', []);
         [alarms, errors] = partition(grblAlarmsAndErrors, ['type', 'ALARM']);
-        console.log(alarms);
-        console.log(errors);
     });
 
     let eepromData = [];
@@ -322,15 +320,15 @@ function generateSupportFile() {
                                                 <Text style={styles.textItalic}>
                                                     {'    X Max: '}
                                                     <Text style={styles.text}>
-                                                        {machineProfile.limits.xmax + '\n'}
+                                                        {get(machineProfile, 'limits.xmax', '0') + '\n'}
                                                     </Text>
                                                     {'    Y Max: '}
                                                     <Text style={styles.text}>
-                                                        {machineProfile.limits.ymax + '\n'}
+                                                        {get(machineProfile, 'limits.ymax', '0') + '\n'}
                                                     </Text>
                                                     {'    Z Max: '}
                                                     <Text style={styles.text}>
-                                                        {machineProfile.limits.zmax + '\n'}
+                                                        {get(machineProfile, 'limits.zmax', '0') + '\n'}
                                                     </Text>
                                                 </Text>
                                             </Text>

diff --git a/src/app/widgets/Console/Terminal.jsx b/src/app/widgets/Console/Terminal.jsx
@@ -220,6 +220,10 @@ class TerminalWrapper extends PureComponent {
     }
 
     writeln(data) {
+        if (!this.term) {
+            return;
+        }
+
         this.term.write('\r');
         if (data.includes('error:')) {
             this.term.write(color.xterm(RED)(data));

diff --git a/src/app/widgets/Probe/index.jsx b/src/app/widgets/Probe/index.jsx
@@ -383,6 +383,7 @@ class ProbeWidget extends PureComponent {
 
     getInitialState() {
         const units = store.get('workspace.units');
+        const defaultToolDiameter = units === METRIC_UNITS ? 6.35 : 0.25;
         const availableTools = store.get('workspace.tools', []);
 
         const touchplateType = store.get('workspace.probeProfile.touchplateType');
@@ -391,7 +392,7 @@ class ProbeWidget extends PureComponent {
         if (touchplateType === TOUCHPLATE_TYPE_AUTOZERO) {
             toolDiameter = PROBE_TYPE_AUTO;
         } else {
-            toolDiameter = availableTools[0][units === METRIC_UNITS ? 'metricDiameter' : 'imperialDiameter'];
+            toolDiameter = availableTools.length === 0 ? defaultToolDiameter : availableTools[0][units === METRIC_UNITS ? 'metricDiameter' : 'imperialDiameter'];
         }
 
         return {

diff --git a/src/server/controllers/Grbl/GrblController.js b/src/server/controllers/Grbl/GrblController.js
@@ -1440,7 +1440,7 @@ class GrblController {
                 const delay = _.get(preferences, 'spindle.delay', false);
 
                 if (delay) {
-                    gcode = gcode.replace(/(S[0-9]* M[3-4])|(M[3-4] S[0-9]*)/g, '$& G4 P1');
+                    gcode = gcode.replace(/\b(?:S\d* ?M[34]|M[34] ?S\d*)\b(?! ?G4 ?P?\b)/g, '$& G4 P1');
                 }
 
                 const gcodeWithoutComments = gcode.replace(bracketCommentLine, '');

diff --git a/src/server/controllers/Grbl/GrblLineParserResultStatus.js b/src/server/controllers/Grbl/GrblLineParserResultStatus.js
@@ -61,7 +61,7 @@ class GrblLineParserResultStatus {
             //   - Door:1 Machine stopped. Door still ajar. Can't resume until closed.
             //   - Door:2 Door opened. Hold (or parking retract) in-progress. Reset will throw an alarm.
             //   - Door:3 Door closed and resuming. Restoring from park, if applicable. Reset will throw an alarm.
-            const states = (params.shift() || '').split(':');
+            const states = (params?.shift() || '').split(':');
             payload.activeState = states[0] || '';
             payload.subState = Number(states[1] || '');
         }

diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js
@@ -1391,7 +1391,7 @@ class GrblHalController {
                 const delay = _.get(preferences, 'spindle.delay', false);
 
                 if (delay) {
-                    gcode = gcode.replace(/(S[0-9]* M[3-4])|(M[3-4] S[0-9]*)/g, '$& G4 P1');
+                    gcode = gcode.replace(/\b(?:S\d* ?M[34]|M[34] ?S\d*)\b(?! ?G4 ?P?\b)/g, '$& G4 P1');
                 }
 
                 const ok = this.sender.load(name, gcode + '\n', context);