Merge c2a7d3e into c779c66

src/server/controllers/Grbl/GrblController.js

@@ -746,6 +746,9 @@ class GrblController {
         // Tool
         const tool = this.runner.getTool();
 
+        // G-code parameters
+        const parameters = this.runner.getParameters();
+
         return Object.assign(context || {}, {
             // User-defined global variables
             global: this.sharedContext,
@@ -791,6 +794,9 @@ class GrblController {
             // Tool
             tool: Number(tool) || 0,
 
+            // G-code parameters
+            params: parameters,
+
             // Global objects
             ...globalObjects,
         });

src/server/controllers/Grbl/GrblRunner.js

@@ -208,6 +208,10 @@ class GrblRunner extends events.EventEmitter {
         return Number(_.get(state, 'parserstate.tool')) || 0;
     }
 
+    getParameters() {
+        return _.get(this.settings, 'parameters', {});
+    }
+
     isAlarm() {
         const activeState = _.get(this.state, 'status.activeState');
         return activeState === GRBL_ACTIVE_STATE_ALARM;

src/server/controllers/index.js

@@ -1,4 +1,6 @@
-export GrblController from './Grbl/GrblController';
-export MarlinController from './Marlin/MarlinController';
-export SmoothieController from './Smoothie/SmoothieController';
-export TinyGController from './TinyG/TinyGController';
+import GrblController from './Grbl/GrblController';
+import MarlinController from './Marlin/MarlinController';
+import SmoothieController from './Smoothie/SmoothieController';
+import TinyGController from './TinyG/TinyGController';
+
+export { GrblController, MarlinController, SmoothieController, TinyGController };

src/server/services/index.js

@@ -1,4 +1,6 @@
-export cncengine from './cncengine';
-export configstore from './configstore';
-export monitor from './monitor';
-export taskrunner from './taskrunner';
+import cncengine from './cncengine';
+import configstore from './configstore';
+import monitor from './monitor';
+import taskrunner from './taskrunner';
+
+export { cncengine, configstore, monitor, taskrunner };