Fix for alarms on HAL with lookup

Sienci-Labs · Mar 19, 2024 · 2544609 · 2544609
1 parent fa957e5
commit 2544609
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js
@@ -791,7 +791,8 @@ class GrblHalController {
         this.runner.on('alarm', (res) => {
             const code = Number(res.message) || this.state.status.subState;
             //const alarm = _.find(this.settings.alarms, { id: code });
-            const alarm = this.settings.alarms[code];
+            const alarm = this.settings.alarms[code.toString()];
+            console.log(alarm);
 
             const { lines, received, name } = this.sender.state;
             const { outstanding } = this.feeder.state;
@@ -824,7 +825,7 @@ class GrblHalController {
                 if (isRunning) {
                     this.workflow.stop();
                 }
-                this.emit('serialport:read', `ALARM:${code} (${alarm.message})`);
+                this.emit('serialport:read', `ALARM:${code} (${alarm.description})`);
                 this.emit('error', {
                     type: ALARM,
                     code: code,

diff --git a/src/server/controllers/Grblhal/GrblHalRunner.js b/src/server/controllers/Grblhal/GrblHalRunner.js
@@ -285,10 +285,11 @@ class GrblHalRunner extends events.EventEmitter {
             return;
         }
         if (type === GrblHalLineParserResultAlarmDetails) {
-            this.settings.alarms[Number(payload.id)] = {
+            this.settings.alarms[payload.id] = {
                 description: payload.description,
                 id: payload.id
             };
+
             this.emit('alarmDetail', this.settings.alarms);
             return;
         }