Added status bar for machine type

Author: mikecentola

src/control.ts

@@ -71,15 +71,15 @@ export class Control {
         this._context = context;
         this._config = config;
 
+        // Load StatusBars
+        context.subscriptions.push((this._statusBarControl = new StatusBarControl(this._context)));
+
         // Load Machine Type
         context.subscriptions.push((this._machineTypeControl = new MachineTypeControl()));
 
         // Load State Controller
         this._stateController = new StateControl(context);
 
-        // Load StatusBars
-        context.subscriptions.push((this._statusBarControl = new StatusBarControl(this._context)));
-
         // Load Hover Controller
         context.subscriptions.push((this._hoverController = new GCodeHoverControl()));
 

src/gcodeUnits.ts

@@ -31,7 +31,13 @@ export class GCodeUnitsController implements Disposable {
 
         this._auto = (this._units = <GCodeUnits>configuration.getParam('general.units')) === GCodeUnits.Auto;
 
-        this._statusbar.updateStatusBar(this._units, this.unitsStatusBar);
+        this._statusbar.updateStatusBar(
+            this._units,
+            this.unitsStatusBar,
+            undefined,
+            undefined,
+            UtilCommands.ShowGCodeSettings,
+        );
 
         Control.context.subscriptions.push(configuration.onDidChange(this.onConfigurationChanged, this));
         Control.context.subscriptions.push(window.onDidChangeActiveTextEditor(() => this.onActiveEditorChanged()));

src/util/machineType.ts

@@ -8,10 +8,15 @@ import { ConfigurationChangeEvent, Disposable, Event, EventEmitter, workspace }
 import { GReference, MachineTypes } from '@appliedengdesign/gcode-reference';
 import { configuration } from './config';
 import { Logger } from './logger';
+import { StatusBar, StatusBarControl } from './statusBar';
+import { Control } from '../control';
+import { UtilCommands } from './commands/common';
 
 export class MachineTypeControl implements Disposable {
     private readonly _dispoable: Disposable | undefined;
     private _machineType: MachineTypes | undefined;
+    private _statusbar: StatusBarControl;
+    private readonly mtypeStatusBar: StatusBar = 'machineTypeBar';
     private _gReference: GReference;
 
     private _onDidChange = new EventEmitter<ConfigurationChangeEvent>();
@@ -20,8 +25,9 @@ export class MachineTypeControl implements Disposable {
     }
 
     constructor() {
+        this._statusbar = Control.statusBarController;
+        this._gReference = new GReference();
         this.update();
-        this._gReference = new GReference(this._machineType);
 
         this._dispoable = Disposable.from(workspace.onDidChangeConfiguration(this.onConfigurationChanged, this));
     }
@@ -57,6 +63,16 @@ export class MachineTypeControl implements Disposable {
             default:
                 return;
         }
+
+        this._statusbar.updateStatusBar(
+            cfgMachineType,
+            this.mtypeStatusBar,
+            undefined,
+            undefined,
+            UtilCommands.ShowGCodeSettings,
+        );
+
+        this._gReference.setType(this._machineType);
     }
 
     get gReference() {

src/util/statusBar.ts

@@ -20,6 +20,7 @@ import { Logger } from './logger';
 export interface StatusBars {
     treeStatusBar?: StatusBarItem | undefined;
     unitsBar?: StatusBarItem | undefined;
+    machineTypeBar?: StatusBarItem | undefined;
     support?: StatusBarItem | undefined;
 }
 
@@ -41,6 +42,7 @@ export class StatusBarControl implements Disposable {
         this._statusBars = {
             treeStatusBar: undefined,
             unitsBar: undefined,
+            machineTypeBar: undefined,
             support: undefined,
         };